Merge pull request #6904 from dotnet-maestro-bot/merge/release/5.0.1xx-preview2-to-master

[automated] Merge branch 'release/5.0.1xx-preview2' => 'master'
2020-03-25 12:06:08 -07:00 · 2020-03-25 12:06:08 -07:00 · efcfa0816b
commit efcfa0816b
parent e0c5ca077c a199c488d7
17 changed files with 97 additions and 143 deletions
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@ -108,7 +108,7 @@
      <ImplicitPackageVariable Include="Microsoft.NETCore.App"
                               TargetFrameworkVersion="2.1"
                               DefaultVersion="2.1.0"
-                               LatestVersion="2.1.16" />
+                               LatestVersion="2.1.17" />
      <ImplicitPackageVariable Include="Microsoft.NETCore.App"
                               TargetFrameworkVersion="2.2"
                               DefaultVersion="2.2.0"
@ -116,11 +116,11 @@
      <ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
                               TargetFrameworkVersion="2.1"
                               DefaultVersion="2.1.1"
-                               LatestVersion="2.1.16"/>
+                               LatestVersion="2.1.17"/>
      <ImplicitPackageVariable Include="Microsoft.AspNetCore.All"
                               TargetFrameworkVersion="2.1"
                               DefaultVersion="2.1.1"
-                               LatestVersion="2.1.16"/>
+                               LatestVersion="2.1.17"/>

      <ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
                               TargetFrameworkVersion="2.2"
@ -246,7 +246,7 @@ Copyright (c) .NET Foundation. All rights reserved.
    <KnownFrameworkReference Include="Microsoft.NETCore.App"
                              TargetFramework="netcoreapp3.1"
                              RuntimeFrameworkName="Microsoft.NETCore.App"
-                              DefaultRuntimeFrameworkVersion="$(_NETCoreApp31RuntimePackVersion)"
+                              DefaultRuntimeFrameworkVersion="3.1.0"
                              LatestRuntimeFrameworkVersion="$(_NETCoreApp31RuntimePackVersion)"
                              TargetingPackName="Microsoft.NETCore.App.Ref"
                              TargetingPackVersion="$(_NETCoreApp31TargetingPackVersion)"
@ -265,7 +265,7 @@ Copyright (c) .NET Foundation. All rights reserved.
    <KnownFrameworkReference Include="Microsoft.WindowsDesktop.App"
                              TargetFramework="netcoreapp3.1"
                              RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
-                              DefaultRuntimeFrameworkVersion="$(_WindowsDesktop31RuntimePackVersion)"
+                              DefaultRuntimeFrameworkVersion="3.1.0"
                              LatestRuntimeFrameworkVersion="$(_WindowsDesktop31RuntimePackVersion)"
                              TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
                              TargetingPackVersion="$(_WindowsDesktop31TargetingPackVersion)"
@ -277,7 +277,7 @@ Copyright (c) .NET Foundation. All rights reserved.
    <KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WPF"
                              TargetFramework="netcoreapp3.1"
                              RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
-                              DefaultRuntimeFrameworkVersion="$(_WindowsDesktop31RuntimePackVersion)"
+                              DefaultRuntimeFrameworkVersion="3.1.0"
                              LatestRuntimeFrameworkVersion="$(_WindowsDesktop31RuntimePackVersion)"
                              TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
                              TargetingPackVersion="$(_WindowsDesktop31TargetingPackVersion)"
@ -290,7 +290,7 @@ Copyright (c) .NET Foundation. All rights reserved.
    <KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms"
                              TargetFramework="netcoreapp3.1"
                              RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
-                              DefaultRuntimeFrameworkVersion="$(_WindowsDesktop31RuntimePackVersion)"
+                              DefaultRuntimeFrameworkVersion="3.1.0"
                              LatestRuntimeFrameworkVersion="$(_WindowsDesktop31RuntimePackVersion)"
                              TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
                              TargetingPackVersion="$(_WindowsDesktop31TargetingPackVersion)"
@ -303,7 +303,7 @@ Copyright (c) .NET Foundation. All rights reserved.
    <KnownFrameworkReference Include="Microsoft.AspNetCore.App"
                              TargetFramework="netcoreapp3.1"
                              RuntimeFrameworkName="Microsoft.AspNetCore.App"
-                              DefaultRuntimeFrameworkVersion="$(_AspNet31RuntimePackVersion)"
+                              DefaultRuntimeFrameworkVersion="3.1.0"
                              LatestRuntimeFrameworkVersion="$(_AspNet31RuntimePackVersion)"
                              TargetingPackName="Microsoft.AspNetCore.App.Ref"
                              TargetingPackVersion="$(_AspNet31TargetingPackVersion)"
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl
@ -51,12 +51,12 @@

 下列項目已安裝在: '[DOTNETHOME]'
    • .NET SDK [DOTNETSDKVERSION]
-    • .NET Runtime [DOTNETRUNTIMEVERSION]
-    • ASP.NET Core Runtime [ASPNETCOREVERSION]
-    • .NET Windows Desktop Runtime [WINFORMSANDWPFVERSION]
+    • .NET 執行階段 [DOTNETRUNTIMEVERSION]
+    • ASP.NET Core 執行階段 [ASPNETCOREVERSION]
+    • .NET Windows Desktop 執行階段 [WINFORMSANDWPFVERSION]

