mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Include WindowsDesktop assets in the arm64 bundled installer (#8965)

Browse source 
* Revert "Create ARM64 verision of bundle theme file to account for lack of WindowsDesktop support"
This reverts commit d590b93a1b.

* Include WindowsDesktop assets in the arm64 bundled installer

* Download ARM64 WindowsDesktop msi
This commit is contained in:
Juan Hoyos 2020-10-22 21:01:47 -07:00 • committed by GitHub
parent 3c9f9f35dd
commit b45ea003fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 3 additions and 316 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/redist/targets/GenerateLayout.targets
View file

@ -220,7 +220,7 @@
</BundledInstallerComponent> </BundledInstallerComponent>
<BundledInstallerComponent Include="DownloadedWindowsDesktopTargetingPackInstallerFile" <BundledInstallerComponent Include="DownloadedWindowsDesktopTargetingPackInstallerFile"
Condition="'$(InstallerExtension)' == '.msi' And '$(SkipBuildingInstallers)' != 'true' And !$(Architecture.StartsWith('arm'))"> Condition="'$(InstallerExtension)' == '.msi' And '$(SkipBuildingInstallers)' != 'true' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
<BaseUrl>$(WinFormsAndWpfSharedFxRootUrl)$(WindowsDesktopTargetingPackBlobVersion)</BaseUrl> <BaseUrl>$(WinFormsAndWpfSharedFxRootUrl)$(WindowsDesktopTargetingPackBlobVersion)</BaseUrl>
<DownloadFileName>$(DownloadedWindowsDesktopTargetingPackInstallerFileName)</DownloadFileName> <DownloadFileName>$(DownloadedWindowsDesktopTargetingPackInstallerFileName)</DownloadFileName>
</BundledInstallerComponent> </BundledInstallerComponent>
@ -299,7 +299,7 @@
</BundledLayoutComponent> </BundledLayoutComponent>
<BundledInstallerComponent Include="DownloadedWinFormsAndWpfSharedFrameworkInstallerFile" <BundledInstallerComponent Include="DownloadedWinFormsAndWpfSharedFrameworkInstallerFile"
Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))"> Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
<BaseUrl>$(WinFormsAndWpfSharedFxRootUrl)$(WindowsDesktopBlobVersion)</BaseUrl> <BaseUrl>$(WinFormsAndWpfSharedFxRootUrl)$(WindowsDesktopBlobVersion)</BaseUrl>
<DownloadFileName>$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)</DownloadFileName> <DownloadFileName>$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)</DownloadFileName>
</BundledInstallerComponent> </BundledInstallerComponent>

15
src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl
View file

@ -58,21 +58,6 @@
此產品會收集使用方式資料 此產品會收集使用方式資料
• 如需詳細資訊並退出，請前往 https://aka.ms/dotnet-cli-telemetry • 如需詳細資訊並退出，請前往 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</String>
<String Id="FirstTimeWelcomeMessageArm64">安裝成功。
下列項目已安裝在: '[DOTNETHOME]'
• .NET SDK [DOTNETSDKVERSION]
• .NET Runtime [DOTNETRUNTIMEVERSION]
• ASP.NET Core Runtime [ASPNETCOREVERSION]
此產品會收集使用方式資料
• 如需詳細資訊並退出，請前往 https://aka.ms/dotnet-cli-telemetry
資源 資源
• 如需 .NET 文件，請前往 https://aka.ms/dotnet-docs • 如需 .NET 文件，請前往 https://aka.ms/dotnet-docs
• 如需 SDK 文件，請前往 https://aka.ms/dotnet-sdk-docs • 如需 SDK 文件，請前往 https://aka.ms/dotnet-sdk-docs

15
src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl
View file

