diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets
index 34833a423..b80378d09 100644
--- a/src/redist/targets/BundledTemplates.targets
+++ b/src/redist/targets/BundledTemplates.targets
@@ -184,7 +184,7 @@
+ Condition="$(ProductMonikerRid.StartsWith('win')) And '$(Architecture)' != 'arm'">
diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 031cce670..9a3fe30eb 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -108,14 +108,12 @@
-
+
+
-
-
$(CoreSetupRootUrl)$(NETCoreAppTargetingPackBlobVersion)
@@ -199,7 +200,7 @@
+ Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
$(CoreSetupRootUrl)$(CoreSetupBlobVersion)
$(DownloadedNetCoreAppHostPackInstallerFileName)
@@ -252,19 +253,19 @@
+ Condition="'$(InstallerExtension)' != '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
$(AspNetCoreSharedFxRootUrl)$(AspNetCoreTargetingPackBlobVersion)
$(DownloadedAspNetTargetingPackInstallerFileName)
+ Condition="'$(InstallerExtension)' != '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion)
$(DownloadedAspNetCoreSharedFxInstallerFileName)
+ Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' == '.msi' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion)
$(DownloadedAspNetCoreSharedFxWixLibFileName)
@@ -276,7 +277,7 @@
+ Condition="!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64'">
$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion)
$(AspNetCoreSharedFxBaseRuntimeVersionFileName)
@@ -284,7 +285,7 @@
false
- true
+ true
false
diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets
index ed366530f..93c431620 100644
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@@ -14,7 +14,7 @@
- 3.10.4
+ 3.14.0.4118
https://dotnetcli.azureedge.net/build/wix/wix.$(WixVersion).zip
$(ArtifactsDir)Tools/WixTools/$(WixVersion)
$(WixRoot)/WixTools.$(WixVersion).zip
@@ -247,7 +247,7 @@
@@ -295,6 +295,9 @@
$(Templates50InstallerUpgradeCode)
NetCore_Templates_5.0
+
+
+
$(Templates31LayoutPath.TrimEnd('\'))
$(Templates31MSIInstallerFile)
@@ -551,7 +554,7 @@
GenerateVSToolsResolverNupkg;
GenerateSdkMSBuildExtensionsNupkg;
GenerateVSTemplateLocatorNupkg"
- Condition=" '$(OS)' == 'Windows_NT' and !$(Architecture.StartsWith('arm')) " />
+ Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' != 'arm' " />
diff --git a/src/redist/targets/Signing.targets b/src/redist/targets/Signing.targets
index a4d986179..c4ebc6ed7 100644
--- a/src/redist/targets/Signing.targets
+++ b/src/redist/targets/Signing.targets
@@ -183,10 +183,15 @@
+
+
+
-
+
+
+
$(InternalCertificateId)
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 004138691..fd301d870 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl
@@ -58,6 +58,21 @@
此產品會收集使用方式資料
• 如需詳細資訊並退出,請前往 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 d190f3138..d17c6fcc7 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl
@@ -58,6 +58,21 @@ 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 fb193fb93..a197ee67a 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl
@@ -58,6 +58,21 @@ 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 2e3e86df2..9944d6e4d 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl
@@ -58,6 +58,21 @@ 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 38cc06a3d..673804e94 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl
@@ -58,6 +58,21 @@ 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 4e9dc4b4a..5c60d0246 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl
@@ -58,6 +58,21 @@ 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 6bdfe68ff..36639d88a 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl
@@ -58,6 +58,21 @@
この製品は使用状況データを収集します
• 詳細およびオプトアウト 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 99a59349c..e8fde1177 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl
@@ -58,6 +58,21 @@
이 제품은 사용량 현황 데이터를 수집합니다.
• 추가 정보 및 옵트아웃 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 c22a5a48e..7b7e0aca2 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl
@@ -58,6 +58,21 @@ 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 42e7dbca4..257d6ebb7 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl
@@ -58,6 +58,21 @@ 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 e79c2aa1f..d9508dcd5 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl
@@ -58,6 +58,21 @@
Этот продукт собирает данные об использовании.
• Чтобы получить дополнительные сведения или отказаться от использования продукта, перейдите на страницу 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 f80a96737..8b194934c 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl
@@ -58,6 +58,21 @@ 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 d3e6e3568..661b39718 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl
@@ -58,6 +58,21 @@
此产品会收集用法数据
• 详细信息和选择退出选项: 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 d70eaa727..b15841abd 100644
--- a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl
@@ -58,6 +58,21 @@ 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 6b41f8564..e22f99c6f 100644
--- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs
@@ -14,6 +14,10 @@
WixBundleInstalled OR ((NOT (DOTNETHOME_X64 ~= DOTNETHOME_X86)) OR DOTNETHOMESIMILARITYCHECKOVERRIDE)
+
+ WixBundleInstalled OR ((NOT (DOTNETHOME_ARM64 ~= DOTNETHOME_X86)) OR DOTNETHOMESIMILARITYCHECKOVERRIDE)
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -107,15 +142,13 @@
-
-
-
+
@@ -128,12 +161,16 @@
-
-
+
+
+
+
+
+
@@ -142,6 +179,7 @@
+
@@ -149,13 +187,23 @@
+
+
+
+
+
+
+
+
diff --git a/src/redist/targets/packaging/windows/clisdk/bundleArm64.thm b/src/redist/targets/packaging/windows/clisdk/bundleArm64.thm
new file mode 100644
index 000000000..3a6f14708
--- /dev/null
+++ b/src/redist/targets/packaging/windows/clisdk/bundleArm64.thm
@@ -0,0 +1,95 @@
+
+
+ #(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)
+
+
+
+
diff --git a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs
index 0474cb9e0..4c4c9fcc8 100644
--- a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs
@@ -2,7 +2,7 @@
-
+
Installed OR ALLOWMSIINSTALL
diff --git a/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs b/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs
index df568a37e..a84391c81 100644
--- a/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs
@@ -15,6 +15,12 @@
+
+ VersionNT64 AND DOTNETHOME_ARM64
+
+
+
+
VersionNT64 AND DOTNETHOME_X64
diff --git a/src/redist/targets/packaging/windows/clisdk/templates.wxs b/src/redist/targets/packaging/windows/clisdk/templates.wxs
index b3e9515ef..a2ef49c4b 100644
--- a/src/redist/targets/packaging/windows/clisdk/templates.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/templates.wxs
@@ -2,7 +2,7 @@
-
+
Installed OR ALLOWMSIINSTALL
diff --git a/src/redist/targets/packaging/windows/clisdk/variables.wxi b/src/redist/targets/packaging/windows/clisdk/variables.wxi
index c9536e77a..bad1ff7ef 100644
--- a/src/redist/targets/packaging/windows/clisdk/variables.wxi
+++ b/src/redist/targets/packaging/windows/clisdk/variables.wxi
@@ -26,10 +26,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs
index 97293638a..11c64c7f7 100644
--- a/test/EndToEnd/ProjectBuildTests.cs
+++ b/test/EndToEnd/ProjectBuildTests.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.IO;
-using System.Linq;
using System.Runtime.InteropServices;
using System.Xml.Linq;
using Microsoft.DotNet.TestFramework;
@@ -83,51 +82,6 @@ namespace EndToEnd.Tests
.Should().Pass().And.HaveStdOutContaining("Hello World!");
}
- [WindowsOnlyFact]
- public void ItCanPublishArm64Winforms()
- {
- DirectoryInfo directory = TestAssets.CreateTestDirectory();
- string projectDirectory = directory.FullName;
-
- string newArgs = "winforms --no-restore";
- new NewCommandShim()
- .WithWorkingDirectory(projectDirectory)
- .Execute(newArgs)
- .Should().Pass();
-
- string publishArgs="-r win-arm64";
- new PublishCommand()
- .WithWorkingDirectory(projectDirectory)
- .Execute(publishArgs)
- .Should().Pass();
-
- var selfContainedPublishDir = new DirectoryInfo(projectDirectory)
- .Sub("bin").Sub("Debug").GetDirectories().FirstOrDefault()
- .Sub("win-arm64").Sub("publish");
-
- selfContainedPublishDir.Should().HaveFilesMatching("System.Windows.Forms.dll", SearchOption.TopDirectoryOnly);
- selfContainedPublishDir.Should().HaveFilesMatching($"{directory.Name}.dll", SearchOption.TopDirectoryOnly);
- }
-
- [WindowsOnlyFact]
- public void ItCantPublishArm64Wpf()
- {
- DirectoryInfo directory = TestAssets.CreateTestDirectory();
- string projectDirectory = directory.FullName;
-
- string newArgs = "wpf --no-restore";
- new NewCommandShim()
- .WithWorkingDirectory(projectDirectory)
- .Execute(newArgs)
- .Should().Pass();
-
- string publishArgs="-r win-arm64";
- new PublishCommand()
- .WithWorkingDirectory(projectDirectory)
- .Execute(publishArgs)
- .Should().Fail();
- }
-
[Theory]
[InlineData("console")]
[InlineData("classlib")]