From 694984e38bb3103001bef2131f0bbe5dd8bf18f2 Mon Sep 17 00:00:00 2001 From: kasperk81 <83082615+kasperk81@users.noreply.github.com> Date: Wed, 4 Jan 2023 20:04:20 +0000 Subject: [PATCH] use var.VersionMajor/Minor in installer --- src/redist/targets/GenerateMSIs.targets | 8 +++++++ .../windows/clisdk/LCID/1028/bundle.wxl | 4 ++-- .../windows/clisdk/LCID/1029/bundle.wxl | 4 ++-- .../windows/clisdk/LCID/1031/bundle.wxl | 4 ++-- .../windows/clisdk/LCID/1033/bundle.wxl | 4 ++-- .../windows/clisdk/LCID/1036/bundle.wxl | 10 ++++---- .../windows/clisdk/LCID/1040/bundle.wxl | 4 ++-- .../windows/clisdk/LCID/1041/bundle.wxl | 4 ++-- .../windows/clisdk/LCID/1042/bundle.wxl | 4 ++-- .../windows/clisdk/LCID/1045/bundle.wxl | 4 ++-- .../windows/clisdk/LCID/1046/bundle.wxl | 4 ++-- .../windows/clisdk/LCID/1049/bundle.wxl | 24 +++++++++---------- .../windows/clisdk/LCID/1055/bundle.wxl | 4 ++-- .../windows/clisdk/LCID/2052/bundle.wxl | 4 ++-- .../windows/clisdk/LCID/3082/bundle.wxl | 4 ++-- .../packaging/windows/clisdk/bundle.wxs | 2 ++ .../windows/clisdk/generatebundle.ps1 | 4 ++++ .../packaging/windows/clisdk/generatemsi.ps1 | 4 ++++ .../clisdk/generatesdkplaceholdermsi.ps1 | 4 ++++ .../windows/clisdk/generatetemplatesmsi.ps1 | 4 ++++ 20 files changed, 67 insertions(+), 41 deletions(-) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 527bc988c..22dd63038 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -166,6 +166,8 @@ '$(MsiVersion)' ^ '$(SDKBundleVersion)' ^ '$(Version)' ^ + '$(VersionMajor)' ^ + '$(VersionMinor)' ^ '$(SdkInstallerUpgradeCode)' ^ '$(SdkDependencyKeyName)' ^ '$(Architecture)' ^ @@ -204,6 +206,8 @@ '$(MsiVersion)' ^ '$(SDKBundleVersion)' ^ '$(Version)' ^ + '$(VersionMajor)' ^ + '$(VersionMinor)' ^ '$(SdkPlaceholderInstallerUpgradeCode)' ^ '$(SdkPlaceholderDependencyKeyName)' ^ '$(Architecture)' ^ @@ -239,6 +243,8 @@ '%(TemplatesMsiComponent.MsiVersion)' ^ '%(TemplatesMsiComponent.MsiVersion)' ^ '$(FullNugetVersion)' ^ + '$(VersionMajor)' ^ + '$(VersionMinor)' ^ '%(TemplatesMsiComponent.UpgradeCode)' ^ '%(TemplatesMsiComponent.DependencyKeyName)' ^ '$(Architecture)' ^ @@ -349,6 +355,8 @@ -DotnetMSIVersion '$(MsiVersion)' ^ -SDKBundleVersion '$(SDKBundleVersion)' ^ -DotnetCLINugetVersion '$(Version)' ^ + -VersionMajor '$(VersionMajor)' ^ + -VersionMinor '$(VersionMinor)' ^ -WindowsDesktopVersion '$(MicrosoftWindowsDesktopAppRuntimePackageVersion)' ^ -UpgradeCode '$(CombinedFrameworkSDKHostInstallerUpgradeCode)' ^ -DependencyKeyName '$(SdkDependencyKeyName)' ^ diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl index 560a196e9..893684173 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl @@ -61,7 +61,7 @@ 資源 • 如需 .NET 文件，請前往 https://aka.ms/dotnet-docs • 如需 SDK 文件，請前往 https://aka.ms/dotnet-sdk-docs - • 如需版本資訊，請前往 https://aka.ms/dotnet7-release-notes + • 如需版本資訊，請前往 https://aka.ms/dotnet[VERSIONMAJOR]-release-notes • 如需教學課程，請前往 https://aka.ms/dotnet-tutorials .NET SDK @@ -76,7 +76,7 @@ 安裝附註 安裝程序期間將會執行命令，加快專案還原速度並啟用離線存取。最多需要一分鐘的時間完成。 - 若預計要搭配 Visual Studio 使用 .NET 7.0，需要 Visual Studio 2022 17.4 或更新版本。<A HREF="https://aka.ms/dotnet7-release-notes">深入了解</A>. + 若預計要搭配 Visual Studio 使用 .NET [VERSIONMAJOR].[VERSIONMINOR]，需要 Visual Studio 2022 17.4 或更新版本。<A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">深入了解</A>. 按一下 [\[]安裝[\[] 即表示您同意下列條款。 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/1029/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl index 3b40ee4f3..a8059e832 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl @@ -61,7 +61,7 @@ Tento produkt shromažďuje data o využití. Zdroje informací • Dokumentace k .NET : https://aka.ms/dotnet-docs • Dokumentace k sadě SDK: https://aka.ms/dotnet-sdk-docs - • Zpráva k vydání verze: https://aka.ms/dotnet7-release-notes + • Zpráva k vydání verze: https://aka.ms/dotnet[VERSIONMAJOR]-release-notes • Kurzy: https://aka.ms/dotnet-tutorials Sada .NET SDK @@ -76,7 +76,7 @@ Zdroje informací 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 se chystáte používat .NET 7.0 se sadou Visual Studio, potřebujete Visual Studio 2022 17.4 nebo novější. <A HREF="https://aka.ms/dotnet7-release-notes">Další informace</A>. + Pokud se chystáte používat .NET [VERSIONMAJOR].[VERSIONMINOR] se sadou Visual Studio, potřebujete Visual Studio 2022 17.4 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. 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/1031/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl index 8e7bc63c3..9785ec6e1 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl @@ -61,7 +61,7 @@ Dieses Produkt erfasst Nutzungsdaten. Ressourcen • .NET-Dokumentation: https://aka.ms/dotnet-docs • SDK-Dokumentation: https://aka.ms/dotnet-sdk-docs - • Versionshinweise: https://aka.ms/dotnet7-release-notes + • Versionshinweise: https://aka.ms/dotnet[VERSIONMAJOR]-release-notes • Tutorials: https://aka.ms/dotnet-tutorials .NET SDK @@ -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 .NET 7.0 mit Visual Studio verwenden möchten, ist Visual Studio 2022 17.4 oder höher erforderlich. <A HREF="https://aka.ms/dotnet7-release-notes">Weitere Informationen</A> + Wenn Sie .NET [VERSIONMAJOR].[VERSIONMINOR] mit Visual Studio verwenden möchten, ist Visual Studio 2022 17.4 oder höher erforderlich. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Weitere Informationen</A> Durch Klicken auf "Installieren" stimmen Sie den nachstehenden Bedingungen zu. 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/1033/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl index 5caf9204f..3f736ecff 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl @@ -61,7 +61,7 @@ This product collects usage data Resources • .NET Documentation https://aka.ms/dotnet-docs • SDK Documentation https://aka.ms/dotnet-sdk-docs - • Release Notes https://aka.ms/dotnet7-release-notes + • Release Notes https://aka.ms/dotnet[VERSIONMAJOR]-release-notes • Tutorials https://aka.ms/dotnet-tutorials .NET SDK @@ -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 7.0 with Visual Studio, Visual Studio 2022 17.4 or newer is required. <A HREF="https://aka.ms/dotnet7-release-notes">Learn more</A>. + 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>. 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 c536c3eb3..fc16071cb 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl @@ -19,7 +19,7 @@ &Installer &Fermer Avancement de l'installation - En cours : + En cours : Initialisation... &Annuler Modifier l'installation @@ -42,7 +42,7 @@ &Redémarrer &Fermer Fichiers en cours d'utilisation - Les applications suivantes utilisent des fichiers nécessitant une mise à jour : + Les applications suivantes utilisent des fichiers nécessitant une mise à jour : &Fermer les applications essayez de les ouvrir de nouveau. &Ne pas fermer les applications. Un redémarrage sera nécessaire. &OK @@ -61,11 +61,11 @@ Ce produit collecte des données d'utilisation Ressources • Documentation .NET sur https://aka.ms/dotnet-docs • Documentation de kit SDK sur https://aka.ms/dotnet-sdk-docs - • Notes de publication sur https://aka.ms/dotnet7-release-notes + • Notes de publication sur https://aka.ms/dotnet[VERSIONMAJOR]-release-notes • Tutoriels sur https://aka.ms/dotnet-tutorials SDK .NET - Le kit SDK .NET permet de générer, d'exécuter et de tester des applications .NET. Vous pouvez choisir parmi plusieurs langages, éditeurs et outils de développement. De plus, vous pouvez bénéficier d'un vaste écosystème de bibliothèques afin de générer des applications pour le web, les appareils mobiles, les ordinateurs de bureau, les jeux et l'IoT. Nous espérons que vous l'apprécierez ! + Le kit SDK .NET permet de générer, d'exécuter et de tester des applications .NET. Vous pouvez choisir parmi plusieurs langages, éditeurs et outils de développement. De plus, vous pouvez bénéficier d'un vaste écosystème de bibliothèques afin de générer des applications pour le web, les appareils mobiles, les ordinateurs de bureau, les jeux et l'IoT. Nous espérons que vous l'apprécierez ! En savoir plus sur .NET Ressources <A HREF="https://aka.ms/dotnet-docs">Documentation .NET</A> @@ -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 comptez utiliser .NET 7.0 avec Visual Studio, Visual Studio 2022 17.4 ou une version ultérieure est nécessaire. <A HREF="https://aka.ms/dotnet7-release-notes">En savoir plus</A>. + Si vous comptez 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>. En cliquant sur Installer, vous acceptez les conditions suivantes. 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/1040/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl index 5633413e5..fff78672c 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl @@ -61,7 +61,7 @@ Questo prodotto consente di raccogliere i dati sull'utilizzo Risorse • Documentazione di .NET https://aka.ms/dotnet-docs • Documentazione dell'SDK https://aka.ms/dotnet-sdk-docs - • Note sulla versione https://aka.ms/dotnet7-release-notes + • Note sulla versione https://aka.ms/dotnet[VERSIONMAJOR]-release-notes • Esercitazioni https://aka.ms/dotnet-tutorials .NET SDK @@ -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 intende usare .NET 7.0 con Visual Studio, è richiesto Visual Studio 2022 17.4 o versione successiva. <A HREF="https://aka.ms/dotnet7-release-notes">Altre informazioni</A>. + Se si intende usare .NET [VERSIONMAJOR].[VERSIONMINOR] con Visual Studio, è richiesto Visual Studio 2022 17.4 o versione successiva. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Altre informazioni</A>. Facendo clic su Installa, si accettano le condizioni seguenti. 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/1041/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl index 6d1134ef2..6fbf9211e 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl @@ -61,7 +61,7 @@ リソース • .NET ドキュメント https://aka.ms/dotnet-docs • SDK ドキュメント https://aka.ms/dotnet-sdk-docs - • リリース ノート https://aka.ms/dotnet7-release-notes + • リリース ノート https://aka.ms/dotnet[VERSIONMAJOR]-release-notes • チュートリアル https://aka.ms/dotnet-tutorials .NET SDK @@ -76,7 +76,7 @@ インストール メモ コマンドはインストール処理中に実行されるので、プロジェクトの復元速度が向上し、オフラインでアクセスできます。完了するまでに最大 1 分かかります。 - .NET 7.0 を Visual Studio で使用する場合は、Visual Studio 2022 17.4 以降が必要です。<A HREF="https://aka.ms/dotnet7-release-notes">詳細情報</A>。 + .NET [VERSIONMAJOR].[VERSIONMINOR] を Visual Studio で使用する場合は、Visual Studio 2022 17.4 以降が必要です。<A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">詳細情報</A>。 [インストール] をクリックすると、次の条項に同意したものと見なされます。 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/1042/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl index c086313c9..30af51882 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl @@ -61,7 +61,7 @@ 리소스 • .NET 설명서 https://aka.ms/dotnet-docs • SDK 설명서 https://aka.ms/dotnet-sdk-docs - • 릴리스 정보 https://aka.ms/dotnet7-release-notes + • 릴리스 정보 https://aka.ms/dotnet[VERSIONMAJOR]-release-notes • 자습서 https://aka.ms/dotnet-tutorials .NET SDK @@ -76,7 +76,7 @@ 설치 정보 프로젝트 복원 속도를 향상하고 오프라인 액세스를 사용할 수 있도록 하는 설치 프로세스 중 명령이 실행됩니다. 완료하는 데 최대 1분이 걸립니다. - Visual Studio와 함께 .NET 7.0을 사용하려면 Visual Studio 2022 17.4 이상이 필요합니다. <A HREF="https://aka.ms/dotnet7-release-notes">자세한 정보</A>. + Visual Studio와 함께 .NET [VERSIONMAJOR].[VERSIONMINOR]을 사용하려면 Visual Studio 2022 17.4 이상이 필요합니다. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">자세한 정보</A>. [설치]를 클릭하면 다음 사용 약관에 동의하는 것입니다. 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/1045/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl index 7139a7f10..a549591ca 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl @@ -61,7 +61,7 @@ Ten produkt gromadzi dane dotyczące użycia Zasoby • Dokumentacja platformy .NET: https://aka.ms/dotnet-docs • Dokumentacja zestawu SDK: https://aka.ms/dotnet-sdk-docs - • Informacje o wersji: https://aka.ms/dotnet7-release-notes + • Informacje o wersji: https://aka.ms/dotnet[VERSIONMAJOR]-release-notes • Samouczki: https://aka.ms/dotnet-tutorials .NET SDK @@ -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 7.0 z programem Visual Studio, wymagany jest program Visual Studio 2022 17.4 lub nowszy. <A HREF="https://aka.ms/dotnet7-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 17.4 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. 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/1046/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl index 807e819b7..7e992b7be 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl @@ -61,7 +61,7 @@ Este produto coleta dados de uso Recursos • Documentação do .NET: https://aka.ms/dotnet-docs • Documentação do SDK: https://aka.ms/dotnet-sdk-docs - • Notas sobre a Versão: https://aka.ms/dotnet7-release-notes + • Notas sobre a Versão: https://aka.ms/dotnet[VERSIONMAJOR]-release-notes • Tutoriais: https://aka.ms/dotnet-tutorials SDK do .NET @@ -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 7.0 com o Visual Studio, é necessário usar o Visual Studio 2022 17.4 ou mais recente. <A HREF="https://aka.ms/dotnet7-release-notes">Saiba mais</A>. + Se você planeja usar o .NET [VERSIONMAJOR].[VERSIONMINOR] com o Visual Studio, é necessário usar o Visual Studio 2022 17.4 ou mais recente. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Saiba mais</A>. Ao clicar em instalar, você concorda com os termos a seguir. 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/1049/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl index 789d01b60..c5d0d4d3e 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl @@ -5,14 +5,14 @@ Вы действительно хотите отменить? Предыдущая версия Справка по установке - /install | /repair | /uninstall | /layout [\[]"каталог"[\]] — установка, восстановление, удаление или - создание полной локальной копии пакета в каталоге. По умолчанию — "/install". + /install | /repair | /uninstall | /layout [\[]"каталог"[\]] — установка, восстановление, удаление или + создание полной локальной копии пакета в каталоге. По умолчанию — "/install". -/passive | /quiet — отображение минимального пользовательского интерфейса без запросов или работа без пользовательского интерфейса и +/passive | /quiet — отображение минимального пользовательского интерфейса без запросов или работа без пользовательского интерфейса и без запросов. По умолчанию отображаются пользовательский интерфейс и все запросы. -/norestart — подавление всех попыток перезагрузки. По умолчанию в пользовательском интерфейсе перед перезагрузкой отображается запрос. -/log [\[]"log.txt"[\]] — запись журнала в указанный файл. По умолчанию файл журнала создается в папке %TEMP%. +/norestart — подавление всех попыток перезагрузки. По умолчанию в пользовательском интерфейсе перед перезагрузкой отображается запрос. +/log [\[]"log.txt"[\]] — запись журнала в указанный файл. По умолчанию файл журнала создается в папке %TEMP%. З&акрыть Я &принимаю условия лицензии &Параметры @@ -50,10 +50,10 @@ Установка выполнена. Установлены следующие компоненты: - • Пакет SDK для .NET [DOTNETSDKVERSION] - • Среда выполнения .NET [DOTNETRUNTIMEVERSION] - • Среда выполнения ASP.NET Core [ASPNETCOREVERSION] - • Среда выполнения .NET для Windows Desktop [WINFORMSANDWPFVERSION] + • Пакет SDK для .NET [DOTNETSDKVERSION] + • Среда выполнения .NET [DOTNETRUNTIMEVERSION] + • Среда выполнения ASP.NET Core [ASPNETCOREVERSION] + • Среда выполнения .NET для Windows Desktop [WINFORMSANDWPFVERSION] Этот продукт собирает данные об использовании. • Чтобы получить дополнительные сведения или отказаться от использования продукта, перейдите на страницу https://aka.ms/dotnet-cli-telemetry @@ -61,9 +61,9 @@ Ресурсы • Документация по .NET: https://aka.ms/dotnet-docs • Документация по SDK: https://aka.ms/dotnet-sdk-docs - • Заметки о выпуске: https://aka.ms/dotnet7-release-notes + • Заметки о выпуске: https://aka.ms/dotnet[VERSIONMAJOR]-release-notes • Учебники: https://aka.ms/dotnet-tutorials - Пакет SDK для .NET + Пакет SDK для .NET Пакет SDK для .NET используется для сборки, запуска и тестирования приложений .NET. Вы можете выбрать один из нескольких языков, использовать различные редакторы и инструменты для разработчиков, а также воспользоваться преимуществами большой экосистемы библиотек для создания веб-приложений, мобильных и классических приложений, игр и приложений Интернета вещей. Надеемся, вам понравится! Дополнительные сведения о .NET @@ -76,7 +76,7 @@ Примечание по установке В процессе установки будет выполнена команда, которая увеличит скорость восстановления проекта и обеспечит автономный доступ. Выполнение займет до минуты. - Если вы планируете использовать .NET 7.0 с Visual Studio, требуется Visual Studio 2022 версии 17.4 или более поздней. <A HREF="https://aka.ms/dotnet7-release-notes">Дополнительные сведения</A>. + Если вы планируете использовать .NET [VERSIONMAJOR].[VERSIONMINOR] с Visual Studio, требуется Visual Studio 2022 версии 17.4 или более поздней. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Дополнительные сведения</A>. Нажимая кнопку "Установить", вы принимаете следующие условия. 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/1055/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl index 93d628b74..93e8fdf10 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl @@ -61,7 +61,7 @@ Bu ürün, kullanım verilerini toplar Kaynaklar • .NET Belgeleri https://aka.ms/dotnet-docs • SDK Belgeleri https://aka.ms/dotnet-sdk-docs - • Sürüm Notları https://aka.ms/dotnet7-release-notes + • Sürüm Notları https://aka.ms/dotnet[VERSIONMAJOR]-release-notes • Öğreticiler https://aka.ms/dotnet-tutorials .NET SDK'sı @@ -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 7.0 kullanmayı planlıyorsanız Visual Studio 2022 17.4 veya üzeri bir sürüm gerekir. <A HREF="https://aka.ms/dotnet7-release-notes">Daha Fazla Bilgi</A>. + 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</A>. Yükle'ye tıklayarak aşağıdaki koşulları kabul etmiş olursunuz. 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/2052/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl index a0e8980fd..29b6f1efe 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl @@ -61,7 +61,7 @@ 资源 • .NET 文档: https://aka.ms/dotnet-docs • SDK 文档: https://aka.ms/dotnet-sdk-docs - • 发行说明: https://aka.ms/dotnet7-release-notes + • 发行说明: https://aka.ms/dotnet[VERSIONMAJOR]-release-notes • 教程: https://aka.ms/dotnet-tutorials .NET SDK @@ -76,7 +76,7 @@ 安装说明 将在要提升项目还原速度并实现脱机访问的安装进程期间运行命令。此操作最多 1 分钟即可完成。 - 如果打算结合使用 .NET 7.0 和 Visual Studio，需要 Visual Studio 2022 17.4 或更高版本。<A HREF="https://aka.ms/dotnet7-release-notes">了解详细信息</A>。 + 如果打算结合使用 .NET [VERSIONMAJOR].[VERSIONMINOR] 和 Visual Studio，需要 Visual Studio 2022 17.4 或更高版本。<A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">了解详细信息</A>。 单击“安装”即表示你同意以下条款。 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/3082/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl index 67487f10d..fcea89ce2 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl @@ -61,7 +61,7 @@ Este producto recopila datos de uso Recursos • Documentación de .NET https://aka.ms/dotnet-docs • Documentación del SDK https://aka.ms/dotnet-sdk-docs - • Notas de la versión https://aka.ms/dotnet7-release-notes + • Notas de la versión https://aka.ms/dotnet[VERSIONMAJOR]-release-notes • Tutoriales https://aka.ms/dotnet-tutorials SDK de .NET @@ -76,7 +76,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 usar .NET 7.0 con Visual Studio, se requiere Visual Studio 2022 17.4 o una versión más reciente. <A HREF="https://aka.ms/dotnet7-release-notes">Obtenga más información</A>. + Si tiene previsto usar .NET [VERSIONMAJOR].[VERSIONMINOR] con Visual Studio, se requiere Visual Studio 2022 17.4 o una versión más reciente. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Obtenga más información</A>. Al hacer clic en Instalar, acepta los términos siguientes. 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/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index bac843303..ea5a58ae6 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -150,6 +150,8 @@ + + diff --git a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 index 4cf3d5697..4d0f91565 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 @@ -25,6 +25,8 @@ param( [Parameter(Mandatory=$true)][string]$DotnetMSIVersion, [Parameter(Mandatory=$true)][string]$SDKBundleVersion, [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion, + [Parameter(Mandatory=$true)][string]$VersionMajor, + [Parameter(Mandatory=$true)][string]$VersionMinor, [Parameter(Mandatory=$true)][string]$WindowsDesktopVersion, [Parameter(Mandatory=$true)][string]$UpgradeCode, [Parameter(Mandatory=$true)][string]$DependencyKeyName, @@ -49,6 +51,8 @@ function RunCandleForBundle -dSDKBundleVersion="$SDKBundleVersion" ` -dSDKProductBandVersion="$SDKProductBandVersion" ` -dNugetVersion="$DotnetCLINugetVersion" ` + -dVersionMajor="$VersionMajor" ` + -dVersionMinor="$VersionMinor" ` -dCLISDKMsiSourcePath="$CLISDKMSIFile" ` -dDependencyKeyName="$DependencyKeyName" ` -dUpgradeCode="$UpgradeCode" ` diff --git a/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 b/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 index 13b4e9636..126f42804 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 @@ -10,6 +10,8 @@ param( [Parameter(Mandatory=$true)][string]$DotnetMSIVersion, [Parameter(Mandatory=$true)][string]$SDKBundleVersion, [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion, + [Parameter(Mandatory=$true)][string]$VersionMajor, + [Parameter(Mandatory=$true)][string]$VersionMinor, [Parameter(Mandatory=$true)][string]$UpgradeCode, [Parameter(Mandatory=$true)][string]$DependencyKeyName, [Parameter(Mandatory=$true)][string]$Architecture, @@ -68,6 +70,8 @@ function RunCandle -dSdkFeatureBandVersion="$SdkFeatureBandVersion" ` -dSDKBundleVersion="$SDKBundleVersion" ` -dNugetVersion="$DotnetCLINugetVersion" ` + -dVersionMajor="$VersionMajor" ` + -dVersionMinor="$VersionMinor" ` -dUpgradeCode="$UpgradeCode" ` -dDependencyKeyName="$DependencyKeyName" ` -arch "$Architecture" ` diff --git a/src/redist/targets/packaging/windows/clisdk/generatesdkplaceholdermsi.ps1 b/src/redist/targets/packaging/windows/clisdk/generatesdkplaceholdermsi.ps1 index 4461b0cc9..a4f167458 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatesdkplaceholdermsi.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatesdkplaceholdermsi.ps1 @@ -8,6 +8,8 @@ param( [Parameter(Mandatory=$true)][string]$DotnetMSIVersion, [Parameter(Mandatory=$true)][string]$SDKBundleVersion, [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion, + [Parameter(Mandatory=$true)][string]$VersionMajor, + [Parameter(Mandatory=$true)][string]$VersionMinor, [Parameter(Mandatory=$true)][string]$UpgradeCode, [Parameter(Mandatory=$true)][string]$DependencyKeyName, [Parameter(Mandatory=$true)][string]$Architecture @@ -27,6 +29,8 @@ function RunCandle -dBuildVersion="$DotnetMSIVersion" ` -dSDKBundleVersion="$SDKBundleVersion" ` -dNugetVersion="$DotnetCLINugetVersion" ` + -dVersionMajor="$VersionMajor" ` + -dVersionMinor="$VersionMinor" ` -dUpgradeCode="$UpgradeCode" ` -dDependencyKeyName="$DependencyKeyName" ` -arch "$Architecture" ` diff --git a/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 b/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 index ecbb68ba6..2858c5913 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 @@ -9,6 +9,8 @@ param( [Parameter(Mandatory=$true)][string]$DotnetMSIVersion, [Parameter(Mandatory=$true)][string]$SDKBundleVersion, [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion, + [Parameter(Mandatory=$true)][string]$VersionMajor, + [Parameter(Mandatory=$true)][string]$VersionMinor, [Parameter(Mandatory=$true)][string]$UpgradeCode, [Parameter(Mandatory=$true)][string]$DependencyKeyName, [Parameter(Mandatory=$true)][string]$Architecture @@ -59,6 +61,8 @@ function RunCandle -dBuildVersion="$DotnetMSIVersion" ` -dSDKBundleVersion="$SDKBundleVersion" ` -dNugetVersion="$DotnetCLINugetVersion" ` + -dVersionMajor="$VersionMajor" ` + -dVersionMinor="$VersionMinor" ` -dUpgradeCode="$UpgradeCode" ` -dDependencyKeyName="$DependencyKeyName" ` -arch "$Architecture" `