Fix recognizing dotnet ./file.cs with special arguments (#49909)

jjonescz · web-flow · commit 99c8904a4315 · 2025-07-24T11:53:45.000Z
diff --git a/src/Cli/dotnet/Program.cs b/src/Cli/dotnet/Program.cs
@@ -286,8 +286,7 @@ internal static int ProcessArgs(string[] args, TimeSpan startupTime)
         {
             // If we didn't match any built-in commands, and a C# file path is the first argument,
             // parse as `dotnet run --file file.cs ..rest_of_args` instead.
-            if (parseResult.CommandResult.Command is RootCommand
-                && parseResult.GetValue(Parser.DotnetSubCommand) is { } unmatchedCommandOrFile
+            if (parseResult.GetValue(Parser.DotnetSubCommand) is { } unmatchedCommandOrFile
                 && VirtualProjectBuildingCommand.IsValidEntryPointPath(unmatchedCommandOrFile))
             {
                 List<string> otherTokens = new(parseResult.Tokens.Count - 1);
diff --git a/test/dotnet.Tests/CommandTests/New/DotnetSlnPostActionTests.cs b/test/dotnet.Tests/CommandTests/New/DotnetSlnPostActionTests.cs
@@ -29,7 +29,7 @@ public void AddProjectToSolutionPostActionFindSolutionFileAtOutputPath()
             Assert.Equal(solutionFileFullPath, solutionFiles[0]);
         }
 
-        [Fact(DisplayName = nameof(AddProjectToSolutionPostActionFindSlnxFileAtOutputPath))]
+        [PlatformSpecificFact(TestPlatforms.Any & ~TestPlatforms.Linux)] // https://github.com/dotnet/sdk/issues/49923
         public void AddProjectToSolutionPostActionFindSlnxFileAtOutputPath()
         {
             string targetBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath();
diff --git a/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs b/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs
@@ -142,14 +142,34 @@ Hello from Program
             {s_program}
             """);
 
+        string expectedOutput = """
+            Hello from Program
+            Release config
+            """;
+
         new DotnetCommand(Log, "Program.cs")
             .WithWorkingDirectory(testInstance.Path)
             .Execute()
             .Should().Pass()
-            .And.HaveStdOut("""
-                Hello from Program
-                Release config
-                """);
+            .And.HaveStdOut(expectedOutput);
+
+        new DotnetCommand(Log, "./Program.cs")
+            .WithWorkingDirectory(testInstance.Path)
+            .Execute()
+            .Should().Pass()
+            .And.HaveStdOut(expectedOutput);
+
+        new DotnetCommand(Log, $".{Path.DirectorySeparatorChar}Program.cs")
+            .WithWorkingDirectory(testInstance.Path)
+            .Execute()
+            .Should().Pass()
+            .And.HaveStdOut(expectedOutput);
+
+        new DotnetCommand(Log, Path.Join(testInstance.Path, "Program.cs"))
+            .WithWorkingDirectory(testInstance.Path)
+            .Execute()
+            .Should().Pass()
+            .And.HaveStdOut(expectedOutput);
 
         new DotnetCommand(Log, "Program.cs", "-c", "Debug")
             .WithWorkingDirectory(testInstance.Path)
@@ -168,6 +188,16 @@ Hello from Program
                 Hello from Program
                 Release config
                 """);
+
+        new DotnetCommand(Log, "Program.cs", "build")
+            .WithWorkingDirectory(testInstance.Path)
+            .Execute()
+            .Should().Pass()
+            .And.HaveStdOut("""
+                echo args:build
+                Hello from Program
+                Release config
+                """);
     }
 
     /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -286,8 +286,7 @@ internal static int ProcessArgs(string[] args, TimeSpan startupTime)`
`286`	`286`	`{`
`287`	`287`	`// If we didn't match any built-in commands, and a C# file path is the first argument,`
`288`	`288`	// parse as `dotnet run --file file.cs ..rest_of_args` instead.
`289`		`- if (parseResult.CommandResult.Command is RootCommand`
`290`		`- && parseResult.GetValue(Parser.DotnetSubCommand) is { } unmatchedCommandOrFile`
	`289`	`+ if (parseResult.GetValue(Parser.DotnetSubCommand) is { } unmatchedCommandOrFile`
`291`	`290`	`&& VirtualProjectBuildingCommand.IsValidEntryPointPath(unmatchedCommandOrFile))`
`292`	`291`	`{`
`293`	`292`	`List<string> otherTokens = new(parseResult.Tokens.Count - 1);`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public void AddProjectToSolutionPostActionFindSolutionFileAtOutputPath()`
`29`	`29`	`Assert.Equal(solutionFileFullPath, solutionFiles[0]);`
`30`	`30`	`}`
`31`	`31`
`32`		`- [Fact(DisplayName = nameof(AddProjectToSolutionPostActionFindSlnxFileAtOutputPath))]`
	`32`	`+ [PlatformSpecificFact(TestPlatforms.Any & ~TestPlatforms.Linux)] // https://github.com/dotnet/sdk/issues/49923`
`33`	`33`	`public void AddProjectToSolutionPostActionFindSlnxFileAtOutputPath()`
`34`	`34`	`{`
`35`	`35`	`string targetBasePath = _engineEnvironmentSettings.GetTempVirtualizedPath();`