diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 58f2c722d..0c0f92684 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -220,7 +220,7 @@ + Condition="'$(InstallerExtension)' == '.msi' And '$(SkipBuildingInstallers)' != 'true' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')"> $(WinFormsAndWpfSharedFxRootUrl)$(WindowsDesktopTargetingPackBlobVersion) $(DownloadedWindowsDesktopTargetingPackInstallerFileName) @@ -299,7 +299,7 @@ + Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')"> $(WinFormsAndWpfSharedFxRootUrl)$(WindowsDesktopBlobVersion) $(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName) 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 fd301d870..004138691 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl @@ -58,21 +58,6 @@ 此產品會收集使用方式資料 • 如需詳細資訊並退出,請前往 https://aka.ms/dotnet-cli-telemetry -資源 - • 如需 .NET 文件,請前往 https://aka.ms/dotnet-docs - • 如需 SDK 文件,請前往 https://aka.ms/dotnet-sdk-docs - • 如需版本資訊,請前往 https://aka.ms/dotnet5-release-notes - • 如需教學課程,請前往 https://aka.ms/dotnet-tutorials -安裝成功。 - -下列項目已安裝在: '[DOTNETHOME]' - • .NET SDK [DOTNETSDKVERSION] - • .NET Runtime [DOTNETRUNTIMEVERSION] - • ASP.NET Core Runtime [ASPNETCOREVERSION] - -此產品會收集使用方式資料 - • 如需詳細資訊並退出,請前往 https://aka.ms/dotnet-cli-telemetry - 資源 • 如需 .NET 文件,請前往 https://aka.ms/dotnet-docs • 如需 SDK 文件,請前往 https://aka.ms/dotnet-sdk-docs 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 d17c6fcc7..d190f3138 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl @@ -58,21 +58,6 @@ Do [DOTNETHOME] byly nainstalovány tyto součásti: Tento produkt shromažďuje data o využití. • Další informace a vyjádření výslovného nesouhlasu: https://aka.ms/dotnet-cli-telemetry -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/dotnet5-release-notes - • Kurzy: https://aka.ms/dotnet-tutorials - Instalace proběhla úspěšně. - -Do [DOTNETHOME] byly nainstalovány tyto součásti: - • Sada .NET SDK [DOTNETSDKVERSION] - • Modul runtime .NET [DOTNETRUNTIMEVERSION] - • Modul runtime ASP.NET Core [ASPNETCOREVERSION] - -Tento produkt shromažďuje data o využití. - • Další informace a vyjádření výslovného nesouhlasu: https://aka.ms/dotnet-cli-telemetry - Zdroje informací • Dokumentace k .NET : https://aka.ms/dotnet-docs • Dokumentace k sadě SDK: https://aka.ms/dotnet-sdk-docs 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 a197ee67a..fb193fb93 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl @@ -58,21 +58,6 @@ Folgende Komponenten wurden unter [DOTNETHOME] installiert: Dieses Produkt erfasst Nutzungsdaten. • Weitere Informationen und Deaktivieren der Erfassung: https://aka.ms/dotnet-cli-telemetry -Ressourcen - • .NET-Dokumentation: https://aka.ms/dotnet-docs - • SDK-Dokumentation: https://aka.ms/dotnet-sdk-docs - • Versionshinweise: https://aka.ms/dotnet5-release-notes - • Tutorials: https://aka.ms/dotnet-tutorials -Die Installation war erfolgreich. - -Folgende Komponenten wurden unter [DOTNETHOME] installiert: - • .NET SDK [DOTNETSDKVERSION] - • .NET-Runtime [DOTNETRUNTIMEVERSION] - • ASP.NET Core-Runtime [ASPNETCOREVERSION] - -Dieses Produkt erfasst Nutzungsdaten. - • Weitere Informationen und Deaktivieren der Erfassung: https://aka.ms/dotnet-cli-telemetry - Ressourcen • .NET-Dokumentation: https://aka.ms/dotnet-docs • SDK-Dokumentation: https://aka.ms/dotnet-sdk-docs 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 9944d6e4d..2e3e86df2 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl @@ -58,21 +58,6 @@ The following were installed at: '[DOTNETHOME]' This product collects usage data • More information and opt-out https://aka.ms/dotnet-cli-telemetry -Resources - • .NET Documentation https://aka.ms/dotnet-docs - • SDK Documentation https://aka.ms/dotnet-sdk-docs - • Release Notes https://aka.ms/dotnet5-release-notes - • Tutorials https://aka.ms/dotnet-tutorials -The installation was successful. - -The following were installed at: '[DOTNETHOME]' - • .NET SDK [DOTNETSDKVERSION] - • .NET Runtime [DOTNETRUNTIMEVERSION] - • ASP.NET Core Runtime [ASPNETCOREVERSION] - -This product collects usage data - • More information and opt-out https://aka.ms/dotnet-cli-telemetry - Resources • .NET Documentation https://aka.ms/dotnet-docs • SDK Documentation https://aka.ms/dotnet-sdk-docs 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 673804e94..38cc06a3d 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl @@ -58,21 +58,6 @@ Les éléments suivants ont été installés sur : '[DOTNETHOME]' Ce produit collecte des données d'utilisation • Plus informations et refus d'adhésion sur https://aka.ms/dotnet-cli-telemetry -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/dotnet5-release-notes - • Tutoriels sur https://aka.ms/dotnet-tutorials - L'installation a réussi. - -Les éléments suivants ont été installés sur : '[DOTNETHOME]' - • Kit SDK .NET [DOTNETSDKVERSION] - • Runtime .NET [DOTNETRUNTIMEVERSION] - • Runtime ASP.NET Core [ASPNETCOREVERSION] - -Ce produit collecte des données d'utilisation - • Plus informations et refus d'adhésion sur https://aka.ms/dotnet-cli-telemetry - Ressources • Documentation .NET sur https://aka.ms/dotnet-docs • Documentation de kit SDK sur https://aka.ms/dotnet-sdk-docs 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 5c60d0246..4e9dc4b4a 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl @@ -58,21 +58,6 @@ I componenti seguenti sono stati installati in '[DOTNETHOME]' Questo prodotto consente di raccogliere i dati sull'utilizzo • Altre informazioni e annullamento sottoscrizione https://aka.ms/dotnet-cli-telemetry -Risorse - • Documentazione di .NET https://aka.ms/dotnet-docs - • Documentazione dell'SDK https://aka.ms/dotnet-sdk-docs - • Note sulla versione https://aka.ms/dotnet5-release-notes - • Esercitazioni https://aka.ms/dotnet-tutorials - L'installazione è riuscita. - -I componenti seguenti sono stati installati in '[DOTNETHOME]' - • .NET SDK [DOTNETSDKVERSION] - • Runtime di .NET [DOTNETRUNTIMEVERSION] - • Runtime di ASP.NET Core [ASPNETCOREVERSION] - -Questo prodotto consente di raccogliere i dati sull'utilizzo - • Altre informazioni e annullamento sottoscrizione https://aka.ms/dotnet-cli-telemetry - Risorse • Documentazione di .NET https://aka.ms/dotnet-docs • Documentazione dell'SDK https://aka.ms/dotnet-sdk-docs 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 36639d88a..6bdfe68ff 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl @@ -58,21 +58,6 @@ この製品は使用状況データを収集します • 詳細およびオプトアウト https://aka.ms/dotnet-cli-telemetry -リソース - • .NET ドキュメント https://aka.ms/dotnet-docs - • SDK ドキュメント https://aka.ms/dotnet-sdk-docs - • リリース ノート https://aka.ms/dotnet5-release-notes - • チュートリアル https://aka.ms/dotnet-tutorials - インストールが成功しました。 - -'[DOTNETHOME]' に以下がインストールされました - • .NET SDK [DOTNETSDKVERSION] - • .NET Runtime [DOTNETRUNTIMEVERSION] - • ASP.NET Core Runtime [ASPNETCOREVERSION] - -この製品は使用状況データを収集します - • 詳細およびオプトアウト https://aka.ms/dotnet-cli-telemetry - リソース • .NET ドキュメント https://aka.ms/dotnet-docs • SDK ドキュメント https://aka.ms/dotnet-sdk-docs 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 e8fde1177..99a59349c 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl @@ -58,21 +58,6 @@ 이 제품은 사용량 현황 데이터를 수집합니다. • 추가 정보 및 옵트아웃 https://aka.ms/dotnet-cli-telemetry -리소스 - • .NET 설명서 https://aka.ms/dotnet-docs - • SDK 설명서 https://aka.ms/dotnet-sdk-docs - • 릴리스 정보 https://aka.ms/dotnet5-release-notes - • 자습서 https://aka.ms/dotnet-tutorials - 설치가 완료되었습니다. - -다음이 '[DOTNETHOME]'에 설치되었습니다. - • .NET SDK [DOTNETSDKVERSION] - • .NET 런타임 [DOTNETRUNTIMEVERSION] - • ASP.NET Core 런타임 [ASPNETCOREVERSION] - -이 제품은 사용량 현황 데이터를 수집합니다. - • 추가 정보 및 옵트아웃 https://aka.ms/dotnet-cli-telemetry - 리소스 • .NET 설명서 https://aka.ms/dotnet-docs • SDK 설명서 https://aka.ms/dotnet-sdk-docs 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 7b7e0aca2..c22a5a48e 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl @@ -58,21 +58,6 @@ Następujące elementy zostały zainstalowane w: „[DOTNETHOME]” Ten produkt gromadzi dane dotyczące użycia • Więcej informacji i rezygnacja: https://aka.ms/dotnet-cli-telemetry -Zasoby - • Dokumentacja platformy .NET: https://aka.ms/dotnet-docs - • Dokumentacja zestawu SDK: https://aka.ms/dotnet-sdk-docs - • Informacje o wersji: https://aka.ms/dotnet5-release-notes - • Samouczki: https://aka.ms/dotnet-tutorials - Instalacja zakończyła się pomyślnie. - -Następujące elementy zostały zainstalowane w: „[DOTNETHOME]” - • Zestaw .NET SDK [DOTNETSDKVERSION] - • Środowisko uruchomieniowe platformy .NET [DOTNETRUNTIMEVERSION] - • Środowisko uruchomieniowe platformy ASP.NET Core [ASPNETCOREVERSION] - -Ten produkt gromadzi dane dotyczące użycia - • Więcej informacji i rezygnacja: https://aka.ms/dotnet-cli-telemetry - Zasoby • Dokumentacja platformy .NET: https://aka.ms/dotnet-docs • Dokumentacja zestawu SDK: https://aka.ms/dotnet-sdk-docs 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 257d6ebb7..42e7dbca4 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl @@ -58,21 +58,6 @@ O seguinte foi instalado em: '[DOTNETHOME]' Este produto coleta dados de uso • Para obter mais informações ou recusá-lo, acesse https://aka.ms/dotnet-cli-telemetry -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/netcore3releasenotes - • Tutoriais: https://aka.ms/dotnet-tutorials - A instalação foi bem-sucedida. - -O seguinte foi instalado em: '[DOTNETHOME]' - • SDK do .NET [DOTNETSDKVERSION] - • Runtime do .NET [DOTNETRUNTIMEVERSION] - • Runtime do ASP.NET Core [ASPNETCOREVERSION] - -Este produto coleta dados de uso - • Para obter mais informações ou recusá-lo, acesse https://aka.ms/dotnet-cli-telemetry - Recursos • Documentação do .NET: https://aka.ms/dotnet-docs • Documentação do SDK: https://aka.ms/dotnet-sdk-docs 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 d9508dcd5..e79c2aa1f 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl @@ -58,21 +58,6 @@ Этот продукт собирает данные об использовании. • Чтобы получить дополнительные сведения или отказаться от использования продукта, перейдите на страницу https://aka.ms/dotnet-cli-telemetry -Ресурсы - • Документация по .NET: https://aka.ms/dotnet-docs - • Документация по SDK: https://aka.ms/dotnet-sdk-docs - • Заметки о выпуске: https://aka.ms/dotnet5-release-notes - • Учебники: https://aka.ms/dotnet-tutorials - Установка выполнена. - -В "[DOTNETHOME]" установлены следующие компоненты: - • Пакет SDK для .NET [DOTNETSDKVERSION] - • Среда выполнения .NET [DOTNETRUNTIMEVERSION] - • Среда выполнения ASP.NET Core [ASPNETCOREVERSION] - -Этот продукт собирает данные об использовании. - • Чтобы получить дополнительные сведения или отказаться от использования продукта, перейдите на страницу https://aka.ms/dotnet-cli-telemetry - Ресурсы • Документация по .NET: https://aka.ms/dotnet-docs • Документация по SDK: https://aka.ms/dotnet-sdk-docs 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 8b194934c..f80a96737 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl @@ -58,21 +58,6 @@ Aşağıdakiler şu konumda yüklü: '[DOTNETHOME]' Bu ürün, kullanım verilerini toplar • Daha fazla bilgi ve katılmamayı seçmek için bkz. https://aka.ms/dotnet-cli-telemetry -Kaynaklar - • .NET Belgeleri https://aka.ms/dotnet-docs - • SDK Belgeleri https://aka.ms/dotnet-sdk-docs - • Sürüm Notları https://aka.ms/dotnet5-release-notes - • Öğreticiler https://aka.ms/dotnet-tutorials - Yükleme başarılı oldu. - -Aşağıdakiler şu konumda yüklü: '[DOTNETHOME]' - • .NET SDK [DOTNETSDKVERSION] - • .NET Çalışma Zamanı [DOTNETRUNTIMEVERSION] - • ASP.NET Core Çalışma Zamanı [ASPNETCOREVERSION] - -Bu ürün, kullanım verilerini toplar - • Daha fazla bilgi ve katılmamayı seçmek için bkz. https://aka.ms/dotnet-cli-telemetry - Kaynaklar • .NET Belgeleri https://aka.ms/dotnet-docs • SDK Belgeleri https://aka.ms/dotnet-sdk-docs 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 661b39718..d3e6e3568 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl @@ -58,21 +58,6 @@ 此产品会收集用法数据 • 详细信息和选择退出选项: https://aka.ms/dotnet-cli-telemetry -资源 - • .NET 文档: https://aka.ms/dotnet-docs - • SDK 文档: https://aka.ms/dotnet-sdk-docs - • 发行说明: https://aka.ms/dotnet5-release-notes - • 教程: https://aka.ms/dotnet-tutorials -已成功安装。 - -下列项安装于: "[DOTNETHOME]" - • .NET SDK [DOTNETSDKVERSION] - • .NET 运行时 [DOTNETRUNTIMEVERSION] - • ASP.NET Core 运行时 [ASPNETCOREVERSION] - -此产品会收集用法数据 - • 详细信息和选择退出选项: https://aka.ms/dotnet-cli-telemetry - 资源 • .NET 文档: https://aka.ms/dotnet-docs • SDK 文档: https://aka.ms/dotnet-sdk-docs 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 b15841abd..d70eaa727 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl @@ -58,21 +58,6 @@ Se instaló lo siguiente en: "[DOTNETHOME]" Este producto recopila datos de uso • Para obtener más información y declinar la participación, visite https://aka.ms/dotnet-cli-telemetry -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/dotnet5-release-notes - • Tutoriales https://aka.ms/dotnet-tutorials - La instalación se realizó correctamente. - -Se instaló lo siguiente en: "[DOTNETHOME]" - • SDK de .NET [DOTNETSDKVERSION] - • .NET Runtime [DOTNETRUNTIMEVERSION] - • ASP.NET Core Runtime [ASPNETCOREVERSION] - -Este producto recopila datos de uso - • Para obtener más información y declinar la participación, visite https://aka.ms/dotnet-cli-telemetry - Recursos • Documentación de .NET https://aka.ms/dotnet-docs • Documentación del SDK https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index 84d0675ac..31f8bc56b 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -161,13 +161,13 @@ + - @@ -195,15 +195,7 @@ - - - - - - diff --git a/src/redist/targets/packaging/windows/clisdk/bundleArm64.thm b/src/redist/targets/packaging/windows/clisdk/bundleArm64.thm deleted file mode 100644 index 3a6f14708..000000000 --- a/src/redist/targets/packaging/windows/clisdk/bundleArm64.thm +++ /dev/null @@ -1,95 +0,0 @@ - - - #(loc.Caption) - Segoe UI - Segoe UI - Segoe UI - Segoe UI - Segoe UI - Segoe UI - - #(loc.Title) - - - - - - #(loc.HelpHeader) - #(loc.HelpText) - - - - - - - - #(loc.WelcomeHeaderMessage) - #(loc.WelcomeDescription) - #(loc.VisualStudioWarning) - #(loc.LicenseAssent) - #(loc.PrivacyStatementLink) - #(loc.DotNetEulaLink) - - - - - - - #(loc.FilesInUseHeader) - #(loc.FilesInUseLabel) - - - - - - - - - - - - - - #(loc.ProgressHeader) - #(loc.ProgressLabel) - #(loc.OverallProgressPackageText) - - - - - - - - #(loc.ModifyHeader) - - - - - - - - - #(loc.SuccessHeader) - #(loc.FirstTimeWelcomeMessageArm64) - #(loc.SuccessRepairHeader) - #(loc.SuccessUninstallHeader) - - #(loc.SuccessRestartText) - - - - - - - - #(loc.FailureHeader) - #(loc.FailureInstallHeader) - #(loc.FailureUninstallHeader) - #(loc.FailureRepairHeader) - #(loc.FailureHyperlinkLogText) - - #(loc.FailureRestartText) - - - -