@ -58,21 +58,6 @@ Do [DOTNETHOME] byly nainstalovány tyto součásti:
Tento produkt shromažďuje data o využití. Tento produkt shromažďuje data o využití.
• Další informace a vyjádření výslovného nesouhlasu: https://aka.ms/dotnet-cli-telemetry • 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</String>
<String Id="FirstTimeWelcomeMessageArm64">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í Zdroje informací
• Dokumentace k .NET : https://aka.ms/dotnet-docs • Dokumentace k .NET : https://aka.ms/dotnet-docs
• Dokumentace k sadě SDK: https://aka.ms/dotnet-sdk-docs • Dokumentace k sadě SDK: https://aka.ms/dotnet-sdk-docs

15
src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl
View file

@ -58,21 +58,6 @@ Folgende Komponenten wurden unter [DOTNETHOME] installiert:
Dieses Produkt erfasst Nutzungsdaten. Dieses Produkt erfasst Nutzungsdaten.
• Weitere Informationen und Deaktivieren der Erfassung: https://aka.ms/dotnet-cli-telemetry • 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</String>
<String Id="FirstTimeWelcomeMessageArm64">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 Ressourcen
• .NET-Dokumentation: https://aka.ms/dotnet-docs • .NET-Dokumentation: https://aka.ms/dotnet-docs
• SDK-Dokumentation: https://aka.ms/dotnet-sdk-docs • SDK-Dokumentation: https://aka.ms/dotnet-sdk-docs

15
src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl
View file

@ -58,21 +58,6 @@ The following were installed at: '[DOTNETHOME]'
This product collects usage data This product collects usage data
• More information and opt-out https://aka.ms/dotnet-cli-telemetry • 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</String>
<String Id="FirstTimeWelcomeMessageArm64">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 Resources
• .NET Documentation https://aka.ms/dotnet-docs • .NET Documentation https://aka.ms/dotnet-docs
• SDK Documentation https://aka.ms/dotnet-sdk-docs • SDK Documentation https://aka.ms/dotnet-sdk-docs

15
src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl
View file

@ -58,21 +58,6 @@ Les éléments suivants ont été installés sur : '[DOTNETHOME]'
Ce produit collecte des données d'utilisation Ce produit collecte des données d'utilisation
• Plus informations et refus d'adhésion sur https://aka.ms/dotnet-cli-telemetry • 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</String>
<String Id="FirstTimeWelcomeMessageArm64">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 Ressources
• Documentation .NET sur https://aka.ms/dotnet-docs • Documentation .NET sur https://aka.ms/dotnet-docs
• Documentation de kit SDK sur https://aka.ms/dotnet-sdk-docs • Documentation de kit SDK sur https://aka.ms/dotnet-sdk-docs

15
src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl
View file

@ -58,21 +58,6 @@ I componenti seguenti sono stati installati in '[DOTNETHOME]'
Questo prodotto consente di raccogliere i dati sull'utilizzo Questo prodotto consente di raccogliere i dati sull'utilizzo
• Altre informazioni e annullamento sottoscrizione https://aka.ms/dotnet-cli-telemetry • 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</String>
<String Id="FirstTimeWelcomeMessageArm64">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 Risorse
• Documentazione di .NET https://aka.ms/dotnet-docs • Documentazione di .NET https://aka.ms/dotnet-docs
• Documentazione dell'SDK https://aka.ms/dotnet-sdk-docs • Documentazione dell'SDK https://aka.ms/dotnet-sdk-docs

15
src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl
View file

@ -58,21 +58,6 @@
この製品は使用状況データを収集します この製品は使用状況データを収集します
• 詳細およびオプトアウト https://aka.ms/dotnet-cli-telemetry • 詳細およびオプトアウト 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</String>
<String Id="FirstTimeWelcomeMessageArm64">インストールが成功しました。
'[DOTNETHOME]' に以下がインストールされました
• .NET SDK [DOTNETSDKVERSION]
• .NET Runtime [DOTNETRUNTIMEVERSION]
• ASP.NET Core Runtime [ASPNETCOREVERSION]
この製品は使用状況データを収集します
• 詳細およびオプトアウト https://aka.ms/dotnet-cli-telemetry
リソース リソース
• .NET ドキュメント https://aka.ms/dotnet-docs • .NET ドキュメント https://aka.ms/dotnet-docs
• SDK ドキュメント https://aka.ms/dotnet-sdk-docs • SDK ドキュメント https://aka.ms/dotnet-sdk-docs

