small tweaks to enable running against singular-valued targetframeworks lists

baronfel · baronfel · commit 3847cfb9809f · 2025-11-03T14:45:54.000-06:00
diff --git a/src/Cli/dotnet/Commands/Run/RunCommand.cs b/src/Cli/dotnet/Commands/Run/RunCommand.cs
@@ -54,7 +54,7 @@ public class RunCommand
 
     /// <summary>
     /// Parsed structure representing the MSBuild arguments that will be used to build the project.
-    /// 
+    ///
     /// Note: This property has a private setter and is mutated within the class when framework selection modifies it.
     /// This mutability is necessary to allow the command to update MSBuild arguments after construction based on framework selection.
     /// </summary>
@@ -468,7 +468,8 @@ static ProjectInstance EvaluateProject(string? projectFilePath, Func<ProjectColl
 
         static void ValidatePreconditions(ProjectInstance project)
         {
-            if (string.IsNullOrWhiteSpace(project.GetPropertyValue("TargetFramework")))
+            // there must be some kind of TFM available to run a project
+            if (string.IsNullOrWhiteSpace(project.GetPropertyValue("TargetFramework")) && string.IsNullOrEmpty(project.GetPropertyValue("TargetFrameworks")))
             {
                 ThrowUnableToRunError(project);
             }
@@ -853,11 +854,11 @@ private void SendProjectBasedTelemetry(ProjectLaunchSettingsModel? launchSetting
     {
         Debug.Assert(ProjectFileFullPath != null);
         var projectIdentifier = RunTelemetry.GetProjectBasedIdentifier(ProjectFileFullPath, GetRepositoryRoot(), Sha256Hasher.Hash);
-        
+
         // Get package and project reference counts for project-based apps
         int packageReferenceCount = 0;
         int projectReferenceCount = 0;
-        
+
         // Try to get project information for telemetry if we built the project
         if (ShouldBuild)
         {
@@ -866,10 +867,10 @@ private void SendProjectBasedTelemetry(ProjectLaunchSettingsModel? launchSetting
                 var globalProperties = MSBuildArgs.GlobalProperties?.ToDictionary() ?? new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
                 globalProperties[Constants.EnableDefaultItems] = "false";
                 globalProperties[Constants.MSBuildExtensionsPath] = AppContext.BaseDirectory;
-                
+
                 using var collection = new ProjectCollection(globalProperties: globalProperties);
                 var project = collection.LoadProject(ProjectFileFullPath).CreateProjectInstance();
-                
+
                 packageReferenceCount = RunTelemetry.CountPackageReferences(project);
                 projectReferenceCount = RunTelemetry.CountProjectReferences(project);
             }
@@ -898,10 +899,10 @@ private void SendProjectBasedTelemetry(ProjectLaunchSettingsModel? launchSetting
     {
         try
         {
-            var currentDir = ProjectFileFullPath != null 
+            var currentDir = ProjectFileFullPath != null
                 ? Path.GetDirectoryName(ProjectFileFullPath)
                 : Directory.GetCurrentDirectory();
-                
+
             while (currentDir != null)
             {
                 if (Directory.Exists(Path.Combine(currentDir, ".git")))
@@ -915,7 +916,7 @@ private void SendProjectBasedTelemetry(ProjectLaunchSettingsModel? launchSetting
         {
             // Ignore errors when trying to find repo root
         }
-        
+
         return null;
     }
 }
diff --git a/src/Cli/dotnet/Commands/Run/TargetFrameworkSelector.cs b/src/Cli/dotnet/Commands/Run/TargetFrameworkSelector.cs
@@ -54,11 +54,15 @@ public static bool TrySelectTargetFramework(
             return true;
         }
 
-        var frameworks = targetFrameworks.Split(';', StringSplitOptions.RemoveEmptyEntries);
+        // parse the TargetFrameworks property and make sure to account for any additional whitespace
+        // users may have added for formatting reasons.
+        var frameworks = targetFrameworks.Split(';', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
 
-        // If there's only one framework, no selection needed
-        if (frameworks.Length <= 1)
+        // If there's only one framework in the TargetFrameworks, we do need to pick it to force the subsequent builds/evaluations
+        // to act against the correct 'view' of the project
+        if (frameworks.Length == 1)
         {
+            selectedFramework = frameworks[0];
             return true;
         }
 
@@ -73,12 +77,12 @@ public static bool TrySelectTargetFramework(
             Reporter.Error.WriteLine();
             Reporter.Error.WriteLine(CliCommandStrings.RunCommandAvailableTargetFrameworks);
             Reporter.Error.WriteLine();
-            
+
             for (int i = 0; i < frameworks.Length; i++)
             {
                 Reporter.Error.WriteLine($"  {i + 1}. {frameworks[i]}");
             }
-            
+
             Reporter.Error.WriteLine();
             Reporter.Error.WriteLine($"{CliCommandStrings.RunCommandExampleText}: dotnet run --framework {frameworks[0]}");
             Reporter.Error.WriteLine();
@@ -98,7 +102,7 @@ public static bool TrySelectTargetFramework(
                 .PageSize(10)
                 .MoreChoicesText($"[grey]({Markup.Escape(CliCommandStrings.RunCommandMoreFrameworksText)})[/]")
                 .AddChoices(frameworks);
-            
+
             return Spectre.Console.AnsiConsole.Prompt(prompt);
         }
         catch (Exception)

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public class RunCommand`
`54`	`54`
`55`	`55`	`/// <summary>`
`56`	`56`	`/// Parsed structure representing the MSBuild arguments that will be used to build the project.`
`57`		`- ///`
	`57`	`+ ///`
`58`	`58`	`/// Note: This property has a private setter and is mutated within the class when framework selection modifies it.`
`59`	`59`	`/// This mutability is necessary to allow the command to update MSBuild arguments after construction based on framework selection.`
`60`	`60`	`/// </summary>`
`@@ -468,7 +468,8 @@ static ProjectInstance EvaluateProject(string? projectFilePath, Func<ProjectColl`
`468`	`468`
`469`	`469`	`static void ValidatePreconditions(ProjectInstance project)`
`470`	`470`	`{`
`471`		`- if (string.IsNullOrWhiteSpace(project.GetPropertyValue("TargetFramework")))`
	`471`	`+ // there must be some kind of TFM available to run a project`
	`472`	`+ if (string.IsNullOrWhiteSpace(project.GetPropertyValue("TargetFramework")) && string.IsNullOrEmpty(project.GetPropertyValue("TargetFrameworks")))`
`472`	`473`	`{`
`473`	`474`	`ThrowUnableToRunError(project);`
`474`	`475`	`}`
`@@ -853,11 +854,11 @@ private void SendProjectBasedTelemetry(ProjectLaunchSettingsModel? launchSetting`
`853`	`854`	`{`
`854`	`855`	`Debug.Assert(ProjectFileFullPath != null);`
`855`	`856`	`var projectIdentifier = RunTelemetry.GetProjectBasedIdentifier(ProjectFileFullPath, GetRepositoryRoot(), Sha256Hasher.Hash);`
`856`		`-`
	`857`	`+`
`857`	`858`	`// Get package and project reference counts for project-based apps`
`858`	`859`	`int packageReferenceCount = 0;`
`859`	`860`	`int projectReferenceCount = 0;`
`860`		`-`
	`861`	`+`
`861`	`862`	`// Try to get project information for telemetry if we built the project`
`862`	`863`	`if (ShouldBuild)`
`863`	`864`	`{`
`@@ -866,10 +867,10 @@ private void SendProjectBasedTelemetry(ProjectLaunchSettingsModel? launchSetting`
`866`	`867`	`var globalProperties = MSBuildArgs.GlobalProperties?.ToDictionary() ?? new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);`
`867`	`868`	`globalProperties[Constants.EnableDefaultItems] = "false";`
`868`	`869`	`globalProperties[Constants.MSBuildExtensionsPath] = AppContext.BaseDirectory;`
`869`		`-`
	`870`	`+`
`870`	`871`	`using var collection = new ProjectCollection(globalProperties: globalProperties);`
`871`	`872`	`var project = collection.LoadProject(ProjectFileFullPath).CreateProjectInstance();`
`872`		`-`
	`873`	`+`
`873`	`874`	`packageReferenceCount = RunTelemetry.CountPackageReferences(project);`
`874`	`875`	`projectReferenceCount = RunTelemetry.CountProjectReferences(project);`
`875`	`876`	`}`
`@@ -898,10 +899,10 @@ private void SendProjectBasedTelemetry(ProjectLaunchSettingsModel? launchSetting`
`898`	`899`	`{`
`899`	`900`	`try`
`900`	`901`	`{`
`901`		`- var currentDir = ProjectFileFullPath != null`
	`902`	`+ var currentDir = ProjectFileFullPath != null`
`902`	`903`	`? Path.GetDirectoryName(ProjectFileFullPath)`
`903`	`904`	`: Directory.GetCurrentDirectory();`
`904`		`-`
	`905`	`+`
`905`	`906`	`while (currentDir != null)`
`906`	`907`	`{`
`907`	`908`	`if (Directory.Exists(Path.Combine(currentDir, ".git")))`
`@@ -915,7 +916,7 @@ private void SendProjectBasedTelemetry(ProjectLaunchSettingsModel? launchSetting`
`915`	`916`	`{`
`916`	`917`	`// Ignore errors when trying to find repo root`
`917`	`918`	`}`
`918`		`-`
	`919`	`+`
`919`	`920`	`return null;`
`920`	`921`	`}`
`921`	`922`	`}`