Refactoring InferRunSettingsHelper

src/Microsoft.TestPlatform.Utilities/InferRunSettingsHelper.cs

@@ -49,6 +49,8 @@ public class InferRunSettingsHelper
         private const string LegacyElementsString = "Elements";
         private const string DeploymentAttributesString = "DeploymentAttributes";
         private const string ExecutionAttributesString = "ExecutionAttributes";
+        private const string DotNetFrameworkString = ".NETFramework";
+        private const string DotNetCoreString = ".NETCoreApp";
         private static readonly List<string> ExecutionNodesPaths = new List<string> { @"/RunSettings/LegacySettings/Execution/TestTypeSpecific/UnitTestRunConfig/AssemblyResolution", @"/RunSettings/LegacySettings/Execution/Timeouts", @"/RunSettings/LegacySettings/Execution/Hosts" };
 
         /// <summary>
@@ -608,6 +610,28 @@ public static bool TryGetFrameworkXml(XPathNavigator runSettingsNavigator, out s
             return XmlUtilities.IsValidNodeXmlValue(frameworkXml, validator);
         }
 
+        /// <summary>
+        /// Returns true if target framework is incompatible with any source framework, that is run needs to be aborted
+        /// </summary>
+        public static bool IsFrameworkIncompatible(Framework chosenFramework, IDictionary<String, Framework> sourceFrameworks)
+        {
+            bool isFrameworkIncompatible = false;
+            foreach (var source in sourceFrameworks.Keys)
+            {
+                Framework actualFramework = sourceFrameworks[source];
+                string sourceFrameworkName = actualFramework.Name.Split(',')[0];
+                string targetFrameworkName = chosenFramework.Name.Split(',')[0];
+
+                if (sourceFrameworkName.Equals(DotNetFrameworkString, StringComparison.OrdinalIgnoreCase) && targetFrameworkName.Equals(DotNetCoreString, StringComparison.OrdinalIgnoreCase) ||
+                   sourceFrameworkName.Equals(DotNetCoreString, StringComparison.OrdinalIgnoreCase) && targetFrameworkName.Equals(DotNetFrameworkString, StringComparison.OrdinalIgnoreCase))
+                {
+                    isFrameworkIncompatible = true;
+                }
+            }
+
+            return isFrameworkIncompatible;
+        }
+
         /// <summary>
         /// Returns the sources matching the specified platform and framework settings.
         /// For incompatible sources, warning is added to incompatibleSettingWarning.
@@ -648,73 +672,31 @@ public static IEnumerable<String> FilterCompatibleSources(Architecture chosenPla
             return compatibleSources;
         }
 
-        /// <summary>
-        /// Returns true if target framework is incompatible with any source framework, that is run needs to be aborted
-        /// </summary>
-        public static bool IsFrameworkIncompatible(Framework chosenFramework, IDictionary<String, Framework> sourceFrameworks)
-        {
-            bool isSettingIncompatible = false;
-            foreach (var source in sourceFrameworks.Keys)
-            {
-                Framework actualFramework = sourceFrameworks[source];
-                string sourceFrameworkName = actualFramework.Name.Split(',')[0];
-                string targetFrameworkName = chosenFramework.Name.Split(',')[0];
-
-                if (sourceFrameworkName.Equals(".NETFramework", StringComparison.OrdinalIgnoreCase) && targetFrameworkName.Equals(".NETCoreApp", StringComparison.OrdinalIgnoreCase) ||
-                   sourceFrameworkName.Equals(".NETCoreApp", StringComparison.OrdinalIgnoreCase) && targetFrameworkName.Equals(".NETFramework", StringComparison.OrdinalIgnoreCase))
-                {
-                    isSettingIncompatible = true;
-                }
-            }
-
-            return isSettingIncompatible;
-        }
-
         /// <summary>
         /// Returns true if source settings are incompatible with target settings.
+        /// Returns true if either source Platform is incompatible with target platform or source FrameworkVersion is incompatible with target FrameworkVersion.
         /// </summary>
         private static bool IsSettingIncompatible(Architecture sourcePlatform,
         Architecture targetPlatform,
         Framework sourceFramework,
         Framework targetFramework)
         {
-            var res =  IsPlatformIncompatible(sourcePlatform, targetPlatform) || IsFrameworkIncompatible(sourceFramework, targetFramework);
-            return res;
-        }
+            bool isFrameworkSettingIncompatible = false;
+            bool isPlatformSettingIncompatible = false;
 