15
src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl
View file

@ -58,21 +58,6 @@
이 제품은 사용량 현황 데이터를 수집합니다. 이 제품은 사용량 현황 데이터를 수집합니다.
• 추가 정보 및 옵트아웃 https://aka.ms/dotnet-cli-telemetry • 추가 정보 및 옵트아웃 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</String>
<String Id="FirstTimeWelcomeMessageArm64">설치가 완료되었습니다.
다음이 '[DOTNETHOME]'에 설치되었습니다.
• .NET SDK [DOTNETSDKVERSION]
• .NET 런타임 [DOTNETRUNTIMEVERSION]
• ASP.NET Core 런타임 [ASPNETCOREVERSION]
이 제품은 사용량 현황 데이터를 수집합니다.
• 추가 정보 및 옵트아웃 https://aka.ms/dotnet-cli-telemetry
리소스 리소스
• .NET 설명서 https://aka.ms/dotnet-docs • .NET 설명서 https://aka.ms/dotnet-docs
• SDK 설명서 https://aka.ms/dotnet-sdk-docs • SDK 설명서 https://aka.ms/dotnet-sdk-docs

15
src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl
View file

@ -58,21 +58,6 @@ Następujące elementy zostały zainstalowane w: „[DOTNETHOME]”
Ten produkt gromadzi dane dotyczące użycia Ten produkt gromadzi dane dotyczące użycia
• Więcej informacji i rezygnacja: https://aka.ms/dotnet-cli-telemetry • 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</String>
<String Id="FirstTimeWelcomeMessageArm64">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 Zasoby
• Dokumentacja platformy .NET: https://aka.ms/dotnet-docs • Dokumentacja platformy .NET: https://aka.ms/dotnet-docs
• Dokumentacja zestawu SDK: https://aka.ms/dotnet-sdk-docs • Dokumentacja zestawu SDK: https://aka.ms/dotnet-sdk-docs

15
src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl
View file

@ -58,21 +58,6 @@ O seguinte foi instalado em: '[DOTNETHOME]'
Este produto coleta dados de uso Este produto coleta dados de uso
• Para obter mais informações ou recusá-lo, acesse https://aka.ms/dotnet-cli-telemetry • 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</String>
<String Id="FirstTimeWelcomeMessageArm64">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 Recursos
• Documentação do .NET: https://aka.ms/dotnet-docs • Documentação do .NET: https://aka.ms/dotnet-docs
• Documentação do SDK: https://aka.ms/dotnet-sdk-docs • Documentação do SDK: https://aka.ms/dotnet-sdk-docs

15
src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl
View file

@ -58,21 +58,6 @@
Этот продукт собирает данные об использовании. Этот продукт собирает данные об использовании.
• Чтобы получить дополнительные сведения или отказаться от использования продукта, перейдите на страницу https://aka.ms/dotnet-cli-telemetry • Чтобы получить дополнительные сведения или отказаться от использования продукта, перейдите на страницу 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</String>
<String Id="FirstTimeWelcomeMessageArm64">Установка выполнена.
В "[DOTNETHOME]" установлены следующие компоненты:
• Пакет SDK для .NET [DOTNETSDKVERSION]
• Среда выполнения .NET [DOTNETRUNTIMEVERSION]
• Среда выполнения ASP.NET Core [ASPNETCOREVERSION]
Этот продукт собирает данные об использовании.
• Чтобы получить дополнительные сведения или отказаться от использования продукта, перейдите на страницу https://aka.ms/dotnet-cli-telemetry
Ресурсы Ресурсы
• Документация по .NET: https://aka.ms/dotnet-docs • Документация по .NET: https://aka.ms/dotnet-docs
• Документация по SDK: https://aka.ms/dotnet-sdk-docs • Документация по SDK: https://aka.ms/dotnet-sdk-docs

