From 64e30a95e07a82b97d016eb3a456374749406cfe Mon Sep 17 00:00:00 2001 From: Sarabjot Singh Date: Thu, 15 Mar 2018 18:35:06 +0530 Subject: [PATCH] - User should not need to give /framework:FrameworkUap10 for Uwp projects. - Fixed the string for /Tests option. --- src/vstest.console/CommandLine/InferHelper.cs | 3 ++- src/vstest.console/Resources/Resources.Designer.cs | 8 ++++---- src/vstest.console/Resources/Resources.resx | 4 ++-- src/vstest.console/Resources/xlf/Resources.cs.xlf | 12 ++++++------ src/vstest.console/Resources/xlf/Resources.de.xlf | 12 ++++++------ src/vstest.console/Resources/xlf/Resources.es.xlf | 12 ++++++------ src/vstest.console/Resources/xlf/Resources.fr.xlf | 12 ++++++------ src/vstest.console/Resources/xlf/Resources.it.xlf | 12 ++++++------ src/vstest.console/Resources/xlf/Resources.ja.xlf | 12 ++++++------ src/vstest.console/Resources/xlf/Resources.ko.xlf | 12 ++++++------ src/vstest.console/Resources/xlf/Resources.pl.xlf | 12 ++++++------ src/vstest.console/Resources/xlf/Resources.pt-BR.xlf | 12 ++++++------ src/vstest.console/Resources/xlf/Resources.ru.xlf | 12 ++++++------ src/vstest.console/Resources/xlf/Resources.tr.xlf | 12 ++++++------ src/vstest.console/Resources/xlf/Resources.xlf | 4 ++-- .../Resources/xlf/Resources.zh-Hans.xlf | 12 ++++++------ .../Resources/xlf/Resources.zh-Hant.xlf | 12 ++++++------ .../CommandLine/InferHelperTests.cs | 8 ++++++++ .../Processors/FrameworkArgumentProcessorTests.cs | 2 +- 19 files changed, 97 insertions(+), 88 deletions(-) diff --git a/src/vstest.console/CommandLine/InferHelper.cs b/src/vstest.console/CommandLine/InferHelper.cs index ce7d7a61cc..f9dda8b734 100644 --- a/src/vstest.console/CommandLine/InferHelper.cs +++ b/src/vstest.console/CommandLine/InferHelper.cs @@ -143,7 +143,8 @@ private FrameworkName DetermineFrameworkName(IEnumerable sources, IDicti // possible for js files. So using default .NET Full framework version. fx = new FrameworkName(Constants.DotNetFramework40); } - else if (extension.Equals(".appx", StringComparison.OrdinalIgnoreCase)) + else if (extension.Equals(".appx", StringComparison.OrdinalIgnoreCase) + || extension.Equals(".appxrecipe", StringComparison.OrdinalIgnoreCase)) { fx = new FrameworkName(Constants.DotNetFrameworkUap10); } diff --git a/src/vstest.console/Resources/Resources.Designer.cs b/src/vstest.console/Resources/Resources.Designer.cs index 979c384cbf..809a760940 100644 --- a/src/vstest.console/Resources/Resources.Designer.cs +++ b/src/vstest.console/Resources/Resources.Designer.cs @@ -621,7 +621,7 @@ public static string FileNotFound /// Looks up a localized string similar to --Framework|/Framework:<Framework Version> /// Target .Net Framework version to be used for test execution. /// Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc. - /// Other supported values are Framework35, Framework40, Framework45 and FrameworkCore10.. + /// Other supported values are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10.. /// public static string FrameworkArgumentHelp { @@ -757,7 +757,7 @@ public static string InvalidEnableCodeCoverageCommand } /// - /// Looks up a localized string similar to Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40 and Framework45.. + /// Looks up a localized string similar to Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10.. /// public static string InvalidFrameworkVersion { @@ -1358,10 +1358,10 @@ public static string RunSingleAppContainerSource /// /// Looks up a localized string similar to --Tests|/Tests:<Test Names> - /// Run tests with names that match the provided values. To provide multiple + /// Run tests with names that contain the provided values. To provide multiple /// values, separate them by commas. /// Examples: /Tests:TestMethod1 - /// /Tests:TestMethod1,testMethod2. + /// /Tests:TestMethod1,TestMethod2. /// public static string RunSpecificTestsHelp { diff --git a/src/vstest.console/Resources/Resources.resx b/src/vstest.console/Resources/Resources.resx index fa58820f94..6287288bc1 100644 --- a/src/vstest.console/Resources/Resources.resx +++ b/src/vstest.console/Resources/Resources.resx @@ -273,7 +273,7 @@ --Framework|/Framework:<Framework Version> Target .Net Framework version to be used for test execution. Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc. - Other supported values are Framework35, Framework40, Framework45 and FrameworkCore10. + Other supported values are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. The /Framework argument requires the target .Net Framework version for the test run. Example: /Framework:".NETFramework,Version=v4.5.1" @@ -314,7 +314,7 @@ Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again. - Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45 and FrameworkCore10. + Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again. diff --git a/src/vstest.console/Resources/xlf/Resources.cs.xlf b/src/vstest.console/Resources/xlf/Resources.cs.xlf index 60379aec9b..024b1312e9 100644 --- a/src/vstest.console/Resources/xlf/Resources.cs.xlf +++ b/src/vstest.console/Resources/xlf/Resources.cs.xlf @@ -747,12 +747,12 @@ --Framework|/Framework:<Framework Version> Target .Net Framework version to be used for test execution. Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc. - Other supported values are Framework35, Framework40, Framework45 and FrameworkCore10. - --Framework|/Framework:<Verze rozhraní> + Other supported values are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + --Framework|/Framework:<Verze rozhraní> Cílová verze rozhraní .NET Framework, která se použije k provedení testu. Platné hodnoty jsou ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" atd. Dalšími podporovanými hodnotami jsou Framework35, Framework40, Framework45 a FrameworkCore10. - + --Framework | / Framework: < Framework verze > Cílové rozhraní .net Framework verze pro spuštění testu. @@ -771,9 +771,9 @@ fuzzyMatch="15" wordcount="16" adjWordcount="13.6" curWordcount="13.6" - Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45 and FrameworkCore10. - Neplatná verze rozhraní .NET Framework: {0}. Zadejte prosím úplný název cílového rozhraní. Dalšími podporovanými verzemi jsou Framework35, Framework40, Framework45 a FrameworkCore10. - + Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + Neplatná verze rozhraní .NET Framework: {0}. Zadejte prosím úplný název cílového rozhraní. Dalšími podporovanými verzemi jsou Framework35, Framework40, Framework45 a FrameworkCore10. + Neplatné rozhraní .net Framework verze: {0}. uveďte, prosím, fullname TargetFramework. Ostatní podporované rozhraní .net Framework verze jsou Framework35, Framework40 a Framework45. diff --git a/src/vstest.console/Resources/xlf/Resources.de.xlf b/src/vstest.console/Resources/xlf/Resources.de.xlf index 8a072dc89e..c4169f759b 100644 --- a/src/vstest.console/Resources/xlf/Resources.de.xlf +++ b/src/vstest.console/Resources/xlf/Resources.de.xlf @@ -747,12 +747,12 @@ --Framework|/Framework:<Framework Version> Target .Net Framework version to be used for test execution. Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc. - Other supported values are Framework35, Framework40, Framework45 and FrameworkCore10. - --Framework|/Framework:< Frameworkversion > + Other supported values are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + --Framework|/Framework:< Frameworkversion > Die .NET Framework-Zielversion, die für die Testausführung verwendet werden soll. Gültige Werte sind ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0 " usw. Weitere unterstützte Werte sind "Framework35", "Framework40", "Framework45" und "FrameworkCore10". - + -Framework | / Framework: < Frameworkversion > Ziel von .net Framework-Version für die Ausführung verwendet werden. @@ -771,9 +771,9 @@ fuzzyMatch="15" wordcount="16" adjWordcount="13.6" curWordcount="13.6" - Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45 and FrameworkCore10. - Ungültige .NET Framework-Version: {0}. Geben Sie den vollständigen Namen von TargetFramework an. Weitere unterstützte .NET Framework-Versionen sind "Framework35", "Framework40", "Framework45" und "FrameworkCore10". - + Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + Ungültige .NET Framework-Version: {0}. Geben Sie den vollständigen Namen von TargetFramework an. Weitere unterstützte .NET Framework-Versionen sind "Framework35", "Framework40", "Framework45" und "FrameworkCore10". + Ungültige .net Framework-Version: {0}. Geben Fullname der TargetFramework. Andere unterstützt .net Framework-Versionen sind Framework35, Framework40 und Framework45. diff --git a/src/vstest.console/Resources/xlf/Resources.es.xlf b/src/vstest.console/Resources/xlf/Resources.es.xlf index 23384f83f2..821f582110 100644 --- a/src/vstest.console/Resources/xlf/Resources.es.xlf +++ b/src/vstest.console/Resources/xlf/Resources.es.xlf @@ -749,12 +749,12 @@ --Framework|/Framework:<Framework Version> Target .Net Framework version to be used for test execution. Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc. - Other supported values are Framework35, Framework40, Framework45 and FrameworkCore10. - --Framework|/Framework:<VersiónDeMarco> + Other supported values are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + --Framework|/Framework:<VersiónDeMarco> Versión de .Net Framework de destino que debe usarse para la ejecución de pruebas. Los valores válidos son: ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0", etc. Otros valores admitidos son: Framework35, Framework40, Framework45 y FrameworkCore10. - + --Framework | / Framework: < versión de Framework > Trabajar en .net Framework versión que se utilizará para la ejecución de la prueba. @@ -773,9 +773,9 @@ fuzzyMatch="15" wordcount="16" adjWordcount="13.6" curWordcount="13.6" - Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45 and FrameworkCore10. - Versión de .Net Framework no válida ({0}). Proporcione el nombre completo de la plataforma de destino. Otras versiones de .Net Framework admitidas son Framework35, Framework40, Framework45 y FrameworkCore10. - + Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + Versión de .Net Framework no válida ({0}). Proporcione el nombre completo de la plataforma de destino. Otras versiones de .Net Framework admitidas son Framework35, Framework40, Framework45 y FrameworkCore10. + Válido .net Framework versión: {0}. proporcione el nombre completo de la TargetFramework. Sí admite .net Framework versiones son Framework35, Framework40 y Framework45. diff --git a/src/vstest.console/Resources/xlf/Resources.fr.xlf b/src/vstest.console/Resources/xlf/Resources.fr.xlf index fd31ecc801..ab132f2617 100644 --- a/src/vstest.console/Resources/xlf/Resources.fr.xlf +++ b/src/vstest.console/Resources/xlf/Resources.fr.xlf @@ -747,12 +747,12 @@ --Framework|/Framework:<Framework Version> Target .Net Framework version to be used for test execution. Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc. - Other supported values are Framework35, Framework40, Framework45 and FrameworkCore10. - --Framework|/Framework:<version du framework> + Other supported values are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + --Framework|/Framework:<version du framework> Version cible du .Net Framework à utiliser pour l'exécution des tests. Les valeurs valides sont : ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0", etc. Les autres valeurs prises en charge sont Framework35, Framework40, Framework45 et FrameworkCore10. - + --Framework | / Framework : < Version .NET Framework > Ciblez .net version de Framework à utiliser pour l’exécution du test. @@ -771,9 +771,9 @@ fuzzyMatch="15" wordcount="16" adjWordcount="13.6" curWordcount="13.6" - Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45 and FrameworkCore10. - Version non valide du .Net Framework : {0}. Indiquez le nom complet de TargetFramework. Les autres versions du .Net Framework prises en charge sont Framework35, Framework40, Framework45 et FrameworkCore10. - + Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + Version non valide du .Net Framework : {0}. Indiquez le nom complet de TargetFramework. Les autres versions du .Net Framework prises en charge sont Framework35, Framework40, Framework45 et FrameworkCore10. + Non valide .net version du Framework : {0}. Veuillez donner le nom complet de la TargetFramework. Autre prise en charge de .net Framework versions sont Framework35, Framework40 et Framework45. diff --git a/src/vstest.console/Resources/xlf/Resources.it.xlf b/src/vstest.console/Resources/xlf/Resources.it.xlf index 5c9a74f7c3..78c7b373b2 100644 --- a/src/vstest.console/Resources/xlf/Resources.it.xlf +++ b/src/vstest.console/Resources/xlf/Resources.it.xlf @@ -747,12 +747,12 @@ --Framework|/Framework:<Framework Version> Target .Net Framework version to be used for test execution. Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc. - Other supported values are Framework35, Framework40, Framework45 and FrameworkCore10. - --Framework|/Framework:<Versione framework> + Other supported values are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + --Framework|/Framework:<Versione framework> Versione di .NET Framework di destinazione da usare per l'esecuzione dei test. Valori validi: ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" e così via. Altri valori supportati: Framework35, Framework40, Framework45 e FrameworkCore10. - + -Framework | / Framework: < versione Framework > Destinazione di .net Framework versione da utilizzare per l'esecuzione del test. @@ -771,9 +771,9 @@ fuzzyMatch="15" wordcount="16" adjWordcount="13.6" curWordcount="13.6" - Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45 and FrameworkCore10. - La versione di .NET Framework {0} non è valida. Specificare il nome completo della versione di .NET Framework di destinazione. Altre versioni di .NET Framework supportate: Framework35, Framework40, Framework45 e FrameworkCore10. - + Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + La versione di .NET Framework {0} non è valida. Specificare il nome completo della versione di .NET Framework di destinazione. Altre versioni di .NET Framework supportate: Framework35, Framework40, Framework45 e FrameworkCore10. + .Net valida versione Framework: {0}. assegnare fullname del TargetFramework. Altro supportato di .net Framework versioni sono Framework35, Framework40 e Framework45. diff --git a/src/vstest.console/Resources/xlf/Resources.ja.xlf b/src/vstest.console/Resources/xlf/Resources.ja.xlf index fa2c87c4be..c579cb6a6a 100644 --- a/src/vstest.console/Resources/xlf/Resources.ja.xlf +++ b/src/vstest.console/Resources/xlf/Resources.ja.xlf @@ -747,12 +747,12 @@ --Framework|/Framework:<Framework Version> Target .Net Framework version to be used for test execution. Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc. - Other supported values are Framework35, Framework40, Framework45 and FrameworkCore10. - --Framework|/Framework:<Framework のバージョン> + Other supported values are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + --Framework|/Framework:<Framework のバージョン> テストの実行に使用する対象の .Net Framework バージョンです。 有効な値は ".NETFramework,Version=v4.5.1"、".NETCoreApp,Version=v1.0" などです。 その他のサポートされる値は Framework35、Framework40、Framework45、FrameworkCore10 です。 - + --フレームワーク |/フレームワーク: < フレームワーク バージョン > 対象の .Net Framework のバージョンをテストの実行に使用します。 @@ -771,9 +771,9 @@ fuzzyMatch="15" wordcount="16" adjWordcount="13.6" curWordcount="13.6" - Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45 and FrameworkCore10. - .Net Framework バージョンが無効です: {0}。TargetFramework の完全な名前を指定してください。その他のサポートされる .Net Framework バージョンは Framework35、Framework40、Framework45、FrameworkCore10 です。 - + Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + .Net Framework バージョンが無効です: {0}。TargetFramework の完全な名前を指定してください。その他のサポートされる .Net Framework バージョンは Framework35、Framework40、Framework45、FrameworkCore10 です。 + 無効な .Net Framework のバージョン: {0}.、TargetFramework のフルネームを指定してください。サポートされているその他の .Net Framework のバージョンは、Framework35、Framework40 および Framework45。 diff --git a/src/vstest.console/Resources/xlf/Resources.ko.xlf b/src/vstest.console/Resources/xlf/Resources.ko.xlf index e7c2b458c9..0557a01e71 100644 --- a/src/vstest.console/Resources/xlf/Resources.ko.xlf +++ b/src/vstest.console/Resources/xlf/Resources.ko.xlf @@ -747,12 +747,12 @@ --Framework|/Framework:<Framework Version> Target .Net Framework version to be used for test execution. Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc. - Other supported values are Framework35, Framework40, Framework45 and FrameworkCore10. - --Framework|/Framework:<프레임워크 버전> + Other supported values are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + --Framework|/Framework:<프레임워크 버전> 테스트 실행에 사용할 대상 .NET Framework 버전입니다. 유효한 값은 ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" 등입니다. 지원되는 기타 값은 Framework35, Framework40, Framework45 및 FrameworkCore10입니다. - + -프레임 워크 | / 프레임 워크: < 프레임 워크 버전 > 대상.Net Framework 버전 테스트 실행에 사용할 수 있습니다. @@ -771,9 +771,9 @@ fuzzyMatch="15" wordcount="16" adjWordcount="13.6" curWordcount="13.6" - Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45 and FrameworkCore10. - .Net Framework 버전 {0}이(가) 잘못되었습니다. TargetFramework의 전체 경로를 지정하세요. 지원되는 다른 .Net Framework 버전은 Framework35, Framework40, Framework45 및 FrameworkCore10입니다. - + Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + .Net Framework 버전 {0}이(가) 잘못되었습니다. TargetFramework의 전체 경로를 지정하세요. 지원되는 다른 .Net Framework 버전은 Framework35, Framework40, Framework45 및 FrameworkCore10입니다. + 잘못 된.Net Framework 버전: {0}. fullname은 TargetFramework의 이름을 입력 하십시오. 지원 되는 다른.Net Framework 버전은 Framework35, Framework40 및 Framework45. diff --git a/src/vstest.console/Resources/xlf/Resources.pl.xlf b/src/vstest.console/Resources/xlf/Resources.pl.xlf index 651c01c08f..c7a6c11966 100644 --- a/src/vstest.console/Resources/xlf/Resources.pl.xlf +++ b/src/vstest.console/Resources/xlf/Resources.pl.xlf @@ -742,12 +742,12 @@ --Framework|/Framework:<Framework Version> Target .Net Framework version to be used for test execution. Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc. - Other supported values are Framework35, Framework40, Framework45 and FrameworkCore10. - --Framework|/Framework:<wersja struktury> + Other supported values are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + --Framework|/Framework:<wersja struktury> Docelowa wersja programu .NET Framework, która zostanie użyta na potrzeby wykonania testu. Prawidłowe wartości to ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" itp. Inne obsługiwane wartości to Framework35, Framework40, Framework45 i FrameworkCore10. - + --Framework | / Framework: < Framework w wersji > Cel systemu .net Framework w wersji używanego do wykonania testu. @@ -766,9 +766,9 @@ fuzzyMatch="15" wordcount="16" adjWordcount="13.6" curWordcount="13.6" - Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45 and FrameworkCore10. - Nieprawidłowa wersja programu .NET Framework: {0}. Podaj pełną nazwę struktury docelowej. Inne obsługiwane wersje programu .NET Framework to Framework35, Framework40, Framework45 i FrameworkCore10. - + Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + Nieprawidłowa wersja programu .NET Framework: {0}. Podaj pełną nazwę struktury docelowej. Inne obsługiwane wersje programu .NET Framework to Framework35, Framework40, Framework45 i FrameworkCore10. + Nieprawidłowy .net Framework w wersji: {0}. Proszę podać imię i nazwisko z TargetFramework. Inne obsługiwane platformy .net Framework w wersji są Framework35, Framework40 i Framework45. diff --git a/src/vstest.console/Resources/xlf/Resources.pt-BR.xlf b/src/vstest.console/Resources/xlf/Resources.pt-BR.xlf index b7238ba277..ad959ed278 100644 --- a/src/vstest.console/Resources/xlf/Resources.pt-BR.xlf +++ b/src/vstest.console/Resources/xlf/Resources.pt-BR.xlf @@ -747,12 +747,12 @@ --Framework|/Framework:<Framework Version> Target .Net Framework version to be used for test execution. Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc. - Other supported values are Framework35, Framework40, Framework45 and FrameworkCore10. - --Framework|/Framework:<Framework Version> + Other supported values are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + --Framework|/Framework:<Framework Version> A versão do .Net Framework de destino a ser usada para a execução de teste. Os valores válidos são ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc. Outros valores com suporte são Framework35, Framework40, Framework45 e FrameworkCore10. - + -Framework | / Framework: < versão do Framework > Direcionar o .net Framework versão a ser usada para a execução do teste. @@ -771,9 +771,9 @@ fuzzyMatch="15" wordcount="16" adjWordcount="13.6" curWordcount="13.6" - Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45 and FrameworkCore10. - Versão inválida do .Net Framework: {0}. Forneça o nome completo do TargetFramework. Outras versões com suporte do .Net Framework são Framework35, Framework40, Framework45 e FrameworkCore10. - + Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + Versão inválida do .Net Framework: {0}. Forneça o nome completo do TargetFramework. Outras versões com suporte do .Net Framework são Framework35, Framework40, Framework45 e FrameworkCore10. + Inválido .net Framework versão: {0}. Forneça o fullname do TargetFramework. Outro suporte para .net Framework versões são Framework35, Framework40 e Framework45. diff --git a/src/vstest.console/Resources/xlf/Resources.ru.xlf b/src/vstest.console/Resources/xlf/Resources.ru.xlf index db94a8deb0..560a2af02f 100644 --- a/src/vstest.console/Resources/xlf/Resources.ru.xlf +++ b/src/vstest.console/Resources/xlf/Resources.ru.xlf @@ -747,12 +747,12 @@ --Framework|/Framework:<Framework Version> Target .Net Framework version to be used for test execution. Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc. - Other supported values are Framework35, Framework40, Framework45 and FrameworkCore10. - --Framework|/Framework:<версия платформы> + Other supported values are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + --Framework|/Framework:<версия платформы> Целевая версия .NET Framework для выполнения тестов. Допустимые значения: ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" и т. д. Другие поддерживаемые значения: Framework35, Framework40, Framework45 и FrameworkCore10. - + --Framework | / Framework: < Framework версии > Целевой .net Framework версии, используемый для выполнения теста. @@ -771,9 +771,9 @@ fuzzyMatch="15" wordcount="16" adjWordcount="13.6" curWordcount="13.6" - Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45 and FrameworkCore10. - Недопустимая версия .NET Framework: {0}. Укажите полное имя целевой платформы. Другие поддерживаемые версии .NET Framework: Framework35, Framework40, Framework45 и FrameworkCore10. - + Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + Недопустимая версия .NET Framework: {0}. Укажите полное имя целевой платформы. Другие поддерживаемые версии .NET Framework: Framework35, Framework40, Framework45 и FrameworkCore10. + Недопустимый .net Framework версии: {0}. Укажите имя fullname TargetFramework. Другие поддерживаемые .net Framework версии, Framework35, Framework40 и Framework45. diff --git a/src/vstest.console/Resources/xlf/Resources.tr.xlf b/src/vstest.console/Resources/xlf/Resources.tr.xlf index b5d72784fa..71c82b0997 100644 --- a/src/vstest.console/Resources/xlf/Resources.tr.xlf +++ b/src/vstest.console/Resources/xlf/Resources.tr.xlf @@ -748,12 +748,12 @@ --Framework|/Framework:<Framework Version> Target .Net Framework version to be used for test execution. Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc. - Other supported values are Framework35, Framework40, Framework45 and FrameworkCore10. - --Framework|/Framework:<Framework Sürümü> + Other supported values are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + --Framework|/Framework:<Framework Sürümü> Test yürütmesi için kullanılacak hedef .NET Framework sürümü. Geçerli değerler ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" vb. Framework35, Framework40, Framework45 ve FrameworkCore10 desteklenen diğer değerlerdir. - + --Framework | / Framework: < Framework sürüm > Hedef .net Framework sürümünü test yürütmesi için kullanılacak. @@ -772,9 +772,9 @@ fuzzyMatch="15" wordcount="16" adjWordcount="13.6" curWordcount="13.6" - Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45 and FrameworkCore10. - Geçersiz .NET Framework sürümü: {0}. Lütfen TargetFramework tam adını belirtin. Desteklenen diğer .NET Framework sürümleri Framework35, Framework40, Framework45 ve FrameworkCore10’dur. - + Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + Geçersiz .NET Framework sürümü: {0}. Lütfen TargetFramework tam adını belirtin. Desteklenen diğer .NET Framework sürümleri Framework35, Framework40, Framework45 ve FrameworkCore10’dur. + Geçersiz .net Framework sürümü: {0}. Lütfen fullname in TargetFramework verin. Diğer desteklenen .net Framework sürümleri şunlardır: Framework35, Framework40 ve Framework45. diff --git a/src/vstest.console/Resources/xlf/Resources.xlf b/src/vstest.console/Resources/xlf/Resources.xlf index a55bc66db2..2884352c39 100644 --- a/src/vstest.console/Resources/xlf/Resources.xlf +++ b/src/vstest.console/Resources/xlf/Resources.xlf @@ -312,7 +312,7 @@ --Framework|/Framework:<Framework Version> Target .Net Framework version to be used for test execution. Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc. - Other supported values are Framework35, Framework40, Framework45 and FrameworkCore10. + Other supported values are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. @@ -320,7 +320,7 @@ - Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45 and FrameworkCore10. + Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. diff --git a/src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf b/src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf index ea029e760a..575a5ae4b1 100644 --- a/src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf +++ b/src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf @@ -747,12 +747,12 @@ --Framework|/Framework:<Framework Version> Target .Net Framework version to be used for test execution. Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc. - Other supported values are Framework35, Framework40, Framework45 and FrameworkCore10. - --Framework|/Framework:<Framework Version> + Other supported values are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + --Framework|/Framework:<Framework Version> 用于测试执行的目标 .Net Framework 版本。 有效值为 ".NETFramework,Version=v4.5.1"、".NETCoreApp,Version=v1.0" 等。 其他受支持的值为 Framework35、Framework40、Framework45 和 FrameworkCore10。 - + — 框架 | / 框架︰ < 框架版本 > 目标.Net Framework 版本以用于测试执行。 @@ -771,9 +771,9 @@ fuzzyMatch="15" wordcount="16" adjWordcount="13.6" curWordcount="13.6" - Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45 and FrameworkCore10. - 无效的 .Net Framework 版本: {0}。请提供 TargetFramework 的全名。其他支持的 .Net Framework 版本为 Framework35、Framework40、Framework45 和 FrameworkCore10。 - + Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + 无效的 .Net Framework 版本: {0}。请提供 TargetFramework 的全名。其他支持的 .Net Framework 版本为 Framework35、Framework40、Framework45 和 FrameworkCore10。 + 无效的.Net Framework 版本︰ {0}。 请给 TargetFramework 的全名。其他受支持的.Net Framework 版本是 Framework35、 Framework40 和 Framework45。 diff --git a/src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf b/src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf index 545df27504..8b3ac55270 100644 --- a/src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf +++ b/src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf @@ -747,12 +747,12 @@ --Framework|/Framework:<Framework Version> Target .Net Framework version to be used for test execution. Valid values are ".NETFramework,Version=v4.5.1", ".NETCoreApp,Version=v1.0" etc. - Other supported values are Framework35, Framework40, Framework45 and FrameworkCore10. - --Framework|/Framework:<Framework 版本> + Other supported values are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + --Framework|/Framework:<Framework 版本> 要用於測試執行的目標 .Net Framework 版本。 有效值為 ".NETFramework,Version=v4.5.1"、".NETCoreApp,Version=v1.0" 等 其他支援的值為 Framework35、Framework40、Framework45 和 FrameworkCore10。 - + — 框架 | / 框架︰ < 框架版本 > 目标.Net Framework 版本以用于测试执行。 @@ -771,9 +771,9 @@ fuzzyMatch="15" wordcount="16" adjWordcount="13.6" curWordcount="13.6" - Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45 and FrameworkCore10. - .NET Framework 版本無效: {0}。請指定 TargetFramework 的全名。其他支援的 .Net Framework 版本為 Framework35、Framework40、Framework45 和 FrameworkCore10。 - + Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10. + .NET Framework 版本無效: {0}。請指定 TargetFramework 的全名。其他支援的 .Net Framework 版本為 Framework35、Framework40、Framework45 和 FrameworkCore10。 + 无效的.Net Framework 版本︰ {0}。 请给 TargetFramework 的全名。其他受支持的.Net Framework 版本是 Framework35、 Framework40 和 Framework45。 diff --git a/test/vstest.console.UnitTests/CommandLine/InferHelperTests.cs b/test/vstest.console.UnitTests/CommandLine/InferHelperTests.cs index ca09022bff..4c35efddd4 100644 --- a/test/vstest.console.UnitTests/CommandLine/InferHelperTests.cs +++ b/test/vstest.console.UnitTests/CommandLine/InferHelperTests.cs @@ -198,6 +198,14 @@ public void AutoDetectFrameworkShouldReturnFrameworkUap10ForAppxFiles() SetupAndValidateForSingleAssembly(assemblyName, fx, false); } + [TestMethod] + public void AutoDetectFrameworkShouldReturnFrameworkUap10ForAppxrecipeFiles() + { + var fx = Framework.FromString(Constants.DotNetFrameworkUap10); + var assemblyName = "uwp10.appxrecipe"; + SetupAndValidateForSingleAssembly(assemblyName, fx, false); + } + [TestMethod] public void AutoDetectFrameworkShouldReturnDefaultFullFrameworkForJsFiles() { diff --git a/test/vstest.console.UnitTests/Processors/FrameworkArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/FrameworkArgumentProcessorTests.cs index 0d3900d3af..3cc08ea287 100644 --- a/test/vstest.console.UnitTests/Processors/FrameworkArgumentProcessorTests.cs +++ b/test/vstest.console.UnitTests/Processors/FrameworkArgumentProcessorTests.cs @@ -87,7 +87,7 @@ public void InitializeShouldThrowIfArgumentIsInvalid() { ExceptionUtilities.ThrowsException( () => this.executor.Initialize("foo"), - "Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45 and FrameworkCore10.", + "Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40, Framework45, FrameworkCore10 and FrameworkUap10.", "foo"); }