Merge pull request #8712 from dotnet/marcpop-rc2merge

Update the release branch with the rc2 state
2020-09-28 07:26:24 -07:00 · 2020-09-28 07:26:24 -07:00 · 6391ec157b
commit 6391ec157b
parent 53a032d031 e35d18e472
53 changed files with 774 additions and 351 deletions
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@ -262,6 +262,7 @@ stages:
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
  - template: eng\common\templates\post-build\post-build.yml
    parameters:
+      publishingInfraVersion: 3
      enableSymbolValidation: false
      enableSigningValidation: false
      enableNugetValidation: false
@ -286,7 +287,7 @@ stages:
    dependsOn:
      # This will run only after all the publishing stages have run.
      # These stages are introduced in the eng/common/templates/post-build/channels YAML templates
-      - NetCore_Dev5_Publish
+      - publish_using_darc
    jobs:
    - job: Copy_SDK_To_Latest
      pool:
--- a/eng/ManualVersions.props
+++ b/eng/ManualVersions.props
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+<!-- The following properties (unlike those in version.props) are maintained manually.  So
+     when there is a merge conflict, the highest version should generally be chosen, rather
+     than keeping what's in the branch, which is the usual strategy with version.props merge
+     conflicts.
+       
+     Basically: In this file, choose the highest version when resolving merge conflicts.
+ -->
+  <PropertyGroup>
+    <MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.3-preview</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.4-preview</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.3-preview</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
+  </PropertyGroup>
+</Project>
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
 <Project>
+  <PropertyGroup>
+    <PublishingVersion>3</PublishingVersion>
+  </PropertyGroup>
+
  <PropertyGroup>
    <Product>Sdk</Product>
    <BlobStoragePartialRelativePath>$(Product)</BlobStoragePartialRelativePath>
@ -99,30 +103,6 @@
          PropertyName="FullNugetVersion"/>
    </ReadLinesFromFile>

-    <!-- If the sdk version is stabilized, then we should double publish the binaries to suffixed file names.
-         To do this, create new copies of the blobs, replacing the SdkVersion string in the file name with the
-         FullNugetVersion, except if the FullNuGetVersion is already in the file name (which would end up
-         publishing the same exact file name twice). -->
-    <ItemGroup Condition="'$(DotNetFinalVersionKind)'== 'release'">
-        <SdkAssetsToCopyWithSuffix Include="@(SdkAssetsToPublish)" Condition="'$([System.String]::Copy(`%(Filename)`).Contains(`$(Version)`))' == 'true'">
-          <SuffixedPath>$(ArtifactsShippingPackagesDir)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('$(Version)' ,'$(FullNuGetVersion)'))</SuffixedPath>
-        </SdkAssetsToCopyWithSuffix>
-        <CheckSumsToCopyWithSuffix Include="@(CheckSumsToPublish)" Condition="'$([System.String]::Copy(`%(Filename)`).Contains(`$(Version)`))' == 'true'">
-          <SuffixedPath>$(ArtifactsShippingPackagesDir)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('$(Version)' ,'$(FullNuGetVersion)'))</SuffixedPath>
-        </CheckSumsToCopyWithSuffix>
-    </ItemGroup>
-
-    <Copy
-      SourceFiles="@(SdkAssetsToCopyWithSuffix -> '%(Identity)')"
-      DestinationFiles="@(SdkAssetsToCopyWithSuffix -> '%(SuffixedPath)')">
-      <Output TaskParameter="CopiedFiles" ItemName="SdkAssetsToPublishWithSuffix" />
-    </Copy>
-    <Copy
-      SourceFiles="@(CheckSumsToCopyWithSuffix -> '%(Identity)')"
-      DestinationFiles="@(CheckSumsToCopyWithSuffix -> '%(SuffixedPath)')">
-      <Output TaskParameter="CopiedFiles" ItemName="CheckSumsToPublishWithSuffix" />
-    </Copy>
-
    <ItemGroup>
      <!-- Always publish blobs to a suffixed directory. -->
      <SdkAssetsToPushToBlobFeed Include="@(SdkAssetsToPublish)">
@ -137,36 +117,28 @@
      <ChecksumsToPushToBlobFeed Include="@(CheckSumsToPublish)">
        <RelativeBlobPath>$(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)'))</RelativeBlobPath>
      </ChecksumsToPushToBlobFeed>
-
-      <SdkAssetsWithSuffixToPushToBlobFeed Include="@(SdkAssetsToPublishWithSuffix)">
-        <RelativeBlobPath>$(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)'))</RelativeBlobPath>
-        <ManifestArtifactData>NonShipping=true</ManifestArtifactData>
-      </SdkAssetsWithSuffixToPushToBlobFeed>
-
-      <ChecksumsWithSuffixToPushToBlobFeed Include="@(CheckSumsToPublishWithSuffix)" Condition="'$(DotNetFinalVersionKind)'== 'release'">
-        <RelativeBlobPath>$(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)'))</RelativeBlobPath>
-        <ManifestArtifactData>NonShipping=true</ManifestArtifactData>
-      </ChecksumsWithSuffixToPushToBlobFeed>
    </ItemGroup>

    <PushToAzureDevOpsArtifacts
-      ItemsToPush="@(SdkAssetsToPushToBlobFeed);@(SdkAssetsWithSuffixToPushToBlobFeed)"
+      ItemsToPush="@(SdkAssetsToPushToBlobFeed)"
      ManifestBuildData="@(ManifestBuildData)"
-      ManifestRepoUri="$(BUILD_REPOSITORY_URI)"
+      ManifestRepoUri="$(BUILD_REPOSITORY_NAME)"
      ManifestBranch="$(BUILD_SOURCEBRANCH)"
      ManifestBuildId="$(BUILD_BUILDNUMBER)"
      ManifestCommit="$(BUILD_SOURCEVERSION)"
      AssetManifestPath="$(InstallersAssetManifestFilePath)"
-      PublishFlatContainer="true" />
+      PublishFlatContainer="true"
+      PublishingVersion="3"/>

    <PushToAzureDevOpsArtifacts
-      ItemsToPush="@(ChecksumsToPushToBlobFeed);@(ChecksumsWithSuffixToPushToBlobFeed)"
+      ItemsToPush="@(ChecksumsToPushToBlobFeed)"
      ManifestBuildData="@(ManifestBuildData)"
-      ManifestRepoUri="$(BUILD_REPOSITORY_URI)"
+      ManifestRepoUri="$(BUILD_REPOSITORY_NAME)"
      ManifestBranch="$(BUILD_SOURCEBRANCH)"
      ManifestBuildId="$(BUILD_BUILDNUMBER)"
      ManifestCommit="$(BUILD_SOURCEVERSION)"
      AssetManifestPath="$(ChecksumsAssetManifestFilePath)"
-      PublishFlatContainer="true" />
+      PublishFlatContainer="true" 
+      PublishingVersion="3"/>
  </Target>
 </Project>
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
  <ProductDependencies>
-    <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="5.0.0-rc.1.20452.2" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="5.0.0-rc.2.20473.6" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/windowsdesktop</Uri>
-      <Sha>9ea6951cdc8e275e30901a51be700e88d03c4bb9</Sha>
+      <Sha>c71e13f80b7e7c62d81dde989c206df42c5924e2</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-rc.1.20452.2" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-rc.2.20473.6" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/windowsdesktop</Uri>
-      <Sha>9ea6951cdc8e275e30901a51be700e88d03c4bb9</Sha>
+      <Sha>c71e13f80b7e7c62d81dde989c206df42c5924e2</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.0-rc.1.20452.2" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.0-rc.2.20473.6" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/windowsdesktop</Uri>
-      <Sha>9ea6951cdc8e275e30901a51be700e88d03c4bb9</Sha>
+      <Sha>c71e13f80b7e7c62d81dde989c206df42c5924e2</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-rc.1.20451.14" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-rc.2.20473.9" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>38017c3935de95d0335bac04f4901ddfc2718656</Sha>
+      <Sha>467647115ce628504762ee3555d4439ae2da6582</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-rc.1.20451.14" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-rc.2.20473.9" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>38017c3935de95d0335bac04f4901ddfc2718656</Sha>
+      <Sha>467647115ce628504762ee3555d4439ae2da6582</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-rc.1.20451.14" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-rc.2.20473.9" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>38017c3935de95d0335bac04f4901ddfc2718656</Sha>
+      <Sha>467647115ce628504762ee3555d4439ae2da6582</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="5.0.0-rc.1.20451.14" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="5.0.0-rc.2.20473.9" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>38017c3935de95d0335bac04f4901ddfc2718656</Sha>
+      <Sha>467647115ce628504762ee3555d4439ae2da6582</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="5.0.0-rc.1.20451.14" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="5.0.0-rc.2.20473.9" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>38017c3935de95d0335bac04f4901ddfc2718656</Sha>
+      <Sha>467647115ce628504762ee3555d4439ae2da6582</Sha>
    </Dependency>
    <!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
    <!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
@ -39,33 +39,37 @@
      <Uri>https://github.com/dotnet/core-setup</Uri>
      <Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-rc.1.20451.14" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-rc.2.20473.9" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>38017c3935de95d0335bac04f4901ddfc2718656</Sha>
+      <Sha>467647115ce628504762ee3555d4439ae2da6582</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="5.0.0-rc.1.20451.17" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="5.0.0-rc.2.20473.12" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ecdcc752d4639061c2c49727ee77a1039bbbca22</Sha>
+      <Sha>82fea485edc9654cdd2ceac914399657d006c8b9</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.0-rc.1.20451.17" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="5.0.0-rc.2.20473.12" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ecdcc752d4639061c2c49727ee77a1039bbbca22</Sha>
+      <Sha>82fea485edc9654cdd2ceac914399657d006c8b9</Sha>
    </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0" Version="5.0.0-rc.1.20451.17" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.0-rc.2.20473.12" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ecdcc752d4639061c2c49727ee77a1039bbbca22</Sha>
+      <Sha>82fea485edc9654cdd2ceac914399657d006c8b9</Sha>
    </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="5.0.0-rc.1.20451.17" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0" Version="5.0.0-rc.2.20473.12" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ecdcc752d4639061c2c49727ee77a1039bbbca22</Sha>
+      <Sha>82fea485edc9654cdd2ceac914399657d006c8b9</Sha>
    </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="5.0.0-rc.1.20451.17" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-dev-certs" Version="5.0.0-rc.2.20473.12" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ecdcc752d4639061c2c49727ee77a1039bbbca22</Sha>
+      <Sha>82fea485edc9654cdd2ceac914399657d006c8b9</Sha>
    </Dependency>
-    <Dependency Name="dotnet-watch" Version="5.0.0-rc.1.20451.17" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-secrets" Version="5.0.0-rc.2.20473.12" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ecdcc752d4639061c2c49727ee77a1039bbbca22</Sha>
+      <Sha>82fea485edc9654cdd2ceac914399657d006c8b9</Sha>
+    </Dependency>
+    <Dependency Name="dotnet-watch" Version="5.0.0-rc.2.20473.12" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://github.com/dotnet/aspnetcore</Uri>
+      <Sha>82fea485edc9654cdd2ceac914399657d006c8b9</Sha>
    </Dependency>
    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.20420.1">
      <Uri>https://github.com/dotnet/test-templates</Uri>
@ -75,51 +79,51 @@
      <Uri>https://github.com/dotnet/test-templates</Uri>
      <Sha>a2b05d8171915c69ad97ab5d49bbb07d2c780a67</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.0-rc.1.20431.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.0-rc.2.20471.2" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>da62f3656cac0ac4bfb6b012bc072b3499f78e6c</Sha>
+      <Sha>545ef30a75ffd18beaba07430bc04c6991ddfdda</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-rc.1.20452.20">
+    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-rc.2.20474.10">
      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>394fae2553937858c8f05a6158613dcc7f821fba</Sha>
+      <Sha>0551cfeeadee9779fe94b2da6c74871af938d35a</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.100-rc.1.20452.20">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.100-rc.2.20474.10">
      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>394fae2553937858c8f05a6158613dcc7f821fba</Sha>
+      <Sha>0551cfeeadee9779fe94b2da6c74871af938d35a</Sha>
    </Dependency>
    <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
-    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.0-rc.1.20451.14" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.0-rc.2.20473.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
      <Uri>https://github.com/dotnet/winforms</Uri>