15
src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl
View file

@ -58,21 +58,6 @@ Aşağıdakiler şu konumda yüklü: '[DOTNETHOME]'
Bu ürün, kullanım verilerini toplar Bu ürün, kullanım verilerini toplar
• Daha fazla bilgi ve katılmamayı seçmek için bkz. https://aka.ms/dotnet-cli-telemetry • 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</String>
<String Id="FirstTimeWelcomeMessageArm64">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 Kaynaklar
• .NET Belgeleri https://aka.ms/dotnet-docs • .NET Belgeleri https://aka.ms/dotnet-docs
• SDK Belgeleri https://aka.ms/dotnet-sdk-docs • SDK Belgeleri https://aka.ms/dotnet-sdk-docs

15
src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl
View file

@ -58,21 +58,6 @@
此产品会收集用法数据 此产品会收集用法数据
• 详细信息和选择退出选项: https://aka.ms/dotnet-cli-telemetry • 详细信息和选择退出选项: 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</String>
<String Id="FirstTimeWelcomeMessageArm64">已成功安装。
下列项安装于: "[DOTNETHOME]"
• .NET SDK [DOTNETSDKVERSION]
• .NET 运行时 [DOTNETRUNTIMEVERSION]
• ASP.NET Core 运行时 [ASPNETCOREVERSION]
此产品会收集用法数据
• 详细信息和选择退出选项: https://aka.ms/dotnet-cli-telemetry
资源 资源
• .NET 文档: https://aka.ms/dotnet-docs • .NET 文档: https://aka.ms/dotnet-docs
• SDK 文档: https://aka.ms/dotnet-sdk-docs • SDK 文档: https://aka.ms/dotnet-sdk-docs

15
src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl
View file

@ -58,21 +58,6 @@ Se instaló lo siguiente en: "[DOTNETHOME]"
Este producto recopila datos de uso Este producto recopila datos de uso
• Para obtener más información y declinar la participación, visite https://aka.ms/dotnet-cli-telemetry • 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</String>
<String Id="FirstTimeWelcomeMessageArm64">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 Recursos
• Documentación de .NET https://aka.ms/dotnet-docs • Documentación de .NET https://aka.ms/dotnet-docs
• Documentación del SDK https://aka.ms/dotnet-sdk-docs • Documentación del SDK https://aka.ms/dotnet-sdk-docs

10
src/redist/targets/packaging/windows/clisdk/bundle.wxs
View file

@ -161,13 +161,13 @@
<MsiPackage SourceFile="$(var.NetStandardTargetingPackMsiSourcePath)"> <MsiPackage SourceFile="$(var.NetStandardTargetingPackMsiSourcePath)">
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" /> <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
</MsiPackage> </MsiPackage>
<?endif?>
<MsiPackage SourceFile="$(var.WinFormsAndWpfMsiSourcePath)"> <MsiPackage SourceFile="$(var.WinFormsAndWpfMsiSourcePath)">
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" /> <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
</MsiPackage> </MsiPackage>
<MsiPackage SourceFile="$(var.WindowsDesktopTargetingPackMsiSourcePath)"> <MsiPackage SourceFile="$(var.WindowsDesktopTargetingPackMsiSourcePath)">
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" /> <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
</MsiPackage> </MsiPackage>
<?endif?>
<MsiPackage SourceFile="$(var.AspNetTargetingPackMsiSourcePath)"> <MsiPackage SourceFile="$(var.AspNetTargetingPackMsiSourcePath)">
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" /> <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
</MsiPackage> </MsiPackage>
@ -195,15 +195,7 @@
<Fragment> <Fragment>
<PayloadGroup Id="DotnetCoreBAPayloads"> <PayloadGroup Id="DotnetCoreBAPayloads">
<!-- This theme is dupped with a slight change: It uses a modified version of FirstTimeWelcomeMessageArm64
for SuccessInstallHeader to account for ARM64's lack of support for WPF/WinForms. Once they converge, remove
this and remove FirstTimeWelcomeMessageArm64 from the wxl files. -->
<?if $(var.Platform)=arm64?>
<Payload Name="thm.xml" Compressed="yes" SourceFile="bundleArm64.thm" />
<?else?>
<Payload Name="thm.xml" Compressed="yes" SourceFile="bundle.thm" /> <Payload Name="thm.xml" Compressed="yes" SourceFile="bundle.thm" />
<?endif?>
<!-- Default/Neutral localized content is US English --> <!-- Default/Neutral localized content is US English -->
<Payload Name="thm.wxl" Compressed="yes" SourceFile="LCID\1033\bundle.wxl" /> <Payload Name="thm.wxl" Compressed="yes" SourceFile="LCID\1033\bundle.wxl" />
<Payload Name="bg.png" Compressed="yes" SourceFile="..\..\osx\clisdk\resources\dotnetbackground.png" /> <Payload Name="bg.png" Compressed="yes" SourceFile="..\..\osx\clisdk\resources\dotnetbackground.png" />