-此產品會收集使用方式資料
-    • 如需詳細資訊或退出，請前往 https://aka.ms/dotnet-cli-telemetry
+此產品會收集使用量資料
+    • 如需詳細資訊並退出，請前往 https://aka.ms/dotnet-cli-telemetry

 資源
    • 如需 .NET 文件，請前往 https://aka.ms/dotnet-docs
@ -65,16 +65,16 @@
    • 如需教學課程，請前往 https://aka.ms/dotnet-tutorials</String>
  <String Id="WelcomeHeaderMessage">.NET SDK</String>
  <String Id="WelcomeDescription">
-    .NET 是 Microsoft 支援的跨平台開放原始碼。您可以用它以 C#、F# 或 VB 建置下一個應用程式。希望您會喜歡!</String>
+    .NET 是 Microsoft 支援的跨平台開放原始碼。您可以使用 .NET 以 C#、F# 或 VB 建置下一個應用程式。希望您會喜歡!</String>
  <String Id="LearnMoreTitle">深入了解 .NET</String>
  <String Id="ResourcesHeader">資源</String>
-  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;核心文件&lt;/A&gt;</String>
+  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;.NET 文件&lt;/A&gt;</String>
  <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;SDK 文件&lt;/A&gt;</String>
  <String Id="PrivacyStatementLink">&lt;A HREF="https://aka.ms/dev-privacy"&gt;隱私權聲明&lt;/A&gt;</String>
  <String Id="DotNetEulaLink">&lt;A HREF="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;.NET 程式庫 EULA&lt;/A&gt;</String>
  <String Id="InstallationNoteTitle">安裝附註</String>
  <String Id="InstallationNote">安裝程序期間將會執行命令，加快專案還原速度並啟用離線存取。最多需要一分鐘的時間完成。
  </String>
-  <String Id="VisualStudioWarning">若您打算透過 Visual Studio 使用 .NET Core 3.1，則需要 Visual Studio 2019 16.4 或更新版本。&lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;深入了解&lt;/A&gt;。
+  <String Id="VisualStudioWarning">若您打算透過 Visual Studio 使用 .NET 5.0，則需要 Visual Studio 2019 16.6 或更新版本。&lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;深入了解&lt;/A&gt;。
  </String>
 </WixLocalization>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl
@ -59,22 +59,22 @@ 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 .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/netcore3releasenotes
    • Kurzy: https://aka.ms/dotnet-tutorials</String>
  <String Id="WelcomeHeaderMessage">Sada .NET SDK</String>
  <String Id="WelcomeDescription">
-    .NET je opensourcová, víceplatformová architektura podporovaná společností Microsoft. Můžete ji použít k vytvoření své další aplikace v jazyce C#, F # nebo VB. Věříme, že s ní budete spokojeni.</String>
+    .NET je opensourcová architektura pro více platforem podporovaná společností Microsoft. Můžete ji použít k vytvoření své další aplikace v jazyce C#, F # nebo VB. Věříme, že s ní budete spokojeni.</String>
  <String Id="LearnMoreTitle">Další informace o .NET</String>
  <String Id="ResourcesHeader">Prostředky</String>
-  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Dokumentace k platformě Core&lt;/A&gt;</String>
+  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Dokumentace k architektuře .NET&lt;/A&gt;</String>
  <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;Dokumentace k sadě SDK&lt;/A&gt;</String>
  <String Id="PrivacyStatementLink">&lt;A HREF="https://aka.ms/dev-privacy"&gt;Prohlášení o zásadách ochrany osobních údajů&lt;/A&gt;</String>
  <String Id="DotNetEulaLink">&lt;A HREF="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;Smlouva EULA ke knihovně .NET&lt;/A&gt;</String>
  <String Id="InstallationNoteTitle">Poznámka k instalaci</String>
  <String Id="InstallationNote">Během procesu instalace se spustí příkaz, který zlepší rychlost obnovení projektu a povolí offline přístup. Akce se dokončí přibližně za minutu.
  </String>
-  <String Id="VisualStudioWarning">Pokud plánujete používání .NET Core 3.1 se sadou Visual Studio, potřebujete Visual Studio 2019 16.4 nebo novější. &lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;Další informace&lt;/A&gt;
+  <String Id="VisualStudioWarning">Pokud plánujete používat .NET 5.0 se sadou Visual Studio, potřebujete Visual Studio 2019 16.6 nebo novější. &lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;Další informace&lt;/A&gt;
  </String>
 </WixLocalization>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl
@ -49,14 +49,14 @@
  <String Id="FilesInUseCancelButton">&amp;Abbrechen</String>
  <String Id="FirstTimeWelcomeMessage">Die Installation war erfolgreich.

-Folgendes wurde unter [DOTNETHOME] installiert:
+Folgende Komponenten wurden unter [DOTNETHOME] installiert:
    • .NET SDK [DOTNETSDKVERSION]
    • .NET Runtime [DOTNETRUNTIMEVERSION]
    • ASP.NET Core-Runtime [ASPNETCOREVERSION]
    • .NET Windows Desktop-Runtime [WINFORMSANDWPFVERSION]

 Dieses Produkt erfasst Nutzungsdaten.
-    • Weitere Informationen und Abbestellen: 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
@ -65,16 +65,16 @@ Ressourcen
    • Tutorials: https://aka.ms/dotnet-tutorials</String>
  <String Id="WelcomeHeaderMessage">.NET SDK</String>
  <String Id="WelcomeDescription">