-      <Sha>97d99ec9e047dcdff90185bfd0bbe9f26b7be62f</Sha>
+      <Sha>9d2bbfc661d724bd33869203dc5453910f1bf944</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-rc.1.20451.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-rc.2.20473.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
      <Uri>https://github.com/dotnet/wpf</Uri>
-      <Sha>be89bbfaded6ad3f0f4143bf1a8dd075a5789715</Sha>
+      <Sha>ff605be0f60b590c657e2bc6ad84a5442ce7ca5b</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.FSharp.Compiler" Version="11.0.0-beta.20428.2" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.FSharp.Compiler" Version="11.0.0-beta.20471.4" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/fsharp</Uri>
-      <Sha>068ebd3c599bc5a47163a18b8b90d2fe5517186e</Sha>
+      <Sha>53e58f4b5814540bf037567a8b01f777066b4961</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NET.Test.Sdk" Version="16.8.0-release-20200902-05" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NET.Test.Sdk" Version="16.8.0-release-20200924-01" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/microsoft/vstest</Uri>
-      <Sha>0c0fafa64de5c73981e7c40a99d7363f57635f60</Sha>
+      <Sha>2418d9ec492e93245e1ce8699d6ae9cd7b86649b</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rc.1.20431.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rc.2.20468.1" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/mono/linker</Uri>
-      <Sha>863b5502cc43b1c75b5a93ac395899f8d8b5f0a4</Sha>
+      <Sha>6d26f7ac409c5723bca669385e65582e69b4da75</Sha>
      <RepoName>linker</RepoName>
    </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-3.20452.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-4.20474.4" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>90e570d763637c4d0d30524674a64b07bb885994</Sha>
+      <Sha>cec38d8c307bb51596c35b6517f45607d8ea9cc8</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Build" Version="16.8.0-preview-20451-02" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.Build" Version="16.8.0-preview-20473-01" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>51a1071f8871e0c93afbaf1b2ac2c9e59c7b6491</Sha>
+      <Sha>250161603c003af239d6e276c4fc6357586ba301</Sha>
    </Dependency>
-    <Dependency Name="NuGet.Build.Tasks" Version="5.8.0-preview.3.6783" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="NuGet.Build.Tasks" Version="5.8.0-rc.6853" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/NuGet/NuGet.Client</Uri>
-      <Sha>3501ddedc274ac10d4b135856b7593a6bb8a72f1</Sha>
+      <Sha>0e5413751caebf168e7d363c88b9c22a3560fe60</Sha>
    </Dependency>
    <Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/cliCommandLineParser</Uri>
@ -136,21 +140,21 @@
    </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20431.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20471.1">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4be47e467013f8a07a1ed7b6e49e39c8150bde54</Sha>
+      <Sha>0365488709f58e37de6c2180e7fb243203ca0a9c</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20431.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20471.1">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4be47e467013f8a07a1ed7b6e49e39c8150bde54</Sha>
+      <Sha>0365488709f58e37de6c2180e7fb243203ca0a9c</Sha>
    </Dependency>
    <Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
      <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
      <Sha>639aeb4d76c8b1a6226bf7c4edb34fbdae30e6e1</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-20206-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
+    <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-20464-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
      <Uri>https://github.com/dotnet/sourcelink</Uri>
-      <Sha>db7c31800400b6203d2b162255fa46cbaf2f04aa</Sha>
+      <Sha>8a3edd1902dbfe3adba65f22e3bb7aa2cc73e97f</Sha>
    </Dependency>
    <Dependency Name="XliffTasks" Version="1.0.0-beta.20420.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
      <Uri>https://github.com/dotnet/xliff-tasks</Uri>
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -11,25 +11,28 @@
    <VersionFeature>00</VersionFeature>
    <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
    <PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
-    <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
+    <PreReleaseVersionIteration>2</PreReleaseVersionIteration>
    <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
    <CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
+    <!-- Enable to remove prerelease label. -->
+    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
+    <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20431.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20471.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/winforms -->
-    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.0-rc.1.20451.14</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
+    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.0-rc.2.20473.7</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/wpf -->
-    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.0-rc.1.20451.6</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
+    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.0-rc.2.20473.5</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/templating -->
-    <MicrosoftDotNetCommonItemTemplatesPackageVersion>5.0.0-rc.1.20431.3</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+    <MicrosoftDotNetCommonItemTemplatesPackageVersion>5.0.0-rc.2.20471.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/test-templates -->
@ -41,41 +44,43 @@
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>5.0.0-rc.1.20451.17</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftAspNetCoreAppRefPackageVersion>5.0.0-rc.1.20451.17</MicrosoftAspNetCoreAppRefPackageVersion>
-    <VSRedistCommonAspNetCoreTargetingPackx6450PackageVersion>5.0.0-rc.1.20451.17</VSRedistCommonAspNetCoreTargetingPackx6450PackageVersion>
-    <dotnetdevcertsPackageVersion>5.0.0-rc.1.20451.17</dotnetdevcertsPackageVersion>
-    <dotnetusersecretsPackageVersion>5.0.0-rc.1.20451.17</dotnetusersecretsPackageVersion>
-    <dotnetwatchPackageVersion>5.0.0-rc.1.20451.17</dotnetwatchPackageVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>5.0.0-rc.2.20473.12</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftAspNetCoreAppRefPackageVersion>5.0.0-rc.2.20473.12</MicrosoftAspNetCoreAppRefPackageVersion>
+    <MicrosoftAspNetCoreAppRefInternalPackageVersion>5.0.0-rc.2.20473.12</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+    <VSRedistCommonAspNetCoreTargetingPackx6450PackageVersion>5.0.0-rc.2.20473.12</VSRedistCommonAspNetCoreTargetingPackx6450PackageVersion>
+    <dotnetdevcertsPackageVersion>5.0.0-rc.2.20473.12</dotnetdevcertsPackageVersion>
+    <dotnetusersecretsPackageVersion>5.0.0-rc.2.20473.12</dotnetusersecretsPackageVersion>
+    <dotnetwatchPackageVersion>5.0.0-rc.2.20473.12</dotnetwatchPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>5.0.100-rc.1.20452.20</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.100-rc.1.20452.20</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>5.0.100-rc.2.20474.10</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.100-rc.2.20474.10</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
    <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
    <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/dotnet/corefx -->
-    <MicrosoftNETCorePlatformsPackageVersion>5.0.0-rc.1.20451.14</MicrosoftNETCorePlatformsPackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>5.0.0-rc.2.20473.9</MicrosoftNETCorePlatformsPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/dotnet/core-setup -->
-    <MicrosoftNETCoreAppInternalPackageVersion>5.0.0-rc.1.20451.14</MicrosoftNETCoreAppInternalPackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-rc.1.20451.14</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftNETCoreAppHostwinx64PackageVersion>5.0.0-rc.1.20451.14</MicrosoftNETCoreAppHostwinx64PackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>5.0.0-rc.1.20451.14</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETCoreDotNetHostResolverPackageVersion>5.0.0-rc.1.20451.14</MicrosoftNETCoreDotNetHostResolverPackageVersion>
+    <MicrosoftNETCoreAppInternalPackageVersion>5.0.0-rc.2.20473.9</MicrosoftNETCoreAppInternalPackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-rc.2.20473.9</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreAppHostwinx64PackageVersion>5.0.0-rc.2.20473.9</MicrosoftNETCoreAppHostwinx64PackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>5.0.0-rc.2.20473.9</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreDotNetHostResolverPackageVersion>5.0.0-rc.2.20473.9</MicrosoftNETCoreDotNetHostResolverPackageVersion>
    <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
-    <MicrosoftWindowsDesktopAppPackageVersion>5.0.0-rc.1.20452.2</MicrosoftWindowsDesktopAppPackageVersion>
-    <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.0-rc.1.20452.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
-    <MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0-rc.1.20452.2</MicrosoftWindowsDesktopAppRefPackageVersion>
+    <MicrosoftWindowsDesktopAppPackageVersion>5.0.0-rc.2.20473.6</MicrosoftWindowsDesktopAppPackageVersion>
+    <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.0-rc.2.20473.6</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
+    <MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0-rc.2.20473.6</MicrosoftWindowsDesktopAppRefPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64    -->
@ -105,6 +110,7 @@
    <MicrosoftDotNetCommonProjectTemplates31PackageVersion>$(MicrosoftDotNetCommonItemTemplates31PackageVersion)</MicrosoftDotNetCommonProjectTemplates31PackageVersion>
    <MicrosoftDotNetTestProjectTemplates31PackageVersion>$(MicrosoftDotNetTestProjectTemplates50PackageVersion)</MicrosoftDotNetTestProjectTemplates31PackageVersion>
    <AspNetCorePackageVersionFor31Templates>3.1.7</AspNetCorePackageVersionFor31Templates>
+    <MicrosoftAspNetCoreComponentsWebAssemblyTemplatesPackageVersion>3.2.1</MicrosoftAspNetCoreComponentsWebAssemblyTemplatesPackageVersion>
    <!-- 3.0 Template versions -->
    <MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>4.8.0-rc2.19462.10</MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>
    <MicrosoftDotNetWpfProjectTemplates30PackageVersion>3.0.0</MicrosoftDotNetWpfProjectTemplates30PackageVersion>
@ -118,21 +124,17 @@
    <MicrosoftDotNetCommonItemTemplates21PackageVersion>1.0.2-beta3</MicrosoftDotNetCommonItemTemplates21PackageVersion>
    <MicrosoftDotNetCommonProjectTemplates21PackageVersion>$(MicrosoftDotNetCommonItemTemplates21PackageVersion)</MicrosoftDotNetCommonProjectTemplates21PackageVersion>
    <MicrosoftDotNetTestProjectTemplates21PackageVersion>1.0.2-beta4.20420.1</MicrosoftDotNetTestProjectTemplates21PackageVersion>
-    <AspNetCorePackageVersionFor21Templates>2.1.14</AspNetCorePackageVersionFor21Templates>
+    <AspNetCorePackageVersionFor21Templates>2.1.22</AspNetCorePackageVersionFor21Templates>
  </PropertyGroup>
  <!-- infrastructure and test only dependencies -->
  <PropertyGroup>
    <VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
    <DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
-    <MicrosoftNETTestSdkVersion>16.8.0-release-20200902-05</MicrosoftNETTestSdkVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.3-preview</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.4-preview</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.3-preview</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
+    <MicrosoftNETTestSdkVersion>16.8.0-release-20200924-01</MicrosoftNETTestSdkVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- pinned dependency. This package is not being produced outside of the 2.0 branch of corefx and should not change. -->
    <CLI_NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</CLI_NETStandardLibraryNETFrameworkVersion>
  </PropertyGroup>
+  <Import Project="$(RepositoryEngineeringDir)ManualVersions.props" />
 </Project>
--- a/eng/build.yml
+++ b/eng/build.yml
@ -123,7 +123,7 @@ phases:
        env:
          DOTNETCLIMSRC_READ_SAS_TOKEN: $(_DOTNETCLIMSRC_READ_SAS_TOKEN)

-    - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.agentOs, 'Windows_NT')) }}:
+    - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.agentOs, 'Windows_NT'), ne(variables['PostBuildSign'], 'true')) }}:
      - task: NuGetCommand@2
        displayName: Push Visual Studio NuPkgs
        inputs:
--- a/eng/common/internal/Directory.Build.props
+++ b/eng/common/internal/Directory.Build.props
@ -1,4 +1,4 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project>
  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 </Project>
