diff --git a/src/Microsoft.TestPlatform.Utilities/InferRunSettingsHelper.cs b/src/Microsoft.TestPlatform.Utilities/InferRunSettingsHelper.cs
index ac6ee82def..e65aef5e0a 100644
--- a/src/Microsoft.TestPlatform.Utilities/InferRunSettingsHelper.cs
+++ b/src/Microsoft.TestPlatform.Utilities/InferRunSettingsHelper.cs
@@ -182,9 +182,6 @@ public static void UpdateRunSettingsWithUserProvidedSwitches(XmlDocument runSett
EqtTrace.Verbose("Using effective platform:{0} effective framework:{1}", architecture, framework);
- // check if platform is compatible with current system architecture.
- VerifyCompatibilityWithOsArchitecture(architecture);
-
// Check if inputRunSettings has results directory configured.
var hasResultsDirectory = runSettingsDocument.SelectSingleNode(ResultsDirectoryNodePath) != null;
@@ -559,27 +556,6 @@ private static void ValidateRunConfiguration(XPathNavigator runSettingsNavigator
}
}
- ///
- /// Throws SettingsException if platform is incompatible with system architecture.
- ///
- ///
- private static void VerifyCompatibilityWithOsArchitecture(Architecture architecture)
- {
- var osArchitecture = XmlRunSettingsUtilities.OSArchitecture;
-
- if (architecture == Architecture.X86 && osArchitecture == Architecture.X64)
- {
- return;
- }
-
- if (architecture == osArchitecture)
- {
- return;
- }
-
- throw new SettingsException(string.Format(CultureInfo.CurrentCulture, UtilitiesResources.SystemArchitectureIncompatibleWithTargetPlatform, architecture, osArchitecture));
- }
-
///
/// Regenerates the RunConfiguration node with new values under runsettings.
///
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/Resources.Designer.cs b/src/Microsoft.TestPlatform.Utilities/Resources/Resources.Designer.cs
index 25477ab959..7973a35232 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/Resources.Designer.cs
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/Resources.Designer.cs
@@ -11,8 +11,8 @@
namespace Microsoft.VisualStudio.TestPlatform.Utilities.Resources {
using System;
using System.Reflection;
-
-
+
+
///
/// A strongly-typed resource class, for looking up localized strings, etc.
///
@@ -20,7 +20,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Utilities.Resources {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@@ -106,15 +106,6 @@ internal static string RunSettingsParseError {
}
}
- ///
- /// Looks up a localized string similar to Incompatible Target platform settings '{0}' with system architecture '{1}'..
- ///
- internal static string SystemArchitectureIncompatibleWithTargetPlatform {
- get {
- return ResourceManager.GetString("SystemArchitectureIncompatibleWithTargetPlatform", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Unexpected settings file specified..
///
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/Resources.resx b/src/Microsoft.TestPlatform.Utilities/Resources/Resources.resx
index 6a9c1f39f1..0e7cec5c32 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/Resources.resx
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/Resources.resx
@@ -132,9 +132,6 @@
An error occurred while loading the settings. Error: {0}.
-
- Incompatible Target platform settings '{0}' with system architecture '{1}'.
-
Unexpected settings file specified.
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.cs.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.cs.xlf
index 8c267db1e4..153dd5f1a1 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.cs.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.cs.xlf
@@ -27,11 +27,6 @@
Při načítání nastavení se stala chyba. Chyba: {0}
-
- Incompatible Target platform settings '{0}' with system architecture '{1}'.
-
- Nastavení cílové platformy {0} není kompatibilní s architekturou systému {1}.
-
Unexpected settings file specified.
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.de.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.de.xlf
index 38ee0127b6..da8c0aae82 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.de.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.de.xlf
@@ -27,11 +27,6 @@
Fehler beim Laden der Einstellungen. Fehler: {0}.
-
- Incompatible Target platform settings '{0}' with system architecture '{1}'.
-
- Inkompatible Zielplattformeinstellungen "{0}" mit der Systemarchitektur "{1}".
-
Unexpected settings file specified.
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.es.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.es.xlf
index 692b6957eb..37de189541 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.es.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.es.xlf
@@ -27,11 +27,6 @@
Error al cargar la configuración. Error: {0}.
-
- Incompatible Target platform settings '{0}' with system architecture '{1}'.
-
- La configuración de plataforma de destino '{0}' es incompatible con la arquitectura del sistema '{1}'.
-
Unexpected settings file specified.
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.fr.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.fr.xlf
index 748f424522..ded1b121cd 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.fr.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.fr.xlf
@@ -27,11 +27,6 @@
Une erreur s'est produite durant le chargement des paramètres. Erreur : {0}.
-
- Incompatible Target platform settings '{0}' with system architecture '{1}'.
-
- Paramètres de plateforme cible '{0}' incompatibles avec l'architecture système '{1}'.
-
Unexpected settings file specified.
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.it.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.it.xlf
index f5104eff95..6b0d20ce6a 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.it.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.it.xlf
@@ -27,11 +27,6 @@
Si è verificato un errore durante il caricamento delle impostazioni. Errore: {0}.
-
- Incompatible Target platform settings '{0}' with system architecture '{1}'.
-
- Le impostazioni della piattaforma di destinazione '{0}' non sono compatibili con l'architettura di sistema '{1}'.
-
Unexpected settings file specified.
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ja.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ja.xlf
index 6aa4ff3684..2c069554ee 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ja.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ja.xlf
@@ -27,11 +27,6 @@
設定の読み込み中にエラーが発生しました。エラー: {0}。
-
- Incompatible Target platform settings '{0}' with system architecture '{1}'.
-
- ターゲット プラットフォームの設定 '{0}' はシステム アーキテクチャ '{1}' と互換性がありません。
-
Unexpected settings file specified.
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ko.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ko.xlf
index f59fb250b3..3779891678 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ko.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ko.xlf
@@ -27,11 +27,6 @@
설정을 로드하는 동안 오류가 발생했습니다. 오류: {0}.
-
- Incompatible Target platform settings '{0}' with system architecture '{1}'.
-
- 대상 플랫폼 설정 '{0}'이(가) 시스템 아키텍처 '{1}'과(와) 호환되지 않습니다.
-
Unexpected settings file specified.
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.pl.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.pl.xlf
index b9c2a6974b..5417c6a2a4 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.pl.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.pl.xlf
@@ -27,11 +27,6 @@
Wystąpił błąd podczas ładowania ustawień. Błąd: {0}
-
- Incompatible Target platform settings '{0}' with system architecture '{1}'.
-
- Niezgodne ustawienia platformy docelowej „{0}” z architekturą systemu „{1}”.
-
Unexpected settings file specified.
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.pt-BR.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.pt-BR.xlf
index a8cb17021f..3665da4175 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.pt-BR.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.pt-BR.xlf
@@ -27,11 +27,6 @@
Ocorreu um erro ao carregar as configurações. Erro: {0}.
-
- Incompatible Target platform settings '{0}' with system architecture '{1}'.
-
- Configurações da plataforma de destino '{0}' incompatíveis com a arquitetura do sistema '{1}'.
-
Unexpected settings file specified.
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ru.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ru.xlf
index 321ddfc8a5..51dad6953b 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ru.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.ru.xlf
@@ -27,11 +27,6 @@
Произошла ошибка при загрузке параметров. Ошибка: {0}.
-
- Incompatible Target platform settings '{0}' with system architecture '{1}'.
-
- Параметры целевой платформы "{0}" несовместимы с архитектурой системы "{1}".
-
Unexpected settings file specified.
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.tr.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.tr.xlf
index 96cb6bfb86..3c67fe9b1a 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.tr.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.tr.xlf
@@ -27,11 +27,6 @@
Ayarlar yüklenirken bir hata oluştu. Hata: {0}.
-
- Incompatible Target platform settings '{0}' with system architecture '{1}'.
-
- '{0}' hedef platform ayarları, '{1}' sistem mimarisiyle uyumlu değil.
-
Unexpected settings file specified.
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf
index 07a69c0e27..518b6b38d5 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.xlf
@@ -22,10 +22,6 @@
An error occurred while loading the settings. Error: {0}.
-
- Incompatible Target platform settings '{0}' with system architecture '{1}'.
-
-
Unexpected settings file specified.
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.zh-Hans.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.zh-Hans.xlf
index 435639785f..475f024d4d 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.zh-Hans.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.zh-Hans.xlf
@@ -27,11 +27,6 @@
加载设置时出错。错误: {0}。
-
- Incompatible Target platform settings '{0}' with system architecture '{1}'.
-
- 目标平台设置“{0}”与系统体系结构“{1}”不兼容。
-
Unexpected settings file specified.
diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.zh-Hant.xlf b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.zh-Hant.xlf
index 8895f16c8f..24a38478c5 100644
--- a/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.zh-Hant.xlf
+++ b/src/Microsoft.TestPlatform.Utilities/Resources/xlf/Resources.zh-Hant.xlf
@@ -27,11 +27,6 @@
載入設定時發生錯誤。錯誤: {0}。
-
- Incompatible Target platform settings '{0}' with system architecture '{1}'.
-
- 目標平台設定 '{0}' 與系統架構 '{1}' 不相容。
-
Unexpected settings file specified.
diff --git a/test/Microsoft.TestPlatform.Utilities.UnitTests/InferRunSettingsHelperTests.cs b/test/Microsoft.TestPlatform.Utilities.UnitTests/InferRunSettingsHelperTests.cs
index 22b97e8d7c..4554873231 100644
--- a/test/Microsoft.TestPlatform.Utilities.UnitTests/InferRunSettingsHelperTests.cs
+++ b/test/Microsoft.TestPlatform.Utilities.UnitTests/InferRunSettingsHelperTests.cs
@@ -10,7 +10,6 @@ namespace Microsoft.TestPlatform.Utilities.UnitTests;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
using OMResources = VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources;
-using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
using Microsoft.VisualStudio.TestPlatform.Utilities;
using VisualStudio.TestTools.UnitTesting;
using MSTest.TestFramework.AssertExtensions;
@@ -217,21 +216,6 @@ public void UpdateRunSettingsShouldReturnBackACompleteRunSettings()
Assert.AreEqual(expectedRunSettings, xml);
}
- [TestMethod]
- public void UpdateRunSettingsShouldThrowIfArchitectureSetIsIncompatibleWithCurrentSystemArchitecture()
- {
- var settings = @"";
- var xmlDocument = GetXmlDocument(settings);
-
- Action action = () => InferRunSettingsHelper.UpdateRunSettingsWithUserProvidedSwitches(xmlDocument, Architecture.ARM, Framework.DefaultFramework, "temp");
-
- Assert.That.Throws(action)
- .WithMessage(string.Format(
- "Incompatible Target platform settings '{0}' with system architecture '{1}'.",
- "ARM",
- XmlRunSettingsUtilities.OSArchitecture.ToString()));
- }
-
[TestMethod]
public void UpdateDesignModeOrCsiShouldNotModifyXmlIfNodeIsAlreadyPresent()
{