-    .Net ist eine plattformübergreifende Open-Source-Software, die von Microsoft unterstützt wird. Verwenden Sie sie zur Erstellung Ihrer nächsten App mit C#, F# oder VB. Wir wünschen Ihnen viel Spaß!</String>
+    .NET ist eine plattformübergreifende Open-Source-Software, die von Microsoft unterstützt wird. Verwenden Sie sie zur Entwicklung Ihrer nächsten App mit C#, F# oder VB. Wir wünschen Ihnen viel Spaß!</String>
  <String Id="LearnMoreTitle">Weitere Informationen zu .NET</String>
  <String Id="ResourcesHeader">Ressourcen</String>
-  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Core-Dokumentation&lt;/A&gt;</String>
+  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;.NET-Dokumentation&lt;/A&gt;</String>
  <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;SDK-Dokumentation&lt;/A&gt;</String>
  <String Id="PrivacyStatementLink">&lt;A HREF="https://aka.ms/dev-privacy"&gt;Datenschutzerklärung&lt;/A&gt;</String>
  <String Id="DotNetEulaLink">&lt;A HREF="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;Lizenzbedingungen für die .NET-Bibliothek&lt;/A&gt;</String>
  <String Id="InstallationNoteTitle">Installationshinweis</String>
  <String Id="InstallationNote">Während des Installationsvorgangs wird ein Befehl ausgeführt, durch den die Geschwindigkeit der Projektwiederherstellung verbessert und der Offlinezugriff aktiviert wird. Der Vorgang dauert bis zu einer Minute.
  </String>
-  <String Id="VisualStudioWarning">Wenn Sie .NET Core 3.1 mit Visual Studio verwenden möchten, ist Visual Studio 2019 16.4 oder höher erforderlich. &lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;Weitere Informationen&lt;/A&gt;.
+  <String Id="VisualStudioWarning">Wenn Sie .NET 5.0 mit Visual Studio verwenden möchten, ist Visual Studio 2019 16.6 oder höher erforderlich. &lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;Weitere Informationen&lt;/A&gt;.
  </String>
 </WixLocalization>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl
@ -75,6 +75,6 @@ Resources
  <String Id="InstallationNoteTitle">Installation note</String>
  <String Id="InstallationNote">A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.
  </String>
-  <String Id="VisualStudioWarning">If you plan to use .NET 5.0 with Visual Studio, Visual Studio 2019 16.6 or newer is required. &lt;A HREF=&quot;https://go.microsoft.com/fwlink/?linkid=866799&quot;&gt;Learn More&lt;/A&gt;.
+  <String Id="VisualStudioWarning">If you plan to use .NET 5.0 with Visual Studio, Visual Studio 2019 16.6 or newer is required. &lt;A HREF=&quot;https://aka.ms/dotnet5-release-notes&quot;&gt;Learn More&lt;/A&gt;.
  </String>
 </WixLocalization>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl
@ -63,18 +63,18 @@ Ressources
    • Documentation du kit SDK sur https://aka.ms/dotnet-sdk-docs
    • Notes de publication sur https://aka.ms/netcore3releasenotes
    • Tutoriels sur https://aka.ms/dotnet-tutorials</String>
-  <String Id="WelcomeHeaderMessage">Kit SDK .NET</String>
+  <String Id="WelcomeHeaderMessage">SDK .NET</String>
  <String Id="WelcomeDescription">
    .NET est open source, multiplatforme et pris en charge par Microsoft. Vous pouvez l'utiliser pour créer votre prochaine application avec C#, F# ou VB. Nous espérons qu'il vous plaira !</String>
  <String Id="LearnMoreTitle">En savoir plus sur .NET</String>
  <String Id="ResourcesHeader">Ressources</String>
-  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Documentation Core&lt;/A&gt;</String>
+  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Documentation .NET&lt;/A&gt;</String>
  <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;Documentation du kit SDK&lt;/A&gt;</String>
  <String Id="PrivacyStatementLink">&lt;A HREF="https://aka.ms/dev-privacy"&gt;Déclaration de confidentialité&lt;/A&gt;</String>
  <String Id="DotNetEulaLink">&lt;A HREF="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;CLUF de la bibliothèque .NET&lt;/A&gt;</String>
  <String Id="InstallationNoteTitle">Note d'installation</String>
  <String Id="InstallationNote">Une commande va être exécutée pendant le processus d'installation, ce qui va améliorer la vitesse de restauration du projet et permettre l'accès hors connexion. L'opération va prendre environ une minute.
  </String>
-  <String Id="VisualStudioWarning">Si vous envisagez d'utiliser .NET Core 3.1 avec Visual Studio, Visual Studio 2019 16.4 ou une version plus récente est nécessaire. &lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;En savoir plus&lt;/A&gt;.
+  <String Id="VisualStudioWarning">Si vous envisagez d'utiliser .NET 5.0 avec Visual Studio, Visual Studio 2019 16.6 ou une version plus récente est nécessaire. &lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;En savoir plus&lt;/A&gt;.
  </String>
 </WixLocalization>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl
@ -75,6 +75,6 @@ Resources
  <String Id="InstallationNoteTitle">Nota sull'installazione</String>
  <String Id="InstallationNote">Durante il processo di installazione verrà eseguito un comando che migliorerà la velocità di ripristino del progetto e abiliterà l'accesso offline. Il completamento del comando richiederà un minuto.
  </String>
-  <String Id="VisualStudioWarning">Se si intende usare .NET Core 3.1 con Visual Studio, è richiesto Visual Studio 2019 16.4 o versione successiva. &lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;Altre informazioni&lt;/A&gt;.
+  <String Id="VisualStudioWarning">Se si intende usare .NET 5.0 con Visual Studio, è richiesto Visual Studio 2019 16.6 o versione successiva. &lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;Altre informazioni&lt;/A&gt;.
  </String>
 </WixLocalization>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl
@ -65,16 +65,16 @@
    • チュートリアル https://aka.ms/dotnet-tutorials</String>
  <String Id="WelcomeHeaderMessage">.NET SDK</String>
  <String Id="WelcomeDescription">
-    .NET は、オープンソースまたはクロスプラットフォームで、Microsoft によってサポートされています。これを使用して、C#、F # または VB で次のアプリをビルドできます。お楽しみいただければ幸いです。</String>
-  <String Id="LearnMoreTitle">.Net の詳細</String>
+    .NET は、オープンソースまたはクロスプラットフォームで、Microsoft によってサポートされています。これを使用して、C#、F# または VB で次のアプリをビルドできます。お楽しみいただければ幸いです。</String>
+  <String Id="LearnMoreTitle">.Net の詳細情報</String>
  <String Id="ResourcesHeader">リソース</String>
-  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;コア ドキュメント&lt;/A&gt;</String>
+  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;.NET ドキュメント&lt;/A&gt;</String>
  <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;SDK ドキュメント&lt;/A&gt;</String>
  <String Id="PrivacyStatementLink">&lt;A HREF="https://aka.ms/dev-privacy"&gt;プライバシーに関する声明&lt;/A&gt;</String>
  <String Id="DotNetEulaLink">&lt;A HREF="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;.NET ライブラリのライセンス条項&lt;/A&gt;</String>
  <String Id="InstallationNoteTitle">インストール メモ</String>
  <String Id="InstallationNote">コマンドはインストール処理中に実行されるので、プロジェクトの復元速度が向上し、オフラインでアクセスできます。完了するまでに最大 1 分かかります。
  </String>
-  <String Id="VisualStudioWarning">.Net Core 3.1 を Visual Studio と共に使用する場合は、Visual Studio 2019 16.4 以降が必要です。&lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;詳細情報&lt;/A&gt;。
+  <String Id="VisualStudioWarning">.NET 5.0 を Visual Studio と共に使用する場合は、Visual Studio 2019 16.6 以降が必要です。&lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;詳細情報&lt;/A&gt;。
  </String>
 </WixLocalization>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl
@ -42,8 +42,8 @@
  <String Id="FailureRestartButton">다시 시작(&amp;R)</String>
  <String Id="FailureCloseButton">닫기(&amp;C)</String>
  <String Id="FilesInUseHeader">사용 중인 파일</String>
-  <String Id="FilesInUseLabel">다음의 응용 프로그램이 업데이트해야 할 파일을 사용 중입니다.</String>
-  <String Id="FilesInUseCloseRadioButton">응용 프로그램을 닫고 다시 시작합니다(&amp;A).</String>
+  <String Id="FilesInUseLabel">다음의 애플리케이션이 업데이트해야 할 파일을 사용 중입니다.</String>
+  <String Id="FilesInUseCloseRadioButton">애플리케이션을 닫고 다시 시작합니다(&amp;A).</String>
  <String Id="FilesInUseDontCloseRadioButton">애플리케이션을 닫지 않습니다(&amp;D). 다시 부팅해야 합니다.</String>
  <String Id="FilesInUseOkButton">확인(&amp;O)</String>
  <String Id="FilesInUseCancelButton">취소(&amp;C)</String>
@ -55,7 +55,7 @@
    • ASP.NET Core 런타임 [ASPNETCOREVERSION]
    • .NET Windows 데스크톱 런타임 [WINFORMSANDWPFVERSION]

-이 제품은 사용량 데이터를 수집합니다.
+이 제품은 사용량 현황 데이터를 수집합니다.
    • 추가 정보 및 옵트아웃 https://aka.ms/dotnet-cli-telemetry

 리소스
@ -65,16 +65,16 @@
    • 자습서 https://aka.ms/dotnet-tutorials</String>
  <String Id="WelcomeHeaderMessage">.NET SDK</String>
  <String Id="WelcomeDescription">
-    Microsoft가 지원하는 플랫폼 간 오픈 소스인 .NET를 사용하여 C#, F# 또는 VB로 다음 앱을 빌드할 수 있습니다. .NET를 유용하게 사용하시길 바랍니다.</String>
-  <String Id="LearnMoreTitle">.NET 에 대한 자세한 정보</String>
+    Microsoft가 지원하는 플랫폼 간 오픈 소스인 .NET을 사용하여 C#, F# 또는 VB로 다음 앱을 빌드할 수 있습니다. .NET Core를 유용하게 사용하시길 바랍니다.</String>
+  <String Id="LearnMoreTitle">.NET에 대한 자세한 정보</String>
  <String Id="ResourcesHeader">리소스</String>
-  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Core 설명서&lt;/A&gt;</String>
+  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;.NET 설명서&lt;/A&gt;</String>
  <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;SDK 설명서&lt;/A&gt;</String>
  <String Id="PrivacyStatementLink">&lt;A HREF="https://aka.ms/dev-privacy"&gt;개인정보처리방침&lt;/A&gt;</String>
  <String Id="DotNetEulaLink">&lt;A HREF="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;.NET Library EULA&lt;/A&gt;</String>
  <String Id="InstallationNoteTitle">설치 정보</String>
  <String Id="InstallationNote">프로젝트 복원 속도를 향상하고 오프라인 액세스를 사용할 수 있도록 하는 설치 프로세스 중 명령이 실행됩니다. 완료하는 데 최대 1분이 걸립니다.
  </String>