95
src/redist/targets/packaging/windows/clisdk/bundleArm64.thm
View file

@ -1,95 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Theme xmlns="http://wixtoolset.org/schemas/thmutil/2010">
<Window Width="660" Height="488" HexStyle="100a0000" FontId="0">#(loc.Caption)</Window>
<Font Id="0" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
<Font Id="1" Height="-24" Weight="900" Foreground="FFFFFF" Background="D42B51">Segoe UI</Font>
<Font Id="2" Height="-22" Weight="500" Foreground="666666">Segoe UI</Font>
<Font Id="3" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
<Font Id="4" Height="-12" Weight="500" Foreground="ff0000" Background="FFFFFF" Underline="yes">Segoe UI</Font>
<Font Id="5" Height="-14" Weight="500" Foreground="444444">Segoe UI</Font>
<Text Name="Title" X="11" Y="11" Width="-11" Height="64" FontId="1" Visible="yes" Center="yes" DisablePrefix="yes">#(loc.Title)</Text>
<Page Name="Help">
<Image Name="BackgroundImage" X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
<Text X="0" Y="0" Width="660" Height="75" FontId="1" />
<Text Name="HelpHeader" X="151" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.HelpHeader)</Text>
<Text Name="HelpText" X="160" Y="115" Width="-11" Height="-35" FontId="3" DisablePrefix="yes">#(loc.HelpText)</Text>
<Button Name="HelpCancelButton" X="-32" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0">#(loc.HelpCloseButton)</Button>
</Page>
<Page Name="Install">
<Image Name="BackgroundImage" X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
<Text X="0" Y="0" Width="660" Height="75" FontId="1" />
<Text Name="WelcomeText" X="155" Y="80" Width="-11" Height="-70" FontId="2" HexStyle="0x800000" DisablePrefix="yes" />
<Text Name="WelcomeHeaderMessage" X="160" Y="80" Width="300" Height="30" FontId="2">#(loc.WelcomeHeaderMessage)</Text>
<Text Name="WelcomeDescription" X="160" Y="125" Width="460" Height="65" FontId="3">#(loc.WelcomeDescription)</Text>
<Hypertext Name="VisualStudioWarning" X="160" Y="209" Width="460" Height="30" TabStop="yes" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.VisualStudioWarning)</Hypertext>
<Text Name="LicenseAssent" X="160" Y="264" Width="460" Height="30" FontId="3">#(loc.LicenseAssent)</Text>
<Hypertext Name="PrivacyStatementLink" X="185" Y="301" Width="400" Height="22" FontId="3" TabStop="yes" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.PrivacyStatementLink)</Hypertext>
<Hypertext Name="DotNetEulaLink" X="185" Y="323" Width="400" Height="22" FontId="3" TabStop="yes" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.DotNetEulaLink)</Hypertext>
<Button Name="InstallButton" X="-133" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0">#(loc.InstallInstallButton)</Button>
<Button Name="WelcomeCancelButton" X="-32" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0">#(loc.InstallCloseButton)</Button>
</Page>
<Page Name="FilesInUse">
<Text X="0" Y="0" Width="660" Height="75" FontId="1" />
<Text Name="FilesInUseHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.FilesInUseHeader)</Text>
<Text Name="FilesInUseLabel" X="11" Y="121" Width="-11" Height="34" FontId="3" DisablePrefix="yes">#(loc.FilesInUseLabel)</Text>
<Text Name="FilesInUseText" X="11" Y="150" Width="-11" Height="-86" FontId="3" DisablePrefix="yes" HexStyle="0x0000000C"></Text>
<Button Name="FilesInUseCloseRadioButton" X="300" Y="-65" Width="-11" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes" HexStyle="0x000009">#(loc.FilesInUseCloseRadioButton)</Button>
<Button Name="FilesInUseDontCloseRadioButton" X="300" Y="-45" Width="-11" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes" HexStyle="0x000009">#(loc.FilesInUseDontCloseRadioButton)</Button>
<Button Name="FilesInUseOkButton" X="-133" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FilesInUseOkButton)</Button>
<Button Name="FilesInUseCancelButton" X="-32" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0">#(loc.FilesInUseCancelButton)</Button>
<Image Name="BackgroundImage" X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
</Page>
<Page Name="Progress">
<Image Name="BackgroundImage" X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
<Text X="0" Y="0" Width="660" Height="75" FontId="1" />
<Text Name="ProgressHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ProgressHeader)</Text>
<Text Name="ProgressLabel" X="11" Y="121" Width="70" Height="17" FontId="3" DisablePrefix="yes">#(loc.ProgressLabel)</Text>
<Text Name="OverallProgressPackageText" X="85" Y="121" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Text>
<Progressbar Name="OverallCalculatedProgressbar" X="11" Y="143" Width="-11" Height="15" />
<Button Name="ProgressCancelButton" X="-32" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0">#(loc.ProgressCancelButton)</Button>
</Page>
<Page Name="Modify">
<Image Name="BackgroundImage" X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
<Text X="0" Y="0" Width="660" Height="75" FontId="1" />
<Text Name="ModifyHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ModifyHeader)</Text>
<Button Name="RepairButton" X="-234" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
<Button Name="UninstallButton" X="-133" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0">#(loc.ModifyUninstallButton)</Button>
<Button Name="ModifyCancelButton" X="-32" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0">#(loc.ModifyCloseButton)</Button>
</Page>
<Page Name="Success">
<Image Name="BackgroundImage" X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
<Text X="0" Y="0" Width="660" Height="75" FontId="1" />
<Text Name="SuccessHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
<Richedit Name="SuccessInstallHeader" X="160" Y="81" Width="-12" Height="-71" FontId="5" HideWhenDisabled="yes">#(loc.FirstTimeWelcomeMessageArm64)</Richedit>
<Text Name="SuccessRepairHeader" X="160" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRepairHeader)</Text>
<Text Name="SuccessUninstallHeader" X="160" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessUninstallHeader)</Text>
<Button Name="LaunchButton" X="-133" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
<Text Name="SuccessRestartText" X="-11" Y="-40" Width="400" Height="23" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRestartText)</Text>
<Button Name="SuccessRestartButton" X="-133" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
<Button Name="SuccessCancelButton" X="-32" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0">#(loc.SuccessCloseButton)</Button>
</Page>
<Page Name="Failure">
<Image Name="BackgroundImage" X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
<Text X="0" Y="0" Width="660" Height="75" FontId="1" />
<Text Name="FailureHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
<Text Name="FailureInstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureInstallHeader)</Text>
<Text Name="FailureUninstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureUninstallHeader)</Text>
<Text Name="FailureRepairHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRepairHeader)</Text>
<Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
<Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
<Text Name="FailureRestartText" X="-11" Y="-40" Width="400" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text>
<Button Name="FailureRestartButton" X="-133" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
<Button Name="FailureCloseButton" X="-32" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0">#(loc.FailureCloseButton)</Button>
</Page>
</Theme>