--- a/eng/common/post-build/publish-using-darc.ps1
+++ b/eng/common/post-build/publish-using-darc.ps1
@ -8,7 +8,7 @@ param(
  [Parameter(Mandatory=$false)][string] $EnableSourceLinkValidation,
  [Parameter(Mandatory=$false)][string] $EnableSigningValidation,
  [Parameter(Mandatory=$false)][string] $EnableNugetValidation,
-  [Parameter(Mandatory=$true)][string] $PublishInstallersAndChecksums,
+  [Parameter(Mandatory=$false)][string] $PublishInstallersAndChecksums,
  [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
  [Parameter(Mandatory=$false)][string] $SigningValidationAdditionalParameters
 )
@ -16,7 +16,7 @@ param(
 try {
  . $PSScriptRoot\post-build-utils.ps1
  # Hard coding darc version till the next arcade-services roll out, cos this version has required API changes for darc add-build-to-channel
-  . $PSScriptRoot\..\darc-init.ps1 -darcVersion "1.1.0-beta.20418.1"
+  $darc = Get-Darc "1.1.0-beta.20418.1"

  $optionalParams = [System.Collections.ArrayList]::new()

@ -29,7 +29,7 @@ try {
    $optionalParams.Add("--no-wait") | Out-Null
  }

-  if ("true" -eq $PublishInstallersAndChecksums) {
+  if ("false" -ne $PublishInstallersAndChecksums) {
    $optionalParams.Add("--publish-installers-and-checksums") | Out-Null
  }

@ -50,7 +50,7 @@ try {
    }
  }

-  & darc add-build-to-channel `
+  & $darc add-build-to-channel `
  --id $buildId `
  --publishing-infra-version $PublishingInfraVersion `
  --default-channels `
--- a/eng/common/post-build/sourcelink-validation.ps1
+++ b/eng/common/post-build/sourcelink-validation.ps1
@ -144,11 +144,27 @@ $ValidatePackage = {

  if ($FailedFiles -eq 0) {
    Write-Host 'Passed.'
-    return 0
+    return [pscustomobject]@{
+      result = 0
+      packagePath = $PackagePath
+    }
  }
  else {
    Write-PipelineTelemetryError -Category 'SourceLink' -Message "$PackagePath has broken SourceLink links."
-    return 1
+    return [pscustomobject]@{
+      result = 1
+      packagePath = $PackagePath
+    }
+  }
+}
+
+function CheckJobResult(
+    $result, 
+    $packagePath,
+    [ref]$ValidationFailures) {
+  if ($jobResult.result -ne '0') {
+    Write-PipelineTelemetryError -Category 'SourceLink' -Message "$packagePath has broken SourceLink links."
+    $ValidationFailures.Value++
  }
 }

@ -211,10 +227,8 @@ function ValidateSourceLinkLinks {
      }

      foreach ($Job in @(Get-Job -State 'Completed')) {
-        $jobResult = Receive-Job -Id $Job.Id
-        if ($jobResult -ne '0') {
-          $ValidationFailures++
-        }
+        $jobResult = Wait-Job -Id $Job.Id | Receive-Job
+        CheckJobResult $jobResult.result $jobResult.packagePath ([ref]$ValidationFailures)
        Remove-Job -Id $Job.Id
      }
    }
--- a/eng/common/post-build/symbols-validation.ps1
+++ b/eng/common/post-build/symbols-validation.ps1
@ -141,11 +141,6 @@ $CountMissingSymbols = {
  if ($using:Clean) {
    Remove-Item $ExtractPath -Recurse -Force
  }
-
-  if ($MissingSymbols -ne 0)
-  {
-    Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $MissingSymbols modules in the package $PackagePath"
-  }
  
  Pop-Location

@ -165,6 +160,7 @@ function CheckJobResult(
    $DupedSymbols.Value++
  } 
  elseif ($jobResult.result -ne '0') {
+    Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $result modules in the package $packagePath"
    $TotalFailures.Value++
  }
 }
@ -201,7 +197,6 @@ function CheckSymbolsAvailable {
      Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList $FullName | Out-Null

      $NumJobs = @(Get-Job -State 'Running').Count
-      Write-Host $NumJobs

      while ($NumJobs -ge $MaxParallelJobs) {
        Write-Host "There are $NumJobs validation jobs running right now. Waiting $SecondsBetweenLoadChecks seconds to check again."
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@ -64,7 +64,7 @@ try {
      $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
    }
    if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
-      $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.5.0-alpha" -MemberType NoteProperty
+      $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.8.0-preview3" -MemberType NoteProperty
    }
    if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
        $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
--- a/eng/common/templates/post-build/channels/generic-internal-channel.yml
+++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml
@ -4,7 +4,7 @@ parameters:
  artifactsPublishingAdditionalParameters: ''
  dependsOn:
  - Validate
-  publishInstallersAndChecksums: false
+  publishInstallersAndChecksums: true
  symbolPublishingAdditionalParameters: ''
  stageName: ''
  channelName: ''
@ -158,7 +158,7 @@ stages:
            /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
            /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
            /p:Configuration=Release
-            /p:PublishInstallersAndChecksums=true
+            /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
            /p:ChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
            /p:ChecksumsAzureAccountKey=$(InternalChecksumsBlobFeedKey)
            /p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
--- a/eng/common/templates/post-build/channels/generic-public-channel.yml
+++ b/eng/common/templates/post-build/channels/generic-public-channel.yml
@ -4,7 +4,7 @@ parameters:
  artifactsPublishingAdditionalParameters: ''
  dependsOn:
  - Validate
-  publishInstallersAndChecksums: false
+  publishInstallersAndChecksums: true
  symbolPublishingAdditionalParameters: ''
  stageName: ''
  channelName: ''
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@ -19,7 +19,7 @@ parameters:
  enableSigningValidation: true
  enableSymbolValidation: false
  enableNugetValidation: true
-  publishInstallersAndChecksums: false
+  publishInstallersAndChecksums: true
  SDLValidationParameters:
    enable: false
    continueOnError: false
--- a/eng/common/templates/steps/perf-send-to-helix.yml
+++ b/eng/common/templates/steps/perf-send-to-helix.yml
@ -19,12 +19,18 @@ parameters:
  DisplayNamePrefix: 'Send job to Helix' # optional -- rename the beginning of the displayName of the steps in AzDO 
  condition: succeeded()                 # optional -- condition for step to execute; defaults to succeeded()
  continueOnError: false                 # optional -- determines whether to continue the build if the step errors; defaults to false
+  osGroup: ''                            # required -- operating system for the job
            

 steps:
-  - powershell: $(Build.SourcesDirectory)\eng\common\msbuild.ps1 $(Build.SourcesDirectory)\eng\common\performance\${{ parameters.ProjectFile }} /restore /t:Test /bl:$(Build.SourcesDirectory)\artifacts\log\$env:BuildConfig\SendToHelix.binlog
-    displayName: ${{ parameters.DisplayNamePrefix }} (Windows)
-    env:
+- template: /eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml
+  parameters:
+    osGroup: ${{ parameters.osGroup }}
+    sendParams: $(Build.SourcesDirectory)/eng/common/performance/${{ parameters.ProjectFile }} /restore /t:Test /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
+    displayName: ${{ parameters.DisplayNamePrefix }}
+    condition: ${{ parameters.condition }}
+    continueOnError: ${{ parameters.continueOnError }}
+    environment:
      BuildConfig: $(_BuildConfig)
      HelixSource: ${{ parameters.HelixSource }}
      HelixType: ${{ parameters.HelixType }}
@ -42,27 +48,3 @@ steps:
      WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }}
      Creator: ${{ parameters.Creator }}
      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-    condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT'))
-    continueOnError: ${{ parameters.continueOnError }}
-  - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/performance/${{ parameters.ProjectFile }} /restore /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
-    displayName: ${{ parameters.DisplayNamePrefix }} (Unix)
-    env:
-      BuildConfig: $(_BuildConfig)
-      HelixSource: ${{ parameters.HelixSource }}
-      HelixType: ${{ parameters.HelixType }}
-      HelixBuild: ${{ parameters.HelixBuild }}
-      HelixTargetQueues: ${{ parameters.HelixTargetQueues }}
-      HelixAccessToken: ${{ parameters.HelixAccessToken }}
-      HelixPreCommands: ${{ parameters.HelixPreCommands }}
-      HelixPostCommands: ${{ parameters.HelixPostCommands }}
-      WorkItemDirectory: ${{ parameters.WorkItemDirectory }}
-      CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }}
-      IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }}
-      DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }}
-      DotNetCliVersion: ${{ parameters.DotNetCliVersion }}
-      EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }}
-      WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }}
-      Creator: ${{ parameters.Creator }}
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-    condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT'))
-    continueOnError: ${{ parameters.continueOnError }}
--- a/eng/common/templates/steps/publish-logs.yml
+++ b/eng/common/templates/steps/publish-logs.yml
@ -3,20 +3,21 @@ parameters:
  JobLabel: ''

 steps:
- task: CopyFiles@2
-  displayName: Copy Logs to $(Build.StagingDirectory)\BuildLogs
+- task: Powershell@2
+  displayName: Prepare Binlogs to Upload
  inputs:
-    SourceFolder: $(Build.SourcesDirectory)\artifacts
-    Contents: |
-      **/*.log
-      **/*.binlog
-    TargetFolder: '$(Build.StagingDirectory)\BuildLogs'
+    targetType: inline
+    script: |
+      New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/
+      Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/
  continueOnError: true
-  condition: succeededOrFailed()
+  condition: always()

- task: PublishPipelineArtifact@1
-  displayName: Publish BuildLogs
+- task: PublishBuildArtifacts@1
+  displayName: Publish Logs
  inputs:
-    targetPath: '$(Build.StagingDirectory)\BuildLogs'
-    artifactName: ${{ parameters.JobLabel }}
-  condition: succeededOrFailed()
+    PathtoPublish: '$(Build.SourcesDirectory)/PostBuildLogs'
+    PublishLocation: Container
+    ArtifactName: PostBuildLogs
+  continueOnError: true
+  condition: always()
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@ -240,8 +240,8 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
  return $installScript
 }

-function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $architecture = '') {
-  InstallDotNet $dotnetRoot $version $architecture '' $false $runtimeSourceFeed $runtimeSourceFeedKey
+function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $architecture = '', [switch] $noPath) {
+  InstallDotNet $dotnetRoot $version $architecture '' $false $runtimeSourceFeed $runtimeSourceFeedKey -noPath:$noPath
 }

 function InstallDotNet([string] $dotnetRoot,
@ -250,7 +250,8 @@ function InstallDotNet([string] $dotnetRoot,
  [string] $runtime = '',
  [bool] $skipNonVersionedFiles = $false,
  [string] $runtimeSourceFeed = '',
-  [string] $runtimeSourceFeedKey = '') {
+  [string] $runtimeSourceFeedKey = '',
+  [switch] $noPath) {

  $installScript = GetDotNetInstallScript $dotnetRoot
  $installParameters = @{
@ -261,6 +262,7 @@ function InstallDotNet([string] $dotnetRoot,
  if ($architecture) { $installParameters.Architecture = $architecture }
  if ($runtime) { $installParameters.Runtime = $runtime }
  if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles }
+  if ($noPath) { $installParameters.NoPath = $True }

  try {
    & $installScript @installParameters
@ -310,9 +312,15 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
    return $global:_MSBuildExe
  }

-  $vsMinVersionReqdStr = '16.5'
+  # Minimum VS version to require.
+  $vsMinVersionReqdStr = '16.8'
  $vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr)

+  # If the version of msbuild is going to be xcopied,
+  # use this version. Version matches a package here:
+  # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=16.8.0-preview3&view=overview
+  $defaultXCopyMSBuildVersion = '16.8.0-preview3'
+
  if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
  $vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { $vsMinVersionReqdStr }
  $vsMinVersion = [Version]::new($vsMinVersionStr)
@ -347,23 +355,28 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
      $xcopyMSBuildVersion = $GlobalJson.tools.'xcopy-msbuild'
      $vsMajorVersion = $xcopyMSBuildVersion.Split('.')[0]
    } else {
-      #if vs version provided in global.json is incompatible then use the default version for xcopy msbuild download
+      #if vs version provided in global.json is incompatible (too low) then use the default version for xcopy msbuild download
      if($vsMinVersion -lt $vsMinVersionReqd){
-        Write-Host "Using xcopy-msbuild version of $vsMinVersionReqdStr.0-alpha since VS version $vsMinVersionStr provided in global.json is not compatible"
-        $vsMajorVersion = $vsMinVersionReqd.Major
-        $vsMinorVersion = $vsMinVersionReqd.Minor
+        Write-Host "Using xcopy-msbuild version of $defaultXCopyMSBuildVersion since VS version $vsMinVersionStr provided in global.json is not compatible"
+        $xcopyMSBuildVersion = $defaultXCopyMSBuildVersion
      }
      else{
+        # If the VS version IS compatible, look for an xcopy msbuild package
+        # with a version matching VS.
+        # Note: If this version does not exist, then an explicit version of xcopy msbuild
+        # can be specified in global.json. This will be required for pre-release versions of msbuild.
        $vsMajorVersion = $vsMinVersion.Major
        $vsMinorVersion = $vsMinVersion.Minor
+        $xcopyMSBuildVersion = "$vsMajorVersion.$vsMinorVersion.0"
      }
-
-      $xcopyMSBuildVersion = "$vsMajorVersion.$vsMinorVersion.0-alpha"
    }

    $vsInstallDir = $null
    if ($xcopyMSBuildVersion.Trim() -ine "none") {
        $vsInstallDir = InitializeXCopyMSBuild $xcopyMSBuildVersion $install
+        if ($vsInstallDir -eq $null) {
+            throw "Could not xcopy msbuild. Please check that package 'RoslynTools.MSBuild @ $xcopyMSBuildVersion' exists on feed 'dotnet-eng'."
+        }
    }
    if ($vsInstallDir -eq $null) {
      throw 'Unable to find Visual Studio that has required version and components installed'
@ -716,6 +729,16 @@ function IsWindowsPlatform() {
  return [environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
 }

+function Get-Darc($version) {
+  $darcPath  = "$TempDir\darc\$(New-Guid)"
+  if ($version -ne $null) {
+    & $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host
+  } else {
+    & $PSScriptRoot\darc-init.ps1 -toolpath $darcPath | Out-Host
+  }
+  return "$darcPath\darc.exe"
+}
+
 . $PSScriptRoot\pipeline-logging-functions.ps1

 $RepoRoot = Resolve-Path (Join-Path $PSScriptRoot '..\..')
--- a/eng/dockerrun.sh
+++ b/eng/dockerrun.sh
@ -160,6 +160,7 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \
    -e _PACKAGEVERSIONPROPSURL \
    -e EXTERNALRESTORESOURCES \
    -e BUILD_REPOSITORY_URI \
+    -e BUILD_REPOSITORY_NAME \
    -e BUILD_SOURCEBRANCH \
    -e BUILD_BUILDNUMBER \
    -e BUILD_BUILDID \
--- a/global.json
+++ b/global.json
@ -1,6 +1,6 @@
 {
  "tools": {
-    "dotnet": "5.0.100-preview.6.20310.4",
+    "dotnet": "5.0.100-rc.1.20452.10",
    "runtimes": {
      "dotnet": [
        "$(MicrosoftNETCoreAppInternalPackageVersion)"
@ -8,6 +8,6 @@
    }
  },
  "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20431.1"
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20471.1"
  }
 }
--- a/src/VSTemplateLocator/VSTemplateLocator.csproj
+++ b/src/VSTemplateLocator/VSTemplateLocator.csproj
@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>$(CoreSdkTargetFramework)</TargetFramework>
+    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <GenerateRuntimeCofigurationFiles>false</GenerateRuntimeCofigurationFiles>
+    <AssemblyName>UNUSED</AssemblyName>
+    <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="microsoft.dotnet.templateLocator" Version="$(MicrosoftDotnetTemplateLocatorPackageVersion)" ExcludeAssets="all" GeneratePathProperty="true"/>
+    <PackageReference Include="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" ExcludeAssets="all" GeneratePathProperty="true" />
+    <PackageReference Include="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" ExcludeAssets="all" GeneratePathProperty="true" />
+  </ItemGroup>
+
+  <Target
+    Name="GenerateLayout" 
+    Condition=" '$(OS)' == 'Windows_NT' "
+    BeforeTargets="AfterBuild"
+    >
+    <Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(OutputPath)" />
+
+    <RemoveDir Directories="$(OutputPath)" />
+    <MakeDir Directories="$(OutputPath)" />
+
+    <ItemGroup>
+      <_VSTemplateLocatorSrc Include="$(Pkgruntime_win-x86_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x86\native\hostfxr.dll" Arch="x86\" />
+      <_VSTemplateLocatorSrc Include="$(Pkgruntime_win-x64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x64\native\hostfxr.dll" Arch="x64\" />
+      <_VSTemplateLocatorSrc Include="$(Pkgmicrosoft_dotnet_templateLocator)\lib\net472\**\*.dll" Arch="" />
+      <_VSTemplateLocatorDst Include="@(_VSTemplateLocatorSrc->'$(OutputPath)VSTemplateLocator\%(Arch)%(RecursiveDir)%(Filename)%(Extension)')" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(_VSTemplateLocatorSrc)" DestinationFiles="@(_VSTemplateLocatorDst)" />
+  </Target>
+
+</Project>
--- a/src/core-sdk-tasks/CalculateTemplateVersions.cs
+++ b/src/core-sdk-tasks/CalculateTemplateVersions.cs
@ -12,9 +12,6 @@ namespace Microsoft.DotNet.Cli.Build
        [Required]
        public string AspNetCorePackageVersionTemplate { get; set; }

-        [Required]
-        public string VersionSuffix { get; set; }
-
        [Output]
        public string BundledTemplateInstallPath { get; set; }

@ -28,7 +25,7 @@ namespace Microsoft.DotNet.Cli.Build

        public override bool Execute()
        {
-            var result = Calculate(AspNetCorePackageVersionTemplate, VersionSuffix);
+            var result = Calculate(AspNetCorePackageVersionTemplate);
            BundledTemplateInstallPath = result.BundledTemplateInstallPath;
            BundledTemplateMajorMinorVersion = result.BundledTemplateMajorMinorVersion;
            BundledTemplateMajorMinorPatchVersion = result.BundledTemplateMajorMinorPatchVersion;
@ -40,16 +37,14 @@ namespace Microsoft.DotNet.Cli.Build
            (string BundledTemplateInstallPath,
            string BundledTemplateMajorMinorVersion,
 			string BundledTemplateMajorMinorPatchVersion) 
-            Calculate(
-                string aspNetCorePackageVersionTemplate,
-                string versionSuffix)
+            Calculate(string aspNetCorePackageVersionTemplate)
        {
            var aspNetCoreTemplate = NuGetVersion.Parse(aspNetCorePackageVersionTemplate);

            NuGetVersion baseMajorMinorPatch = GetBaseMajorMinorPatch(aspNetCoreTemplate);

            string bundledTemplateInstallPath = aspNetCoreTemplate.IsPrerelease
-                ? $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}-{versionSuffix}"
+                ? $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}-{aspNetCoreTemplate.Release}"
                : $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}";

            return (
--- a/src/core-sdk-tasks/ReplaceFileContents.cs
+++ b/src/core-sdk-tasks/ReplaceFileContents.cs
@ -12,18 +12,18 @@ namespace Microsoft.DotNet.Cli.Build
 {
    /// <summary>
    /// Reads contents of an input file, and searches for each replacement passed in.
-    /// 
+    ///
    /// When ReplacementItems is matched, it will replace the Include/ItemSpec with the corresponding
    /// ReplacementString metadata value. This can be useful if the ReplacementString is a value that
    /// cannot be represented by ITaskItem.ItemSpec (like string.Empty).
-    /// 
-    /// When a ReplacementPattern is matched it will replace it with the string of the corresponding (by index) 
+    ///
+    /// When a ReplacementPattern is matched it will replace it with the string of the corresponding (by index)
    /// item in ReplacementStrings.
-    /// 
-    /// For example, if 2 ReplacementPatterns are passed in, 2 ReplacementStrings must also passed in and the first 
+    ///
+    /// For example, if 2 ReplacementPatterns are passed in, 2 ReplacementStrings must also passed in and the first
    /// pattern will be replaced with the first string, and the second pattern replaced with the second string.
-    /// 
-    /// ReplacementPattern could easily be a regex, but it isn't needed for current use cases, so leaving this 
+    ///
+    /// ReplacementPattern could easily be a regex, but it isn't needed for current use cases, so leaving this
    /// as just a string that will be replaced.
    /// </summary>
    public class ReplaceFileContents : Task
@ -40,6 +40,11 @@ namespace Microsoft.DotNet.Cli.Build

        public ITaskItem[] ReplacementStrings { get; set; }

+        /// <summary>
+        /// Gets or sets a string that a file must contain for the replacement to be performed.
+        /// </summary>
+        public string FileMustContainText { get; set; }
+
        public override bool Execute()
        {
            if (ReplacementItems == null && ReplacementPatterns == null && ReplacementStrings == null)
@ -81,6 +86,12 @@ namespace Microsoft.DotNet.Cli.Build
        public void ReplaceContents(string inputFile, string destinationFile)
        {
            string inputFileText = File.ReadAllText(inputFile);
+            if (!string.IsNullOrEmpty(FileMustContainText) && !inputFileText.Contains(FileMustContainText))
+            {
+                Log.LogMessage(MessageImportance.Low, $"Skipping replacement on `{inputFile}` because it does not contain the text '{FileMustContainText}'.");
+                return;
+            }
+
            string outputFileText = ReplacePatterns(inputFileText);

            WriteOutputFile(destinationFile, outputFileText);
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@ -3,6 +3,7 @@
    <TargetFramework>$(CoreSdkTargetFramework)</TargetFramework>
    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
    <CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
+    <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
  </PropertyGroup>

  <ItemGroup>
@ -12,6 +13,7 @@
                        />

    <ProjectReference Include="..\SdkResolver\SdkResolver.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\VSTemplateLocator\VSTemplateLocator.csproj" ReferenceOutputAssembly="false" />
  </ItemGroup>

  <ItemGroup>
--- a/src/redist/targets/BundledTemplates.targets
+++ b/src/redist/targets/BundledTemplates.targets
@ -1,29 +1,25 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Target Name="CalculateTemplatesVersions" DependsOnTargets="SetupWixProperties">

-    <CalculateTemplateVersions AspNetCorePackageVersionTemplate="$(AspNetCorePackageVersionFor50Templates)"
-                               VersionSuffix="$(VersionSuffix)">
+    <CalculateTemplateVersions AspNetCorePackageVersionTemplate="$(AspNetCorePackageVersionFor50Templates)">
      <Output TaskParameter="BundledTemplateInstallPath" PropertyName="BundledTemplates50InstallPath" />
      <Output TaskParameter="BundledTemplateMajorMinorVersion" PropertyName="BundledTemplates50MajorMinorVersion" />
      <Output TaskParameter="BundledTemplateMajorMinorPatchVersion" PropertyName="BundledTemplates50MajorMinorPatchVersion" />
    </CalculateTemplateVersions>

-    <CalculateTemplateVersions AspNetCorePackageVersionTemplate="$(AspNetCorePackageVersionFor31Templates)"
-                               VersionSuffix="$(VersionSuffix)">
+    <CalculateTemplateVersions AspNetCorePackageVersionTemplate="$(AspNetCorePackageVersionFor31Templates)">
      <Output TaskParameter="BundledTemplateInstallPath" PropertyName="BundledTemplates31InstallPath" />
      <Output TaskParameter="BundledTemplateMajorMinorVersion" PropertyName="BundledTemplates31MajorMinorVersion" />
      <Output TaskParameter="BundledTemplateMajorMinorPatchVersion" PropertyName="BundledTemplates31MajorMinorPatchVersion" />
    </CalculateTemplateVersions>

-    <CalculateTemplateVersions AspNetCorePackageVersionTemplate="$(AspNetCorePackageVersionFor30Templates)"
-                               VersionSuffix="$(VersionSuffix)">
+    <CalculateTemplateVersions AspNetCorePackageVersionTemplate="$(AspNetCorePackageVersionFor30Templates)">
      <Output TaskParameter="BundledTemplateInstallPath" PropertyName="BundledTemplates30InstallPath" />
      <Output TaskParameter="BundledTemplateMajorMinorVersion" PropertyName="BundledTemplates30MajorMinorVersion" />
      <Output TaskParameter="BundledTemplateMajorMinorPatchVersion" PropertyName="BundledTemplates30MajorMinorPatchVersion" />
    </CalculateTemplateVersions>

-    <CalculateTemplateVersions AspNetCorePackageVersionTemplate="$(AspNetCorePackageVersionFor21Templates)"
-                               VersionSuffix="$(VersionSuffix)">
+    <CalculateTemplateVersions AspNetCorePackageVersionTemplate="$(AspNetCorePackageVersionFor21Templates)">
      <Output TaskParameter="BundledTemplateInstallPath" PropertyName="BundledTemplates21InstallPath" />
      <Output TaskParameter="BundledTemplateMajorMinorVersion" PropertyName="BundledTemplates21MajorMinorVersion" />
      <Output TaskParameter="BundledTemplateMajorMinorPatchVersion" PropertyName="BundledTemplates21MajorMinorPatchVersion" />
@ -70,6 +66,7 @@
    <Bundled31Templates Include="Microsoft.DotNet.Web.ItemTemplates" PackageVersion="$(AspNetCorePackageVersionFor31Templates)" />
    <Bundled31Templates Include="Microsoft.DotNet.Web.ProjectTemplates.3.1" PackageVersion="$(AspNetCorePackageVersionFor31Templates)" />
    <Bundled31Templates Include="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" PackageVersion="$(AspNetCorePackageVersionFor31Templates)" />
+    <Bundled31Templates Include="Microsoft.AspNetCore.Components.WebAssembly.Templates" PackageVersion="$(MicrosoftAspNetCoreComponentsWebAssemblyTemplatesPackageVersion)" />
    <Bundled31Templates Include="NUnit3.DotNetNew.Template" PackageVersion="$(NUnit3Templates31PackageVersion)" />
  </ItemGroup>
  <ItemGroup>
@ -183,7 +180,7 @@

  <Target Name="LayoutTemplatesFor50MSI"
          DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersions"
-          Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))">
+          Condition="$(ProductMonikerRid.StartsWith('win')) And '$(Architecture)' != 'arm'">
    <Copy SourceFiles="%(Bundled50Templates.RestoredNupkgPath)"
          DestinationFolder="$(Templates50LayoutPath)templates/$(BundledTemplates50InstallPath)"/>
  </Target>
--- a/src/redist/targets/Crossgen.targets
+++ b/src/redist/targets/Crossgen.targets
@ -71,7 +71,7 @@
      <RemainingFiles Remove="$(SdkOutputDirectory)**\*.resources.dll" />

      <!-- Don't crossgen reference assemblies redisted with msbuild for RoslynCodeTaskFactory -->
-      <RemainingFiles Remove="$(SdkOutputDirectory)ref\*.dll" />
+      <RemainingFiles Remove="$(SdkOutputDirectory)**\ref\*.dll" />

      <DiasymReaderPath Include="$(SharedFrameworkNameVersionPath)/Microsoft.DiaSymReader.Native.$(DIASymReaderCrossgenFilter).dll" />
    </ItemGroup>
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@ -108,14 +108,12 @@
      <Crossgen2SupportedRids Include="linux-musl-x64;linux-x64;win-x64" />

      <AspNetCore31RuntimePackRids Include="@(AspNetCore30RuntimePackRids)" />
-      <AspNetCoreRuntimePackRids Include="@(AspNetCore31RuntimePackRids)" />
+      <AspNetCore50RuntimePackRids Include="@(AspNetCore31RuntimePackRids);win-arm64" />
+      <AspNetCoreRuntimePackRids Include="@(AspNetCore50RuntimePackRids)" />

      <WindowsDesktop30RuntimePackRids Include="win-x64;win-x86" />
      <WindowsDesktop31RuntimePackRids Include="@(WindowsDesktop30RuntimePackRids)" />
      <WindowsDesktopRuntimePackRids Include="@(WindowsDesktop31RuntimePackRids)" />
-      <!-- TODO: remove this once WPF is available on ARM64 and replace usage
-            of this group for WindowsDesktopRuntimePackRids. -->
-      <WindowsDesktopRuntimePackWinformsRids Include="@(WindowsDesktopRuntimePackRids);win-arm64" />
    </ItemGroup>

    <!--
@ -264,7 +262,7 @@ Copyright (c) .NET Foundation. All rights reserved.
                              TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
                              TargetingPackVersion="$(MicrosoftWindowsDesktopAppRefPackageVersion)"
                              RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
-                              RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackWinformsRids, '%3B')"
+                              RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')"
                              IsWindowsOnly="true"
                              Profile="WindowsForms"
                              />
@ -277,7 +275,7 @@ Copyright (c) .NET Foundation. All rights reserved.
                              TargetingPackName="Microsoft.AspNetCore.App.Ref"
                              TargetingPackVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)"
                              RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"
-                              RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')"
+                              RuntimePackRuntimeIdentifiers="@(AspNetCore50RuntimePackRids, '%3B')"
                              />

    <KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@ -17,7 +17,7 @@

    <!-- Change these individually to or $(CoreSetupBlobVersion), $(AspNetCoreBlobVersion), or appropriate fixed version depending if corresponding .Ref packages are unpinned. -->
    <NETCoreAppTargetingPackBlobVersion>$(CoreSetupBlobVersion)</NETCoreAppTargetingPackBlobVersion>
-    <AspNetCoreTargetingPackBlobVersion>$(AspNetCoreBlobVersion)</AspNetCoreTargetingPackBlobVersion>
+    <AspNetCoreTargetingPackBlobVersion>$(MicrosoftAspNetCoreAppRefInternalPackageVersion)</AspNetCoreTargetingPackBlobVersion>
    <WindowsDesktopTargetingPackBlobVersion>$(WindowsDesktopBlobVersion)</WindowsDesktopTargetingPackBlobVersion>
    <NETStandardTargetingPackBlobVersion>3.0.0</NETStandardTargetingPackBlobVersion>
  </PropertyGroup>
@ -78,10 +78,11 @@
      <AspNetCoreSharedFxInstallerRid Condition="'$(InstallerExtension)' == '.deb' OR '$(InstallerExtension)' == '.rpm'">x64</AspNetCoreSharedFxInstallerRid>

      <DownloadedAspNetCoreSharedFxInstallerFileName Condition=" '$(InstallerExtension)' != '' AND !$([MSBuild]::IsOSPlatform('OSX')) ">aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetCoreSharedFxInstallerFileName>
+      <DownloadedAspNetCoreSharedFxInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-runtime-$(VSRedistCommonAspNetCoreTargetingPackx6450PackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetCoreSharedFxInstallerFileName>
      <!-- Note: we use the "-internal" archives and installers that contain only the aspnetcore shared framework, and shouldn't overlap with Microsoft.NETCore.App. -->
      <DownloadedAspNetCoreSharedFxWixLibFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib</DownloadedAspNetCoreSharedFxWixLibFileName>
      <DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
-      <DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
+      <DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
      <DownloadedAspNetCoreV2ModuleInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcoremodule_$(Architecture)_en_v2_$(MicrosoftAspNetCoreAppRuntimePackageVersion)$(InstallerExtension)</DownloadedAspNetCoreV2ModuleInstallerFileName>
      <AspNetTargetingPackArchiveFileName>aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(ArchiveExtension)</AspNetTargetingPackArchiveFileName>
      <AspNetCoreSharedFxArchiveFileName>aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension)</AspNetCoreSharedFxArchiveFileName>
@ -167,29 +168,30 @@
      </BundledInstallerComponent>

      <BundledInstallerComponent Include="DownloadedSharedFrameworkInstallerFile"
-                                 Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
+                                 Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
        <BaseUrl>$(CoreSetupRootUrl)$(CoreSetupBlobVersion)</BaseUrl>
        <DownloadFileName>$(DownloadedSharedFrameworkInstallerFileName)</DownloadFileName>
      </BundledInstallerComponent>

      <BundledInstallerComponent Include="DownloadedSharedHostInstallerFile"
-                                 Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
+                                 Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
        <BaseUrl>$(CoreSetupRootUrl)$(CoreSetupBlobVersion)</BaseUrl>
        <DownloadFileName>$(DownloadedSharedHostInstallerFileName)</DownloadFileName>
      </BundledInstallerComponent>

      <BundledInstallerComponent Include="DownloadedHostFxrInstallerFile"
-                                 Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
+                                 Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
        <BaseUrl>$(CoreSetupRootUrl)$(CoreSetupBlobVersion)</BaseUrl>
        <DownloadFileName>$(DownloadedHostFxrInstallerFileName)</DownloadFileName>
      </BundledInstallerComponent>

      <BundledInstallerComponent Include="DownloadedNetCoreAppTargetingPackInstallerFile"
-                                 Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
+                                 Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
        <BaseUrl>$(CoreSetupRootUrl)$(NETCoreAppTargetingPackBlobVersion)</BaseUrl>
        <DownloadFileName>$(DownloadedNetCoreAppTargetingPackInstallerFileName)</DownloadFileName>
      </BundledInstallerComponent>

+      <!-- TODO: Should we somehow obtain a .NET Standard ARM64 package? -->
      <BundledInstallerComponent Include="DownloadedNetStandardTargetingPackInstallerFile"
                           Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
        <BaseUrl>$(CoreSetupRootUrl)$(NETCoreAppTargetingPackBlobVersion)</BaseUrl>
@ -198,7 +200,7 @@
      </BundledInstallerComponent>

      <BundledInstallerComponent Include="DownloadedNetCoreAppHostPackInstallerFile"
-                     Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
+                     Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
        <BaseUrl>$(CoreSetupRootUrl)$(CoreSetupBlobVersion)</BaseUrl>
        <DownloadFileName>$(DownloadedNetCoreAppHostPackInstallerFileName)</DownloadFileName>
      </BundledInstallerComponent>
@ -251,19 +253,19 @@
      </BundledLayoutComponent>

      <BundledInstallerComponent Include="DownloadedAspNetTargetingPackInstallerFile"
-                                 Condition="'$(InstallerExtension)' != '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
+                                 Condition="'$(InstallerExtension)' != '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
        <BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreTargetingPackBlobVersion)</BaseUrl>
        <DownloadFileName>$(DownloadedAspNetTargetingPackInstallerFileName)</DownloadFileName>
      </BundledInstallerComponent>

      <BundledInstallerComponent Include="DownloadedAspNetCoreSharedFxInstallerFile"
-                                 Condition="'$(InstallerExtension)' != '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
+                                 Condition="'$(InstallerExtension)' != '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
        <BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion)</BaseUrl>
        <DownloadFileName>$(DownloadedAspNetCoreSharedFxInstallerFileName)</DownloadFileName>
      </BundledInstallerComponent>

      <BundledInstallerComponent Include="DownloadedAspNetCoreSharedFxWixLibFile"
-                                 Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' == '.msi' And !$(Architecture.StartsWith('arm'))">
+                                 Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' == '.msi' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
        <BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion)</BaseUrl>
        <DownloadFileName>$(DownloadedAspNetCoreSharedFxWixLibFileName)</DownloadFileName>
      </BundledInstallerComponent>
@ -275,7 +277,7 @@
      </BundledInstallerComponent>

      <BundledInstallerComponent Include="AspNetCoreSharedFxBaseRuntimeVersionFile"
-                                 Condition="!$(Architecture.StartsWith('arm'))">
+                                 Condition="!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64'">
        <BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion)</BaseUrl>
        <DownloadFileName>$(AspNetCoreSharedFxBaseRuntimeVersionFileName)</DownloadFileName>
      </BundledInstallerComponent>
@ -283,7 +285,7 @@

    <PropertyGroup>
      <IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' AND '$(Architecture)' == 'arm'">false</IncludeWpfAndWinForms>
-      <IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' AND '$(OS)' == 'Windows_NT'">true</IncludeWpfAndWinForms>
+      <IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' AND '$(OS)' == 'Windows_NT' AND '$(Architecture)' != 'arm64' ">true</IncludeWpfAndWinForms>
      <IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' ">false</IncludeWpfAndWinForms>
    </PropertyGroup>

@ -403,15 +405,27 @@
    <PropertyGroup>
      <ReplacementPattern>"version": ".*"</ReplacementPattern>
      <ReplacementString>"version": "$(MicrosoftNETCoreAppRuntimePackageVersion)"</ReplacementString>
+      <AspNetCoreRuntimeReplacementString>"version": "$(MicrosoftAspNetCoreAppRuntimePackageVersion)"</AspNetCoreRuntimeReplacementString>
    </PropertyGroup>
    <ItemGroup>
      <ToolRuntimeConfigPath Include="$(RedistLayoutPath)sdk/$(Version)/**/*.runtimeconfig.json" />
    </ItemGroup>
+
+    <!-- Update runtimeconfig files that target Microsoft.NETCore.App -->
    <ReplaceFileContents
      InputFiles="@(ToolRuntimeConfigPath)"
      DestinationFiles="@(ToolRuntimeConfigPath)"
      ReplacementPatterns="$(ReplacementPattern)"
-      ReplacementStrings="$(ReplacementString)" />
+      ReplacementStrings="$(ReplacementString)"
+      FileMustContainText="Microsoft.NETCore.App" />
+
+    <!-- Update runtimeconfig files that target Microsoft.AspNetCore.App -->
+    <ReplaceFileContents
+      InputFiles="@(ToolRuntimeConfigPath)"
+      DestinationFiles="@(ToolRuntimeConfigPath)"
+      ReplacementPatterns="$(ReplacementPattern)"
+      ReplacementStrings="$(AspNetCoreRuntimeReplacementString)"
+      FileMustContainText="Microsoft.AspNetCore.App" />
  </Target>

  <Target Name="GenerateVersionFile"
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@ -5,7 +5,7 @@
  </ItemGroup>
  
  <PropertyGroup>
-    <MicrosoftDotNetBuildTasksInstallersTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\netcoreapp2.0\Microsoft.DotNet.Build.Tasks.Installers.dll</MicrosoftDotNetBuildTasksInstallersTaskAssembly>
+    <MicrosoftDotNetBuildTasksInstallersTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\netcoreapp2.1\Microsoft.DotNet.Build.Tasks.Installers.dll</MicrosoftDotNetBuildTasksInstallersTaskAssembly>
    <MicrosoftDotNetBuildTasksInstallersTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\net472\Microsoft.DotNet.Build.Tasks.Installers.dll</MicrosoftDotNetBuildTasksInstallersTaskAssembly>
  </PropertyGroup>

@ -14,7 +14,7 @@
  <Target Name="SetupWixProperties" DependsOnTargets="GetCurrentRuntimeInformation">
    <!-- AcquireWix Properties -->
    <PropertyGroup>
-      <WixVersion>3.10.4</WixVersion>
+      <WixVersion>3.14.0.4118</WixVersion>
      <WixDownloadUrl>https://dotnetcli.azureedge.net/build/wix/wix.$(WixVersion).zip</WixDownloadUrl>
      <WixRoot>$(ArtifactsDir)Tools/WixTools/$(WixVersion)</WixRoot>
      <WixDestinationPath>$(WixRoot)/WixTools.$(WixVersion).zip</WixDestinationPath>
@ -46,6 +46,10 @@
      <SdkMSBuildExtensionsNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$(FullNugetVersion).nupkg</SdkMSBuildExtensionsNupkgFile>
      <SdkMSBuildExtensionsSwrFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.swr</SdkMSBuildExtensionsSwrFile>

+      <VSTemplateLocatorLayoutPath>$(ArtifactsDir)bin/VSTemplateLocator/Debug</VSTemplateLocatorLayoutPath>
+      <VSTemplateLocatorNuspecFile>$(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec</VSTemplateLocatorNuspecFile>
+      <VSTemplateLocatorNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.$(FullNugetVersion).nupkg</VSTemplateLocatorNupkgFile>
+
      <!-- Temp directory for light command layouts -->
      <LightCommandObjDir>$(ArtifactsObjDir)/LightCommandPackages</LightCommandObjDir>
      <!-- Directory for the zipped up light command package -->
@ -197,19 +201,14 @@
    </ItemGroup>
    <CreateLightCommandPackageDrop
      LightCommandWorkingDir="$(LightCommandObjDir)"
+      OutputFolder="$(LightCommandPackagesDir)"
      NoLogo="true"
      Cultures="en-us"
-      Out="$(SdkMSIInstallerFile)"
+      InstallerFile="$(SdkMSIInstallerFile)"
      WixExtensions="WixUIExtension;WixDependencyExtension;WixUtilExtension"
      WixSrcFiles="@(SdkMsiWixSrcFiles)">
-      <Output TaskParameter="LightCommandPackageNameOutput" PropertyName="_LightCommandPackageNameOutput" />
+      <Output TaskParameter="OutputFile" PropertyName="_LightCommandPackageNameOutput" />
    </CreateLightCommandPackageDrop>
-    <MakeDir Directories="$(LightCommandPackagesDir)" />
-
-    <ZipDirectory
-      DestinationFile="$(LightCommandPackagesDir)/LightCommandPackage-$(_LightCommandPackageNameOutput).zip"
-      SourceDirectory="$(LightCommandObjDir)/$(_LightCommandPackageNameOutput)"
-      Overwrite="true" />
  </Target>

  <Target Name="GenerateSdkPlaceholderMsi"
@ -235,25 +234,20 @@
    </ItemGroup>
    <CreateLightCommandPackageDrop
      LightCommandWorkingDir="$(LightCommandObjDir)"
+      OutputFolder="$(LightCommandPackagesDir)"
      NoLogo="true"
      Cultures="en-us"
-      Out="$(SdkPlaceholderMSIInstallerFile)"
+      InstallerFile="$(SdkPlaceholderMSIInstallerFile)"
      WixExtensions="WixUIExtension;WixDependencyExtension;WixUtilExtension"
      WixSrcFiles="@(SdkPlaceholdMsiWixSrcFiles)"
      AdditionalBasePaths="$(MSBuildThisFileDirectory)packaging/windows/clisdk">
-      <Output TaskParameter="LightCommandPackageNameOutput" PropertyName="_LightCommandPackageNameOutput" />
+      <Output TaskParameter="OutputFile" PropertyName="_LightCommandPackageNameOutput" />
    </CreateLightCommandPackageDrop>
-    <MakeDir Directories="$(LightCommandPackagesDir)" />
-
-    <ZipDirectory
-      DestinationFile="$(LightCommandPackagesDir)/LightCommandPackage-$(_LightCommandPackageNameOutput).zip"
-      SourceDirectory="$(LightCommandObjDir)/$(_LightCommandPackageNameOutput)"
-      Overwrite="true" />
  </Target>

  <Target Name="GenerateTemplatesMsis"
          DependsOnTargets="GenerateLayout;AcquireWix;MsiTargetsSetupInputOutputs;SetSdkBrandingInfo;SetupTemplatesMsis"
-          Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))"
+          Condition="$(ProductMonikerRid.StartsWith('win')) And '$(Architecture)' != 'arm'"
          Inputs="@(TemplatesMsiComponent);$(TemplatesGenerateMsiPowershellScript)"
          Outputs="%(TemplatesMsiComponent.MSIInstallerFile)">

@ -277,19 +271,14 @@

    <CreateLightCommandPackageDrop
      LightCommandWorkingDir="$(LightCommandObjDir)"
+      OutputFolder="$(LightCommandPackagesDir)"
      NoLogo="true"
      Cultures="en-us"
-      Out="%(TemplatesMsiComponent.MSIInstallerFile)"
+      InstallerFile="%(TemplatesMsiComponent.MSIInstallerFile)"
      WixExtensions="WixUIExtension;WixDependencyExtension;WixUtilExtension"
      WixSrcFiles="@(TemplatesMsiWixSrcFiles)">
-      <Output TaskParameter="LightCommandPackageNameOutput" PropertyName="_LightCommandPackageNameOutput" />
+      <Output TaskParameter="OutputFile" PropertyName="_LightCommandPackageNameOutput" />
    </CreateLightCommandPackageDrop>
-    <MakeDir Directories="$(LightCommandPackagesDir)" />
-
-    <ZipDirectory
-      DestinationFile="$(LightCommandPackagesDir)/LightCommandPackage-$(_LightCommandPackageNameOutput).zip"
-      SourceDirectory="$(LightCommandObjDir)/$(_LightCommandPackageNameOutput)"
-      Overwrite="true" />
  </Target>

  <Target Name="SetupTemplatesMsis">
@ -306,6 +295,9 @@
        <UpgradeCode>$(Templates50InstallerUpgradeCode)</UpgradeCode>
        <DependencyKeyName>NetCore_Templates_5.0</DependencyKeyName>
      </TemplatesMsiComponent>
+    </ItemGroup>
+
+    <ItemGroup Condition="!$(Architecture.StartsWith('arm'))">
      <TemplatesMsiComponent Include="NetCore31TemplatesMsi">
        <LayoutPath>$(Templates31LayoutPath.TrimEnd('\'))</LayoutPath>
        <MSIInstallerFile>$(Templates31MSIInstallerFile)</MSIInstallerFile>
@ -379,20 +371,15 @@
    </ItemGroup>
    <CreateLightCommandPackageDrop
      LightCommandWorkingDir="$(LightCommandObjDir)"
+      OutputFolder="$(LightCommandPackagesDir)"
      NoLogo="true"
      Cultures="en-us"
-      Out="$(CombinedFrameworkSdkHostMSIInstallerFile)"
+      InstallerFile="$(CombinedFrameworkSdkHostMSIInstallerFile)"
      WixExtensions="WixBalExtension;WixUtilExtension;WixTagExtension"
      WixSrcFiles="@(BundleMsiWixSrcFiles)"
      AdditionalBasePaths="$(MSBuildThisFileDirectory)packaging/windows/clisdk">
-      <Output TaskParameter="LightCommandPackageNameOutput" PropertyName="_LightCommandPackageNameOutput" />
+      <Output TaskParameter="OutputFile" PropertyName="_LightCommandPackageNameOutput" />
    </CreateLightCommandPackageDrop>
-    <MakeDir Directories="$(LightCommandPackagesDir)" />
-
-    <ZipDirectory
-      DestinationFile="$(LightCommandPackagesDir)/LightCommandPackage-$(_LightCommandPackageNameOutput).zip"
-      SourceDirectory="$(LightCommandObjDir)/$(_LightCommandPackageNameOutput)"
-      Overwrite="true" />
  </Target>

  <Target Name="GenerateToolsetNupkg"
@ -531,6 +518,23 @@

  </Target>

+  <Target Name="GenerateVSTemplateLocatorNupkg"
+          DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs"
+          Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "
+          Inputs="$(MSBuildExtensionsLayoutDirectory)/**/*;
+                    $(VSTemplateLocatorNuspecFile);
+                    $(GenerateNupkgPowershellScript)"
+          Outputs="$(VSTemplateLocatorNupkgFile)">
+
+    <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
+                      '$(ArtifactsDir)' ^
+                      '$(VSTemplateLocatorLayoutPath.TrimEnd('\'))' ^
+                      '$(FullNugetVersion)' ^
+                      '$(VSTemplateLocatorNuspecFile)' ^
+                      '$(VSTemplateLocatorNupkgFile)'" />
+
+  </Target>
+
  <Target Name="GenerateMsis"
        DependsOnTargets="GenerateLayout;
                            MsiTargetsSetupInputOutputs;
@ -548,8 +552,9 @@
                            GenerateSdkPlaceholderNupkg;
                            GenerateVSToolsNupkg;
                            GenerateVSToolsResolverNupkg;
-                            GenerateSdkMSBuildExtensionsNupkg"
-        Condition=" '$(OS)' == 'Windows_NT' and !$(Architecture.StartsWith('arm')) " />
+                            GenerateSdkMSBuildExtensionsNupkg;
+                            GenerateVSTemplateLocatorNupkg"
+        Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' != 'arm' " />


 </Project>
--- a/src/redist/targets/Signing.targets
+++ b/src/redist/targets/Signing.targets
@ -113,6 +113,7 @@
                            $(SdkOutputDirectory)**/MSBuild.dll;
                            $(SdkOutputDirectory)**/MSBuild.resources.dll;
                            $(SdkOutputDirectory)**/PresentationBuildTasks.dll;
+                            $(SdkOutputDirectory)**/redist.dll;
                            $(SdkOutputDirectory)**/rzc.dll;
                            $(SdkOutputDirectory)**/testhost.dll;
                            $(SdkOutputDirectory)**/testhost.exe;
@ -183,10 +184,15 @@

    <ItemGroup>
      <TemplatesMsiFilesToSign Include="$(Templates50MSIInstallerFile)" />
+    </ItemGroup>
+
+    <ItemGroup Condition="!$(Architecture.StartsWith('arm'))">
      <TemplatesMsiFilesToSign Include="$(Templates31MSIInstallerFile)" />
      <TemplatesMsiFilesToSign Include="$(Templates30MSIInstallerFile)" />
      <TemplatesMsiFilesToSign Include="$(Templates21MSIInstallerFile)" />
-
+    </ItemGroup>
+    
+    <ItemGroup>
      <TemplatesMsiFileSignInfo Include="@(TemplatesMsiFilesToSign->'%(Filename)%(Extension)')">
        <CertificateName>$(InternalCertificateId)</CertificateName>
      </TemplatesMsiFileSignInfo>
--- a/src/redist/targets/Versions.targets
+++ b/src/redist/targets/Versions.targets
@ -1,7 +1,8 @@
 <Project>
  <Target Name="GenerateFullNuGetVersion">
    <PropertyGroup>
-      <FullNugetVersion>$(VersionPrefix)-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</FullNugetVersion>
+      <FullNugetVersion>$(VersionPrefix)-$(PreReleaseVersionLabel)</FullNugetVersion>
+      <FullNugetVersion Condition="'$(PreReleaseVersionIteration)' != ''">$(FullNugetVersion).$(PreReleaseVersionIteration)</FullNugetVersion>
      <FullNugetVersion Condition=" '$(VersionSuffixDateStamp)' != '' And '$(VersionSuffixBuildOfTheDay)' != '' ">$(FullNugetVersion).$(VersionSuffixDateStamp).$(VersionSuffixBuildOfTheDay)</FullNugetVersion>
    </PropertyGroup>
  </Target>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl
@ -58,6 +58,21 @@
 此產品會收集使用方式資料
    • 如需詳細資訊並退出，請前往 https://aka.ms/dotnet-cli-telemetry

+資源
+    • 如需 .NET 文件，請前往 https://aka.ms/dotnet-docs
+    • 如需 SDK 文件，請前往 https://aka.ms/dotnet-sdk-docs
+    • 如需版本資訊，請前往 https://aka.ms/dotnet5-release-notes
+    • 如需教學課程，請前往 https://aka.ms/dotnet-tutorials</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
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl
@ -58,6 +58,21 @@ Do [DOTNETHOME] byly nainstalovány tyto součásti:
 Tento produkt shromažďuje data o využití.
    • Další informace a vyjádření výslovného nesouhlasu: https://aka.ms/dotnet-cli-telemetry

+Zdroje informací
+    • Dokumentace k .NET : https://aka.ms/dotnet-docs
+    • Dokumentace k sadě SDK: https://aka.ms/dotnet-sdk-docs
+    • Zpráva k vydání verze: https://aka.ms/dotnet5-release-notes
+    • Kurzy: https://aka.ms/dotnet-tutorials</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
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl
@ -58,6 +58,21 @@ Folgende Komponenten wurden unter [DOTNETHOME] installiert:
 Dieses Produkt erfasst Nutzungsdaten.
    • Weitere Informationen und Deaktivieren der Erfassung: https://aka.ms/dotnet-cli-telemetry

+Ressourcen
+    • .NET-Dokumentation: https://aka.ms/dotnet-docs
+    • SDK-Dokumentation: https://aka.ms/dotnet-sdk-docs
+    • Versionshinweise: https://aka.ms/dotnet5-release-notes
+    • Tutorials: https://aka.ms/dotnet-tutorials</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
    • .NET-Dokumentation: https://aka.ms/dotnet-docs
    • SDK-Dokumentation: https://aka.ms/dotnet-sdk-docs
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl
@ -58,6 +58,21 @@ The following were installed at: '[DOTNETHOME]'
 This product collects usage data
    • More information and opt-out https://aka.ms/dotnet-cli-telemetry

+Resources
+    • .NET Documentation https://aka.ms/dotnet-docs
+    • SDK Documentation https://aka.ms/dotnet-sdk-docs
+    • Release Notes https://aka.ms/dotnet5-release-notes
+    • Tutorials https://aka.ms/dotnet-tutorials</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
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl
@ -58,6 +58,21 @@ Les éléments suivants ont été installés sur : '[DOTNETHOME]'
 Ce produit collecte des données d'utilisation
    • Plus informations et refus d'adhésion sur https://aka.ms/dotnet-cli-telemetry

+Ressources
+    • Documentation .NET sur https://aka.ms/dotnet-docs
+    • Documentation de kit SDK sur https://aka.ms/dotnet-sdk-docs
+    • Notes de publication sur https://aka.ms/dotnet5-release-notes
+    • Tutoriels sur https://aka.ms/dotnet-tutorials</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
    • Documentation .NET sur https://aka.ms/dotnet-docs
    • Documentation de kit SDK sur https://aka.ms/dotnet-sdk-docs
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl
@ -58,6 +58,21 @@ I componenti seguenti sono stati installati in '[DOTNETHOME]'
 Questo prodotto consente di raccogliere i dati sull'utilizzo
    • Altre informazioni e annullamento sottoscrizione https://aka.ms/dotnet-cli-telemetry

+Risorse
+    • Documentazione di .NET https://aka.ms/dotnet-docs
+    • Documentazione dell'SDK https://aka.ms/dotnet-sdk-docs
+    • Note sulla versione https://aka.ms/dotnet5-release-notes
+    • Esercitazioni https://aka.ms/dotnet-tutorials</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
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl
@ -58,6 +58,21 @@
 この製品は使用状況データを収集します
    • 詳細およびオプトアウト https://aka.ms/dotnet-cli-telemetry

+リソース
+    • .NET ドキュメント https://aka.ms/dotnet-docs
+    • SDK ドキュメント https://aka.ms/dotnet-sdk-docs
+    • リリース ノート https://aka.ms/dotnet5-release-notes
+    • チュートリアル https://aka.ms/dotnet-tutorials</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
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl
@ -58,6 +58,21 @@
 이 제품은 사용량 현황 데이터를 수집합니다.
    • 추가 정보 및 옵트아웃 https://aka.ms/dotnet-cli-telemetry

+리소스
+    • .NET 설명서 https://aka.ms/dotnet-docs
+    • SDK 설명서 https://aka.ms/dotnet-sdk-docs
+    • 릴리스 정보 https://aka.ms/dotnet5-release-notes
+    • 자습서 https://aka.ms/dotnet-tutorials</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
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl
@ -58,6 +58,21 @@ Następujące elementy zostały zainstalowane w: „[DOTNETHOME]”
 Ten produkt gromadzi dane dotyczące użycia
    • Więcej informacji i rezygnacja: https://aka.ms/dotnet-cli-telemetry

+Zasoby
+    • Dokumentacja platformy .NET: https://aka.ms/dotnet-docs
+    • Dokumentacja zestawu SDK: https://aka.ms/dotnet-sdk-docs
+    • Informacje o wersji: https://aka.ms/dotnet5-release-notes
+    • Samouczki: https://aka.ms/dotnet-tutorials</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
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl
@ -58,6 +58,21 @@ O seguinte foi instalado em: '[DOTNETHOME]'
 Este produto coleta dados de uso
    • Para obter mais informações ou recusá-lo, acesse https://aka.ms/dotnet-cli-telemetry

+Recursos
+    • Documentação do .NET: https://aka.ms/dotnet-docs
+    • Documentação do SDK: https://aka.ms/dotnet-sdk-docs
+    • Notas sobre a Versão: https://aka.ms/netcore3releasenotes
+    • Tutoriais: https://aka.ms/dotnet-tutorials</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
@ -71,7 +86,7 @@ Recursos
  <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://aka.ms/dotnet-License-Windows" &gt; Informações de licenciamento para .NET&lt;/A&gt;</String>
+  <String Id="DotNetEulaLink">&lt;A HREF="https://aka.ms/dotnet-License-Windows"&gt;Informações de licenciamento para .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>
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl
@ -58,6 +58,21 @@
 Этот продукт собирает данные об использовании.
    • Чтобы получить дополнительные сведения или отказаться от использования продукта, перейдите на страницу https://aka.ms/dotnet-cli-telemetry

+Ресурсы
+    • Документация по .NET: https://aka.ms/dotnet-docs
+    • Документация по SDK: https://aka.ms/dotnet-sdk-docs
+    • Заметки о выпуске: https://aka.ms/dotnet5-release-notes
+    • Учебники: https://aka.ms/dotnet-tutorials</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
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl
@ -58,6 +58,21 @@ Aşağıdakiler şu konumda yüklü: '[DOTNETHOME]'
 Bu ürün, kullanım verilerini toplar
    • Daha fazla bilgi ve katılmamayı seçmek için bkz. https://aka.ms/dotnet-cli-telemetry

+Kaynaklar
+    • .NET Belgeleri https://aka.ms/dotnet-docs
+    • SDK Belgeleri https://aka.ms/dotnet-sdk-docs
+    • Sürüm Notları https://aka.ms/dotnet5-release-notes
+    • Öğreticiler https://aka.ms/dotnet-tutorials</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
--- a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl
@ -58,6 +58,21 @@
 此产品会收集用法数据
    • 详细信息和选择退出选项: https://aka.ms/dotnet-cli-telemetry

+资源
+    • .NET 文档: https://aka.ms/dotnet-docs
+    • SDK 文档: https://aka.ms/dotnet-sdk-docs
+    • 发行说明: https://aka.ms/dotnet5-release-notes
+    • 教程: https://aka.ms/dotnet-tutorials</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
--- a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl
@ -58,6 +58,21 @@ Se instaló lo siguiente en: "[DOTNETHOME]"
 Este producto recopila datos de uso
    • Para obtener más información y declinar la participación, visite https://aka.ms/dotnet-cli-telemetry

+Recursos
+    • Documentación de .NET https://aka.ms/dotnet-docs
+    • Documentación del SDK https://aka.ms/dotnet-sdk-docs
+    • Notas de la versión https://aka.ms/dotnet5-release-notes
+    • Tutoriales https://aka.ms/dotnet-tutorials</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
--- a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec
+++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec
@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+    <metadata>
+        <id>VS.Redist.Common.Net.Core.SDK.VSTemplateLocator</id>
+        <version>1.0.0</version>
+        <title>VS.Redist.Common.Net.Core.SDK.VSTemplateLocator</title>
+        <authors>Microsoft</authors>
+        <owners>Microsoft</owners>
+        <licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
+        <projectUrl>https://github.com/dotnet/core-sdk</projectUrl>
+        <requireLicenseAcceptance>true</requireLicenseAcceptance>
+        <description>MSBuild extensions bundled with .NET Core SDK for internal Visual Studio build consumption</description>
+        <copyright>© Microsoft Corporation. All rights reserved.</copyright>
+    </metadata>
+    <files>
+        <file src="$PAYLOAD_FILES$\**\*" />
+    </files>
+</package>
--- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs
@ -14,6 +14,10 @@
        WixBundleInstalled OR ((NOT (DOTNETHOME_X64 ~= DOTNETHOME_X86)) OR DOTNETHOMESIMILARITYCHECKOVERRIDE)
    </bal:Condition>

+    <bal:Condition Message="The installation path for ARM64 SDK installations: &quot;[DOTNETHOME_ARM64]&quot; cannot be the same as for x86 SDK installations: &quot;[DOTNETHOME_X86]&quot;">
+        WixBundleInstalled OR ((NOT (DOTNETHOME_ARM64 ~= DOTNETHOME_X86)) OR DOTNETHOMESIMILARITYCHECKOVERRIDE)
+    </bal:Condition>
+
    <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.Foundation">
      <bal:WixStandardBootstrapperApplication
        LicenseFile="dummyeula.rtf"
@ -25,13 +29,13 @@

    <swid:Tag Regid="microsoft.com" InstallPath="[DOTNETHOME]" />

-      <util:RegistrySearch Id="CheckDotnetInstallLocation_x86"
+    <util:RegistrySearch Id="CheckDotnetInstallLocation_x86"
              Variable="DotnetInstallLocationExists_x86"
              Result="exists"
              Root="HKLM"
              Key="SOFTWARE\dotnet\Setup\InstalledVersions\x86"
              Value="InstallLocation" />
-      <util:RegistrySearch Id="DotnetInstallLocation_x86"
+    <util:RegistrySearch Id="DotnetInstallLocation_x86"
              After="CheckDotnetInstallLocation_x86"
              Condition="DotnetInstallLocationExists_x86"
              Variable="DOTNETHOME_X86"
@ -40,18 +44,19 @@
              Key="SOFTWARE\dotnet\Setup\InstalledVersions\x86"
              Value="InstallLocation" />

-      <util:FileSearch Id="DotnetExeSearch_x86"
+    <util:FileSearch Id="DotnetExeSearch_x86"
              After="DotnetInstallLocation_x86"
              Variable="DotnetExeExists_x86"
              Condition="NOT DotnetInstallLocationExists_x86"
              Result="exists"
              Path="[ProgramFilesFolder]dotnet\dotnet.exe"/>
-      <util:DirectorySearch Id="DotnetExeLocation_x86"
+    <util:DirectorySearch Id="DotnetExeLocation_x86"
              After="DotnetExeSearch_x86"
              Condition="DotnetExeExists_x86"
              Variable="DOTNETHOME_X86"
              Path="[ProgramFilesFolder]dotnet"/>
-      
+
+    <?if $(var.Platform)=x64?>
    <util:RegistrySearch Id="CheckDotnetInstallLocation_x64"
              Variable="DotnetInstallLocationExists_x64"
              Result="exists"
@ -79,6 +84,35 @@
              Variable="DOTNETHOME_X64"
              Path="[ProgramFiles64Folder]dotnet"/>

+    <?elseif $(var.Platform)=arm64?>
+    <util:RegistrySearch Id="CheckDotnetInstallLocation_arm64"
+              Variable="DotnetInstallLocationExists_arm64"
+              Result="exists"
+              Root="HKLM"
+              Key="SOFTWARE\dotnet\Setup\InstalledVersions\arm64"
+              Value="InstallLocation" />
+    <util:RegistrySearch Id="DotnetInstallLocation_arm64"
+              After="CheckDotnetInstallLocation_arm64"
+              Condition="DotnetInstallLocationExists_arm64"
+              Variable="DOTNETHOME_ARM64"
+              Result="value"
+              Root="HKLM"
+              Key="SOFTWARE\dotnet\Setup\InstalledVersions\arm64"
+              Value="InstallLocation" />
+
+    <util:FileSearch Id="DotnetExeSearch_arm64"
+              After="DotnetInstallLocation_arm64"
+              Variable="DotnetExeExists_arm64"
+              Condition="NOT DotnetInstallLocationExists_arm64"
+              Result="exists"
+              Path="[ProgramFiles64Folder]dotnet\dotnet.exe"/>
+    <util:DirectorySearch Id="DotnetExeLocation_arm64"
+              After="DotnetExeSearch_arm64"
+              Condition="DotnetExeExists_arm64"
+              Variable="DOTNETHOME_ARM64"
+              Path="[ProgramFiles64Folder]dotnet"/>
+    <?endif?>
+
    <!-- 
        When installing the SDK bundle to a custom location using the commandline parameters, it is intended, not mandatory, that 
        both "DOTNETHOME_X86" and "DOTNETHOME_X64" should be used on the commandline and should take this convention:
@ -89,6 +123,7 @@
    -->
    <Variable Name="DOTNETHOME_X86" Type="string" Value="[ProgramFilesFolder]dotnet" bal:Overridable="yes" />
    <Variable Name="DOTNETHOME_X64" Type="string" Value="[ProgramFiles64Folder]dotnet" bal:Overridable="yes" />
+    <Variable Name="DOTNETHOME_ARM64" Type="string" Value="[ProgramFiles64Folder]dotnet" bal:Overridable="yes" />
    <Variable Name="DOTNETHOME" Type="string" Value="[DOTNETHOME_$(var.PlatformToken)]" bal:Overridable="no" />
    <Variable Name="BUNDLEMONIKER" Type="string" Value="$(var.ProductMoniker)" bal:Overridable="no" />
    <Variable Name="DOTNETSDKVERSION" Type="string" Value="$(var.NugetVersion)" bal:Overridable="no" />
@ -107,15 +142,13 @@
      <MsiPackage SourceFile="$(var.SharedHostMsiSourcePath)">
        <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
      </MsiPackage>
-      <MsiPackage SourceFile="$(var.WinFormsAndWpfMsiSourcePath)">
-        <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
-      </MsiPackage>
      <MsiPackage SourceFile="$(var.NetCoreAppTargetingPackMsiSourcePath)">
        <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
      </MsiPackage>
      <MsiPackage SourceFile="$(var.NetCoreAppHostPackMsiSourcePath)">
        <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
      </MsiPackage>
+      <?if $(var.Platform)=x86 or $(var.Platform)=x64?>
      <MsiPackage SourceFile="$(var.AlternateNetCoreAppHostPackMsiSourcePath)">
        <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
      </MsiPackage>
@ -128,12 +161,16 @@
      <MsiPackage SourceFile="$(var.NetStandardTargetingPackMsiSourcePath)">
        <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
      </MsiPackage>
-      <MsiPackage SourceFile="$(var.AspNetTargetingPackMsiSourcePath)">
-        <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
+      <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>
      <MsiPackage SourceFile="$(var.TemplatesMsiSourcePath)">
        <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
        <MsiProperty Name="ALLOWMSIINSTALL" Value="True" />
@ -142,6 +179,7 @@
        <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
        <MsiProperty Name="DOTNETHOME_X86" Value="[DOTNETHOME_X86]" />
        <MsiProperty Name="DOTNETHOME_X64" Value="[DOTNETHOME_X64]" />
+        <MsiProperty Name="DOTNETHOME_ARM64" Value="[DOTNETHOME_ARM64]" />
        <MsiProperty Name="EXEFULLPATH" Value="[WixBundleOriginalSource]" />
        <MsiProperty Name="ALLOWMSIINSTALL" Value="True" />
      </MsiPackage>
@ -149,13 +187,23 @@
        <PackageGroupRef Id="PG_AspNetCoreSharedFramework_x86"/>
      <?elseif $(var.Platform)=x64?>
        <PackageGroupRef Id="PG_AspNetCoreSharedFramework_x64"/>
+      <?elseif $(var.Platform)=arm64?>
+        <PackageGroupRef Id="PG_AspNetCoreSharedFramework_arm64"/>
      <?endif?>
    </Chain>
  </Bundle>

  <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" />
--- a/src/redist/targets/packaging/windows/clisdk/bundleArm64.thm
+++ b/src/redist/targets/packaging/windows/clisdk/bundleArm64.thm
@ -0,0 +1,95 @@
+<?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>
--- a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs
@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
  <?include "Variables.wxi" ?>
  <Product Id="*" Name="$(var.ProductName)" Language="$(var.ProductLanguage)" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
-    <Package Compressed="yes" InstallScope="perMachine" InstallerVersion="200" />
+    <Package Compressed="yes" InstallScope="perMachine" InstallerVersion="$(var.InstallerVersion)" />

    <Condition Message="$(var.ProductName) must be installed as part of a coordinated SDK installation.">
      Installed OR ALLOWMSIINSTALL
--- a/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs
@ -15,6 +15,12 @@
          <RegistryValue Action="write" Name="WpfWinformsTemplates" Type="integer" Value="1" KeyPath="yes"/>
        </RegistryKey>
      </Component>
+      <Component Id="DotnetInstallLocation_arm64" Directory="TARGETDIR" Win64="no">
+        <Condition>VersionNT64 AND DOTNETHOME_ARM64</Condition>
+        <RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\arm64">
+          <RegistryValue Action="write" Name="InstallLocation" Type="string" Value="[DOTNETHOME_ARM64]" KeyPath="yes"/>
+        </RegistryKey>
+      </Component>
      <Component Id="DotnetInstallLocation_x64" Directory="TARGETDIR" Win64="no">
        <Condition>VersionNT64 AND DOTNETHOME_X64</Condition>
        <RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\x64">
--- a/src/redist/targets/packaging/windows/clisdk/templates.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/templates.wxs
@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
  <?include "Variables.wxi" ?>
  <Product Id="*" Name="$(var.ProductName)" Language="$(var.ProductLanguage)" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
-    <Package Compressed="yes" InstallScope="perMachine" InstallerVersion="200" />
+    <Package Compressed="yes" InstallScope="perMachine" InstallerVersion="$(var.InstallerVersion)" />

    <Condition Message="$(var.ProductName) must be installed as part of a coordinated SDK installation.">
      Installed OR ALLOWMSIINSTALL
--- a/src/redist/targets/packaging/windows/clisdk/variables.wxi
+++ b/src/redist/targets/packaging/windows/clisdk/variables.wxi
@ -26,10 +26,23 @@
  <?define WixQuietExec="WixQuietExec64"?>
  <?define Program_Files="ProgramFiles64Folder"?>
  <?define Win64AttributeValue=yes?>
+  <?elseif $(var.Platform)=arm64?>
+  <?define PlatformToken="ARM64"?>
+  <?define WixQuietExec="WixQuietExec64"?>
+  <?define Program_Files="ProgramFiles64Folder"?>
+  <?define Win64AttributeValue=yes?>
  <?else?>
  <?error Invalid Platform ($(var.Platform))?>
  <?endif?>

+  <!-- See https://docs.microsoft.com/en-us/windows/win32/msi/using-64-bit-windows-installer-packages. -->
+  <!-- For 64-bit packages on the Arm64 platform, the Windows Installer database schema must be 500 or higher. -->
+  <?if $(var.Platform)=arm64?>
+  <?define InstallerVersion="500"?>
+  <?else?>
+  <?define InstallerVersion="200"?>
+  <?endif?>
+
  <?define DependencyKey   = "$(var.DependencyKeyName)_$(var.SDKBundleVersion)_$(var.Platform)"?>
  <?define DependencyKeyId = "$(var.DependencyKey)" ?>
 </Include>
--- a/test/EndToEnd/ProjectBuildTests.cs
+++ b/test/EndToEnd/ProjectBuildTests.cs
@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.

 using System.IO;
-using System.Linq;
 using System.Runtime.InteropServices;
 using System.Xml.Linq;
 using Microsoft.DotNet.TestFramework;
@ -83,51 +82,6 @@ namespace EndToEnd.Tests
                .Should().Pass().And.HaveStdOutContaining("Hello World!");
        }

-        [WindowsOnlyFact]
-        public void ItCanPublishArm64Winforms()
-        {
-            DirectoryInfo directory = TestAssets.CreateTestDirectory();
-            string projectDirectory = directory.FullName;
-
-            string newArgs = "winforms --no-restore";
-            new NewCommandShim()
-                .WithWorkingDirectory(projectDirectory)
-                .Execute(newArgs)
-                .Should().Pass();
-
-            string publishArgs="-r win-arm64";
-            new PublishCommand()
-                .WithWorkingDirectory(projectDirectory)
-                .Execute(publishArgs)
-                .Should().Pass();
-            
-            var selfContainedPublishDir = new DirectoryInfo(projectDirectory)
-                .Sub("bin").Sub("Debug").GetDirectories().FirstOrDefault()
-                .Sub("win-arm64").Sub("publish");
-
-            selfContainedPublishDir.Should().HaveFilesMatching("System.Windows.Forms.dll", SearchOption.TopDirectoryOnly);
-            selfContainedPublishDir.Should().HaveFilesMatching($"{directory.Name}.dll", SearchOption.TopDirectoryOnly);
-        }
-        
-        [WindowsOnlyFact]
-        public void ItCantPublishArm64Wpf()
-        {
-            DirectoryInfo directory = TestAssets.CreateTestDirectory();
-            string projectDirectory = directory.FullName;
-
-            string newArgs = "wpf --no-restore";
-            new NewCommandShim()
-                .WithWorkingDirectory(projectDirectory)
-                .Execute(newArgs)
-                .Should().Pass();
-
-            string publishArgs="-r win-arm64";
-            new PublishCommand()
-                .WithWorkingDirectory(projectDirectory)
-                .Execute(publishArgs)
-                .Should().Fail();
-        }
-
        [Theory]
        [InlineData("console")]
        [InlineData("classlib")]
--- a/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs
+++ b/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs
@ -9,7 +9,7 @@ namespace EndToEnd
        [Fact]
        public void WhenAspNetCoreTemplateMajorVersionLowerthan3ItCanCalculateTemplateVersionsInStableBuilds()
        {
-            var result = CalculateTemplateVersions.Calculate("3.1.0", "dev");
+            var result = CalculateTemplateVersions.Calculate("3.1.0");

            result.Should()
                .Be(("3.1.1", "3.1", "3.1.1"),
@ -20,16 +20,16 @@ namespace EndToEnd
        [Fact]
        public void WhenAspNetCoreTemplateMajorVersionLowerthan3ItCanCalculateTemplateVersionsInNonStableBuilds()
        {
-            var result = CalculateTemplateVersions.Calculate("3.0.0-alpha.1.20071.6", "dev");
+            var result = CalculateTemplateVersions.Calculate("3.0.0-alpha.1.20071.6");

            result.Should()
-                .Be(("3.0.1-dev", "3.0", "3.0.1"));
+                .Be(("3.0.1-alpha.1.20071.6", "3.0", "3.0.1"));
        }

        [Fact]
        public void WhenAspNetCoreTemplateMajorVersionHigherthan3ItCanCalculateTemplateVersionsInStableBuilds()
        {
-            var result = CalculateTemplateVersions.Calculate("5.1.0", "dev");
+            var result = CalculateTemplateVersions.Calculate("5.1.0");

            result.Should()
                .Be(("5.1.0", "5.1", "5.1.0"),
@ -40,10 +40,10 @@ namespace EndToEnd
        [Fact]
        public void WhenAspNetCoreTemplateMajorVersionHigherthan3ItCanCalculateTemplateVersionsInNonStableBuilds()
        {
-            var result = CalculateTemplateVersions.Calculate("5.0.0-alpha.1.20071.6", "dev");
+            var result = CalculateTemplateVersions.Calculate("5.0.0-alpha.1.20071.6");

            result.Should()
-                .Be(("5.0.0-dev", "5.0", "5.0.0"));
+                .Be(("5.0.0-alpha.1.20071.6", "5.0", "5.0.0"));
        }
    }
 }