From 4e7ee44ce88ff504e379e44f57d48ef3d803c579 Mon Sep 17 00:00:00 2001 From: Adam Ratzman Date: Tue, 20 Jun 2023 23:24:51 -0700 Subject: [PATCH 1/7] Add Settings for project system --- eng/imports/RepoLayout.props | 1 + .../CommonFiles.swr | 3 + ...ProjectSystem.Managed.CommonFiles.swixproj | 2 +- .../ProjectSystemSetup.csproj | 5 + .../ManagedProjectSystem.registration.json | 111 ++++++++++++++++++ .../VSPackage.resx | 39 ++++++ .../xlf/VSPackage.cs.xlf | 65 ++++++++++ .../xlf/VSPackage.de.xlf | 65 ++++++++++ .../xlf/VSPackage.es.xlf | 65 ++++++++++ .../xlf/VSPackage.fr.xlf | 65 ++++++++++ .../xlf/VSPackage.it.xlf | 65 ++++++++++ .../xlf/VSPackage.ja.xlf | 65 ++++++++++ .../xlf/VSPackage.ko.xlf | 65 ++++++++++ .../xlf/VSPackage.pl.xlf | 65 ++++++++++ .../xlf/VSPackage.pt-BR.xlf | 65 ++++++++++ .../xlf/VSPackage.ru.xlf | 65 ++++++++++ .../xlf/VSPackage.tr.xlf | 65 ++++++++++ .../xlf/VSPackage.zh-Hans.xlf | 65 ++++++++++ .../xlf/VSPackage.zh-Hant.xlf | 65 ++++++++++ 19 files changed, 1005 insertions(+), 1 deletion(-) create mode 100644 setup/ProjectSystemSetup/UnifiedSettings/ManagedProjectSystem.registration.json diff --git a/eng/imports/RepoLayout.props b/eng/imports/RepoLayout.props index ad4c4e19fde..66b70d98502 100644 --- a/eng/imports/RepoLayout.props +++ b/eng/imports/RepoLayout.props @@ -18,6 +18,7 @@ $(VisualStudioSetupOutputPath)Insertion\ $(ArtifactsConfigurationDir)VSSetup.obj\ $(VisualStudioSetupOutputPath)Rules\ + $(RepoRoot)setup\ \ No newline at end of file diff --git a/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/CommonFiles.swr b/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/CommonFiles.swr index c858a5d152a..349bdcbabd7 100644 --- a/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/CommonFiles.swr +++ b/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/CommonFiles.swr @@ -657,3 +657,6 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\zh-Hant" file source="$(VisualStudioXamlRulesDir)zh-Hant\ResolvedProjectReference.xaml" file source="$(VisualStudioXamlRulesDir)zh-Hant\ResolvedSdkReference.xaml" file source="$(VisualStudioXamlRulesDir)zh-Hant\SdkReference.xaml" + + folder "Extensions\Microsoft\ManagedProjectSystem\UnifiedSettings" + file source="$(VisualStudioExtensionSetupDir)\ProjectSystemSetup\UnifiedSettings\ManagedProjectSystem.registration.json" diff --git a/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles.swixproj b/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles.swixproj index 84737929906..655ff587dbb 100644 --- a/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles.swixproj +++ b/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles.swixproj @@ -5,7 +5,7 @@ - $(PackagePreprocessorDefinitions);VisualStudioXamlRulesDir=$(VisualStudioXamlRulesDir) + $(PackagePreprocessorDefinitions);VisualStudioXamlRulesDir=$(VisualStudioXamlRulesDir);VisualStudioExtensionSetupDir=$(VisualStudioExtensionSetupDir) diff --git a/setup/ProjectSystemSetup/ProjectSystemSetup.csproj b/setup/ProjectSystemSetup/ProjectSystemSetup.csproj index 21e64f2186e..524bf6c3909 100644 --- a/setup/ProjectSystemSetup/ProjectSystemSetup.csproj +++ b/setup/ProjectSystemSetup/ProjectSystemSetup.csproj @@ -26,6 +26,11 @@ + + PreserveNewest + true + + BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;SatelliteDllsProjectOutputGroup;PkgdefProjectOutputGroup diff --git a/setup/ProjectSystemSetup/UnifiedSettings/ManagedProjectSystem.registration.json b/setup/ProjectSystemSetup/UnifiedSettings/ManagedProjectSystem.registration.json new file mode 100644 index 00000000000..5a059f5727a --- /dev/null +++ b/setup/ProjectSystemSetup/UnifiedSettings/ManagedProjectSystem.registration.json @@ -0,0 +1,111 @@ +{ + "properties": { + "projectsAndSolutions.sdkStyleProjects.fastUpToDateCheck.enabled": { + "type": "boolean", + "title": "@Setting_FastUpToDateCheck_Enabled_Title{860A27C0-B665-47F3-BC12-637E16A1050A}", + "default": true, + "requiresRestart": false, + "migration": { + "pass": { + "input": { + "store": "SettingsManager", + "path": "ManagedProjectSystem\\FastUpToDateCheckEnabled" + } + } + } + }, + "projectsAndSolutions.sdkStyleProjects.fastUpToDateCheck.loggingLevel": { + "type": "string", + "title": "@Setting_FastUpToDateCheck_LoggingLevel_Title{860A27C0-B665-47F3-BC12-637E16A1050A}", + "default": "none", + "enum": [ + "none", + "minimal", + "info", + "verbose" + ], + "enumItemLabels": [ + "@Setting_FastUpToDateCheck_LoggingLevel_None{860A27C0-B665-47F3-BC12-637E16A1050A}", + "@Setting_FastUpToDateCheck_LoggingLevel_Minimal{860A27C0-B665-47F3-BC12-637E16A1050A}", + "@Setting_FastUpToDateCheck_LoggingLevel_Info{860A27C0-B665-47F3-BC12-637E16A1050A}", + "@Setting_FastUpToDateCheck_LoggingLevel_Verbose{860A27C0-B665-47F3-BC12-637E16A1050A}" + ], + "requiresRestart": false, + "migration": { + "enumIntegerToString": { + "input": { + "store": "SettingsManager", + "path": "ManagedProjectSystem\\FastUpToDateLogLevel" + }, + "map": [ + { + "result": "none", + "match": 0 + }, + { + "result": "minimal", + "match": 1 + }, + { + "result": "info", + "match": 2 + }, + { + "result": "verbose", + "match": 3 + } + ] + } + } + }, + "projectsAndSolutions.sdkStyleProjects.fileNestingSettings.ignoreSolutionAndProjectSettings": { + "type": "boolean", + "title": "@Setting_FileNesting_IgnoreSolutionAndProjectSettings_Title{860A27C0-B665-47F3-BC12-637E16A1050A}", + "default": false, + "requiresRestart": false, + "migration": { + "pass": { + "input": { + "store": "SettingsManager", + "path": "Cps.NestingIgnoreSolutionAndProjectProfiles" + } + } + } + }, + "projectsAndSolutions.sdkStyleProjects.multiTargetingSettings.preferSingleTargetBuilds": { + "type": "boolean", + "title": "@Setting_FileNesting_PreferSingleTargetBuilds_Title{860A27C0-B665-47F3-BC12-637E16A1050A}", + "description": "@Setting_FileNesting_PreferSingleTargetBuilds_Description{860A27C0-B665-47F3-BC12-637E16A1050A}", + "default": false, + "requiresRestart": false, + "migration": { + "pass": { + "input": { + "store": "SettingsManager", + "path": "ManagedProjectSystem\\PreferSingleTargetBuilds" + } + } + } + } + }, + + "categories": { + "projectsAndSolutions.sdkStyleProjects": { + "title": "@Settings_Category_SdkStyleProjects{860A27C0-B665-47F3-BC12-637E16A1050A}" + }, + "projectsAndSolutions.sdkStyleProjects.fastUpToDateCheck": { + "title": "@Settings_Category_FastUpToDateCheck{860A27C0-B665-47F3-BC12-637E16A1050A}", + "order": 1, + "additionalKeywords": [ "futd", "up-to-date", "build" ] + }, + "projectsAndSolutions.sdkStyleProjects.fileNestingSettings": { + "title": "@Settings_Category_FileNestingSettings{860A27C0-B665-47F3-BC12-637E16A1050A}", + "order": 2 + }, + "projectsAndSolutions.sdkStyleProjects.multiTargetingSettings": { + "title": "@Settings_Category_MultiTargetingSettings{860A27C0-B665-47F3-BC12-637E16A1050A}", + "order": 3, + "additionalKeywords": [ "build" ] + } + } + } \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/VSPackage.resx b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/VSPackage.resx index 3cff6be6ec6..6896b3eeae2 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/VSPackage.resx +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/VSPackage.resx @@ -168,4 +168,43 @@ .NET Core 2015 Project Files (*.xproj);*.xproj + + Don't call MSBuild if a project appears to be up to date + + + Logging Level + + + None + + + Minimal + + + Info + + + Verbose + + + Ignore solution and project settings + + + Prefer single-target builds when starting a project + + + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + + + SDK-Style Projects + + + Up to Date Checks + + + File Nesting Settings + + + Multi-Targeting Settings + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.cs.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.cs.xlf index 21a3750adcb..fc41207d8e7 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.cs.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.cs.xlf @@ -87,6 +87,71 @@ Soubory projektu .NET Core 2015 (*.xproj);*.xproj + + Don't call MSBuild if a project appears to be up to date + Don't call MSBuild if a project appears to be up to date + + + + Info + Info + + + + Minimal + Minimal + + + + None + None + + + + Logging Level + Logging Level + + + + Verbose + Verbose + + + + Ignore solution and project settings + Ignore solution and project settings + + + + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + + + + Prefer single-target builds when starting a project + Prefer single-target builds when starting a project + + + + Up to Date Checks + Up to Date Checks + + + + File Nesting Settings + File Nesting Settings + + + + Multi-Targeting Settings + Multi-Targeting Settings + + + + SDK-Style Projects + SDK-Style Projects + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.de.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.de.xlf index 7b7dc296644..139c62a43aa 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.de.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.de.xlf @@ -87,6 +87,71 @@ .NET Core 2015-Projektdateien (*.xproj);*.xproj + + Don't call MSBuild if a project appears to be up to date + Don't call MSBuild if a project appears to be up to date + + + + Info + Info + + + + Minimal + Minimal + + + + None + None + + + + Logging Level + Logging Level + + + + Verbose + Verbose + + + + Ignore solution and project settings + Ignore solution and project settings + + + + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + + + + Prefer single-target builds when starting a project + Prefer single-target builds when starting a project + + + + Up to Date Checks + Up to Date Checks + + + + File Nesting Settings + File Nesting Settings + + + + Multi-Targeting Settings + Multi-Targeting Settings + + + + SDK-Style Projects + SDK-Style Projects + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.es.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.es.xlf index 323c9417658..3cb6b23f96d 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.es.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.es.xlf @@ -87,6 +87,71 @@ Archivos de proyecto de .NET Core 2015 (*.xproj);*.xproj + + Don't call MSBuild if a project appears to be up to date + Don't call MSBuild if a project appears to be up to date + + + + Info + Info + + + + Minimal + Minimal + + + + None + None + + + + Logging Level + Logging Level + + + + Verbose + Verbose + + + + Ignore solution and project settings + Ignore solution and project settings + + + + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + + + + Prefer single-target builds when starting a project + Prefer single-target builds when starting a project + + + + Up to Date Checks + Up to Date Checks + + + + File Nesting Settings + File Nesting Settings + + + + Multi-Targeting Settings + Multi-Targeting Settings + + + + SDK-Style Projects + SDK-Style Projects + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.fr.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.fr.xlf index dde7cbc9176..986bca064a1 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.fr.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.fr.xlf @@ -87,6 +87,71 @@ Fichiers projet .NET Core 2015 (*.xproj);*.xproj + + Don't call MSBuild if a project appears to be up to date + Don't call MSBuild if a project appears to be up to date + + + + Info + Info + + + + Minimal + Minimal + + + + None + None + + + + Logging Level + Logging Level + + + + Verbose + Verbose + + + + Ignore solution and project settings + Ignore solution and project settings + + + + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + + + + Prefer single-target builds when starting a project + Prefer single-target builds when starting a project + + + + Up to Date Checks + Up to Date Checks + + + + File Nesting Settings + File Nesting Settings + + + + Multi-Targeting Settings + Multi-Targeting Settings + + + + SDK-Style Projects + SDK-Style Projects + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.it.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.it.xlf index 4ab606abeed..4e0ac35786b 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.it.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.it.xlf @@ -87,6 +87,71 @@ File di progetto .NET Core 2015 (*.xproj);*.xproj + + Don't call MSBuild if a project appears to be up to date + Don't call MSBuild if a project appears to be up to date + + + + Info + Info + + + + Minimal + Minimal + + + + None + None + + + + Logging Level + Logging Level + + + + Verbose + Verbose + + + + Ignore solution and project settings + Ignore solution and project settings + + + + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + + + + Prefer single-target builds when starting a project + Prefer single-target builds when starting a project + + + + Up to Date Checks + Up to Date Checks + + + + File Nesting Settings + File Nesting Settings + + + + Multi-Targeting Settings + Multi-Targeting Settings + + + + SDK-Style Projects + SDK-Style Projects + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ja.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ja.xlf index 26db89daa61..1ffda139e43 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ja.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ja.xlf @@ -87,6 +87,71 @@ .NET Core 2015 プロジェクト ファイル (*.xproj);*.xproj + + Don't call MSBuild if a project appears to be up to date + Don't call MSBuild if a project appears to be up to date + + + + Info + Info + + + + Minimal + Minimal + + + + None + None + + + + Logging Level + Logging Level + + + + Verbose + Verbose + + + + Ignore solution and project settings + Ignore solution and project settings + + + + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + + + + Prefer single-target builds when starting a project + Prefer single-target builds when starting a project + + + + Up to Date Checks + Up to Date Checks + + + + File Nesting Settings + File Nesting Settings + + + + Multi-Targeting Settings + Multi-Targeting Settings + + + + SDK-Style Projects + SDK-Style Projects + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ko.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ko.xlf index 120b8f102e7..6da8c40d8b0 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ko.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ko.xlf @@ -87,6 +87,71 @@ .NET Core 2015 프로젝트 파일(*.xproj);*.xproj + + Don't call MSBuild if a project appears to be up to date + Don't call MSBuild if a project appears to be up to date + + + + Info + Info + + + + Minimal + Minimal + + + + None + None + + + + Logging Level + Logging Level + + + + Verbose + Verbose + + + + Ignore solution and project settings + Ignore solution and project settings + + + + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + + + + Prefer single-target builds when starting a project + Prefer single-target builds when starting a project + + + + Up to Date Checks + Up to Date Checks + + + + File Nesting Settings + File Nesting Settings + + + + Multi-Targeting Settings + Multi-Targeting Settings + + + + SDK-Style Projects + SDK-Style Projects + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.pl.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.pl.xlf index 83e8d05e775..104855577ce 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.pl.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.pl.xlf @@ -87,6 +87,71 @@ Pliki projektu .NET Core 2015 (*.xproj);*.xproj + + Don't call MSBuild if a project appears to be up to date + Don't call MSBuild if a project appears to be up to date + + + + Info + Info + + + + Minimal + Minimal + + + + None + None + + + + Logging Level + Logging Level + + + + Verbose + Verbose + + + + Ignore solution and project settings + Ignore solution and project settings + + + + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + + + + Prefer single-target builds when starting a project + Prefer single-target builds when starting a project + + + + Up to Date Checks + Up to Date Checks + + + + File Nesting Settings + File Nesting Settings + + + + Multi-Targeting Settings + Multi-Targeting Settings + + + + SDK-Style Projects + SDK-Style Projects + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.pt-BR.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.pt-BR.xlf index 2385c0e287a..9e42d71aa59 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.pt-BR.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.pt-BR.xlf @@ -87,6 +87,71 @@ Arquivos de Projeto do .NET Core 2015 (*.xproj);*.xproj + + Don't call MSBuild if a project appears to be up to date + Don't call MSBuild if a project appears to be up to date + + + + Info + Info + + + + Minimal + Minimal + + + + None + None + + + + Logging Level + Logging Level + + + + Verbose + Verbose + + + + Ignore solution and project settings + Ignore solution and project settings + + + + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + + + + Prefer single-target builds when starting a project + Prefer single-target builds when starting a project + + + + Up to Date Checks + Up to Date Checks + + + + File Nesting Settings + File Nesting Settings + + + + Multi-Targeting Settings + Multi-Targeting Settings + + + + SDK-Style Projects + SDK-Style Projects + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ru.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ru.xlf index 2e209942580..9df6d964b11 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ru.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ru.xlf @@ -87,6 +87,71 @@ Файлы проектов .NET Core 2015 (*.xproj);*.xproj + + Don't call MSBuild if a project appears to be up to date + Don't call MSBuild if a project appears to be up to date + + + + Info + Info + + + + Minimal + Minimal + + + + None + None + + + + Logging Level + Logging Level + + + + Verbose + Verbose + + + + Ignore solution and project settings + Ignore solution and project settings + + + + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + + + + Prefer single-target builds when starting a project + Prefer single-target builds when starting a project + + + + Up to Date Checks + Up to Date Checks + + + + File Nesting Settings + File Nesting Settings + + + + Multi-Targeting Settings + Multi-Targeting Settings + + + + SDK-Style Projects + SDK-Style Projects + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.tr.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.tr.xlf index b374b5aad4c..a63da810096 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.tr.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.tr.xlf @@ -87,6 +87,71 @@ .NET Core 2015 Proje Dosyaları (*.xproj);*.xproj + + Don't call MSBuild if a project appears to be up to date + Don't call MSBuild if a project appears to be up to date + + + + Info + Info + + + + Minimal + Minimal + + + + None + None + + + + Logging Level + Logging Level + + + + Verbose + Verbose + + + + Ignore solution and project settings + Ignore solution and project settings + + + + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + + + + Prefer single-target builds when starting a project + Prefer single-target builds when starting a project + + + + Up to Date Checks + Up to Date Checks + + + + File Nesting Settings + File Nesting Settings + + + + Multi-Targeting Settings + Multi-Targeting Settings + + + + SDK-Style Projects + SDK-Style Projects + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.zh-Hans.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.zh-Hans.xlf index 9aeedddb74a..c6246fd9d1b 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.zh-Hans.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.zh-Hans.xlf @@ -87,6 +87,71 @@ .NET Core 2015 项目文件(*.xproj);*.xproj + + Don't call MSBuild if a project appears to be up to date + Don't call MSBuild if a project appears to be up to date + + + + Info + Info + + + + Minimal + Minimal + + + + None + None + + + + Logging Level + Logging Level + + + + Verbose + Verbose + + + + Ignore solution and project settings + Ignore solution and project settings + + + + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + + + + Prefer single-target builds when starting a project + Prefer single-target builds when starting a project + + + + Up to Date Checks + Up to Date Checks + + + + File Nesting Settings + File Nesting Settings + + + + Multi-Targeting Settings + Multi-Targeting Settings + + + + SDK-Style Projects + SDK-Style Projects + + \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.zh-Hant.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.zh-Hant.xlf index 00c15ba728b..0e675b23069 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.zh-Hant.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.zh-Hant.xlf @@ -87,6 +87,71 @@ .NET Core 2015 專案檔 (*.xproj);*.xproj + + Don't call MSBuild if a project appears to be up to date + Don't call MSBuild if a project appears to be up to date + + + + Info + Info + + + + Minimal + Minimal + + + + None + None + + + + Logging Level + Logging Level + + + + Verbose + Verbose + + + + Ignore solution and project settings + Ignore solution and project settings + + + + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + + + + Prefer single-target builds when starting a project + Prefer single-target builds when starting a project + + + + Up to Date Checks + Up to Date Checks + + + + File Nesting Settings + File Nesting Settings + + + + Multi-Targeting Settings + Multi-Targeting Settings + + + + SDK-Style Projects + SDK-Style Projects + + \ No newline at end of file From 9906849c29cbd440883cc9f0e440d62574bba84b Mon Sep 17 00:00:00 2001 From: Adam Ratzman Date: Wed, 21 Jun 2023 12:59:08 -0700 Subject: [PATCH 2/7] Was missing semicolon in strings.... --- .../ManagedProjectSystem.registration.json | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/setup/ProjectSystemSetup/UnifiedSettings/ManagedProjectSystem.registration.json b/setup/ProjectSystemSetup/UnifiedSettings/ManagedProjectSystem.registration.json index 5a059f5727a..fbcaac27d73 100644 --- a/setup/ProjectSystemSetup/UnifiedSettings/ManagedProjectSystem.registration.json +++ b/setup/ProjectSystemSetup/UnifiedSettings/ManagedProjectSystem.registration.json @@ -2,7 +2,7 @@ "properties": { "projectsAndSolutions.sdkStyleProjects.fastUpToDateCheck.enabled": { "type": "boolean", - "title": "@Setting_FastUpToDateCheck_Enabled_Title{860A27C0-B665-47F3-BC12-637E16A1050A}", + "title": "@Setting_FastUpToDateCheck_Enabled_Title;{860A27C0-B665-47F3-BC12-637E16A1050A}", "default": true, "requiresRestart": false, "migration": { @@ -16,7 +16,7 @@ }, "projectsAndSolutions.sdkStyleProjects.fastUpToDateCheck.loggingLevel": { "type": "string", - "title": "@Setting_FastUpToDateCheck_LoggingLevel_Title{860A27C0-B665-47F3-BC12-637E16A1050A}", + "title": "@Setting_FastUpToDateCheck_LoggingLevel_Title;{860A27C0-B665-47F3-BC12-637E16A1050A}", "default": "none", "enum": [ "none", @@ -25,10 +25,10 @@ "verbose" ], "enumItemLabels": [ - "@Setting_FastUpToDateCheck_LoggingLevel_None{860A27C0-B665-47F3-BC12-637E16A1050A}", - "@Setting_FastUpToDateCheck_LoggingLevel_Minimal{860A27C0-B665-47F3-BC12-637E16A1050A}", - "@Setting_FastUpToDateCheck_LoggingLevel_Info{860A27C0-B665-47F3-BC12-637E16A1050A}", - "@Setting_FastUpToDateCheck_LoggingLevel_Verbose{860A27C0-B665-47F3-BC12-637E16A1050A}" + "@Setting_FastUpToDateCheck_LoggingLevel_None;{860A27C0-B665-47F3-BC12-637E16A1050A}", + "@Setting_FastUpToDateCheck_LoggingLevel_Minimal;{860A27C0-B665-47F3-BC12-637E16A1050A}", + "@Setting_FastUpToDateCheck_LoggingLevel_Info;{860A27C0-B665-47F3-BC12-637E16A1050A}", + "@Setting_FastUpToDateCheck_LoggingLevel_Verbose;{860A27C0-B665-47F3-BC12-637E16A1050A}" ], "requiresRestart": false, "migration": { @@ -60,7 +60,7 @@ }, "projectsAndSolutions.sdkStyleProjects.fileNestingSettings.ignoreSolutionAndProjectSettings": { "type": "boolean", - "title": "@Setting_FileNesting_IgnoreSolutionAndProjectSettings_Title{860A27C0-B665-47F3-BC12-637E16A1050A}", + "title": "@Setting_FileNesting_IgnoreSolutionAndProjectSettings_Title;{860A27C0-B665-47F3-BC12-637E16A1050A}", "default": false, "requiresRestart": false, "migration": { @@ -74,8 +74,8 @@ }, "projectsAndSolutions.sdkStyleProjects.multiTargetingSettings.preferSingleTargetBuilds": { "type": "boolean", - "title": "@Setting_FileNesting_PreferSingleTargetBuilds_Title{860A27C0-B665-47F3-BC12-637E16A1050A}", - "description": "@Setting_FileNesting_PreferSingleTargetBuilds_Description{860A27C0-B665-47F3-BC12-637E16A1050A}", + "title": "@Setting_FileNesting_PreferSingleTargetBuilds_Title;{860A27C0-B665-47F3-BC12-637E16A1050A}", + "description": "@Setting_FileNesting_PreferSingleTargetBuilds_Description;{860A27C0-B665-47F3-BC12-637E16A1050A}", "default": false, "requiresRestart": false, "migration": { @@ -91,19 +91,19 @@ "categories": { "projectsAndSolutions.sdkStyleProjects": { - "title": "@Settings_Category_SdkStyleProjects{860A27C0-B665-47F3-BC12-637E16A1050A}" + "title": "@Settings_Category_SdkStyleProjects;{860A27C0-B665-47F3-BC12-637E16A1050A}" }, "projectsAndSolutions.sdkStyleProjects.fastUpToDateCheck": { - "title": "@Settings_Category_FastUpToDateCheck{860A27C0-B665-47F3-BC12-637E16A1050A}", + "title": "@Settings_Category_FastUpToDateCheck;{860A27C0-B665-47F3-BC12-637E16A1050A}", "order": 1, "additionalKeywords": [ "futd", "up-to-date", "build" ] }, "projectsAndSolutions.sdkStyleProjects.fileNestingSettings": { - "title": "@Settings_Category_FileNestingSettings{860A27C0-B665-47F3-BC12-637E16A1050A}", + "title": "@Settings_Category_FileNestingSettings;{860A27C0-B665-47F3-BC12-637E16A1050A}", "order": 2 }, "projectsAndSolutions.sdkStyleProjects.multiTargetingSettings": { - "title": "@Settings_Category_MultiTargetingSettings{860A27C0-B665-47F3-BC12-637E16A1050A}", + "title": "@Settings_Category_MultiTargetingSettings;{860A27C0-B665-47F3-BC12-637E16A1050A}", "order": 3, "additionalKeywords": [ "build" ] } From 7d08f19bf402d8861759c7f7c628647203389ed5 Mon Sep 17 00:00:00 2001 From: Adam Ratzman Date: Thu, 22 Jun 2023 12:12:19 -0700 Subject: [PATCH 3/7] Strings reflect current guidelines, don't copy settings file to output --- setup/ProjectSystemSetup/ProjectSystemSetup.csproj | 1 - .../VSPackage.resx | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/setup/ProjectSystemSetup/ProjectSystemSetup.csproj b/setup/ProjectSystemSetup/ProjectSystemSetup.csproj index 524bf6c3909..13aa5ab22d9 100644 --- a/setup/ProjectSystemSetup/ProjectSystemSetup.csproj +++ b/setup/ProjectSystemSetup/ProjectSystemSetup.csproj @@ -27,7 +27,6 @@ - PreserveNewest true diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/VSPackage.resx b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/VSPackage.resx index 6896b3eeae2..f3a7de8c9b5 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/VSPackage.resx +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/VSPackage.resx @@ -193,18 +193,18 @@ Prefer single-target builds when starting a project - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. - SDK-Style Projects + SDK-style projects - Up to Date Checks + Up to date checks - File Nesting Settings + File nesting settings - Multi-Targeting Settings + Multi-targeting settings \ No newline at end of file From e75ba853e5c4d9c08170dd9c35fdecf3c9e0d46e Mon Sep 17 00:00:00 2001 From: Adam Ratzman Date: Thu, 22 Jun 2023 12:39:29 -0700 Subject: [PATCH 4/7] Rename filePrefix/folderPrefix to _xaml.. because the test only covers xaml files, fix package content test --- .../xlf/VSPackage.cs.xlf | 20 ++++++++--------- .../xlf/VSPackage.de.xlf | 20 ++++++++--------- .../xlf/VSPackage.es.xlf | 20 ++++++++--------- .../xlf/VSPackage.fr.xlf | 20 ++++++++--------- .../xlf/VSPackage.it.xlf | 20 ++++++++--------- .../xlf/VSPackage.ja.xlf | 20 ++++++++--------- .../xlf/VSPackage.ko.xlf | 20 ++++++++--------- .../xlf/VSPackage.pl.xlf | 20 ++++++++--------- .../xlf/VSPackage.pt-BR.xlf | 20 ++++++++--------- .../xlf/VSPackage.ru.xlf | 20 ++++++++--------- .../xlf/VSPackage.tr.xlf | 20 ++++++++--------- .../xlf/VSPackage.zh-Hans.xlf | 20 ++++++++--------- .../xlf/VSPackage.zh-Hant.xlf | 20 ++++++++--------- ...ageContentTests.ProjectSystem.verified.txt | 1 + .../Setup/SwrTests.cs | 22 ++++++++++--------- 15 files changed, 143 insertions(+), 140 deletions(-) diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.cs.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.cs.xlf index fc41207d8e7..35b78a3ee5a 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.cs.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.cs.xlf @@ -123,8 +123,8 @@ - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. @@ -133,23 +133,23 @@ - Up to Date Checks - Up to Date Checks + Up to date checks + Up to date checks - File Nesting Settings - File Nesting Settings + File nesting settings + File nesting settings - Multi-Targeting Settings - Multi-Targeting Settings + Multi-targeting settings + Multi-targeting settings - SDK-Style Projects - SDK-Style Projects + SDK-style projects + SDK-style projects diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.de.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.de.xlf index 139c62a43aa..d11c14b8bbb 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.de.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.de.xlf @@ -123,8 +123,8 @@ - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. @@ -133,23 +133,23 @@ - Up to Date Checks - Up to Date Checks + Up to date checks + Up to date checks - File Nesting Settings - File Nesting Settings + File nesting settings + File nesting settings - Multi-Targeting Settings - Multi-Targeting Settings + Multi-targeting settings + Multi-targeting settings - SDK-Style Projects - SDK-Style Projects + SDK-style projects + SDK-style projects diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.es.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.es.xlf index 3cb6b23f96d..01acaa66173 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.es.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.es.xlf @@ -123,8 +123,8 @@ - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. @@ -133,23 +133,23 @@ - Up to Date Checks - Up to Date Checks + Up to date checks + Up to date checks - File Nesting Settings - File Nesting Settings + File nesting settings + File nesting settings - Multi-Targeting Settings - Multi-Targeting Settings + Multi-targeting settings + Multi-targeting settings - SDK-Style Projects - SDK-Style Projects + SDK-style projects + SDK-style projects diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.fr.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.fr.xlf index 986bca064a1..cdf0aab5fb2 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.fr.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.fr.xlf @@ -123,8 +123,8 @@ - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. @@ -133,23 +133,23 @@ - Up to Date Checks - Up to Date Checks + Up to date checks + Up to date checks - File Nesting Settings - File Nesting Settings + File nesting settings + File nesting settings - Multi-Targeting Settings - Multi-Targeting Settings + Multi-targeting settings + Multi-targeting settings - SDK-Style Projects - SDK-Style Projects + SDK-style projects + SDK-style projects diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.it.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.it.xlf index 4e0ac35786b..7258668b6c4 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.it.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.it.xlf @@ -123,8 +123,8 @@ - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. @@ -133,23 +133,23 @@ - Up to Date Checks - Up to Date Checks + Up to date checks + Up to date checks - File Nesting Settings - File Nesting Settings + File nesting settings + File nesting settings - Multi-Targeting Settings - Multi-Targeting Settings + Multi-targeting settings + Multi-targeting settings - SDK-Style Projects - SDK-Style Projects + SDK-style projects + SDK-style projects diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ja.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ja.xlf index 1ffda139e43..716784cf3a8 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ja.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ja.xlf @@ -123,8 +123,8 @@ - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. @@ -133,23 +133,23 @@ - Up to Date Checks - Up to Date Checks + Up to date checks + Up to date checks - File Nesting Settings - File Nesting Settings + File nesting settings + File nesting settings - Multi-Targeting Settings - Multi-Targeting Settings + Multi-targeting settings + Multi-targeting settings - SDK-Style Projects - SDK-Style Projects + SDK-style projects + SDK-style projects diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ko.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ko.xlf index 6da8c40d8b0..495ad8bf5e6 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ko.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ko.xlf @@ -123,8 +123,8 @@ - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. @@ -133,23 +133,23 @@ - Up to Date Checks - Up to Date Checks + Up to date checks + Up to date checks - File Nesting Settings - File Nesting Settings + File nesting settings + File nesting settings - Multi-Targeting Settings - Multi-Targeting Settings + Multi-targeting settings + Multi-targeting settings - SDK-Style Projects - SDK-Style Projects + SDK-style projects + SDK-style projects diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.pl.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.pl.xlf index 104855577ce..8b7e8e66672 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.pl.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.pl.xlf @@ -123,8 +123,8 @@ - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. @@ -133,23 +133,23 @@ - Up to Date Checks - Up to Date Checks + Up to date checks + Up to date checks - File Nesting Settings - File Nesting Settings + File nesting settings + File nesting settings - Multi-Targeting Settings - Multi-Targeting Settings + Multi-targeting settings + Multi-targeting settings - SDK-Style Projects - SDK-Style Projects + SDK-style projects + SDK-style projects diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.pt-BR.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.pt-BR.xlf index 9e42d71aa59..feb9a89a96c 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.pt-BR.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.pt-BR.xlf @@ -123,8 +123,8 @@ - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. @@ -133,23 +133,23 @@ - Up to Date Checks - Up to Date Checks + Up to date checks + Up to date checks - File Nesting Settings - File Nesting Settings + File nesting settings + File nesting settings - Multi-Targeting Settings - Multi-Targeting Settings + Multi-targeting settings + Multi-targeting settings - SDK-Style Projects - SDK-Style Projects + SDK-style projects + SDK-style projects diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ru.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ru.xlf index 9df6d964b11..984429495c8 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ru.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.ru.xlf @@ -123,8 +123,8 @@ - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. @@ -133,23 +133,23 @@ - Up to Date Checks - Up to Date Checks + Up to date checks + Up to date checks - File Nesting Settings - File Nesting Settings + File nesting settings + File nesting settings - Multi-Targeting Settings - Multi-Targeting Settings + Multi-targeting settings + Multi-targeting settings - SDK-Style Projects - SDK-Style Projects + SDK-style projects + SDK-style projects diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.tr.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.tr.xlf index a63da810096..bef00b68a79 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.tr.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.tr.xlf @@ -123,8 +123,8 @@ - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. @@ -133,23 +133,23 @@ - Up to Date Checks - Up to Date Checks + Up to date checks + Up to date checks - File Nesting Settings - File Nesting Settings + File nesting settings + File nesting settings - Multi-Targeting Settings - Multi-Targeting Settings + Multi-targeting settings + Multi-targeting settings - SDK-Style Projects - SDK-Style Projects + SDK-style projects + SDK-style projects diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.zh-Hans.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.zh-Hans.xlf index c6246fd9d1b..94f87612b03 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.zh-Hans.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.zh-Hans.xlf @@ -123,8 +123,8 @@ - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. @@ -133,23 +133,23 @@ - Up to Date Checks - Up to Date Checks + Up to date checks + Up to date checks - File Nesting Settings - File Nesting Settings + File nesting settings + File nesting settings - Multi-Targeting Settings - Multi-Targeting Settings + Multi-targeting settings + Multi-targeting settings - SDK-Style Projects - SDK-Style Projects + SDK-style projects + SDK-style projects diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.zh-Hant.xlf b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.zh-Hant.xlf index 0e675b23069..997d3daf92f 100644 --- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.zh-Hant.xlf +++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/xlf/VSPackage.zh-Hant.xlf @@ -123,8 +123,8 @@ - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework - When starting a project that targets multiple .NET frameworks, the build time can be reduced by limiting the build to a single framework + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. + When starting a project that targets multiple frameworks the build time can be reduced by building only a single one. @@ -133,23 +133,23 @@ - Up to Date Checks - Up to Date Checks + Up to date checks + Up to date checks - File Nesting Settings - File Nesting Settings + File nesting settings + File nesting settings - Multi-Targeting Settings - Multi-Targeting Settings + Multi-targeting settings + Multi-targeting settings - SDK-Style Projects - SDK-Style Projects + SDK-style projects + SDK-style projects diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/PackageContentTests.ProjectSystem.verified.txt b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/PackageContentTests.ProjectSystem.verified.txt index 55b1d0ce75b..6b1af23f1fb 100644 --- a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/PackageContentTests.ProjectSystem.verified.txt +++ b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/PackageContentTests.ProjectSystem.verified.txt @@ -30,6 +30,7 @@ ru/Microsoft.VisualStudio.ProjectSystem.Managed.VS.resources.dll, tr/Microsoft.VisualStudio.ProjectSystem.Managed.resources.dll, tr/Microsoft.VisualStudio.ProjectSystem.Managed.VS.resources.dll, + UnifiedSettings/ManagedProjectSystem.registration.json, zh-Hans/Microsoft.VisualStudio.ProjectSystem.Managed.resources.dll, zh-Hans/Microsoft.VisualStudio.ProjectSystem.Managed.VS.resources.dll, zh-Hant/Microsoft.VisualStudio.ProjectSystem.Managed.resources.dll, diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/SwrTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/SwrTests.cs index ed47b5f8e06..f226358f5af 100644 --- a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/SwrTests.cs +++ b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/SwrTests.cs @@ -15,6 +15,10 @@ public sealed class SwrTests private readonly ITestOutputHelper _output; + private const string _xamlFolderPrefix = @"InstallDir:MSBuild\Microsoft\VisualStudio\Managed"; + private const string _xamlFilePrefix = @"$(VisualStudioXamlRulesDir)"; + + public SwrTests(ITestOutputHelper output) => _output = output; [Fact] @@ -86,16 +90,10 @@ public void CommonFiles_ContainsAllXamlFiles() static (string Culture, string File) ParseSwrFile((string Folder, string File) item) { - const string folderPrefix = @"InstallDir:MSBuild\Microsoft\VisualStudio\Managed"; - const string filePrefix = @"$(VisualStudioXamlRulesDir)"; - - Assert.StartsWith(folderPrefix, item.Folder); - Assert.StartsWith(filePrefix, item.File); - - var culture = item.Folder.Substring(folderPrefix.Length).TrimStart('\\'); + var culture = item.Folder.Substring(_xamlFolderPrefix.Length).TrimStart('\\'); var fileName = culture.Length == 0 - ? item.File.Substring(filePrefix.Length) - : item.File.Substring(filePrefix.Length + culture.Length + 1); + ? item.File.Substring(_xamlFilePrefix.Length) + : item.File.Substring(_xamlFilePrefix.Length + culture.Length + 1); return (culture, fileName); } @@ -146,7 +144,11 @@ public void CommonFiles_ContainsAllXamlFiles() if (folder is null) throw new FileFormatException("'file' entry appears before a 'folder' entry."); var file = fileMatch.Groups["path"].Value; - yield return (folder, file); + + if (folder.StartsWith(_xamlFolderPrefix) && file.StartsWith(_xamlFilePrefix)) + { + yield return (folder, file); + } } } } From f3d7fd87e0fd03efdc72b2e886d434106c02d2a1 Mon Sep 17 00:00:00 2001 From: Adam Ratzman Date: Thu, 22 Jun 2023 14:10:57 -0700 Subject: [PATCH 5/7] Update tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/SwrTests.cs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Melissa Treviño --- .../Setup/SwrTests.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/SwrTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/SwrTests.cs index f226358f5af..727d2c8f3eb 100644 --- a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/SwrTests.cs +++ b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/SwrTests.cs @@ -18,7 +18,6 @@ public sealed class SwrTests private const string _xamlFolderPrefix = @"InstallDir:MSBuild\Microsoft\VisualStudio\Managed"; private const string _xamlFilePrefix = @"$(VisualStudioXamlRulesDir)"; - public SwrTests(ITestOutputHelper output) => _output = output; [Fact] From 89d41186b2b27df8d77552bbd52eba2a31f928ed Mon Sep 17 00:00:00 2001 From: Adam Ratzman Date: Mon, 26 Jun 2023 11:51:39 -0700 Subject: [PATCH 6/7] Ignore settings manifest file in CommonFiles test --- .../Setup/PackageContentTests.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/PackageContentTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/PackageContentTests.cs index 164969eb8d1..9924aa8811d 100644 --- a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/PackageContentTests.cs +++ b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/PackageContentTests.cs @@ -12,6 +12,7 @@ public sealed class PackageContentTests { // These files are only added as part of signing. private const string DigitalSignature = "package/services/digital-signature"; + private const string SettingsRegistrationFileSuffix = "ManagedProjectSystem.registration.json"; private const string Rels = "_rels/.rels"; [Fact] @@ -35,6 +36,7 @@ public Task CommonFiles() { IEnumerable files = GetPackageContents("Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles.vsix"); VerifierSettings.ScrubLinesContaining(DigitalSignature); + VerifierSettings.ScrubLinesContaining(SettingsRegistrationFileSuffix); // manifest.json is the last line for non-signed builds. // It will not contain a comma in this situation, so we need special logic for that. VerifierSettings.ScrubLinesWithReplace(s => s.EndsWith("manifest.json") ? " manifest.json," : s); From e46f762693d0edba51c8427b2eb2a64136faf019 Mon Sep 17 00:00:00 2001 From: Adam Ratzman Date: Mon, 26 Jun 2023 12:29:01 -0700 Subject: [PATCH 7/7] Remove settings file from packaging tests --- .../Setup/PackageContentTests.ProjectSystem.verified.txt | 1 - .../Setup/PackageContentTests.cs | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/PackageContentTests.ProjectSystem.verified.txt b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/PackageContentTests.ProjectSystem.verified.txt index 6b1af23f1fb..55b1d0ce75b 100644 --- a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/PackageContentTests.ProjectSystem.verified.txt +++ b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/PackageContentTests.ProjectSystem.verified.txt @@ -30,7 +30,6 @@ ru/Microsoft.VisualStudio.ProjectSystem.Managed.VS.resources.dll, tr/Microsoft.VisualStudio.ProjectSystem.Managed.resources.dll, tr/Microsoft.VisualStudio.ProjectSystem.Managed.VS.resources.dll, - UnifiedSettings/ManagedProjectSystem.registration.json, zh-Hans/Microsoft.VisualStudio.ProjectSystem.Managed.resources.dll, zh-Hans/Microsoft.VisualStudio.ProjectSystem.Managed.VS.resources.dll, zh-Hant/Microsoft.VisualStudio.ProjectSystem.Managed.resources.dll, diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/PackageContentTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/PackageContentTests.cs index 9924aa8811d..9b9c83018bf 100644 --- a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/PackageContentTests.cs +++ b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/PackageContentTests.cs @@ -19,7 +19,7 @@ public sealed class PackageContentTests public Task ProjectSystem() { IEnumerable files = GetPackageContents("ProjectSystem.vsix"); - VerifierSettings.ScrubLinesContaining(DigitalSignature, Rels); + VerifierSettings.ScrubLinesContaining(DigitalSignature, Rels, SettingsRegistrationFileSuffix); return Verifier.Verify(files); } @@ -27,7 +27,7 @@ public Task ProjectSystem() public Task VisualStudioEditorsSetup() { IEnumerable files = GetPackageContents("VisualStudioEditorsSetup.vsix"); - VerifierSettings.ScrubLinesContaining(DigitalSignature, Rels); + VerifierSettings.ScrubLinesContaining(DigitalSignature, Rels, SettingsRegistrationFileSuffix); return Verifier.Verify(files); }