From 862de26da61d0517ca809cf6898e0b14ccd15c3e Mon Sep 17 00:00:00 2001 From: Youssef1313 Date: Sun, 14 Sep 2025 10:01:42 +0200 Subject: [PATCH 01/10] Add --test-runner option to global.json template --- .../.template.config/dotnetcli.host.json | 4 ++++ .../localize/templatestrings.cs.json | 6 ++++++ .../localize/templatestrings.de.json | 6 ++++++ .../localize/templatestrings.en.json | 6 ++++++ .../localize/templatestrings.es.json | 6 ++++++ .../localize/templatestrings.fr.json | 6 ++++++ .../localize/templatestrings.it.json | 6 ++++++ .../localize/templatestrings.ja.json | 6 ++++++ .../localize/templatestrings.ko.json | 6 ++++++ .../localize/templatestrings.pl.json | 6 ++++++ .../localize/templatestrings.pt-BR.json | 6 ++++++ .../localize/templatestrings.ru.json | 6 ++++++ .../localize/templatestrings.tr.json | 6 ++++++ .../localize/templatestrings.zh-Hans.json | 6 ++++++ .../localize/templatestrings.zh-Hant.json | 6 ++++++ .../GlobalJson/.template.config/template.json | 20 +++++++++++++++++++ .../content/GlobalJson/global.json | 6 ++++++ ...howHelpForTemplate_globaljson.verified.txt | 6 +++++- .../CommonTemplatesTests.cs | 6 ++++++ 19 files changed, 125 insertions(+), 1 deletion(-) diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/dotnetcli.host.json index 22ed44fb96c4..dd7d1528bb3b 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/dotnetcli.host.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/dotnetcli.host.json @@ -9,6 +9,10 @@ "longName": "roll-forward", "shortName": "" }, + "TestRunner": { + "longName": "test-runner", + "shortName": "" + }, "dotnet-cli-version": { "isHidden": "true" } diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.cs.json index c17e2a59dcf8..8e74f03a7b3b 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.cs.json @@ -25,5 +25,11 @@ "symbols/RollForward/choices/latestMajor/displayName": "Nejnovější hlavní verze", "symbols/RollForward/choices/disable/description": "Nedá se posunout vpřed. Vyžaduje se přesná shoda.", "symbols/RollForward/choices/disable/displayName": "Zakázat posunutí vpřed", + "symbols/TestRunner/description": "The test runner to use.", + "symbols/TestRunner/displayName": "Test runner", + "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/displayName": "VSTest", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "Otevře global.json v editoru." } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.de.json index 8523d66e558e..065b2f757310 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.de.json @@ -25,5 +25,11 @@ "symbols/RollForward/choices/latestMajor/displayName": "Neueste Haupt-", "symbols/RollForward/choices/disable/description": "Kein Rollforward. Exakte Übereinstimmung erforderlich.", "symbols/RollForward/choices/disable/displayName": "Rollforward deaktivieren", + "symbols/TestRunner/description": "The test runner to use.", + "symbols/TestRunner/displayName": "Test runner", + "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/displayName": "VSTest", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "Öffnet „global.json“ im Editor." } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.en.json index eda42be5c35d..9162a774004c 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.en.json @@ -25,5 +25,11 @@ "symbols/RollForward/choices/latestMajor/displayName": "Latest major", "symbols/RollForward/choices/disable/description": "Doesn't roll forward. Exact match required.", "symbols/RollForward/choices/disable/displayName": "Disable roll-forward", + "symbols/TestRunner/description": "The test runner to use.", + "symbols/TestRunner/displayName": "Test runner", + "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/displayName": "VSTest", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "Opens global.json in the editor" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.es.json index 3695d9387faf..1d13cfd219b2 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.es.json @@ -25,5 +25,11 @@ "symbols/RollForward/choices/latestMajor/displayName": "Última versión principal", "symbols/RollForward/choices/disable/description": "No se hace un reenvío. Se requiere una coincidencia exacta.", "symbols/RollForward/choices/disable/displayName": "Deshabilitar el reenvío", + "symbols/TestRunner/description": "The test runner to use.", + "symbols/TestRunner/displayName": "Test runner", + "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/displayName": "VSTest", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "Abre global.json el editor" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.fr.json index 44eb3008d8d3..40433c84643f 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.fr.json @@ -25,5 +25,11 @@ "symbols/RollForward/choices/latestMajor/displayName": "Dernière version majeure", "symbols/RollForward/choices/disable/description": "Ne pas restaurer par progression vers l’avant. Correspondance exacte requise.", "symbols/RollForward/choices/disable/displayName": "Désactiver la restauration par progression", + "symbols/TestRunner/description": "The test runner to use.", + "symbols/TestRunner/displayName": "Test runner", + "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/displayName": "VSTest", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "Ouvre global.json dans l’éditeur" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.it.json index 7d3a22b78e38..ac972e629ad6 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.it.json @@ -25,5 +25,11 @@ "symbols/RollForward/choices/latestMajor/displayName": "Valore principale più recente", "symbols/RollForward/choices/disable/description": "Non esegue il roll-forward. Corrispondenza esatta richiesta.", "symbols/RollForward/choices/disable/displayName": "Disabilita roll-forward", + "symbols/TestRunner/description": "The test runner to use.", + "symbols/TestRunner/displayName": "Test runner", + "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/displayName": "VSTest", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "Apre global.json nell'editor" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ja.json index 0d6cc3e58513..08c2396936c7 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ja.json @@ -25,5 +25,11 @@ "symbols/RollForward/choices/latestMajor/displayName": "最新のメジャー", "symbols/RollForward/choices/disable/description": "ロールフォワードしません。完全に一致する必要があります。", "symbols/RollForward/choices/disable/displayName": "ロールフォワードの無効化", + "symbols/TestRunner/description": "The test runner to use.", + "symbols/TestRunner/displayName": "Test runner", + "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/displayName": "VSTest", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "エディターで global.json を開く" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ko.json index 253e652b9754..77ebac186959 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ko.json @@ -25,5 +25,11 @@ "symbols/RollForward/choices/latestMajor/displayName": "최신 주", "symbols/RollForward/choices/disable/description": "롤포워드하지 않습니다. 정확히 일치해야 합니다.", "symbols/RollForward/choices/disable/displayName": "롤포워드 비활성화", + "symbols/TestRunner/description": "The test runner to use.", + "symbols/TestRunner/displayName": "Test runner", + "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/displayName": "VSTest", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "편집기에서 global.json을 엽니다" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.pl.json index 5c4cf77e8c11..74a6f888c99f 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.pl.json @@ -25,5 +25,11 @@ "symbols/RollForward/choices/latestMajor/displayName": "Najnowszy przedział główny", "symbols/RollForward/choices/disable/description": "Nie przechodzi. Wymagane jest dokładne dopasowanie.", "symbols/RollForward/choices/disable/displayName": "Wyłącz przechodzenie", + "symbols/TestRunner/description": "The test runner to use.", + "symbols/TestRunner/displayName": "Test runner", + "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/displayName": "VSTest", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "Otwiera plik global.json w edytorze" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.pt-BR.json index 3ede77decdb7..dffce293c822 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.pt-BR.json @@ -25,5 +25,11 @@ "symbols/RollForward/choices/latestMajor/displayName": "Principal mais recente", "symbols/RollForward/choices/disable/description": "Não rola para frente. Correspondência exata necessária.", "symbols/RollForward/choices/disable/displayName": "Desabilitar rolar para frente", + "symbols/TestRunner/description": "The test runner to use.", + "symbols/TestRunner/displayName": "Test runner", + "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/displayName": "VSTest", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "Abrir global.json no editor" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ru.json index 438e9d733b29..74dd0efbdf9c 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ru.json @@ -25,5 +25,11 @@ "symbols/RollForward/choices/latestMajor/displayName": "Последняя основная версия", "symbols/RollForward/choices/disable/description": "Накат не выполняется. Требуется точное совпадение.", "symbols/RollForward/choices/disable/displayName": "Отключить накат", + "symbols/TestRunner/description": "The test runner to use.", + "symbols/TestRunner/displayName": "Test runner", + "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/displayName": "VSTest", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "Открывает файл global.json в редакторе" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.tr.json index 83799eb377fb..3d2eaf2fbcb8 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.tr.json @@ -25,5 +25,11 @@ "symbols/RollForward/choices/latestMajor/displayName": "Son birincil sürüm", "symbols/RollForward/choices/disable/description": "İleri sarılmıyor. Tam eşleşme gerekiyor.", "symbols/RollForward/choices/disable/displayName": "İleri sarma devre dışı bırakıldı", + "symbols/TestRunner/description": "The test runner to use.", + "symbols/TestRunner/displayName": "Test runner", + "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/displayName": "VSTest", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "Düzenleyicide global.json dosyasını açar" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.zh-Hans.json index df6b667a8fe2..eaa0906ed2a9 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.zh-Hans.json @@ -25,5 +25,11 @@ "symbols/RollForward/choices/latestMajor/displayName": "最新主要版本", "symbols/RollForward/choices/disable/description": "不要前滚。需要完全匹配。", "symbols/RollForward/choices/disable/displayName": "禁用前滚", + "symbols/TestRunner/description": "The test runner to use.", + "symbols/TestRunner/displayName": "Test runner", + "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/displayName": "VSTest", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "在编辑器中打开 global.json" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.zh-Hant.json index 4cbe84a5e91b..9f70abb9b48f 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.zh-Hant.json @@ -25,5 +25,11 @@ "symbols/RollForward/choices/latestMajor/displayName": "最新主要", "symbols/RollForward/choices/disable/description": "不向前復原。需要完全相符。", "symbols/RollForward/choices/disable/displayName": "停用向前復原", + "symbols/TestRunner/description": "The test runner to use.", + "symbols/TestRunner/displayName": "Test runner", + "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/displayName": "VSTest", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "在編輯器中開啟 global.json" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/template.json index ce8bea43c8fb..e34480041c28 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/template.json @@ -100,6 +100,26 @@ "displayName": "Disable roll-forward" } ] + }, + "TestRunner": { + "type": "parameter", + "description": "The test runner to use.", + "displayName": "Test runner", + "replaces": "TEST_RUNNER_VALUE", + "defaultValue": "", + "datatype": "choice", + "choices": [ + { + "choice": "VSTest", + "description": "Use the VSTest test runner", + "displayName": "VSTest" + }, + { + "choice": "Microsoft.Testing.Platform", + "description": "Use the Microsoft.Testing.Platform test runner", + "displayName": "Microsoft.Testing.Platform" + } + ] } }, "postActions": [ diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/global.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/global.json index 217558135c95..687386d0153d 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/global.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/global.json @@ -4,5 +4,11 @@ "rollForward": "ROLL_FORWARD_VALUE", //#endif "version": "SDK_VERSION" + }//#if (TestRunner=="") + //#else + , + "test": { + "runner": "TEST_RUNNER_VALUE" } + //#endif } \ No newline at end of file diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_globaljson.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_globaljson.verified.txt index a23bbb9092c3..890a78e21f0d 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_globaljson.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_globaljson.verified.txt @@ -28,4 +28,8 @@ Template options: latestFeature Uses the highest installed feature band and patch level that matches the requested major and minor with a feature band and patch level that is greater or equal than the specified value. If not found, fails. latestMinor Uses the highest installed minor, feature band, and patch level that matches the requested major with a minor, feature band, and patch level that is greater or equal than the specified value. If not found, fails. latestMajor Uses the highest installed .NET SDK with a version that is greater or equal than the specified value. If not found, fail. - disable Doesn't roll forward. Exact match required. \ No newline at end of file + disable Doesn't roll forward. Exact match required. + --test-runner The test runner to use. + Type: choice + VSTest Use the VSTest test runner + Microsoft.Testing.Platform Use the Microsoft.Testing.Platform test runner diff --git a/test/dotnet-new.IntegrationTests/CommonTemplatesTests.cs b/test/dotnet-new.IntegrationTests/CommonTemplatesTests.cs index 3a373345ff59..2a87095d268c 100644 --- a/test/dotnet-new.IntegrationTests/CommonTemplatesTests.cs +++ b/test/dotnet-new.IntegrationTests/CommonTemplatesTests.cs @@ -29,9 +29,15 @@ public CommonTemplatesTests(SharedHomeDirectory fixture, ITestOutputHelper log) [InlineData("global.json file", "globaljson", null)] [InlineData("global.json file", "globaljson", new[] { "--sdk-version", "6.0.200" })] [InlineData("global.json file", "globaljson", new[] { "--sdk-version", "6.0.200", "--roll-forward", "major" })] + [InlineData("global.json file", "globaljson", new[] { "--TestRunner", "VSTest" })] + [InlineData("global.json file", "globaljson", new[] { "--TestRunner", "Microsoft.Testing.Platform" })] + [InlineData("global.json file", "globaljson", new[] { "--sdk-version", "6.0.200", "--TestRunner", "VSTest" })] + [InlineData("global.json file", "globaljson", new[] { "--roll-forward", "major", "--TestRunner", "Microsoft.Testing.Platform" })] [InlineData("global.json file", "global.json", null)] [InlineData("global.json file", "global.json", new[] { "--sdk-version", "6.0.200" })] [InlineData("global.json file", "global.json", new[] { "--sdk-version", "6.0.200", "--roll-forward", "major" })] + [InlineData("global.json file", "global.json", new[] { "--TestRunner", "VSTest" })] + [InlineData("global.json file", "global.json", new[] { "--TestRunner", "Microsoft.Testing.Platform" })] [InlineData("NuGet Config", "nugetconfig", null)] [InlineData("NuGet Config", "nuget.config", null)] [InlineData("dotnet gitignore file", "gitignore", null)] From 2e0174f29c6d99b6780c24ef910685e9745addff Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Sun, 14 Sep 2025 11:13:07 +0200 Subject: [PATCH 02/10] Update test --- ...howHelpForTemplate_globaljson.verified.txt | 49 ++++++++++++------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_globaljson.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_globaljson.verified.txt index 890a78e21f0d..432a84504c25 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_globaljson.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_globaljson.verified.txt @@ -16,20 +16,35 @@ Options: --type Specifies the template type to instantiate. Template options: - --sdk-version The version of the .NET SDK to use. - Type: string - --roll-forward The roll-forward policy to use when selecting an SDK version. - Type: choice - patch Uses the specified version. If not found, rolls forward to the latest patch level. If not found, fails. This value is the legacy behavior from the earlier versions of the SDK. - feature Uses the latest patch level for the specified major, minor, and feature band. If not found, rolls forward to the next higher feature band within the same major/minor and uses the latest patch level for that feature band. If not found, fails. - minor Uses the latest patch level for the specified major, minor, and feature band. If not found, rolls forward to the next higher feature band within the same major/minor version and uses the latest patch level for that feature band. If not found, rolls forward to the next higher minor and feature band within the same major and uses the latest patch level for that feature band. If not found, fails. - major Uses the latest patch level for the specified major, minor, and feature band. If not found, rolls forward to the next higher feature band within the same major/minor version and uses the latest patch level for that feature band. If not found, rolls forward to the next higher minor and feature band within the same major and uses the latest patch level for that feature band. If not found, rolls forward to the next higher major, minor, and feature band and uses the latest patch level for that feature band. If not found, fails. - latestPatch Uses the latest installed patch level that matches the requested major, minor, and feature band with a patch level and that is greater or equal than the specified value. If not found, fails. - latestFeature Uses the highest installed feature band and patch level that matches the requested major and minor with a feature band and patch level that is greater or equal than the specified value. If not found, fails. - latestMinor Uses the highest installed minor, feature band, and patch level that matches the requested major with a minor, feature band, and patch level that is greater or equal than the specified value. If not found, fails. - latestMajor Uses the highest installed .NET SDK with a version that is greater or equal than the specified value. If not found, fail. - disable Doesn't roll forward. Exact match required. - --test-runner The test runner to use. - Type: choice - VSTest Use the VSTest test runner - Microsoft.Testing.Platform Use the Microsoft.Testing.Platform test runner + --sdk-version The version of the .NET SDK to use. + Type: string + --roll-forward The roll-forward policy to use when selecting an SDK version. + Type: choice + patch Uses the specified version. If not found, rolls forward to the latest patch level. If not found, + fails. This value is the legacy behavior from the earlier versions of the SDK. + feature Uses the latest patch level for the specified major, minor, and feature band. If not found, rolls + forward to the next higher feature band within the same major/minor and uses the latest patch level for that + feature band. If not found, fails. + minor Uses the latest patch level for the specified major, minor, and feature band. If not found, rolls + forward to the next higher feature band within the same major/minor version and uses the latest patch level for + that feature band. If not found, rolls forward to the next higher minor and feature band within the same major and + uses the latest patch level for that feature band. If not found, fails. + major Uses the latest patch level for the specified major, minor, and feature band. If not found, rolls + forward to the next higher feature band within the same major/minor version and uses the latest patch level for + that feature band. If not found, rolls forward to the next higher minor and feature band within the same major and + uses the latest patch level for that feature band. If not found, rolls forward to the next higher major, minor, + and feature band and uses the latest patch level for that feature band. If not found, fails. + latestPatch Uses the latest installed patch level that matches the requested major, minor, and feature band + with a patch level and that is greater or equal than the specified value. If not found, fails. + latestFeature Uses the highest installed feature band and patch level that matches the requested major and + minor with a feature band and patch level that is greater or equal than the specified value. If not found, fails. + latestMinor Uses the highest installed minor, feature band, and patch level that matches the requested major + with a minor, feature band, and patch level that is greater or equal than the specified value. If not found, + fails. + latestMajor Uses the highest installed .NET SDK with a version that is greater or equal than the specified + value. If not found, fail. + disable Doesn't roll forward. Exact match required. + --test-runner The test runner to use. + Type: choice + VSTest Use the VSTest test runner + Microsoft.Testing.Platform Use the Microsoft.Testing.Platform test runner From f5b30f0c0139f9fa6ee145357dddd6230d9a3e6b Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Sun, 14 Sep 2025 11:20:51 +0200 Subject: [PATCH 03/10] Fix --- .../content/GlobalJson/global.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/global.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/global.json index 687386d0153d..23baa04ff4aa 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/global.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/global.json @@ -4,11 +4,12 @@ "rollForward": "ROLL_FORWARD_VALUE", //#endif "version": "SDK_VERSION" - }//#if (TestRunner=="") + //#if (TestRunner=="") + } //#else - , + }, "test": { "runner": "TEST_RUNNER_VALUE" } //#endif -} \ No newline at end of file +} From 599dc41f560a4220411772262d74bdf77a321634 Mon Sep 17 00:00:00 2001 From: Youssef1313 Date: Sun, 14 Sep 2025 12:25:10 +0200 Subject: [PATCH 04/10] Fix --- ...howHelpForTemplate_globaljson.verified.txt | 49 +++++++------------ 1 file changed, 17 insertions(+), 32 deletions(-) diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_globaljson.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_globaljson.verified.txt index 432a84504c25..eebf7064e181 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_globaljson.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_globaljson.verified.txt @@ -16,35 +16,20 @@ Options: --type Specifies the template type to instantiate. Template options: - --sdk-version The version of the .NET SDK to use. - Type: string - --roll-forward The roll-forward policy to use when selecting an SDK version. - Type: choice - patch Uses the specified version. If not found, rolls forward to the latest patch level. If not found, - fails. This value is the legacy behavior from the earlier versions of the SDK. - feature Uses the latest patch level for the specified major, minor, and feature band. If not found, rolls - forward to the next higher feature band within the same major/minor and uses the latest patch level for that - feature band. If not found, fails. - minor Uses the latest patch level for the specified major, minor, and feature band. If not found, rolls - forward to the next higher feature band within the same major/minor version and uses the latest patch level for - that feature band. If not found, rolls forward to the next higher minor and feature band within the same major and - uses the latest patch level for that feature band. If not found, fails. - major Uses the latest patch level for the specified major, minor, and feature band. If not found, rolls - forward to the next higher feature band within the same major/minor version and uses the latest patch level for - that feature band. If not found, rolls forward to the next higher minor and feature band within the same major and - uses the latest patch level for that feature band. If not found, rolls forward to the next higher major, minor, - and feature band and uses the latest patch level for that feature band. If not found, fails. - latestPatch Uses the latest installed patch level that matches the requested major, minor, and feature band - with a patch level and that is greater or equal than the specified value. If not found, fails. - latestFeature Uses the highest installed feature band and patch level that matches the requested major and - minor with a feature band and patch level that is greater or equal than the specified value. If not found, fails. - latestMinor Uses the highest installed minor, feature band, and patch level that matches the requested major - with a minor, feature band, and patch level that is greater or equal than the specified value. If not found, - fails. - latestMajor Uses the highest installed .NET SDK with a version that is greater or equal than the specified - value. If not found, fail. - disable Doesn't roll forward. Exact match required. - --test-runner The test runner to use. - Type: choice - VSTest Use the VSTest test runner - Microsoft.Testing.Platform Use the Microsoft.Testing.Platform test runner + --sdk-version The version of the .NET SDK to use. + Type: string + --roll-forward The roll-forward policy to use when selecting an SDK version. + Type: choice + patch Uses the specified version. If not found, rolls forward to the latest patch level. If not found, fails. This value is the legacy behavior from the earlier versions of the SDK. + feature Uses the latest patch level for the specified major, minor, and feature band. If not found, rolls forward to the next higher feature band within the same major/minor and uses the latest patch level for that feature band. If not found, fails. + minor Uses the latest patch level for the specified major, minor, and feature band. If not found, rolls forward to the next higher feature band within the same major/minor version and uses the latest patch level for that feature band. If not found, rolls forward to the next higher minor and feature band within the same major and uses the latest patch level for that feature band. If not found, fails. + major Uses the latest patch level for the specified major, minor, and feature band. If not found, rolls forward to the next higher feature band within the same major/minor version and uses the latest patch level for that feature band. If not found, rolls forward to the next higher minor and feature band within the same major and uses the latest patch level for that feature band. If not found, rolls forward to the next higher major, minor, and feature band and uses the latest patch level for that feature band. If not found, fails. + latestPatch Uses the latest installed patch level that matches the requested major, minor, and feature band with a patch level and that is greater or equal than the specified value. If not found, fails. + latestFeature Uses the highest installed feature band and patch level that matches the requested major and minor with a feature band and patch level that is greater or equal than the specified value. If not found, fails. + latestMinor Uses the highest installed minor, feature band, and patch level that matches the requested major with a minor, feature band, and patch level that is greater or equal than the specified value. If not found, fails. + latestMajor Uses the highest installed .NET SDK with a version that is greater or equal than the specified value. If not found, fail. + disable Doesn't roll forward. Exact match required. + --test-runner The test runner to use. + Type: choice + VSTest Use the VSTest test runner + Microsoft.Testing.Platform Use the Microsoft.Testing.Platform test runner \ No newline at end of file From 8cc4a81c94f2ebecb7de34e1b6fefab54ba140d1 Mon Sep 17 00:00:00 2001 From: Youssef1313 Date: Sun, 14 Sep 2025 12:26:50 +0200 Subject: [PATCH 05/10] Fix test --- .../CommonTemplatesTests.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/dotnet-new.IntegrationTests/CommonTemplatesTests.cs b/test/dotnet-new.IntegrationTests/CommonTemplatesTests.cs index 2a87095d268c..0241aaf48d91 100644 --- a/test/dotnet-new.IntegrationTests/CommonTemplatesTests.cs +++ b/test/dotnet-new.IntegrationTests/CommonTemplatesTests.cs @@ -29,15 +29,15 @@ public CommonTemplatesTests(SharedHomeDirectory fixture, ITestOutputHelper log) [InlineData("global.json file", "globaljson", null)] [InlineData("global.json file", "globaljson", new[] { "--sdk-version", "6.0.200" })] [InlineData("global.json file", "globaljson", new[] { "--sdk-version", "6.0.200", "--roll-forward", "major" })] - [InlineData("global.json file", "globaljson", new[] { "--TestRunner", "VSTest" })] - [InlineData("global.json file", "globaljson", new[] { "--TestRunner", "Microsoft.Testing.Platform" })] - [InlineData("global.json file", "globaljson", new[] { "--sdk-version", "6.0.200", "--TestRunner", "VSTest" })] - [InlineData("global.json file", "globaljson", new[] { "--roll-forward", "major", "--TestRunner", "Microsoft.Testing.Platform" })] + [InlineData("global.json file", "globaljson", new[] { "--test-runner", "VSTest" })] + [InlineData("global.json file", "globaljson", new[] { "--test-runner", "Microsoft.Testing.Platform" })] + [InlineData("global.json file", "globaljson", new[] { "--sdk-version", "6.0.200", "--test-runner", "VSTest" })] + [InlineData("global.json file", "globaljson", new[] { "--roll-forward", "major", "--test-runner", "Microsoft.Testing.Platform" })] [InlineData("global.json file", "global.json", null)] [InlineData("global.json file", "global.json", new[] { "--sdk-version", "6.0.200" })] [InlineData("global.json file", "global.json", new[] { "--sdk-version", "6.0.200", "--roll-forward", "major" })] - [InlineData("global.json file", "global.json", new[] { "--TestRunner", "VSTest" })] - [InlineData("global.json file", "global.json", new[] { "--TestRunner", "Microsoft.Testing.Platform" })] + [InlineData("global.json file", "global.json", new[] { "--test-runner", "VSTest" })] + [InlineData("global.json file", "global.json", new[] { "--test-runner", "Microsoft.Testing.Platform" })] [InlineData("NuGet Config", "nugetconfig", null)] [InlineData("NuGet Config", "nuget.config", null)] [InlineData("dotnet gitignore file", "gitignore", null)] From c1321e2e109bb03d1fd9217efebbc8ae07733a82 Mon Sep 17 00:00:00 2001 From: Youssef1313 Date: Sun, 14 Sep 2025 12:28:08 +0200 Subject: [PATCH 06/10] Fix test --- .../global-json-file/global.json | 1 + .../std-streams/stdout.txt | 1 + .../global-json-file/global.json | 8 ++++++++ .../std-streams/stdout.txt | 1 + .../global-json-file/global.json | 1 + .../std-streams/stdout.txt | 1 + .../global-json-file/global.json | 8 ++++++++ .../std-streams/stdout.txt | 1 + .../global-json-file/global.json | 2 +- 9 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--roll-forward#major#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json create mode 100644 test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--roll-forward#major#--test-runner#Microsoft.Testing.Platform.verified/std-streams/stdout.txt create mode 100644 test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--sdk-version#6.0.200#--test-runner#VSTest.verified/global-json-file/global.json create mode 100644 test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--sdk-version#6.0.200#--test-runner#VSTest.verified/std-streams/stdout.txt create mode 100644 test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json create mode 100644 test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#Microsoft.Testing.Platform.verified/std-streams/stdout.txt create mode 100644 test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#VSTest.verified/global-json-file/global.json create mode 100644 test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#VSTest.verified/std-streams/stdout.txt diff --git a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--roll-forward#major#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--roll-forward#major#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json new file mode 100644 index 000000000000..5f282702bb03 --- /dev/null +++ b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--roll-forward#major#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--roll-forward#major#--test-runner#Microsoft.Testing.Platform.verified/std-streams/stdout.txt b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--roll-forward#major#--test-runner#Microsoft.Testing.Platform.verified/std-streams/stdout.txt new file mode 100644 index 000000000000..5f282702bb03 --- /dev/null +++ b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--roll-forward#major#--test-runner#Microsoft.Testing.Platform.verified/std-streams/stdout.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--sdk-version#6.0.200#--test-runner#VSTest.verified/global-json-file/global.json b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--sdk-version#6.0.200#--test-runner#VSTest.verified/global-json-file/global.json new file mode 100644 index 000000000000..48b6615a8a10 --- /dev/null +++ b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--sdk-version#6.0.200#--test-runner#VSTest.verified/global-json-file/global.json @@ -0,0 +1,8 @@ +{ + "sdk": { + "version": "6.0.200" + }, + "test": { + "runner": "VSTest" + } +} diff --git a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--sdk-version#6.0.200#--test-runner#VSTest.verified/std-streams/stdout.txt b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--sdk-version#6.0.200#--test-runner#VSTest.verified/std-streams/stdout.txt new file mode 100644 index 000000000000..70cab17a4b13 --- /dev/null +++ b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--sdk-version#6.0.200#--test-runner#VSTest.verified/std-streams/stdout.txt @@ -0,0 +1 @@ +The template "%TEMPLATE_NAME%" was created successfully. \ No newline at end of file diff --git a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json new file mode 100644 index 000000000000..5f282702bb03 --- /dev/null +++ b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#Microsoft.Testing.Platform.verified/std-streams/stdout.txt b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#Microsoft.Testing.Platform.verified/std-streams/stdout.txt new file mode 100644 index 000000000000..5f282702bb03 --- /dev/null +++ b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#Microsoft.Testing.Platform.verified/std-streams/stdout.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#VSTest.verified/global-json-file/global.json b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#VSTest.verified/global-json-file/global.json new file mode 100644 index 000000000000..1de903500acb --- /dev/null +++ b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#VSTest.verified/global-json-file/global.json @@ -0,0 +1,8 @@ +{ + "sdk": { + "version": "10.0.100-dev" + }, + "test": { + "runner": "VSTest" + } +} diff --git a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#VSTest.verified/std-streams/stdout.txt b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#VSTest.verified/std-streams/stdout.txt new file mode 100644 index 000000000000..70cab17a4b13 --- /dev/null +++ b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#VSTest.verified/std-streams/stdout.txt @@ -0,0 +1 @@ +The template "%TEMPLATE_NAME%" was created successfully. \ No newline at end of file diff --git a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item.verified/global-json-file/global.json b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item.verified/global-json-file/global.json index f14d06d447ca..b4a4d8e88737 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item.verified/global-json-file/global.json +++ b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item.verified/global-json-file/global.json @@ -2,4 +2,4 @@ "sdk": { "version": "%CURRENT-VER%" } -} \ No newline at end of file +} From e28df7ebba77fb9e155cdb790dba2fb4819727b0 Mon Sep 17 00:00:00 2001 From: Youssef1313 Date: Sun, 14 Sep 2025 12:29:34 +0200 Subject: [PATCH 07/10] Fix more tests --- .../global-json-file/global.json | 10 +++++++++- .../std-streams/stdout.txt | 2 +- .../global-json-file/global.json | 9 ++++++++- .../std-streams/stdout.txt | 2 +- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--roll-forward#major#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--roll-forward#major#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json index 5f282702bb03..eadf0dd2a7b7 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--roll-forward#major#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json +++ b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--roll-forward#major#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json @@ -1 +1,9 @@ - \ No newline at end of file +{ + "sdk": { + "rollForward": "major", + "version": "10.0.100-dev" + }, + "test": { + "runner": "Microsoft.Testing.Platform" + } +} diff --git a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--roll-forward#major#--test-runner#Microsoft.Testing.Platform.verified/std-streams/stdout.txt b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--roll-forward#major#--test-runner#Microsoft.Testing.Platform.verified/std-streams/stdout.txt index 5f282702bb03..70cab17a4b13 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--roll-forward#major#--test-runner#Microsoft.Testing.Platform.verified/std-streams/stdout.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--roll-forward#major#--test-runner#Microsoft.Testing.Platform.verified/std-streams/stdout.txt @@ -1 +1 @@ - \ No newline at end of file +The template "%TEMPLATE_NAME%" was created successfully. \ No newline at end of file diff --git a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json index 5f282702bb03..ee339552e06e 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json +++ b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json @@ -1 +1,8 @@ - \ No newline at end of file +{ + "sdk": { + "version": "10.0.100-dev" + }, + "test": { + "runner": "Microsoft.Testing.Platform" + } +} diff --git a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#Microsoft.Testing.Platform.verified/std-streams/stdout.txt b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#Microsoft.Testing.Platform.verified/std-streams/stdout.txt index 5f282702bb03..70cab17a4b13 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#Microsoft.Testing.Platform.verified/std-streams/stdout.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#Microsoft.Testing.Platform.verified/std-streams/stdout.txt @@ -1 +1 @@ - \ No newline at end of file +The template "%TEMPLATE_NAME%" was created successfully. \ No newline at end of file From 28ec41754a745bcfbfabc635f1d2c2b1d6292902 Mon Sep 17 00:00:00 2001 From: Youssef1313 Date: Sun, 14 Sep 2025 13:15:20 +0200 Subject: [PATCH 08/10] Fix test --- test/dotnet-new.IntegrationTests/CommonTemplatesTests.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/dotnet-new.IntegrationTests/CommonTemplatesTests.cs b/test/dotnet-new.IntegrationTests/CommonTemplatesTests.cs index 0241aaf48d91..ad2d5e54b48c 100644 --- a/test/dotnet-new.IntegrationTests/CommonTemplatesTests.cs +++ b/test/dotnet-new.IntegrationTests/CommonTemplatesTests.cs @@ -88,7 +88,8 @@ public async Task AllCommonItemsCreate(string expectedTemplateName, string templ // globaljson is appending current sdk version. Due to the 'base' dotnet used to run test this version differs // on dev and CI runs and possibly from the version within test host. Easiest is just to scrub it away - if (expectedTemplateName.Equals("global.json file") && args == null) + if (expectedTemplateName.Equals("global.json file") && + (args == null || !args.Contains("--sdk-version"))) { string sdkVersionUnderTest = await new SdkInfoProvider().GetCurrentVersionAsync(default); options.CustomScrubbers?.AddScrubber(sb => sb.Replace(sdkVersionUnderTest, "%CURRENT-VER%"), "json"); From cefa18ae960872aa6c118556963d9b42196f0bda Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Sun, 14 Sep 2025 13:16:45 +0200 Subject: [PATCH 09/10] Fix test --- .../global-json-file/global.json | 2 +- .../global-json-file/global.json | 2 +- .../global-json-file/global.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--roll-forward#major#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--roll-forward#major#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json index eadf0dd2a7b7..d1f0ac883f01 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--roll-forward#major#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json +++ b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--roll-forward#major#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json @@ -1,7 +1,7 @@ { "sdk": { "rollForward": "major", - "version": "10.0.100-dev" + "version": "%CURRENT-VER%" }, "test": { "runner": "Microsoft.Testing.Platform" diff --git a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json index ee339552e06e..94edcbba188a 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json +++ b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#Microsoft.Testing.Platform.verified/global-json-file/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-dev" + "version": "%CURRENT-VER%" }, "test": { "runner": "Microsoft.Testing.Platform" diff --git a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#VSTest.verified/global-json-file/global.json b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#VSTest.verified/global-json-file/global.json index 1de903500acb..1e73097a7dce 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#VSTest.verified/global-json-file/global.json +++ b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#global-json-file#-n#item#--test-runner#VSTest.verified/global-json-file/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-dev" + "version": "%CURRENT-VER%" }, "test": { "runner": "VSTest" From a658b4e3001d42c513d00fe24cd896a79b7846cd Mon Sep 17 00:00:00 2001 From: Youssef1313 Date: Mon, 15 Sep 2025 13:59:18 +0200 Subject: [PATCH 10/10] Address review comment --- .../.template.config/localize/templatestrings.cs.json | 4 ++-- .../.template.config/localize/templatestrings.de.json | 4 ++-- .../.template.config/localize/templatestrings.en.json | 4 ++-- .../.template.config/localize/templatestrings.es.json | 4 ++-- .../.template.config/localize/templatestrings.fr.json | 4 ++-- .../.template.config/localize/templatestrings.it.json | 4 ++-- .../.template.config/localize/templatestrings.ja.json | 4 ++-- .../.template.config/localize/templatestrings.ko.json | 4 ++-- .../.template.config/localize/templatestrings.pl.json | 4 ++-- .../.template.config/localize/templatestrings.pt-BR.json | 4 ++-- .../.template.config/localize/templatestrings.ru.json | 4 ++-- .../.template.config/localize/templatestrings.tr.json | 4 ++-- .../.template.config/localize/templatestrings.zh-Hans.json | 4 ++-- .../.template.config/localize/templatestrings.zh-Hant.json | 4 ++-- .../content/GlobalJson/.template.config/template.json | 4 ++-- ...ewHelpTests.CanShowHelpForTemplate_globaljson.verified.txt | 4 ++-- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.cs.json index 8e74f03a7b3b..78c8287035f0 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.cs.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.cs.json @@ -27,9 +27,9 @@ "symbols/RollForward/choices/disable/displayName": "Zakázat posunutí vpřed", "symbols/TestRunner/description": "The test runner to use.", "symbols/TestRunner/displayName": "Test runner", - "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/description": "Use VSTest as test runner", "symbols/TestRunner/choices/VSTest/displayName": "VSTest", - "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use Microsoft.Testing.Platform as test runner", "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "Otevře global.json v editoru." } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.de.json index 065b2f757310..3b9e4c415693 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.de.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.de.json @@ -27,9 +27,9 @@ "symbols/RollForward/choices/disable/displayName": "Rollforward deaktivieren", "symbols/TestRunner/description": "The test runner to use.", "symbols/TestRunner/displayName": "Test runner", - "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/description": "Use VSTest as test runner", "symbols/TestRunner/choices/VSTest/displayName": "VSTest", - "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use Microsoft.Testing.Platform as test runner", "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "Öffnet „global.json“ im Editor." } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.en.json index 9162a774004c..3049eb02e445 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.en.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.en.json @@ -27,9 +27,9 @@ "symbols/RollForward/choices/disable/displayName": "Disable roll-forward", "symbols/TestRunner/description": "The test runner to use.", "symbols/TestRunner/displayName": "Test runner", - "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/description": "Use VSTest as test runner", "symbols/TestRunner/choices/VSTest/displayName": "VSTest", - "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use Microsoft.Testing.Platform as test runner", "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "Opens global.json in the editor" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.es.json index 1d13cfd219b2..91b84990cc56 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.es.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.es.json @@ -27,9 +27,9 @@ "symbols/RollForward/choices/disable/displayName": "Deshabilitar el reenvío", "symbols/TestRunner/description": "The test runner to use.", "symbols/TestRunner/displayName": "Test runner", - "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/description": "Use VSTest as test runner", "symbols/TestRunner/choices/VSTest/displayName": "VSTest", - "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use Microsoft.Testing.Platform as test runner", "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "Abre global.json el editor" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.fr.json index 40433c84643f..6a0d8074ddec 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.fr.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.fr.json @@ -27,9 +27,9 @@ "symbols/RollForward/choices/disable/displayName": "Désactiver la restauration par progression", "symbols/TestRunner/description": "The test runner to use.", "symbols/TestRunner/displayName": "Test runner", - "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/description": "Use VSTest as test runner", "symbols/TestRunner/choices/VSTest/displayName": "VSTest", - "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use Microsoft.Testing.Platform as test runner", "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "Ouvre global.json dans l’éditeur" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.it.json index ac972e629ad6..1955f5986f6b 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.it.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.it.json @@ -27,9 +27,9 @@ "symbols/RollForward/choices/disable/displayName": "Disabilita roll-forward", "symbols/TestRunner/description": "The test runner to use.", "symbols/TestRunner/displayName": "Test runner", - "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/description": "Use VSTest as test runner", "symbols/TestRunner/choices/VSTest/displayName": "VSTest", - "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use Microsoft.Testing.Platform as test runner", "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "Apre global.json nell'editor" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ja.json index 08c2396936c7..dd3c5bfae900 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ja.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ja.json @@ -27,9 +27,9 @@ "symbols/RollForward/choices/disable/displayName": "ロールフォワードの無効化", "symbols/TestRunner/description": "The test runner to use.", "symbols/TestRunner/displayName": "Test runner", - "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/description": "Use VSTest as test runner", "symbols/TestRunner/choices/VSTest/displayName": "VSTest", - "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use Microsoft.Testing.Platform as test runner", "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "エディターで global.json を開く" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ko.json index 77ebac186959..63603d9e76c0 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ko.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ko.json @@ -27,9 +27,9 @@ "symbols/RollForward/choices/disable/displayName": "롤포워드 비활성화", "symbols/TestRunner/description": "The test runner to use.", "symbols/TestRunner/displayName": "Test runner", - "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/description": "Use VSTest as test runner", "symbols/TestRunner/choices/VSTest/displayName": "VSTest", - "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use Microsoft.Testing.Platform as test runner", "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "편집기에서 global.json을 엽니다" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.pl.json index 74a6f888c99f..52731300fa71 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.pl.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.pl.json @@ -27,9 +27,9 @@ "symbols/RollForward/choices/disable/displayName": "Wyłącz przechodzenie", "symbols/TestRunner/description": "The test runner to use.", "symbols/TestRunner/displayName": "Test runner", - "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/description": "Use VSTest as test runner", "symbols/TestRunner/choices/VSTest/displayName": "VSTest", - "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use Microsoft.Testing.Platform as test runner", "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "Otwiera plik global.json w edytorze" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.pt-BR.json index dffce293c822..5ac94d837da2 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.pt-BR.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.pt-BR.json @@ -27,9 +27,9 @@ "symbols/RollForward/choices/disable/displayName": "Desabilitar rolar para frente", "symbols/TestRunner/description": "The test runner to use.", "symbols/TestRunner/displayName": "Test runner", - "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/description": "Use VSTest as test runner", "symbols/TestRunner/choices/VSTest/displayName": "VSTest", - "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use Microsoft.Testing.Platform as test runner", "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "Abrir global.json no editor" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ru.json index 74dd0efbdf9c..fea09bc51165 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ru.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.ru.json @@ -27,9 +27,9 @@ "symbols/RollForward/choices/disable/displayName": "Отключить накат", "symbols/TestRunner/description": "The test runner to use.", "symbols/TestRunner/displayName": "Test runner", - "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/description": "Use VSTest as test runner", "symbols/TestRunner/choices/VSTest/displayName": "VSTest", - "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use Microsoft.Testing.Platform as test runner", "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "Открывает файл global.json в редакторе" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.tr.json index 3d2eaf2fbcb8..4ccff9c7d878 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.tr.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.tr.json @@ -27,9 +27,9 @@ "symbols/RollForward/choices/disable/displayName": "İleri sarma devre dışı bırakıldı", "symbols/TestRunner/description": "The test runner to use.", "symbols/TestRunner/displayName": "Test runner", - "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/description": "Use VSTest as test runner", "symbols/TestRunner/choices/VSTest/displayName": "VSTest", - "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use Microsoft.Testing.Platform as test runner", "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "Düzenleyicide global.json dosyasını açar" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.zh-Hans.json index eaa0906ed2a9..cd4c9cb8e84f 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.zh-Hans.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.zh-Hans.json @@ -27,9 +27,9 @@ "symbols/RollForward/choices/disable/displayName": "禁用前滚", "symbols/TestRunner/description": "The test runner to use.", "symbols/TestRunner/displayName": "Test runner", - "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/description": "Use VSTest as test runner", "symbols/TestRunner/choices/VSTest/displayName": "VSTest", - "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use Microsoft.Testing.Platform as test runner", "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "在编辑器中打开 global.json" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.zh-Hant.json index 9f70abb9b48f..169fa5fd8f29 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.zh-Hant.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/localize/templatestrings.zh-Hant.json @@ -27,9 +27,9 @@ "symbols/RollForward/choices/disable/displayName": "停用向前復原", "symbols/TestRunner/description": "The test runner to use.", "symbols/TestRunner/displayName": "Test runner", - "symbols/TestRunner/choices/VSTest/description": "Use the VSTest test runner", + "symbols/TestRunner/choices/VSTest/description": "Use VSTest as test runner", "symbols/TestRunner/choices/VSTest/displayName": "VSTest", - "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use the Microsoft.Testing.Platform test runner", + "symbols/TestRunner/choices/Microsoft.Testing.Platform/description": "Use Microsoft.Testing.Platform as test runner", "symbols/TestRunner/choices/Microsoft.Testing.Platform/displayName": "Microsoft.Testing.Platform", "postActions/open-file/description": "在編輯器中開啟 global.json" } \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/template.json index e34480041c28..e17f4d97c7a9 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/template.json @@ -111,12 +111,12 @@ "choices": [ { "choice": "VSTest", - "description": "Use the VSTest test runner", + "description": "Use VSTest as test runner", "displayName": "VSTest" }, { "choice": "Microsoft.Testing.Platform", - "description": "Use the Microsoft.Testing.Platform test runner", + "description": "Use Microsoft.Testing.Platform as test runner", "displayName": "Microsoft.Testing.Platform" } ] diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_globaljson.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_globaljson.verified.txt index eebf7064e181..e2eabff978f0 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_globaljson.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_globaljson.verified.txt @@ -31,5 +31,5 @@ Template options: disable Doesn't roll forward. Exact match required. --test-runner The test runner to use. Type: choice - VSTest Use the VSTest test runner - Microsoft.Testing.Platform Use the Microsoft.Testing.Platform test runner \ No newline at end of file + VSTest Use VSTest as test runner + Microsoft.Testing.Platform Use Microsoft.Testing.Platform as test runner \ No newline at end of file