From fffc681edd6933371032f8891b0885667783e3d7 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 14 Apr 2023 12:02:20 -0700 Subject: [PATCH] Initial attempt to automate the minimum VS version --- src/redist/targets/GenerateMSIs.targets | 11 +++++++++++ .../packaging/windows/clisdk/LCID/1028/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/1029/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/1031/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/1033/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/1036/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/1040/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/1041/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/1042/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/1045/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/1046/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/1049/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/1055/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/2052/bundle.wxl | 2 +- .../packaging/windows/clisdk/LCID/3082/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/bundle.wxs | 1 + .../packaging/windows/clisdk/generatebundle.ps1 | 1 + 17 files changed, 27 insertions(+), 14 deletions(-) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 3a0fd7fef..714b47a5a 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -309,6 +309,17 @@ Overwrite="true" /> + + + + %(SDKInternalFiles.Identity) + $([System.IO.File]::ReadAllText($(FileToRead)).Trim()) + + + 安裝附註 安裝程序期間將會執行命令，加快專案還原速度並啟用離線存取。最多需要一分鐘的時間完成。 - 若預計要搭配 Visual Studio 使用 .NET [VERSIONMAJOR].[VERSIONMINOR]，需要 Visual Studio 2022 17.4 或更新版本。<A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">深入了解</A>. + 若預計要搭配 Visual Studio 使用 .NET [VERSIONMAJOR].[VERSIONMINOR]，需要 Visual Studio 2022 [MINIMUMVSVERSION] 或更新版本。<A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">深入了解</A>. 按一下 “安裝” 即表示您同意下列條款: x64 SDK 安裝的安裝路徑: "[DOTNETHOME_X64]" 不能與 x86 SDK 安裝的路徑相同: "[DOTNETHOME_X86]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl index 59e1e80bc..f823144e4 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl @@ -76,7 +76,7 @@ Prostředky Poznámka k instalaci Během procesu instalace se spustí příkaz, který zlepší rychlost obnovení projektu a povolí offline přístup. Akce se dokončí přibližně za minutu. - Pokud plánujete používat .NET [VERSIONMAJOR].[VERSIONMINOR] s Visual Studio, vyžaduje se Visual Studio 2022 17.4 nebo novější. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Další informace</A>. + Pokud plánujete používat .NET [VERSIONMAJOR].[VERSIONMINOR] s Visual Studio, vyžaduje se Visual Studio 2022 [MINIMUMVSVERSION] nebo novější. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Další informace</A>. Kliknutím na Nainstalovat vyjadřujete souhlas s následujícími podmínkami: Instalační cesta pro instalace sady x64 SDK[ DOTNETHOME_X64] nemůže být stejná jako u instalací sady x86 SDK: [DOTNETHOME_X86]. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl index 3377e860b..31aec6fde 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl @@ -76,7 +76,7 @@ Ressourcen Installationshinweis Während des Installationsvorgangs wird ein Befehl ausgeführt, durch den die Geschwindigkeit der Projektwiederherstellung verbessert und der Offlinezugriff aktiviert wird. Der Vorgang dauert bis zu einer Minute. - Wenn Sie beabsichtigen, .NET [VERSIONMAJOR].[VERSIONMINOR] mit Visual Studio zu verwenden, ist Visual Studio 2022 17.4 oder höher erforderlich. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Weitere Informationen</A>. + Wenn Sie beabsichtigen, .NET [VERSIONMAJOR].[VERSIONMINOR] mit Visual Studio zu verwenden, ist Visual Studio 2022 [MINIMUMVSVERSION] oder höher erforderlich. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Weitere Informationen</A>. Durch Klicken auf „Installieren2 stimmen Sie den nachstehenden Bedingungen zu: Der Installationspfad „[DOTNETHOME_X64]“ für x64 SDK-Installationen kann nicht derselbe sein wie für x86 SDK-Installationen: „[DOTNETHOME_X86]“ diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl index f73c3f7cd..840955765 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl @@ -76,7 +76,7 @@ Resources Installation note A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete. - If you plan to use .NET [VERSIONMAJOR].[VERSIONMINOR] with Visual Studio, Visual Studio 2022 17.4 or newer is required. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Learn more</A>. + If you plan to use .NET [VERSIONMAJOR].[VERSIONMINOR] with Visual Studio, Visual Studio 2022 [MINIMUMVSVERSION] or newer is required. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Learn more</A>. By clicking Install, you agree to the following terms: The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl index 7301867fb..6243737a1 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl @@ -76,7 +76,7 @@ Ressources Note d’installation Une commande va être exécutée pendant le processus d'installation, ce qui va améliorer la vitesse de restauration du projet et permettre l'accès hors connexion. L'opération va prendre environ une minute. - Si vous envisagez d’utiliser .NET [VERSIONMAJOR].[VERSIONMINOR] avec Visual Studio, Visual Studio 2022 17.4 ou une version ultérieure est nécessaire. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">En savoir plus</A>. + Si vous envisagez d’utiliser .NET [VERSIONMAJOR].[VERSIONMINOR] avec Visual Studio, Visual Studio 2022 [MINIMUMVSVERSION] ou une version ultérieure est nécessaire. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">En savoir plus</A>. En cliquant sur Installer, vous acceptez les conditions suivantes : Le chemin d’installation des installations du Kit de développement logiciel (SDK) x64 : « [DOTNETHOME_X64] » ne peut pas être identique à celui des installations du Kit de développement logiciel (SDK) x86 : « [DOTNETHOME_X86] » diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl index 8eadd7f94..12f021796 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl @@ -76,7 +76,7 @@ Risorse Nota sull'installazione Durante il processo di installazione verrà eseguito un comando che migliorerà la velocità di ripristino del progetto e abiliterà l'accesso offline. Il completamento del comando richiederà un minuto. - Se si prevede di usare .NET [VERSIONMAJOR]. [VERSIONMINOR] con Visual Studio, è necessario Visual Studio 2022 17.4 o versione successiva. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Altre informazioni</A>. + Se si prevede di usare .NET [VERSIONMAJOR]. [VERSIONMINOR] con Visual Studio, è necessario Visual Studio 2022 [MINIMUMVSVERSION] o versione successiva. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Altre informazioni</A>. Facendo clic su Installa, si accettano le condizioni seguenti: Percorso di installazione per le installazioni x64 SDK: "[DOTNETHOME_X64]" non può essere uguale a quello delle installazioni di x86 SDK: "[DOTNETHOME_X86]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl index 1d08d3676..1dbf0062f 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl @@ -76,7 +76,7 @@ インストール メモ コマンドはインストール処理中に実行されるので、プロジェクトの復元速度が向上し、オフラインでアクセスできます。完了するまでに最大 1 分かかります。 - .NET [VERSIONMAJOR].[VERSIONMINOR] を Visual Studio で使用する場合は、Visual Studio 2022 17.4 以降が必要です。<A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">詳細情報</A>. + .NET [VERSIONMAJOR].[VERSIONMINOR] を Visual Studio で使用する場合は、Visual Studio 2022 [MINIMUMVSVERSION] 以降が必要です。<A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">詳細情報</A>. インストール をクリックすると、次の条項に同意したものと見なされます: x64 SDK インストールのインストール パス: "[DOTNETHOME_X64]" を x86 SDK インストールの場合と同じにすることはできません: "[DOTNETHOME_X86]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl index 1cc3ff5b9..d02f2754b 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl @@ -76,7 +76,7 @@ 설치 정보 프로젝트 복원 속도를 향상하고 오프라인 액세스를 사용할 수 있도록 하는 설치 프로세스 중 명령이 실행됩니다. 완료하는 데 최대 1분이 걸립니다. - Visual Studio에서 .NET [VERSIONMAJOR].[VERSIONMINOR]를 사용하려는 경우 Visual Studio 2022 17.4 이상이 필요합니다. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Learn more</A>. + Visual Studio에서 .NET [VERSIONMAJOR].[VERSIONMINOR]를 사용하려는 경우 Visual Studio 2022 [MINIMUMVSVERSION] 이상이 필요합니다. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Learn more</A>. 설치를 클릭하면 다음 사용 약관에 동의하는 것입니다. x64 SDK 설치의 설치 경로: " [DOTNETHOME_x64]" x86 SDK 설치의 경우와 같을 수 없습니다. " [DOTNETHOME_X86]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl index 3a79802fd..ca721b383 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl @@ -76,7 +76,7 @@ Zasoby Uwaga dotycząca instalacji W trakcie procesu instalacji zostanie uruchomione polecenie, które zwiększy szybkość przywracania projektu i umożliwi dostęp do trybu offline. Zajmie to maksymalnie minutę. - Jeśli planujesz używać platformy .NET [VERSIONMAJOR].[VERSIONMINOR] z programem Visual Studio, wymagany jest program Visual Studio 2022 17.4 lub nowszy. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Dowiedz się więcej</A>. + Jeśli planujesz używać platformy .NET [VERSIONMAJOR].[VERSIONMINOR] z programem Visual Studio, wymagany jest program Visual Studio 2022 [MINIMUMVSVERSION] lub nowszy. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Dowiedz się więcej</A>. Klikając pozycję Zainstaluj, wyrażasz zgodę na następujące warunki: Ścieżka instalacji w przypadku instalacji zestawu SDK x64: „[DOTNETHOME_X64]” nie może być taka sama jak w przypadku instalacji zestawu SDK x86: „[DOTNETHOME_X86]” diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl index 52e844682..3b35739d4 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl @@ -76,7 +76,7 @@ Recursos Nota de instalação Um comando será executado durante o processo de instalação que melhorará a velocidade de restauração do projeto e habilitará o acesso offline. Isso levará até um minuto para ser concluído. - Se você planeja usar o .NET [VERSIONMAJOR].[VERSIONMINOR] com o Visual Studio, Visual Studio 2022 17.4 ou mais recente é necessário. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Saiba mais</A>. + Se você planeja usar o .NET [VERSIONMAJOR].[VERSIONMINOR] com o Visual Studio, Visual Studio 2022 [MINIMUMVSVERSION] ou mais recente é necessário. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Saiba mais</A>. Ao clicar em Instalar, você concorda com os termos a seguir: O caminho da instalação para instalações do SDK x64: "[DOTNETHOME_X64]" não pode ser o mesmo que para instalações do SDK x86: "[DOTNETHOME_X86]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl index 6f2d54d3b..eaa2c86c9 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl @@ -76,7 +76,7 @@ Примечание по установке В процессе установки будет выполнена команда, которая увеличит скорость восстановления проекта и обеспечит автономный доступ. Выполнение займет до минуты. - Если вы планируете использовать .NET [VERSIONMAJOR].[VERSIONMINOR] с Visual Studio, требуется Visual Studio 2022 версии 17.4 или более поздней. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Дополнительные сведения</A>. + Если вы планируете использовать .NET [VERSIONMAJOR].[VERSIONMINOR] с Visual Studio, требуется Visual Studio 2022 версии [MINIMUMVSVERSION] или более поздней. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Дополнительные сведения</A>. Нажимая кнопку "Установить", вы принимаете следующие условия. Совпадение пути установки недопустимо для установок пакетов SDK x64: "[DOTNETHOME_X64]" и SDK x86: "[DOTNETHOME_X86]". diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl index 03c3ff437..d38b7dbb3 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl @@ -76,7 +76,7 @@ Kaynaklar Yükleme notu Yükleme işlemi sırasında, proje geri yükleme hızını artıran ve çevrimdışı erişimi etkinleştiren bir komut çalıştırılır. Tamamlanması bir dakikanızı alır. - Visual Studio ile .NET [VERSIONMAJOR].[VERSIONMINOR] kullanmayı planlıyorsanız Visual Studio 2022 17.4 veya üzeri bir sürüm gerekir. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Daha fazla bilgi edinin</A>. + Visual Studio ile .NET [VERSIONMAJOR].[VERSIONMINOR] kullanmayı planlıyorsanız Visual Studio 2022 [MINIMUMVSVERSION] veya üzeri bir sürüm gerekir. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Daha fazla bilgi edinin</A>. Yükle'ye tıklayarak aşağıdaki koşulları kabul etmiş olursunuz: x64 SDK yüklemelerinin yükleme yolu ("[DOTNETHOME_X64]"), x86 SDK yüklemelerinin yükleme yolu ("[DOTNETHOME_X86]") ile aynı olamaz diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl index ed87dfc8d..ab10aed0e 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl @@ -76,7 +76,7 @@ 安装说明 将在要提升项目还原速度并实现脱机访问的安装进程期间运行命令。此操作最多 1 分钟即可完成。 - 如果你计划使用 .NET [VERSIONMAJOR].[VERSIONMINOR] 与 Visual Studio、Visual Studio 2022 17.4 或更高版本是必需的。<A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">了解详细信息</A>。 + 如果你计划使用 .NET [VERSIONMAJOR].[VERSIONMINOR] 与 Visual Studio、Visual Studio 2022 [MINIMUMVSVERSION] 或更高版本是必需的。<A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">了解详细信息</A>。 单击“安装”即表示你同意以下条款: x64 SDK 安装的安装路径: "[DOTNETHOME_X64]" 不能与 x86 SDK 安装的路径相同: "[DOTNETHOME_X86]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl index c29d3a265..d3fe30d21 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl @@ -77,7 +77,7 @@ Recursos Nota de instalación Se ejecutará un comando durante el proceso de instalación que mejorará la velocidad de restauración del proyecto y permitirá el acceso sin conexión. La operación tardará hasta un minuto en completarse. - Si tiene previsto utilizar .NET [VERSIONMAJOR].[VERSIONMINOR] con Visual Studio, necesitará Visual Studio 2022 17.4 o una versión más reciente. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Learn more</A>. + Si tiene previsto utilizar .NET [VERSIONMAJOR].[VERSIONMINOR] con Visual Studio, necesitará Visual Studio 2022 [MINIMUMVSVERSION] o una versión más reciente. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Learn more</A>. Al hacer clic en Instalar, acepta los siguientes términos: La ruta de instalación para las instalaciones del SDK x64: "[DOTNETHOME_X64]" no puede ser la misma que para las instalaciones del SDK x86: "[DOTNETHOME_X86]" diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index ea5a58ae6..27cf3e616 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -152,6 +152,7 @@ + diff --git a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 index 4d0f91565..84bb459fa 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 @@ -72,6 +72,7 @@ function RunCandleForBundle -dTemplatesMsiSourcePath="$TemplatesMSIFile" ` -dManifestsMsiSourcePath="$ManifestsMSIFile" ` -dWinFormsAndWpfVersion="$WindowsDesktopVersion" ` + -dMinimumVSVersion="$MinimumVSVersion" ` -dAdditionalSharedFXMsiSourcePath="$AdditionalSharedFxMSIFile" ` -dAdditionalHostFXRMsiSourcePath="$AdditionalHostFxrMSIFile" ` -dAdditionalSharedHostMsiSourcePath="$AdditionalSharedHostMSIFile" `