-  <String Id="VisualStudioWarning">Visual Studio와 함께 .NET Core 3.1을 사용하려면 Visual Studio 2019 16.4 이상이 필요합니다. &lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;자세한 정보&lt;/A&gt;
+  <String Id="VisualStudioWarning">Visual Studio와 함께 .NET 5.0을 사용하려면 Visual Studio 2019 16.6 이상이 필요합니다. &lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;자세한 정보&lt;/A&gt;.
  </String>
 </WixLocalization>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl
@ -63,18 +63,18 @@ Zasoby
    • Dokumentacja zestawu SDK: https://aka.ms/dotnet-sdk-docs
    • Informacje o wersji: https://aka.ms/netcore3releasenotes
    • Samouczki: https://aka.ms/dotnet-tutorials</String>
-  <String Id="WelcomeHeaderMessage">Zestaw .NET SDK</String>
+  <String Id="WelcomeHeaderMessage">.NET SDK</String>
  <String Id="WelcomeDescription">
-    .NET to przeznaczone na wiele platform rozwiązanie typu open source obsługiwane przez firmę Microsoft. Za jego pomocą możesz utworzyć swoją następną aplikację, korzystając z języka C#, F# lub VB. Mamy nadzieję, że Ci się spodoba.</String>
+    .NET to przeznaczone na wiele platform rozwiązanie typu open source wspierane przez firmę Microsoft. Za jego pomocą możesz utworzyć swoją następną aplikację, korzystając z języka C#, F# lub VB. Mamy nadzieję, że Ci się spodoba.</String>
  <String Id="LearnMoreTitle">Dowiedz się więcej o platformie .NET</String>
  <String Id="ResourcesHeader">Zasoby</String>
-  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Dokumentacja programu Core&lt;/A&gt;</String>
+  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Dokumentacja platformy .NET&lt;/A&gt;</String>
  <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;Dokumentacja zestawu SDK&lt;/A&gt;</String>
  <String Id="PrivacyStatementLink">&lt;A HREF="https://aka.ms/dev-privacy"&gt;Zasady zachowania poufności informacji&lt;/A&gt;</String>
  <String Id="DotNetEulaLink">&lt;A HREF="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;Umowa licencyjna użytkownika oprogramowania biblioteki .NET&lt;/A&gt;</String>
  <String Id="InstallationNoteTitle">Uwaga dotycząca instalacji</String>
  <String Id="InstallationNote">W trakcie procesu instalacji zostanie uruchomione polecenie, które zwiększy szybkość przywracania projektu i umożliwi dostęp do trybu offline. Zajmie to maksymalnie minutę.
  </String>
-  <String Id="VisualStudioWarning">Jeśli planujesz używać platformy .NET Core 3.1 z programem Visual Studio, wymagany jest program Visual Studio 2019 16.4 lub nowszy. &lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;Dowiedz się więcej&lt;/A&gt;.
+  <String Id="VisualStudioWarning">Jeśli planujesz używać platformy .NET 5.0 z programem Visual Studio, wymagany jest program Visual Studio 2019 16.6 lub nowszy. &lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;Dowiedz się więcej&lt;/A&gt;.
  </String>
 </WixLocalization>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl
@ -56,7 +56,7 @@ O seguinte foi instalado em: '[DOTNETHOME]'
    • Runtime da Área de Trabalho do Windows do .NET [WINFORMSANDWPFVERSION]

 Este produto coleta dados de uso
-    • Para obter mais informações e recusar, 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
@ -65,16 +65,16 @@ Recursos
    • Tutoriais: https://aka.ms/dotnet-tutorials</String>
  <String Id="WelcomeHeaderMessage">SDK do .NET</String>
  <String Id="WelcomeDescription">
-    O .NET é um software livre, multiplataforma e com suporte da Microsoft. Você pode usá-lo para criar seu próximo aplicativo, com C#, F# ou VB. Esperamos que você goste!</String>
+    O .NET é um software livre multiplataforma, com suporte da Microsoft. Você pode usá-lo para criar seu próximo aplicativo, com C#, F# ou VB. Esperamos que você goste.</String>
  <String Id="LearnMoreTitle">Saiba mais sobre o .NET</String>
  <String Id="ResourcesHeader">Recursos</String>
-  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Documentação Principal&lt;/A&gt;</String>
+  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Documentação do .NET&lt;/A&gt;</String>
  <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;Documentação do SDK&lt;/A&gt;</String>
  <String Id="PrivacyStatementLink">&lt;A HREF="https://aka.ms/dev-privacy"&gt;Política de Privacidade&lt;/A&gt;</String>
  <String Id="DotNetEulaLink">&lt;A HREF="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;Termos de licença da Biblioteca do .NET&lt;/A&gt;</String>
  <String Id="InstallationNoteTitle">Nota de instalação</String>
  <String Id="InstallationNote">Um comando será executado durante o processo de instalação que melhorará a velocidade de restauração do projeto e habilitará o acesso offline. Isso levará até um minuto para ser concluído.
  </String>
-  <String Id="VisualStudioWarning">Se você planeja usar o .NET Core 3.1 com o Visual Studio, o Visual Studio 2019 16.4 ou mais recente será necessário. &lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;Saiba mais&lt;/A&gt;.
+  <String Id="VisualStudioWarning">Se você planeja usar o .NET 5.0 com o Visual Studio, será necessário usar o Visual Studio 2019 16.6 ou mais recente. &lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;Saiba mais&lt;/A&gt;.
  </String>
 </WixLocalization>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl
@ -49,32 +49,32 @@
  <String Id="FilesInUseCancelButton">Отм&amp;ена</String>
  <String Id="FirstTimeWelcomeMessage">Установка выполнена.

-В "[DOTNETHOME]" установлены следующие компоненты.
-    • Пакет SDK для .NET Core [DOTNETSDKVERSION]
-    • Среда выполнения .NET Core [DOTNETRUNTIMEVERSION]
+В "[DOTNETHOME]" установлены следующие компоненты:
+    • Пакет SDK для .NET [DOTNETSDKVERSION]
+    • Среда выполнения .NET [DOTNETRUNTIMEVERSION]
    • Среда выполнения ASP.NET Core [ASPNETCOREVERSION]
-    • Среда выполнения .NET Core для Windows Desktop [WINFORMSANDWPFVERSION]
+    • Среда выполнения .NET для Windows Desktop [WINFORMSANDWPFVERSION]

 Этот продукт собирает данные об использовании.
    • Дополнительные сведения и отказ: https://aka.ms/dotnet-cli-telemetry

 Ресурсы
-    • Документация по .NET Core: https://aka.ms/dotnet-docs
+    • Документация по .NET: https://aka.ms/dotnet-docs
    • Документация по SDK: https://aka.ms/dotnet-sdk-docs
    • Заметки о выпуске: https://aka.ms/netcore3releasenotes
    • Учебники: https://aka.ms/dotnet-tutorials</String>
-  <String Id="WelcomeHeaderMessage">Пакет SDK для .NET</String>
+  <String Id="WelcomeHeaderMessage">Пакет SDK для .NET</String>
  <String Id="WelcomeDescription">
-    .NET Core — это кроссплатформенное решение с открытым кодом, поддерживаемое корпорацией Майкрософт. Создавайте с его помощью приложения на C#, F# и Visual Basic. Надеемся, оно вам понравится!</String>
+    .NET — это кроссплатформенное решение с открытым кодом, поддерживаемое корпорацией Майкрософт. Создавайте с его помощью приложения на C#, F# и Visual Basic. Надеемся, оно вам понравится!</String>
  <String Id="LearnMoreTitle">Дополнительные сведения о .NET</String>
  <String Id="ResourcesHeader">Ресурсы</String>
-  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Документация по продукту Core&lt;/A&gt;</String>
+  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Документация по .NET&lt;/A&gt;</String>
  <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;Документация по пакету SDK&lt;/A&gt;</String>
  <String Id="PrivacyStatementLink">&lt;A HREF="https://aka.ms/dev-privacy"&gt;Заявление о конфиденциальности&lt;/A&gt;</String>
  <String Id="DotNetEulaLink">&lt;A HREF="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;Лицензионное соглашение для библиотеки .NET&lt;/A&gt;</String>
  <String Id="InstallationNoteTitle">Примечание по установке</String>
  <String Id="InstallationNote">В процессе установки будет выполнена команда, которая увеличит скорость восстановления проекта и обеспечит автономный доступ. Выполнение займет до минуты.
  </String>
-  <String Id="VisualStudioWarning">Если вы планируете использовать .NET Core 3.1 с Visual Studio, требуется Visual Studio 2019 16.4 или более поздней версии. &lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;Подробнее&lt;/A&gt;.
+  <String Id="VisualStudioWarning">Если вы планируете использовать .NET 5.0 с Visual Studio, требуется Visual Studio 2019 версии 16.6 или более поздней. &lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;Подробнее&lt;/A&gt;.
  </String>
 </WixLocalization>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl
@ -65,16 +65,16 @@ Kaynaklar
    • Öğreticiler https://aka.ms/dotnet-tutorials</String>
  <String Id="WelcomeHeaderMessage">.NET SDK'sı</String>
  <String Id="WelcomeDescription">
-    .NET açık kaynaktır, platformlar arası çalışır ve Microsoft tarafından desteklenir. C#, F# veya VB kullanarak sonraki uygulamanızı geliştirmek için .NET'u kullanabilirsiniz. Keyifle kullanmanızı dileriz!</String>
+    .NET açık kaynaktır, platformlar arası çalışır ve Microsoft tarafından desteklenir. C#, F# veya VB kullanarak sonraki uygulamanızı geliştirmek için .NET'i kullanabilirsiniz. Keyifle kullanmanızı dileriz!</String>
  <String Id="LearnMoreTitle">.NET hakkında daha fazla bilgi edinin</String>
  <String Id="ResourcesHeader">Kaynaklar</String>
-  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Çekirdek Belgeler&lt;/A&gt;</String>
+  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;.NET Belgeleri&lt;/A&gt;</String>
  <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;SDK Belgeleri&lt;/A&gt;</String>
  <String Id="PrivacyStatementLink">&lt;A HREF="https://aka.ms/dev-privacy"&gt;Gizlilik Bildirimi&lt;/A&gt;</String>
  <String Id="DotNetEulaLink">&lt;A HREF="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;.NET Kitaplığı EULA&lt;/A&gt;</String>
  <String Id="InstallationNoteTitle">Yükleme notu</String>
  <String Id="InstallationNote">Yükleme işlemi sırasında, proje geri yükleme hızını artıran ve çevrimdışı erişimi etkinleştiren bir komut çalıştırılır. Tamamlanması bir dakikanızı alır.
  </String>
