Cleanup TFM handling for the new dotnet test for MTP

Author: Youssef1313

src/Cli/dotnet/commands/dotnet-test/SolutionAndProjectUtility.cs

@@ -105,85 +105,39 @@ public static IEnumerable<TestModule> GetProjectProperties(string projectFilePat
         {
             var projects = new List<TestModule>();
 
-            var globalPropertiesWithoutTargetFramework = new Dictionary<string, string>(globalProperties);
-            globalPropertiesWithoutTargetFramework.Remove(ProjectProperties.TargetFramework);
 
-            var project = projectCollection.LoadProject(projectFilePath, globalPropertiesWithoutTargetFramework, null);
+            var project = projectCollection.LoadProject(projectFilePath, globalProperties, null);
 
-            // Check if TargetFramework is specified in global properties
-            if (globalProperties.TryGetValue(ProjectProperties.TargetFramework, out string targetFramework))
-            {
-                Logger.LogTrace(() => $"Loaded project '{Path.GetFileName(projectFilePath)}' with global property TargetFramework '{targetFramework}'.");
-
-                if (IsValidTargetFramework(project, targetFramework))
-                {
-                    Logger.LogTrace(() => $"Project '{Path.GetFileName(projectFilePath)}' with TargetFramework '{targetFramework}': before re-evaluation '{ProjectProperties.IsTestingPlatformApplication}' is '{project.GetPropertyValue(ProjectProperties.IsTestingPlatformApplication)}'.");
+            var targetFramework = project.GetPropertyValue(ProjectProperties.TargetFramework);
+            var targetFrameworks = project.GetPropertyValue(ProjectProperties.TargetFrameworks);
+            Logger.LogTrace(() => $"Loaded project '{Path.GetFileName(projectFilePath)}' with TargetFramework '{targetFramework}', TargetFrameworks '{targetFrameworks}', IsTestProject '{project.GetPropertyValue(ProjectProperties.IsTestProject)}', and '{ProjectProperties.IsTestingPlatformApplication}' is '{project.GetPropertyValue(ProjectProperties.IsTestingPlatformApplication)}'.");
 
-                    project.SetProperty(ProjectProperties.TargetFramework, targetFramework);
-                    project.ReevaluateIfNecessary();
-
-                    Logger.LogTrace(() => $"Project '{Path.GetFileName(projectFilePath)}' with TargetFramework '{targetFramework}': after re-evaluation '{ProjectProperties.IsTestingPlatformApplication}' is '{project.GetPropertyValue(ProjectProperties.IsTestingPlatformApplication)}'.");
-
-                    if (GetModuleFromProject(project) is { } module)
-                    {
-                        projects.Add(module);
-                    }
-                }
-                else
+            if (!string.IsNullOrEmpty(targetFramework) || string.IsNullOrEmpty(targetFrameworks))
+            {
+                if (GetModuleFromProject(project) is { } module)
                 {
-                    // TODO: When can this happen? Should we explicitly error?
-                    Logger.LogTrace(() => $"Project '{Path.GetFileName(projectFilePath)}' with TargetFramework '{targetFramework}' was considered invalid.");
+                    projects.Add(module);
                 }
             }
             else
             {
-                string targetFrameworks = project.GetPropertyValue(ProjectProperties.TargetFrameworks);
-
-                if (string.IsNullOrEmpty(targetFrameworks))
+                var frameworks = targetFrameworks.Split(CliConstants.SemiColon, StringSplitOptions.RemoveEmptyEntries);
+                foreach (var framework in frameworks)
                 {
-                    Logger.LogTrace(() => $"Loaded project '{Path.GetFileName(projectFilePath)}' has '{ProjectProperties.IsTestingPlatformApplication}' = '{project.GetPropertyValue(ProjectProperties.IsTestingPlatformApplication)}'.");
+                    project.SetProperty(ProjectProperties.TargetFramework, framework);
+                    project.ReevaluateIfNecessary();
+                    Logger.LogTrace(() => $"Loaded inner project '{Path.GetFileName(projectFilePath)}' has '{ProjectProperties.IsTestingPlatformApplication}' = '{project.GetPropertyValue(ProjectProperties.IsTestingPlatformApplication)}' (TFM: '{framework}').");
 
                     if (GetModuleFromProject(project) is { } module)
                     {
                         projects.Add(module);
                     }
                 }
-                else
-                {
-                    Logger.LogTrace(() => $"Loaded project '{Path.GetFileName(projectFilePath)}' has '{ProjectProperties.IsTestingPlatformApplication}' = '{project.GetPropertyValue(ProjectProperties.IsTestingPlatformApplication)}' (TFMs: '{targetFrameworks}').");
-
-                    var frameworks = targetFrameworks.Split(CliConstants.SemiColon, StringSplitOptions.RemoveEmptyEntries);
-                    foreach (var framework in frameworks)
-                    {
-                        project.SetProperty(ProjectProperties.TargetFramework, framework);
-                        project.ReevaluateIfNecessary();
-
-                        Logger.LogTrace(() => $"Loaded project '{Path.GetFileName(projectFilePath)}' has '{ProjectProperties.IsTestingPlatformApplication}' = '{project.GetPropertyValue(ProjectProperties.IsTestingPlatformApplication)}' (TFM: '{framework}').");
-
-                        if (GetModuleFromProject(project) is { } module)
-                        {
-                            projects.Add(module);
-                        }
-                    }
-                }
             }
 
             return projects;
         }
 
-
-        private static bool IsValidTargetFramework(Project project, string targetFramework)
-        {
-            string targetFrameworks = project.GetPropertyValue(ProjectProperties.TargetFrameworks);
-            if (string.IsNullOrEmpty(targetFrameworks))
-            {
-                return project.GetPropertyValue(ProjectProperties.TargetFramework) == targetFramework;
-            }
-
-            var frameworks = targetFrameworks.Split(CliConstants.SemiColon, StringSplitOptions.RemoveEmptyEntries);
-            return frameworks.Contains(targetFramework);
-        }
-
         private static TestModule? GetModuleFromProject(Project project)
         {
             _ = bool.TryParse(project.GetPropertyValue(ProjectProperties.IsTestProject), out bool isTestProject);