Aborting test run when source and target frameworks/architectures are incompatible

src/Microsoft.TestPlatform.Utilities/InferRunSettingsHelper.cs

@@ -612,18 +612,21 @@ public static bool TryGetFrameworkXml(XPathNavigator runSettingsNavigator, out s
         /// Returns the sources matching the specified platform and framework settings.
         /// For incompatible sources, warning is added to incompatibleSettingWarning.
         /// </summary>
-        public static IEnumerable<String> FilterCompatibleSources(Architecture chosenPlatform, Framework chosenFramework, IDictionary<String, Architecture> sourcePlatforms, IDictionary<String, Framework> sourceFrameworks, out String incompatibleSettingWarning)
+        public static IEnumerable<String> FilterCompatibleSources(Architecture chosenPlatform, Framework chosenFramework, IDictionary<String, Architecture> sourcePlatforms, IDictionary<String, Framework> sourceFrameworks, out String incompatibleSettingWarning, out bool incompatibilityErrorFound)
         {
             incompatibleSettingWarning = string.Empty;
+            bool incompatibilityFound = false;
+            incompatibilityErrorFound = false;
             List<String> compatibleSources = new List<String>();
             StringBuilder warnings = new StringBuilder();
             warnings.AppendLine();
-            bool incompatiblityFound = false;
+
             foreach (var source in sourcePlatforms.Keys)
             {
                 Architecture actualPlatform = sourcePlatforms[source];
                 Framework actualFramework = sourceFrameworks[source];
                 bool isSettingIncompatible = IsSettingIncompatible(actualPlatform, chosenPlatform, actualFramework, chosenFramework);
+                incompatibilityErrorFound = IsFrameworkRuntimeIncompatible(actualFramework, chosenFramework) || IsPlatformArchitectureIncompatible(actualPlatform, chosenPlatform);
                 if (isSettingIncompatible)
                 {
                     string incompatiblityMessage;
@@ -632,15 +635,14 @@ public static IEnumerable<String> FilterCompatibleSources(Architecture chosenPla
                     incompatiblityMessage = string.Format(CultureInfo.CurrentCulture, OMResources.SourceIncompatible, onlyFileName, actualFramework.Version, actualPlatform);
 
                     warnings.AppendLine(incompatiblityMessage);
-                    incompatiblityFound = true;
+                    incompatibilityFound = true;
                 }
                 else
                 {
                     compatibleSources.Add(source);
                 }
             }
-
-            if (incompatiblityFound)
+            if (incompatibilityFound || incompatibilityErrorFound)
             {
                 incompatibleSettingWarning = string.Format(CultureInfo.CurrentCulture, OMResources.DisplayChosenSettings, chosenFramework, chosenPlatform, warnings.ToString(), multiTargettingForwardLink);
             }
@@ -685,5 +687,35 @@ private static bool IsFrameworkIncompatible(Framework sourceFramework, Framework
             }
             return !sourceFramework.Name.Equals(targetFramework.Name, StringComparison.OrdinalIgnoreCase);
         }
+
+        /// <summary>
+        /// Returns true if source platform is incompatible with target platform.
+        /// </summary>
+        private static bool IsPlatformArchitectureIncompatible(Architecture sourcePlatform, Architecture targetPlatform)
+        {
+            if (sourcePlatform == Architecture.X86 && targetPlatform == Architecture.X64 ||
+                sourcePlatform == Architecture.X64 && targetPlatform == Architecture.X86)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Returns true if source Framework Runtime is incompatible with target Framework.
+        /// </summary>
+        private static bool IsFrameworkRuntimeIncompatible(Framework sourceFramework, Framework targetFramework)
+        {
+            string sourceFrameworkName = sourceFramework.Name.Split(',')[0];
+            string targetFrameworkName = targetFramework.Name.Split(',')[0];
+
+            if(sourceFrameworkName.Equals(".NETFramework",StringComparison.OrdinalIgnoreCase) && targetFrameworkName.Equals(".NETCoreApp", StringComparison.OrdinalIgnoreCase) ||
+               sourceFrameworkName.Equals(".NETCoreApp", StringComparison.OrdinalIgnoreCase) && targetFrameworkName.Equals(".NETFramework", StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+            return false;
+        }
     }
 }

src/vstest.console/CommandLine/InferHelper.cs

@@ -27,9 +27,10 @@ internal InferHelper(IAssemblyMetadataProvider assemblyMetadataProvider)
         /// <summary>
         /// Determines Architecture from sources.
         /// </summary>
-        public Architecture AutoDetectArchitecture(List<string> sources, IDictionary<string, Architecture> sourcePlatforms)
+        public Architecture AutoDetectArchitecture(List<string> sources, IDictionary<string, Architecture> sourcePlatforms, out bool isArchitectureIncompatible)
         {
             Architecture architecture = Constants.DefaultPlatform;
+            isArchitectureIncompatible = false;
             try
             {
                 if (sources != null && sources.Count > 0)
@@ -66,6 +67,7 @@ public Architecture AutoDetectArchitecture(List<string> sources, IDictionary<str
                         {
                             finalArch = Constants.DefaultPlatform;
                             EqtTrace.Info("Conflict in platform architecture, using default platform:{0}", finalArch);
+                            isArchitectureIncompatible = true;
                         }
                     }
 
@@ -91,21 +93,27 @@ public Architecture AutoDetectArchitecture(List<string> sources, IDictionary<str
         /// <summary>
         /// Determines Framework from sources.
         /// </summary>
-        public Framework AutoDetectFramework(List<string> sources, IDictionary<string, Framework> sourceFrameworkVersions)
+        public Framework AutoDetectFramework(List<string> sources, IDictionary<string, Framework> sourceFrameworkVersions, out bool isFrameworkIncompatible)
         {
             Framework framework = Framework.DefaultFramework;
+            isFrameworkIncompatible = false;
             try
             {
                 if (sources != null && sources.Count > 0)
                 {
                     var finalFx = DetermineFrameworkName(sources, sourceFrameworkVersions, out var conflictInFxIdentifier);
                     framework = Framework.FromString(finalFx.FullName);
-                    if (conflictInFxIdentifier && EqtTrace.IsInfoEnabled)
+
+                    if (conflictInFxIdentifier)
                     {
-                        // TODO Log to console and client.
-                        EqtTrace.Info(
-                            "conflicts in Framework indentifier of provided sources(test assemblies), using default framework:{0}",
-                            framework);
+                        isFrameworkIncompatible = true;
+                        if (EqtTrace.IsInfoEnabled)
+                        {
+                            // TODO Log to console and client.
+                            EqtTrace.Info(
+                                "conflicts in Framework indentifier of provided sources(test assemblies), using default framework:{0}",
+                                framework);
+                        }
                     }
                 }
             }

src/vstest.console/Resources/Resources.resx

@@ -718,4 +718,7 @@
   <data name="InvalidLoggerArgument" xml:space="preserve">
     <value>Logger argument '{0}' is not valid.</value>
   </data>
+  <data name="ConflictInFrameworkPlatform" xml:space="preserve">
+    <value>Conflicts in framework/platform identifier of provided sources.</value>
+  </data>
 </root>

src/vstest.console/Resources/xlf/Resources.cs.xlf

@@ -1637,6 +1637,11 @@
         <target state="translated">Zadání Framework35 není podporováno. U projektů mířících na .Net Framework 3.5 prosím použijte Framework40, aby testy v CLR 4.0 běžely v režimu kompatibility.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ConflictInFrameworkPlatform">
+        <source>Conflicts in framework/platform identifier of provided sources.</source>
+        <target state="new">Conflicts in framework/platform identifier of provided sources.</target>
+        <note></note>
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/vstest.console/Resources/xlf/Resources.de.xlf

@@ -1637,6 +1637,11 @@
         <target state="translated">Framework35 wird nicht unterstützt. Verwenden Sie für Projekte, die auf .Net Framework 3.5 ausgerichtet sind, Framework40 zum Ausführen von Tests im "Kompatibilitätsmodus" von CLR 4.0.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ConflictInFrameworkPlatform">
+        <source>Conflicts in framework/platform identifier of provided sources.</source>
+        <target state="new">Conflicts in framework/platform identifier of provided sources.</target>
+        <note></note>
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/vstest.console/Resources/xlf/Resources.es.xlf

@@ -1642,6 +1642,11 @@
         <target state="translated">No se admite Framework35. Para proyectos con destino .Net Framework 3.5, use Framework40 para ejecutar las pruebas en "modo de compatibilidad" de CLR 4.0.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ConflictInFrameworkPlatform">
+        <source>Conflicts in framework/platform identifier of provided sources.</source>
+        <target state="new">Conflicts in framework/platform identifier of provided sources.</target>
+        <note></note>
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/vstest.console/Resources/xlf/Resources.fr.xlf

@@ -1637,6 +1637,11 @@
         <target state="translated">Framework35 n'est pas pris en charge. Pour les projets ciblant .Net Framework 3.5, utilisez Framework40 pour exécuter les tests dans CLR 4.0 en "mode compatibilité".</target>
         <note />
       </trans-unit>
+      <trans-unit id="ConflictInFrameworkPlatform">
+        <source>Conflicts in framework/platform identifier of provided sources.</source>
+        <target state="new">Conflicts in framework/platform identifier of provided sources.</target>
+        <note></note>
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/vstest.console/Resources/xlf/Resources.it.xlf

@@ -1637,6 +1637,11 @@
         <target state="translated">Framework35 non è supportato. Per i progetti destinati a .NET Framework 3.5, usare Framework40 per eseguire i test nella modalità di compatibilità di CLR 4.0.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ConflictInFrameworkPlatform">
+        <source>Conflicts in framework/platform identifier of provided sources.</source>
+        <target state="new">Conflicts in framework/platform identifier of provided sources.</target>
+        <note></note>
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/vstest.console/Resources/xlf/Resources.ja.xlf

@@ -1637,6 +1637,11 @@
         <target state="translated">Framework35 はサポートされていません。.Net Framework 3.5 を対象とするプロジェクトでは、Framework40 を使用して CLR 4.0 の "互換モード" でテストを実行してください。</target>
         <note />
       </trans-unit>
+      <trans-unit id="ConflictInFrameworkPlatform">
+        <source>Conflicts in framework/platform identifier of provided sources.</source>
+        <target state="new">Conflicts in framework/platform identifier of provided sources.</target>
+        <note></note>
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/vstest.console/Resources/xlf/Resources.ko.xlf

@@ -1637,6 +1637,11 @@
         <target state="translated">Framework35는 지원되지 않습니다. .NET Framework 3.5를 대상으로 하는 프로젝트의 경우 Framework40을 사용하여 CLR 4.0 "호환 모드"에서 테스트를 실행하세요.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ConflictInFrameworkPlatform">
+        <source>Conflicts in framework/platform identifier of provided sources.</source>
+        <target state="new">Conflicts in framework/platform identifier of provided sources.</target>
+        <note></note>
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/vstest.console/Resources/xlf/Resources.pl.xlf

@@ -1635,6 +1635,11 @@
         <target state="translated">Wersja Framework35 nie jest obsługiwana. W przypadku projektów przeznaczonych dla programu .Net Framework 3.5 użyj wersji Framework40 do uruchamiania testów w „trybie zgodności” CLR 4.0.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ConflictInFrameworkPlatform">
+        <source>Conflicts in framework/platform identifier of provided sources.</source>
+        <target state="new">Conflicts in framework/platform identifier of provided sources.</target>
+        <note></note>
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/vstest.console/Resources/xlf/Resources.pt-BR.xlf

@@ -1635,6 +1635,11 @@
         <target state="translated">Não há suporte para Framework35. Para projetos com .Net Framework 3.5 de destino, use o Framework40 para executar testes em “modo de compatibilidade” CLR 4.0. </target>
         <note />
       </trans-unit>
+      <trans-unit id="ConflictInFrameworkPlatform">
+        <source>Conflicts in framework/platform identifier of provided sources.</source>
+        <target state="new">Conflicts in framework/platform identifier of provided sources.</target>
+        <note></note>
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/vstest.console/Resources/xlf/Resources.ru.xlf

@@ -1637,6 +1637,11 @@
         <target state="translated">Framework35 не поддерживается. В проектах для .Net Framework 3.5 запускайте тесты в режиме совместимости CLR 4.0 с использованием Framework40.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ConflictInFrameworkPlatform">
+        <source>Conflicts in framework/platform identifier of provided sources.</source>
+        <target state="new">Conflicts in framework/platform identifier of provided sources.</target>
+        <note></note>
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/vstest.console/Resources/xlf/Resources.tr.xlf

@@ -1637,6 +1637,11 @@
         <target state="translated">Framework35 desteklenmiyor. .NET Framework 3.5’i hedefleyen projeler için lütfen Framework40 kullanarak testleri CLR 4.0’ın “uyumluluk modunda” çalıştırın.</target>
         <note />
       </trans-unit>
+      <trans-unit id="ConflictInFrameworkPlatform">
+        <source>Conflicts in framework/platform identifier of provided sources.</source>
+        <target state="new">Conflicts in framework/platform identifier of provided sources.</target>
+        <note></note>
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/vstest.console/Resources/xlf/Resources.xlf

@@ -819,6 +819,11 @@
         <target state="new">Framework35 not supported. Use Framework40 or above to run tests in CLR 4.0 "compatibly mode".</target>
         <note></note>
       </trans-unit>
+      <trans-unit id="ConflictInFrameworkPlatform">
+        <source>Conflicts in framework/platform identifier of provided sources.</source>
+        <target state="new">Conflicts in framework/platform identifier of provided sources.</target>
+        <note></note>
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf

@@ -1637,6 +1637,11 @@
         <target state="translated">Framework35 不受支持。对于面向 .Net Framework 3.5 的项目，请使用 Framework40 在 CLR 4.0“兼容性模式”下运行测试。</target>
         <note />
       </trans-unit>
+      <trans-unit id="ConflictInFrameworkPlatform">
+        <source>Conflicts in framework/platform identifier of provided sources.</source>
+        <target state="new">Conflicts in framework/platform identifier of provided sources.</target>
+        <note></note>
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf

@@ -1637,6 +1637,11 @@
         <target state="translated">不支援 Framework35。若為以 .Net Framework 3.5 為目標的專案，請使用 Framework40 在 CLR 4.0「相容模式」中執行測試。</target>
         <note />
       </trans-unit>
+      <trans-unit id="ConflictInFrameworkPlatform">
+        <source>Conflicts in framework/platform identifier of provided sources.</source>
+        <target state="new">Conflicts in framework/platform identifier of provided sources.</target>
+        <note></note>
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/vstest.console/TestPlatformHelpers/TestRequestManager.cs

@@ -363,12 +363,17 @@ private bool UpdateRunSettingsIfRequired(string runsettingsXml, List<string> sou
 
                     var navigator = document.CreateNavigator();
 
-                    var inferedFramework = inferHelper.AutoDetectFramework(sources, sourceFrameworks);
+                    var inferedFramework = inferHelper.AutoDetectFramework(sources, sourceFrameworks, out var isFrameworkIncompatible);
                     Framework chosenFramework;
-                    var inferedPlatform = inferHelper.AutoDetectArchitecture(sources, sourcePlatforms);
+                    var inferedPlatform = inferHelper.AutoDetectArchitecture(sources, sourcePlatforms, out var isPlatformIncompatible);
                     Architecture chosenPlatform;
 
-                    // Update frmaework and platform if required. For commandline scenario update happens in ArgumentProcessor.
+                    if (isFrameworkIncompatible || isPlatformIncompatible)
+                    {
+                        throw new TestPlatformException(Resources.ConflictInFrameworkPlatform);
+                    }
+
+                    // Update framework and platform if required. For commandline scenario update happens in ArgumentProcessor.
                     bool updateFramework = IsAutoFrameworkDetectRequired(navigator, out chosenFramework);
                     bool updatePlatform = IsAutoPlatformDetectRequired(navigator, out chosenPlatform);
 
@@ -386,11 +391,15 @@ private bool UpdateRunSettingsIfRequired(string runsettingsXml, List<string> sou
                         settingsUpdated = true;
                     }
 
-                    var compatibleSources = InferRunSettingsHelper.FilterCompatibleSources(chosenPlatform, chosenFramework, sourcePlatforms, sourceFrameworks, out var incompatibleSettingWarning);
+                    var compatibleSources = InferRunSettingsHelper.FilterCompatibleSources(chosenPlatform, chosenFramework, sourcePlatforms, sourceFrameworks, out var incompatibleSettingWarning, out var incompatibiltyErrorFound);
 
                     if (!string.IsNullOrEmpty(incompatibleSettingWarning))
                     {
                         EqtTrace.Info(incompatibleSettingWarning);
+                        if(incompatibiltyErrorFound)
+                        {
+                            throw new TestPlatformException(incompatibleSettingWarning);
+                        }
                         ConsoleLogger.RaiseTestRunWarning(incompatibleSettingWarning);
                     }