-  <String Id="VisualStudioWarning">Visual Studio ile .NET Core 3.1 kullanmayı planlıyorsanız, Visual Studio 2019 16.4 veya daha yeni bir sürüm gerekir. &lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;Daha Fazla Bilgi&lt;/A&gt;.
+  <String Id="VisualStudioWarning">Visual Studio ile .NET 5.0 kullanmayı planlıyorsanız Visual Studio 2019 16.6 veya daha yeni bir sürüm gerekir. &lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;Daha Fazla Bilgi&lt;/A&gt;.
  </String>
 </WixLocalization>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl
@ -2,7 +2,7 @@
 <WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
  <String Id="Caption">[WixBundleName] 安装程序</String>
  <String Id="Title">[BUNDLEMONIKER]</String>
-  <String Id="ConfirmCancelMessage">您确定要取消吗?</String>
+  <String Id="ConfirmCancelMessage">是否确实要取消?</String>
  <String Id="ExecuteUpgradeRelatedBundleMessage">上一版本</String>
  <String Id="HelpHeader">安装程序帮助</String>
  <String Id="HelpText">/install | /repair | /uninstall | /layout [\[]"directory"[\]] - 安装、修复、卸载
@ -51,9 +51,9 @@

 下列项安装于: “[DOTNETHOME]”
    • .NET SDK [DOTNETSDKVERSION]
-    • .NET Runtime [DOTNETRUNTIMEVERSION]
-    • ASP.NET Core Runtime [ASPNETCOREVERSION]
-    • .NET Windows Desktop Runtime [WINFORMSANDWPFVERSION]
+    • .NET 运行时 [DOTNETRUNTIMEVERSION]
+    • ASP.NET Core 运行时 [ASPNETCOREVERSION]
+    • .NET Windows Desktop 运行时 [WINFORMSANDWPFVERSION]

 此产品会收集用法数据
    • 详细信息和选择退出选项: https://aka.ms/dotnet-cli-telemetry
@ -68,13 +68,13 @@
    .NET 是开源、跨平台的，且由 Microsoft 提供支持。通过它，可使用 C#、F# 或 VB 构建你的下一个应用。希望你喜欢它!</String>
  <String Id="LearnMoreTitle">了解有关 .NET 的详细信息</String>
  <String Id="ResourcesHeader">资源</String>
-  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Core 文档&lt;/A&gt;</String>
+  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;.NET 文档&lt;/A&gt;</String>
  <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;SDK 文档&lt;/A&gt;</String>
  <String Id="PrivacyStatementLink">&lt;A HREF="https://aka.ms/dev-privacy"&gt;隐私声明&lt;/A&gt;</String>
  <String Id="DotNetEulaLink">&lt;A HREF="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;.NET 库 EULA&lt;/A&gt;</String>
  <String Id="InstallationNoteTitle">安装说明</String>
  <String Id="InstallationNote">将在要提升项目还原速度并实现脱机访问的安装进程期间运行命令。此操作最多 1 分钟即可完成。
  </String>
-  <String Id="VisualStudioWarning">如果计划结合使用 .NET Core 3.1 和 Visual Studio，需要 Visual Studio 2019 16.4 或更高版本。&lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;了解详细信息&lt;/A&gt;。
+  <String Id="VisualStudioWarning">如果计划结合使用 .NET 5.0 和 Visual Studio，需要 Visual Studio 2019 16.6 或更高版本。&lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;了解详细信息&lt;/A&gt;。
  </String>
 </WixLocalization>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl
@ -56,7 +56,7 @@ Se instaló lo siguiente en: "[DOTNETHOME]"
    • .NET Windows Desktop Runtime [WINFORMSANDWPFVERSION]

 Este producto recopila datos de uso
-    • Para 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
@ -68,13 +68,13 @@ Recursos
    .NET es una multiplataforma de código abierto admitida por Microsoft. Puede usarla para compilar su próxima aplicación con C#, F# o VB. Esperamos que la disfrute.</String>
  <String Id="LearnMoreTitle">Más información sobre .NET</String>
  <String Id="ResourcesHeader">Recursos</String>
-  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Documentación principal&lt;/A&gt;</String>
+  <String Id="CoreDocumentationLink">&lt;A HREF="https://aka.ms/dotnet-docs"&gt;Documentación de .NET&lt;/A&gt;</String>
  <String Id="SDKDocumentation">&lt;A HREF="https://aka.ms/dotnet-cli-docs"&gt;Documentación del SDK&lt;/A&gt;</String>
  <String Id="PrivacyStatementLink">&lt;A HREF="https://aka.ms/dev-privacy"&gt;Declaración de privacidad&lt;/A&gt;</String>
  <String Id="DotNetEulaLink">&lt;A HREF="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;CLUF de la biblioteca .NET&lt;/A&gt;</String>
  <String Id="InstallationNoteTitle">Nota de instalación</String>
  <String Id="InstallationNote">Se ejecutará un comando durante el proceso de instalación que mejorará la velocidad de restauración del proyecto y permitirá el acceso sin conexión. La operación tardará hasta un minuto en completarse.
  </String>
-  <String Id="VisualStudioWarning">Si planea usar .NET Core 3.1 con Visual Studio, se requiere Visual Studio 2019 16.4 o una versión más reciente. &lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;Más información&lt;/A&gt;.
+  <String Id="VisualStudioWarning">Si planea usar .NET 5.0 con Visual Studio, se requiere Visual Studio 2019 16.6 o una versión más reciente. &lt;A HREF="https://go.microsoft.com/fwlink/?linkid=866799"&gt;Más información&lt;/A&gt;.
  </String>
 </WixLocalization>
