Adjust some tests

dotnet · Forgind · Apr 23, 2025 · Apr 23, 2025 · Apr 23, 2025 · Apr 29, 2025
commit e41488c3a6884bb261d1b0f41099c3a85148db06
diff --git a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetBuildInvocation.cs b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetBuildInvocation.cs
@@ -17,11 +17,11 @@
 
         [Theory]
         [InlineData(new string[] { }, new string[] { })]
-        [InlineData(new string[] { "-o", "foo" }, new string[] { "-property:OutputPath=<cwd>foo", "-property:_CommandLineDefinedOutputPath=true" })]
+        [InlineData(new string[] { "-o", "myoutput" }, new string[] { "-property:OutputPath=<cwd>myoutput", "-property:_CommandLineDefinedOutputPath=true" })]
         [InlineData(new string[] { "-property:Verbosity=diag" }, new string[] { "--property:Verbosity=diag" })]
-        [InlineData(new string[] { "--output", "foo" }, new string[] { "-property:OutputPath=<cwd>foo", "-property:_CommandLineDefinedOutputPath=true" })]
+        [InlineData(new string[] { "--output", "myoutput" }, new string[] { "-property:OutputPath=<cwd>myoutput", "-property:_CommandLineDefinedOutputPath=true" })]
         [InlineData(new string[] { "--artifacts-path", "foo" }, new string[] { "-property:ArtifactsPath=<cwd>foo" })]
-        [InlineData(new string[] { "-o", "foo1 foo2" }, new string[] { "-property:OutputPath=<cwd>foo1 foo2", "-property:_CommandLineDefinedOutputPath=true" })]
+        [InlineData(new string[] { "-o", "foo1 myoutput" }, new string[] { "-property:OutputPath=<cwd>foo1 myoutput", "-property:_CommandLineDefinedOutputPath=true" })]
         [InlineData(new string[] { "--no-incremental" }, new string[] { "-target:Rebuild" })]
         [InlineData(new string[] { "-r", "rid" }, new string[] { "-property:RuntimeIdentifier=rid", "-property:_CommandLineDefinedRuntimeIdentifier=true" })]
         [InlineData(new string[] { "-r", "linux-amd64" }, new string[] { "-property:RuntimeIdentifier=linux-x64", "-property:_CommandLineDefinedRuntimeIdentifier=true" })]
@@ -42,7 +42,7 @@
         {
             CommandDirectoryContext.PerformActionWithBasePath(WorkingDirectory, () =>
             {
-                expectedAdditionalArgs = expectedAdditionalArgs.Select(arg => arg.Replace("<cwd>", WorkingDirectory)).ToArray();
+                expectedAdditionalArgs = expectedAdditionalArgs.Select(arg => arg.Replace("<cwd>", WorkingDirectory).Replace("myoutput", "myoutput" + Path.DirectorySeparatorChar)).ToArray();
 
                 var msbuildPath = "<msbuildpath>";
                 var command = BuildCommand.FromArgs(args, msbuildPath);
@@ -85,12 +85,12 @@
             CommandDirectoryContext.PerformActionWithBasePath(WorkingDirectory, () =>
             {
                 expectedAdditionalArgsForRestore = expectedAdditionalArgsForRestore
-                    .Select(arg => arg.Replace("<cwd>", WorkingDirectory))
+                    .Select(arg => arg.Replace("<cwd>", WorkingDirectory).Replace("myoutput", "myoutput" + Path.DirectorySeparatorChar)
                     .ToArray();
 
                 expectedAdditionalArgs = expectedAdditionalArgs
-                    .Select(arg => arg.Replace("<cwd>", WorkingDirectory))
+                    .Select(arg => arg.Replace("<cwd>", WorkingDirectory).Replace("myoutput", "myoutput" + Path.DirectorySeparatorChar)
                     .ToArray();
 
                 var msbuildPath = "<msbuildpath>";
                var command = BuildCommand.FromArgs(args, msbuildPath);

diff --git a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetCleanInvocation.cs b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetCleanInvocation.cs
@@ -52,7 +52,7 @@ public void MsbuildInvocationIsCorrect(string[] args, string[] expectedAdditiona
             CommandDirectoryContext.PerformActionWithBasePath(WorkingDirectory, () =>
             {
                 expectedAdditionalArgs = expectedAdditionalArgs
-                    .Select(arg => arg.Replace("<cwd>", WorkingDirectory))
+                    .Select(arg => arg.Replace("<cwd>", WorkingDirectory).Replace("<output>", "<output>" + Path.DirectorySeparatorChar))
                     .ToArray();
 
                 var msbuildPath = "<msbuildpath>";

diff --git a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetPublishInvocation.cs b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetPublishInvocation.cs
@@ -45,7 +45,7 @@ public void MsbuildInvocationIsCorrect(string[] args, string[] expectedAdditiona
             CommandDirectoryContext.PerformActionWithBasePath(WorkingDirectory, () =>
             {
                 expectedAdditionalArgs = expectedAdditionalArgs
-                    .Select(arg => arg.Replace("<cwd>", WorkingDirectory))
+                    .Select(arg => arg.Replace("<cwd>", WorkingDirectory).Replace("<publishdir>", "<publishdir>" + Path.DirectorySeparatorChar))
                     .ToArray();
 
                 var msbuildPath = "<msbuildpath>";

diff --git a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetStoreInvocation.cs b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetStoreInvocation.cs
@@ -59,7 +59,7 @@ public void ItAddsOutputPathToMsBuildInvocation(string optionName)
 
             var msbuildPath = "<msbuildpath>";
             StoreCommand.FromArgs(args, msbuildPath)
-                .GetArgumentsToMSBuild().Should().Be($"{ExpectedPrefix} -property:ComposeDir={Path.GetFullPath(path)} -property:_CommandLineDefinedOutputPath=true");
+                .GetArgumentsToMSBuild().Should().Be($"{ExpectedPrefix} -property:ComposeDir={Path.GetFullPath(path)}{Path.DirectorySeparatorChar} -property:_CommandLineDefinedOutputPath=true");
         }
     }
 }