Merge in 'release/5.0.4xx' changes
This commit is contained in:
commit
cf3f8446e2
18 changed files with 60 additions and 225 deletions
|
@ -127,7 +127,7 @@
|
|||
|
||||
<WindowsDesktop30RuntimePackRids Include="win-x64;win-x86" />
|
||||
<WindowsDesktop31RuntimePackRids Include="@(WindowsDesktop30RuntimePackRids)" />
|
||||
<WindowsDesktopRuntimePackRids Include="@(WindowsDesktop31RuntimePackRids)" />
|
||||
<WindowsDesktopRuntimePackRids Include="@(WindowsDesktop31RuntimePackRids);win-arm64" />
|
||||
</ItemGroup>
|
||||
|
||||
<!--
|
||||
|
|
|
@ -224,7 +224,7 @@
|
|||
</BundledInstallerComponent>
|
||||
|
||||
<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>
|
||||
<DownloadFileName>$(DownloadedWindowsDesktopTargetingPackInstallerFileName)</DownloadFileName>
|
||||
</BundledInstallerComponent>
|
||||
|
@ -285,7 +285,7 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' AND '$(Architecture)' == 'arm'">false</IncludeWpfAndWinForms>
|
||||
<IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' AND '$(OS)' == 'Windows_NT' AND '$(Architecture)' != 'arm64' ">true</IncludeWpfAndWinForms>
|
||||
<IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' AND '$(OS)' == 'Windows_NT'">true</IncludeWpfAndWinForms>
|
||||
<IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' ">false</IncludeWpfAndWinForms>
|
||||
</PropertyGroup>
|
||||
|
||||
|
@ -303,7 +303,7 @@
|
|||
</BundledLayoutComponent>
|
||||
|
||||
<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>
|
||||
<DownloadFileName>$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)</DownloadFileName>
|
||||
</BundledInstallerComponent>
|
||||
|
|
|
@ -63,21 +63,6 @@
|
|||
• 如需 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
|
||||
• SDK 文件 https://aka.ms/dotnet-sdk-docs
|
||||
• 版本資訊 https://aka.ms/dotnet5-release-notes
|
||||
• 教學課程 https://aka.ms/dotnet-tutorials</String>
|
||||
<String Id="WelcomeHeaderMessage">.NET SDK</String>
|
||||
<String Id="WelcomeDescription">
|
||||
.NET SDK 可用於建置、執行及測試 .NET 應用程式。您可以選擇多種語言、編輯器以及開發人員工具,並可利用程式庫的大型生態系統,來建置 Web、行動裝置、桌面、遊戲及 IoT 的應用程式。希望您會喜歡!</String>
|
||||
|
|
|
@ -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</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í
|
||||
• Dokumentace k .NET : https://aka.ms/dotnet-docs
|
||||
• Dokumentace k sadě SDK: https://aka.ms/dotnet-sdk-docs
|
||||
|
|
|
@ -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</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 sammelt 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
|
||||
|
|
|
@ -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</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
|
||||
• .NET Documentation https://aka.ms/dotnet-docs
|
||||
• SDK Documentation https://aka.ms/dotnet-sdk-docs
|
||||
|
|
|
@ -63,22 +63,7 @@ Ressources
|
|||
• 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
|
||||
• Pour plus d'informations ou pour vous y opposer, accédez à 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="WelcomeHeaderMessage">Kit SDK .NET</String>
|
||||
<String Id="WelcomeHeaderMessage">SDK .NET</String>
|
||||
<String Id="WelcomeDescription">
|
||||
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 !</String>
|
||||
<String Id="LearnMoreTitle">En savoir plus sur .NET</String>
|
||||
|
|
|
@ -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</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
|
||||
• Documentazione di .NET https://aka.ms/dotnet-docs
|
||||
• Documentazione dell'SDK https://aka.ms/dotnet-sdk-docs
|
||||
|
|
|
@ -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</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
|
||||
• SDK ドキュメント https://aka.ms/dotnet-sdk-docs
|
||||
|
|
|
@ -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</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
|
||||
• SDK 설명서 https://aka.ms/dotnet-sdk-docs
|
||||
|
|
|
@ -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</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
|
||||
• Dokumentacja platformy .NET: https://aka.ms/dotnet-docs
|
||||
• Dokumentacja zestawu SDK: https://aka.ms/dotnet-sdk-docs
|
||||
|
|
|
@ -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/dotnet5-release-notes
|
||||
• 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
|
||||
• Documentação do .NET: https://aka.ms/dotnet-docs
|
||||
• Documentação do SDK: https://aka.ms/dotnet-sdk-docs
|
||||
|
|
|
@ -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</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
|
||||
• Документация по SDK: https://aka.ms/dotnet-sdk-docs
|
||||
|
|
|
@ -63,22 +63,7 @@ Kaynaklar
|
|||
• 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
|
||||
• .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="WelcomeHeaderMessage">.NET SDK</String>
|
||||
<String Id="WelcomeHeaderMessage">.NET SDK'sı</String>
|
||||
<String Id="WelcomeDescription">
|
||||
.NET SDK, .NET uygulamalarını derlemek, çalıştırmak ve test etmek için kullanılır. Birden çok dil, düzenleyici ve geliştirici aracı arasından seçim yapabilirsiniz ve web, mobil, masaüstü, oyun ve IoT uygulamaları oluşturmak için büyük bir kitaplık ekosisteminden yararlanabilirsiniz. Beğeneceğinizi umuyoruz!</String>
|
||||
<String Id="LearnMoreTitle">.NET hakkında daha fazla bilgi edinin</String>
|
||||
|
|
|
@ -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</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
|
||||
• SDK 文档: https://aka.ms/dotnet-sdk-docs
|
||||
|
|
|
@ -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</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
|
||||
• Documentación de .NET https://aka.ms/dotnet-docs
|
||||
• Documentación del SDK https://aka.ms/dotnet-sdk-docs
|
||||
|
|
|
@ -161,13 +161,13 @@
|
|||
<MsiPackage SourceFile="$(var.NetStandardTargetingPackMsiSourcePath)">
|
||||
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
|
||||
</MsiPackage>
|
||||
<?endif?>
|
||||
<MsiPackage SourceFile="$(var.WinFormsAndWpfMsiSourcePath)">
|
||||
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
|
||||
</MsiPackage>
|
||||
<MsiPackage SourceFile="$(var.WindowsDesktopTargetingPackMsiSourcePath)">
|
||||
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
|
||||
</MsiPackage>
|
||||
<?endif?>
|
||||
<MsiPackage SourceFile="$(var.AspNetTargetingPackMsiSourcePath)">
|
||||
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
|
||||
</MsiPackage>
|
||||
|
@ -195,15 +195,7 @@
|
|||
|
||||
<Fragment>
|
||||
<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" />
|
||||
<?endif?>
|
||||
|
||||
<!-- Default/Neutral localized content is US English -->
|
||||
<Payload Name="thm.wxl" Compressed="yes" SourceFile="LCID\1033\bundle.wxl" />
|
||||
<Payload Name="bg.png" Compressed="yes" SourceFile="..\..\osx\clisdk\resources\dotnetbackground.png" />
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
using System.IO;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Linq;
|
||||
using System.Xml.Linq;
|
||||
using Microsoft.DotNet.TestFramework;
|
||||
using Microsoft.DotNet.Tools.Test.Utilities;
|
||||
|
@ -82,6 +83,58 @@ 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 ItCanPublishArm64Wpf()
|
||||
{
|
||||
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().Pass();
|
||||
|
||||
var selfContainedPublishDir = new DirectoryInfo(projectDirectory)
|
||||
.Sub("bin").Sub("Debug").GetDirectories().FirstOrDefault()
|
||||
.Sub("win-arm64").Sub("publish");
|
||||
|
||||
selfContainedPublishDir.Should().HaveFilesMatching("PresentationCore.dll", SearchOption.TopDirectoryOnly);
|
||||
selfContainedPublishDir.Should().HaveFilesMatching("PresentationNative_*.dll", SearchOption.TopDirectoryOnly);
|
||||
selfContainedPublishDir.Should().HaveFilesMatching($"{directory.Name}.dll", SearchOption.TopDirectoryOnly);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData("console")]
|
||||
[InlineData("classlib")]
|
||||
|
|
Loading…
Reference in a new issue