--- a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs
+++ b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs
@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
 using System.Xml.Linq;
 using FluentAssertions;
 using Microsoft.DotNet.TestFramework;
@ -16,40 +13,6 @@ namespace EndToEnd
 {
    public partial class GivenSelfContainedAppsRollForward : TestBase
    {
-
-        [Theory]
-        //  MemberData is used instead of InlineData here so we can access it in another test to
-        //  verify that we are covering the latest release of .NET Core
-        [ClassData(typeof(SupportedNetCoreAppVersions))]
-        public void ItRollsForwardToTheLatestNetCoreVersion(string minorVersion)
-        {
-            if (minorVersion == "3.0" || minorVersion == "3.1" || minorVersion == "5.0")
-            {
-                //  https://github.com/dotnet/core-sdk/issues/621
-                return;
-            }
-            ItRollsForwardToTheLatestVersion(TestProjectCreator.NETCorePackageName, minorVersion);
-        }
-
-        [Theory]
-        [ClassData(typeof(SupportedAspNetCoreVersions))]
-        public void ItRollsForwardToTheLatestAspNetCoreAppVersion(string minorVersion)
-        {
-            if (minorVersion == "3.0" || minorVersion == "3.1" || minorVersion == "5.0")
-            {
-                //  https://github.com/dotnet/core-sdk/issues/621
-                return;
-            }
-            ItRollsForwardToTheLatestVersion(TestProjectCreator.AspNetCoreAppPackageName, minorVersion);
-        }
-
-        [Theory]
-        [ClassData(typeof(SupportedAspNetCoreAllVersions))]
-        public void ItRollsForwardToTheLatestAspNetCoreAllVersion(string minorVersion)
-        {
-            ItRollsForwardToTheLatestVersion(TestProjectCreator.AspNetCoreAllPackageName, minorVersion);
-        }
-
        internal void ItRollsForwardToTheLatestVersion(string packageName, string minorVersion)
        {
            var testProjectCreator = new TestProjectCreator()
@ -184,12 +147,9 @@ namespace EndToEnd
                .Element(ns + "TargetFramework")
                .Value;

-            SupportedAspNetCoreVersions.Versions.Select(v => $"netcoreapp{v}")
+            TargetFrameworkHelper.GetNetAppTargetFrameworks(SupportedAspNetCoreVersions.Versions)
                .Should().Contain(targetFramework, $"the {nameof(SupportedAspNetCoreVersions)} should include the default version " +
-                "of Microsoft.AspNetCore.App used by the templates created by \"dotnet new web\"");
-
-           
+                "of Microsoft.AspNetCore.App used by the templates created by \"dotnet new web\"");           
        }
-
    }
 }
--- a/test/EndToEnd/SupportedNetCoreAppVersions.cs
+++ b/test/EndToEnd/SupportedNetCoreAppVersions.cs
@ -2,31 +2,34 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using Xunit;

 namespace EndToEnd
 {
+    public static class TargetFrameworkHelper
+    {
+        private static Version _firstNetAppVersion = new Version(5, 0);
+
+        public static IEnumerable<string> GetNetAppTargetFrameworks(IEnumerable<string> versions) =>
+            versions.Select(v => $"netcoreapp{v}")
+                    // Add netX.X tfms starting with 5.0
+                    .Concat(versions.Where(v => Version.Parse(v) >= _firstNetAppVersion).Select(v => $"net{v}"));
+    }
+
    public class SupportedNetCoreAppVersions : IEnumerable<object[]>
    {
        public IEnumerator<object[]> GetEnumerator() => Versions.Select(version => new object[] { version }).GetEnumerator();
        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-        public static IEnumerable<string> Versions
+        public static IEnumerable<string> Versions => new[]
        {
-            get
-            {
-                return new[]
-                {
-                    "1.0",
-                    "1.1",
-                    "2.0",
-                    "2.1",
-                    "2.2",
-                    "3.0",
-                    "3.1",
-                    "5.0"
-                };
-            }
-        }
+            "1.0",
+            "1.1",
+            "2.0",
+            "2.1",
+            "2.2",
+            "3.0",
+            "3.1",
+            "5.0"
+        };

        public static IEnumerable<string> TargetFrameworkShortFolderVersion
        {
@ -55,13 +58,8 @@ namespace EndToEnd
        public IEnumerator<object[]> GetEnumerator() => Versions.Select(version => new object[] { version }).GetEnumerator();
        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();

-        public static IEnumerable<string> Versions
-        {
-            get
-            {
-                return SupportedNetCoreAppVersions.Versions.Except(new List<string>() { "1.0", "1.1", "2.0" });
-            }
-        }
+        public static IEnumerable<string> Versions =>
+            SupportedNetCoreAppVersions.Versions.Except(new List<string>() { "1.0", "1.1", "2.0" });
    }

    public class SupportedAspNetCoreAllVersions : IEnumerable<object[]>
@ -69,12 +67,8 @@ namespace EndToEnd
        public IEnumerator<object[]> GetEnumerator() => Versions.Select(version => new object[] { version }).GetEnumerator();
        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();

-        public static IEnumerable<string> Versions
-        {
-            get
-            {
-                return SupportedAspNetCoreVersions.Versions.Where(v => new Version(v).Major < 3);
-            }
-        }
+        public static IEnumerable<string> Versions =>
+            SupportedAspNetCoreVersions.Versions.Where(v => new Version(v).Major < 3);
    }
 }
+