-
-        /// <summary>
-        /// Returns true if source Platform is incompatible with target platform.
-        /// </summary>
-        private static bool IsPlatformIncompatible(Architecture sourcePlatform, Architecture targetPlatform)
-        {
             if (sourcePlatform == Architecture.Default ||
-                sourcePlatform == Architecture.AnyCPU)
+               sourcePlatform == Architecture.AnyCPU)
             {
-                return false;
+                isPlatformSettingIncompatible = false;
             }
-
-            return sourcePlatform != targetPlatform;
-        }
-
-        /// <summary>
-        /// Returns true if source FrameworkVersion is incompatible with target FrameworkVersion.
-        /// </summary>
-        private static bool IsFrameworkIncompatible(Framework sourceFramework, Framework targetFramework)
-        {
-            string sourceFrameworkName = sourceFramework.Name.Split(',')[0];
-            string targetFrameworkName = targetFramework.Name.Split(',')[0];
-
-            bool isFrameworkIncompatible = false;
-
-            if (sourceFrameworkName.Equals(".NETFramework", StringComparison.OrdinalIgnoreCase) && targetFrameworkName.Equals(".NETCoreApp", StringComparison.OrdinalIgnoreCase) ||
-                  sourceFrameworkName.Equals(".NETCoreApp", StringComparison.OrdinalIgnoreCase) && targetFrameworkName.Equals(".NETFramework", StringComparison.OrdinalIgnoreCase))
+            else
             {
-                isFrameworkIncompatible = true;
+                isPlatformSettingIncompatible = sourcePlatform != targetPlatform ? true : false;
             }
 
-            var isFrameworkVersionIncompatible = !sourceFramework.Name.Equals(targetFramework.Name, StringComparison.OrdinalIgnoreCase);
-            return isFrameworkIncompatible || isFrameworkVersionIncompatible;
+            isFrameworkSettingIncompatible = !sourceFramework.Name.Equals(targetFramework.Name, StringComparison.OrdinalIgnoreCase);
+
+            return isPlatformSettingIncompatible || isFrameworkSettingIncompatible;
         }
     }
 }

src/vstest.console/CommandLine/InferHelper.cs

@@ -27,7 +27,7 @@ internal InferHelper(IAssemblyMetadataProvider assemblyMetadataProvider)
         /// <summary>
         /// Determines Architecture from sources and returns true if source architectures are incompatible
         /// </summary>
-        public bool TryGetCompatibleArchitecture(List<string> sources, IDictionary<string, Architecture> sourcePlatforms, out Architecture inferredArchitecture)
+        public bool TryGetAutoDetectCompatibleArchitecture(List<string> sources, IDictionary<string, Architecture> sourcePlatforms, out Architecture inferredArchitecture)
         {
             inferredArchitecture = Constants.DefaultPlatform;
             bool isArchitectureIncompatible = false;
@@ -93,7 +93,7 @@ public bool TryGetCompatibleArchitecture(List<string> sources, IDictionary<strin
         /// <summary>
         /// Determines Framework from sources and returns true if source frameworks are incompatible
         /// </summary>
-        public bool TryGetCompatibleFramework(List<string> sources, IDictionary<string, Framework> sourceFrameworkVersions, out Framework inferredFramework)
+        public bool TryGetAutoDetectCompatibleFramework(List<string> sources, IDictionary<string, Framework> sourceFrameworkVersions, out Framework inferredFramework)
         {
             inferredFramework = Framework.DefaultFramework;
             bool isFrameworkIncompatible = false;

src/vstest.console/TestPlatformHelpers/TestRequestManager.cs

@@ -364,9 +364,9 @@ private bool UpdateRunSettingsIfRequired(string runsettingsXml, List<string> sou
 
                     var navigator = document.CreateNavigator();
 
-                    var isFrameworkIncompatible = inferHelper.TryGetCompatibleFramework(sources, sourceFrameworks, out var inferredFramework);
+                    var isFrameworkIncompatible = inferHelper.TryGetAutoDetectCompatibleFramework(sources, sourceFrameworks, out var inferredFramework);
                     Framework chosenFramework;
-                    var isPlatformIncompatible = inferHelper.TryGetCompatibleArchitecture(sources, sourcePlatforms, out var inferredPlatform);
+                    var isPlatformIncompatible = inferHelper.TryGetAutoDetectCompatibleArchitecture(sources, sourcePlatforms, out var inferredPlatform);
                     Architecture chosenPlatform;
 
                     if (isFrameworkIncompatible || isPlatformIncompatible)