Merge pull request #3383 from johnbeisner/TemplatesUpdate

Adding 2.1 and 2.2 Templates MSIs
2019-07-24 13:49:56 -07:00 · 2019-07-24 13:49:56 -07:00 · a3af2c43a5
commit a3af2c43a5
parent 1f4196b0a6 75e5139fe1
12 changed files with 274 additions and 104 deletions
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -36,11 +36,7 @@
    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-preview8.19374.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
-    <MicrosoftDotNetCommonItemTemplatesPackageVersion>2.0.0-preview8.19373.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
-    <MicrosoftDotNetCommonProjectTemplates30PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates30PackageVersion>
-    <MicrosoftDotNetTestProjectTemplates30PackageVersion>1.0.2-beta4.19354.2</MicrosoftDotNetTestProjectTemplates30PackageVersion>
    <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
-    <NUnit3TemplatesVersion>1.6.1</NUnit3TemplatesVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/dotnet/sdk (to run tests) -->
@ -63,6 +59,28 @@
    <MicrosoftWindowsDesktopAppPackageVersion>3.0.0-preview8-28373-17</MicrosoftWindowsDesktopAppPackageVersion>
    <MicrosoftWindowsDesktopPackageVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</MicrosoftWindowsDesktopPackageVersion>
  </PropertyGroup>
+  <PropertyGroup>
+    <!-- 3.0 Template versions -->
+    <MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>
+    <MicrosoftDotNetWpfProjectTemplates30PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates30PackageVersion>
+    <NUnit3Templates30PackageVersion>1.6.1</NUnit3Templates30PackageVersion>
+    <MicrosoftDotNetCommonItemTemplates30PackageVersion>2.0.0-preview8.19373.1</MicrosoftDotNetCommonItemTemplates30PackageVersion>
+    <MicrosoftDotNetCommonProjectTemplates30PackageVersion>$(MicrosoftDotNetCommonItemTemplates30PackageVersion)</MicrosoftDotNetCommonProjectTemplates30PackageVersion>
+    <MicrosoftDotNetTestProjectTemplates30PackageVersion>1.0.2-beta4.19354.2</MicrosoftDotNetTestProjectTemplates30PackageVersion>
+    <AspNetCorePackageVersionFor30Templates>$(AspNetCoreVersion)</AspNetCorePackageVersionFor30Templates>
+    <!-- 2.2 Template versions -->
+    <NUnit3Templates22PackageVersion>1.6.0</NUnit3Templates22PackageVersion>
+    <MicrosoftDotNetCommonItemTemplates22PackageVersion>1.0.2-beta4</MicrosoftDotNetCommonItemTemplates22PackageVersion>
+    <MicrosoftDotNetCommonProjectTemplates22PackageVersion>$(MicrosoftDotNetCommonItemTemplates22PackageVersion)</MicrosoftDotNetCommonProjectTemplates22PackageVersion>
+    <MicrosoftDotNetTestProjectTemplates22PackageVersion>1.0.2-beta4.19155.2</MicrosoftDotNetTestProjectTemplates22PackageVersion>
+    <AspNetCorePackageVersionFor22Templates>2.2.6</AspNetCorePackageVersionFor22Templates>
+    <!-- 2.1 Template versions -->
+    <NUnit3Templates21PackageVersion>1.5.3</NUnit3Templates21PackageVersion>
+    <MicrosoftDotNetCommonItemTemplates21PackageVersion>1.0.2-beta3</MicrosoftDotNetCommonItemTemplates21PackageVersion>
+    <MicrosoftDotNetCommonProjectTemplates21PackageVersion>$(MicrosoftDotNetCommonItemTemplates21PackageVersion)</MicrosoftDotNetCommonProjectTemplates21PackageVersion>
+    <MicrosoftDotNetTestProjectTemplates21PackageVersion>1.0.2-beta4-20181009-2100240</MicrosoftDotNetTestProjectTemplates21PackageVersion>
+    <AspNetCorePackageVersionFor21Templates>2.1.12</AspNetCorePackageVersionFor21Templates>
+  </PropertyGroup>
  <!-- infrastructure and test only dependencies -->
  <PropertyGroup>
    <BuildTasksFeedToolVersion>2.2.0-beta.19072.10</BuildTasksFeedToolVersion>
--- a/src/redist/targets/Branding.targets
+++ b/src/redist/targets/Branding.targets
@ -12,6 +12,9 @@
      <HostFxrBrandName>Microsoft .NET Core Host FX Resolver $(MicrosoftNETCoreAppPackageVersion)</HostFxrBrandName>
      <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
      <SharedFrameworkNugetName>$(SharedFrameworkName)</SharedFrameworkNugetName>
+      <BundledTemplates30BrandName>Microsoft .NET Core 3.0 Templates</BundledTemplates30BrandName>
+      <BundledTemplates22BrandName>Microsoft .NET Core 2.2 Templates</BundledTemplates22BrandName>
+      <BundledTemplates21BrandName>Microsoft .NET Core 2.1 Templates</BundledTemplates21BrandName>
    </PropertyGroup>
  </Target>
  
--- a/src/redist/targets/BundledTemplates.targets
+++ b/src/redist/targets/BundledTemplates.targets
@ -1,55 +1,134 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="CalculateTemplatesVersion"
+  <Target Name="CalculateTemplatesVersions"
          DependsOnTargets="SetSdkVersionInfo">
    <PropertyGroup>
-      <MicrosoftNETCoreAppVersionPreReleaseSeparator>$(MicrosoftNETCoreAppPackageVersion.IndexOf('-'))</MicrosoftNETCoreAppVersionPreReleaseSeparator>
-      <MicrosoftNETCoreAppMajorMinorPatchVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreAppMajorMinorPatchVersion>
-      <MicrosoftNETCoreAppMajorMinorPatchVersion Condition=" '$(MicrosoftNETCoreAppVersionPreReleaseSeparator)' != -1 ">$(MicrosoftNETCoreAppPackageVersion.Substring(0, $(MicrosoftNETCoreAppVersionPreReleaseSeparator)))</MicrosoftNETCoreAppMajorMinorPatchVersion>
-      <BundledTemplatesVersion>$(MicrosoftNETCoreAppMajorMinorPatchVersion)</BundledTemplatesVersion>
-      <BundledTemplatesVersion Condition=" '$(DropSuffix)' != 'true' And '$(VersionSuffix)' != '' ">$(BundledTemplatesVersion)-$(VersionSuffix)</BundledTemplatesVersion>
+      <AspNetCore30VersionPreReleaseSeparator>$(AspNetCorePackageVersionFor30Templates.IndexOf('-'))</AspNetCore30VersionPreReleaseSeparator>
+      <AspNetCore30VersionMajorMinorPatchVersion>$(AspNetCorePackageVersionFor30Templates)</AspNetCore30VersionMajorMinorPatchVersion>
+      <AspNetCore30VersionMajorMinorPatchVersion Condition=" '$(AspNetCore30VersionPreReleaseSeparator)' != -1 ">$(AspNetCorePackageVersionFor30Templates.Substring(0, $(AspNetCore30VersionPreReleaseSeparator)))</AspNetCore30VersionMajorMinorPatchVersion>
+      <BundledTemplates30Version>$(AspNetCore30VersionMajorMinorPatchVersion)-$(VersionSuffix)</BundledTemplates30Version>
+      <BundledTemplates30MSIVersion>$(AspNetCore30VersionMajorMinorPatchVersion).$(GitCommitCount)</BundledTemplates30MSIVersion>
+      <BundledTemplates30InstallPath>$(AspNetCore30VersionMajorMinorPatchVersion)</BundledTemplates30InstallPath>
+      <BundledTemplates30InstallPath Condition=" '$(AspNetCore30VersionPreReleaseSeparator)' != -1 ">$(BundledTemplates30InstallPath)-$(VersionSuffix)</BundledTemplates30InstallPath>
+      <Templates30VersionPatchSeparatorIndex>$([MSBuild]::Add($(AspNetCore30VersionMajorMinorPatchVersion.IndexOf('.')), 1))</Templates30VersionPatchSeparatorIndex>
+      <Templates30VersionPatchSeparatorIndex>$(AspNetCore30VersionMajorMinorPatchVersion.IndexOf('.', $(Templates30VersionPatchSeparatorIndex)))</Templates30VersionPatchSeparatorIndex>
+      <BundledTemplates30MajorMinorVersion>$(AspNetCore30VersionMajorMinorPatchVersion.Substring(0, $(Templates30VersionPatchSeparatorIndex)))</BundledTemplates30MajorMinorVersion>
+
+      <AspNetCore22VersionPreReleaseSeparator>$(AspNetCorePackageVersionFor22Templates.IndexOf('-'))</AspNetCore22VersionPreReleaseSeparator>
+      <AspNetCore22VersionMajorMinorPatchVersion>$(AspNetCorePackageVersionFor22Templates)</AspNetCore22VersionMajorMinorPatchVersion>
+      <AspNetCore22VersionMajorMinorPatchVersion Condition=" '$(AspNetCore22VersionPreReleaseSeparator)' != -1 ">$(AspNetCorePackageVersionFor22Templates.Substring(0, $(AspNetCore22VersionPreReleaseSeparator)))</AspNetCore22VersionMajorMinorPatchVersion>
+      <BundledTemplates22Version>$(AspNetCore22VersionMajorMinorPatchVersion)-$(VersionSuffix)</BundledTemplates22Version>
+      <BundledTemplates22MSIVersion>$(AspNetCore22VersionMajorMinorPatchVersion).$(GitCommitCount)</BundledTemplates22MSIVersion>
+      <BundledTemplates22InstallPath>$(AspNetCore22VersionMajorMinorPatchVersion)</BundledTemplates22InstallPath>
+      <BundledTemplates22InstallPath Condition=" '$(AspNetCore22VersionPreReleaseSeparator)' != -1 ">$(BundledTemplates22InstallPath)-$(VersionSuffix)</BundledTemplates22InstallPath>
+      <Templates22VersionPatchSeparatorIndex>$([MSBuild]::Add($(AspNetCore22VersionMajorMinorPatchVersion.IndexOf('.')), 1))</Templates22VersionPatchSeparatorIndex>
+      <Templates22VersionPatchSeparatorIndex>$(AspNetCore22VersionMajorMinorPatchVersion.IndexOf('.', $(Templates22VersionPatchSeparatorIndex)))</Templates22VersionPatchSeparatorIndex>
+      <BundledTemplates22MajorMinorVersion>$(AspNetCore22VersionMajorMinorPatchVersion.Substring(0, $(Templates22VersionPatchSeparatorIndex)))</BundledTemplates22MajorMinorVersion>
+
+      <AspNetCore21VersionPreReleaseSeparator>$(AspNetCorePackageVersionFor21Templates.IndexOf('-'))</AspNetCore21VersionPreReleaseSeparator>
+      <AspNetCore21VersionMajorMinorPatchVersion>$(AspNetCorePackageVersionFor21Templates)</AspNetCore21VersionMajorMinorPatchVersion>
+      <AspNetCore21VersionMajorMinorPatchVersion Condition=" '$(AspNetCore21VersionPreReleaseSeparator)' != -1 ">$(AspNetCorePackageVersionFor21Templates.Substring(0, $(AspNetCore21VersionPreReleaseSeparator)))</AspNetCore21VersionMajorMinorPatchVersion>
+      <BundledTemplates21Version>$(AspNetCore21VersionMajorMinorPatchVersion)-$(VersionSuffix)</BundledTemplates21Version>
+      <BundledTemplates21MSIVersion>$(AspNetCore21VersionMajorMinorPatchVersion).$(GitCommitCount)</BundledTemplates21MSIVersion>
+      <BundledTemplates21InstallPath>$(AspNetCore21VersionMajorMinorPatchVersion)</BundledTemplates21InstallPath>
+      <BundledTemplates21InstallPath Condition=" '$(AspNetCore21VersionPreReleaseSeparator)' != -1 ">$(BundledTemplates21InstallPath)-$(VersionSuffix)</BundledTemplates21InstallPath>
+      <Templates21VersionPatchSeparatorIndex>$([MSBuild]::Add($(AspNetCore21VersionMajorMinorPatchVersion.IndexOf('.')), 1))</Templates21VersionPatchSeparatorIndex>
+      <Templates21VersionPatchSeparatorIndex>$(AspNetCore21VersionMajorMinorPatchVersion.IndexOf('.', $(Templates21VersionPatchSeparatorIndex)))</Templates21VersionPatchSeparatorIndex>
+      <BundledTemplates21MajorMinorVersion>$(AspNetCore21VersionMajorMinorPatchVersion.Substring(0, $(Templates21VersionPatchSeparatorIndex)))</BundledTemplates21MajorMinorVersion>
    </PropertyGroup>
  </Target>

  <ItemGroup>
-    <BundledTemplate Include="Microsoft.DotNet.Common.ItemTemplates" Version="$(MicrosoftDotNetCommonItemTemplatesPackageVersion)" />
-    <BundledTemplate Include="Microsoft.DotNet.Common.ProjectTemplates.3.0" Version="$(MicrosoftDotNetCommonProjectTemplates30PackageVersion)" />
-    <BundledTemplate Include="Microsoft.DotNet.Test.ProjectTemplates.3.0" Version="$(MicrosoftDotNetTestProjectTemplates30PackageVersion)" />
-    <BundledTemplate Include="Microsoft.Dotnet.Wpf.ProjectTemplates" Version="$(MicrosoftDotnetWpfProjectTemplatesPackageVersion)" />
-    <BundledTemplate Include="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)" />
+    <Bundled30Templates Include="Microsoft.DotNet.Common.ItemTemplates" PackageVersion="$(MicrosoftDotNetCommonItemTemplates30PackageVersion)" />
+    <Bundled30Templates Include="Microsoft.DotNet.Common.ProjectTemplates.3.0" PackageVersion="$(MicrosoftDotNetCommonProjectTemplates30PackageVersion)" />
+    <Bundled30Templates Include="Microsoft.DotNet.Test.ProjectTemplates.3.0" PackageVersion="$(MicrosoftDotNetTestProjectTemplates30PackageVersion)" />
+    <Bundled30Templates Include="Microsoft.Dotnet.Wpf.ProjectTemplates" PackageVersion="$(MicrosoftDotnetWpfProjectTemplates30PackageVersion)" />
+    <Bundled30Templates Include="Microsoft.Dotnet.WinForms.ProjectTemplates" PackageVersion="$(MicrosoftDotnetWinFormsProjectTemplates30PackageVersion)" />
+    <Bundled30Templates Include="Microsoft.DotNet.Web.ItemTemplates" PackageVersion="$(AspNetCorePackageVersionFor30Templates)" />
+    <Bundled30Templates Include="Microsoft.DotNet.Web.ProjectTemplates.3.0" PackageVersion="$(AspNetCorePackageVersionFor30Templates)" />
+    <Bundled30Templates Include="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0" PackageVersion="$(AspNetCorePackageVersionFor30Templates)" />
+    <Bundled30Templates Include="NUnit3.DotNetNew.Template" PackageVersion="$(NUnit3Templates30PackageVersion)" />
+  </ItemGroup>
+  <ItemGroup>
+    <Bundled22Templates Include="Microsoft.DotNet.Common.ItemTemplates" PackageVersion="$(MicrosoftDotNetCommonItemTemplates22PackageVersion)" />
+    <Bundled22Templates Include="Microsoft.DotNet.Common.ProjectTemplates.2.2" PackageVersion="$(MicrosoftDotNetCommonProjectTemplates22PackageVersion)" />
+    <Bundled22Templates Include="Microsoft.DotNet.Test.ProjectTemplates.2.2" PackageVersion="$(MicrosoftDotNetTestProjectTemplates22PackageVersion)" />
+    <Bundled22Templates Include="Microsoft.DotNet.Web.ItemTemplates" PackageVersion="$(AspNetCorePackageVersionFor22Templates)" />
+    <Bundled22Templates Include="Microsoft.DotNet.Web.ProjectTemplates.2.2" PackageVersion="$(AspNetCorePackageVersionFor22Templates)" />
+    <Bundled22Templates Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" PackageVersion="$(AspNetCorePackageVersionFor22Templates)" />
+    <Bundled22Templates Include="NUnit3.DotNetNew.Template" PackageVersion="$(NUnit3Templates22PackageVersion)" />
+  </ItemGroup>
+  <ItemGroup>
+    <Bundled21Templates Include="Microsoft.DotNet.Common.ItemTemplates" PackageVersion="$(MicrosoftDotNetCommonItemTemplates21PackageVersion)" />
+    <Bundled21Templates Include="Microsoft.DotNet.Common.ProjectTemplates.2.1" PackageVersion="$(MicrosoftDotNetCommonProjectTemplates21PackageVersion)" />
+    <Bundled21Templates Include="Microsoft.DotNet.Test.ProjectTemplates.2.1" PackageVersion="$(MicrosoftDotNetTestProjectTemplates21PackageVersion)" />
+    <Bundled21Templates Include="Microsoft.DotNet.Web.ItemTemplates" PackageVersion="$(AspNetCorePackageVersionFor21Templates)" />
+    <Bundled21Templates Include="Microsoft.DotNet.Web.ProjectTemplates.2.1" PackageVersion="$(AspNetCorePackageVersionFor21Templates)" />
+    <Bundled21Templates Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" PackageVersion="$(AspNetCorePackageVersionFor21Templates)" />
+    <Bundled21Templates Include="NUnit3.DotNetNew.Template" PackageVersion="$(NUnit3Templates21PackageVersion)" />
+  </ItemGroup>

-    <BundledTemplate Include="Microsoft.DotNet.Web.ItemTemplates" Version="$(AspNetCoreVersion)" />
-    <BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.3.0" Version="$(AspNetCoreVersion)" />
-    <BundledTemplate Include="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0" Version="$(AspNetCoreVersion)" />
+  <ItemGroup>
+    <Bundled30Templates Update="@(Bundled30Templates)">
+      <NupkgPathRelativeToPackageRoot>%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg</NupkgPathRelativeToPackageRoot>
+      <RestoredNupkgPath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower())</RestoredNupkgPath>
+      <Version>[%(PackageVersion)]</Version>
+    </Bundled30Templates>
+  </ItemGroup>
+  <ItemGroup>
+    <Bundled22Templates Update="@(Bundled22Templates)">
+      <NupkgPathRelativeToPackageRoot>%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg</NupkgPathRelativeToPackageRoot>
+      <RestoredNupkgPath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower())</RestoredNupkgPath>
+      <Version>[%(PackageVersion)]</Version>
+    </Bundled22Templates>
+  </ItemGroup>
+  <ItemGroup>
+    <Bundled21Templates Update="@(Bundled21Templates)">
+      <NupkgPathRelativeToPackageRoot>%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg</NupkgPathRelativeToPackageRoot>
+      <RestoredNupkgPath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower())</RestoredNupkgPath>
+      <Version>[%(PackageVersion)]</Version>
+    </Bundled21Templates>
+  </ItemGroup>

-    <BundledTemplate Include="NUnit3.DotNetNew.Template" Version="$(NUnit3TemplatesVersion)" />
+  <ItemGroup>
+    <PackageDownload Include="@(Bundled22Templates);@(Bundled21Templates)" />
  </ItemGroup>

  <!-- Restore bundled templates via PackageReference -->
  <ItemGroup>
-    <PackageReference Include="@(BundledTemplate)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <BundledTemplate Update="@(BundledTemplate)">
-      <NupkgPathRelativeToPackageRoot>%(Identity)/%(Version)/%(Identity).%(Version).nupkg</NupkgPathRelativeToPackageRoot>
-      <RestoredNupkgPath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower())</RestoredNupkgPath>
-    </BundledTemplate>
+    <PackageReference Include="@(Bundled30Templates)" />
  </ItemGroup>

  <Target Name="LayoutTemplates"
-          DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersion">
+        DependsOnTargets="LayoutTemplatesForSDK;LayoutTemplatesFor30MSI;LayoutTemplatesFor22MSI;LayoutTemplatesFor21MSI" />
+    
+  <Target Name="LayoutTemplatesForSDK"
+          DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersions">
    <ItemGroup Condition="!$(ProductMonikerRid.StartsWith('win'))">
      <BundledTemplate Remove="Microsoft.Dotnet.Wpf.ProjectTemplates" />
      <BundledTemplate Remove="Microsoft.Dotnet.WinForms.ProjectTemplates" />
    </ItemGroup>
-    <Copy SourceFiles="%(BundledTemplate.RestoredNupkgPath)"
-          DestinationFolder="$(RedistLayoutPath)templates/$(BundledTemplatesVersion)"/>
+    <Copy SourceFiles="%(Bundled30Templates.RestoredNupkgPath)"
+          DestinationFolder="$(RedistLayoutPath)templates/$(BundledTemplates30InstallPath)"/>
  </Target>

-  <Target Name="LayoutTemplatesForMSI"
-          DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersion"
-          Condition="$(ProductMonikerRid.StartsWith('win'))">
-    <Copy SourceFiles="%(BundledTemplate.RestoredNupkgPath)"
-          DestinationFolder="$(TemplatesLayoutPath)templates/$(BundledTemplatesVersion)"/>
+  <Target Name="LayoutTemplatesFor30MSI"
+          DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersions"
+          Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))">
+    <Copy SourceFiles="%(Bundled30Templates.RestoredNupkgPath)"
+          DestinationFolder="$(Templates30LayoutPath)templates/$(BundledTemplates30InstallPath)"/>
+  </Target>
+
+  <Target Name="LayoutTemplatesFor22MSI"
+          DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersions"
+          Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))">
+    <Copy SourceFiles="%(Bundled22Templates.RestoredNupkgPath)"
+          DestinationFolder="$(Templates22LayoutPath)templates/$(BundledTemplates22InstallPath)"/>
+  </Target>
+
+  <Target Name="LayoutTemplatesFor21MSI"
+          DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersions"
+          Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))">
+    <Copy SourceFiles="%(Bundled21Templates.RestoredNupkgPath)"
+          DestinationFolder="$(Templates21LayoutPath)templates/$(BundledTemplates21InstallPath)"/>
  </Target>
 </Project>
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@ -2,7 +2,9 @@
  <PropertyGroup>
    <RedistLayoutPath>$(BaseOutputPath)$(Configuration)\dotnet\</RedistLayoutPath>
    <SdkInternalLayoutPath>$(BaseOutputPath)$(Configuration)\dotnet-internal\</SdkInternalLayoutPath>
-    <TemplatesLayoutPath>$(BaseOutputPath)$(Configuration)\dotnet-templates\</TemplatesLayoutPath>
+    <Templates30LayoutPath>$(BaseOutputPath)$(Configuration)\templates-3.0\</Templates30LayoutPath>
+    <Templates22LayoutPath>$(BaseOutputPath)$(Configuration)\templates-2.2\</Templates22LayoutPath>
+    <Templates21LayoutPath>$(BaseOutputPath)$(Configuration)\templates-2.1\</Templates21LayoutPath>
    <DownloadsFolder>$(IntermediateOutputPath)downloads\</DownloadsFolder>
  </PropertyGroup>
  
@ -416,7 +418,6 @@
                            GenerateBundledVersions;
                            LayoutRuntimeGraph;
                            LayoutTemplates;
-                            LayoutTemplatesForMSI;
                            LayoutBundledTools;
                            RetargetTools;
                            CrossgenLayout;
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@ -16,14 +16,11 @@

      <SdkGenerateMsiPowershellScript>$(MSBuildThisFileDirectory)packaging/windows/clisdk/generatemsi.ps1</SdkGenerateMsiPowershellScript>
      <SdkStableFileIdForApphostTransform>$(MSBuildThisFileDirectory)packaging/windows/clisdk/stablefileidforapphosttransform.xslt</SdkStableFileIdForApphostTransform>
-      <TemplatesGenerateMsiPowershellScript>$(MSBuildThisFileDirectory)packaging/windows/clisdk/generatetemplatesmsi.ps1</TemplatesGenerateMsiPowershellScript>
      <SdkGenerateBundlePowershellScript>$(MSBuildThisFileDirectory)packaging/windows/clisdk/generatebundle.ps1</SdkGenerateBundlePowershellScript>
      <GenerateNupkgPowershellScript>$(MSBuildThisFileDirectory)packaging/windows/clisdk/generatenupkg.ps1</GenerateNupkgPowershellScript>

      <ToolsetInstallerNuspecFile>$(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec</ToolsetInstallerNuspecFile>
      <ToolsetInstallerNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Toolset.$(Architecture).$(FullNugetVersion).nupkg</ToolsetInstallerNupkgFile>
-      <TemplatesInstallerNuspecFile>$(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Redist.Common.NetCore.Templates.nuspec</TemplatesInstallerNuspecFile>
-      <TemplatesInstallerNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(Architecture).$(FullNugetVersion).nupkg</TemplatesInstallerNupkgFile>
      <VSToolsNuspecFile>$(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Tools.Net.Core.SDK.nuspec</VSToolsNuspecFile>
      <VSToolsNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Tools.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg</VSToolsNupkgFile>

@ -39,8 +36,9 @@
    <PropertyGroup>
      <SdkMSIInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkMSIInstallerFile>
      <SdkMSICabFile>$(ArtifactsShippingPackagesDir)d$(Architecture)-1.cab</SdkMSICabFile>
-      <TemplatesMSIInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionTemplates)$(InstallerExtension)</TemplatesMSIInstallerFile>
-      <TemplatesMSICabFile>$(ArtifactsShippingPackagesDir)t$(Architecture)-1.cab</TemplatesMSICabFile>
+      <Templates30MSIInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameTemplates)-$(BundledTemplates30Version)-$(ProductMonikerRid)$(InstallerExtension)</Templates30MSIInstallerFile>
+      <Templates22MSIInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameTemplates)-$(BundledTemplates22Version)-$(ProductMonikerRid)$(InstallerExtension)</Templates22MSIInstallerFile>
+      <Templates21MSIInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameTemplates)-$(BundledTemplates21Version)-$(ProductMonikerRid)$(InstallerExtension)</Templates21MSIInstallerFile>
      <CombinedFrameworkSdkHostMSIInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)</CombinedFrameworkSdkHostMSIInstallerFile>
      <SdkBundleInstallerOutputGuidString>$(ProductBandCombinedHostHostFxrFrameworkSdkName)</SdkBundleInstallerOutputGuidString>

@ -56,7 +54,7 @@
          DependsOnTargets="GenerateLayout;SetupWixProperties;GetCoreSdkGitCommitInfo">
    <!-- Consumed By Publish -->
    <ItemGroup>
-      <GeneratedInstallers Include="$(SdkMSIInstallerFile);$(TemplatesMSIInstallerFile);$(CombinedFrameworkSdkHostMSIInstallerFile)" />
+      <GeneratedInstallers Include="$(SdkMSIInstallerFile);$(Templates30MSIInstallerFile);$(Templates22MSIInstallerFile);$(Templates21MSIInstallerFile);$(CombinedFrameworkSdkHostMSIInstallerFile)" />
    </ItemGroup>

    <GenerateMsiVersion CommitCount="$(GitCommitCount)"
@ -71,9 +69,19 @@
          PropertyName="SdkInstallerUpgradeCode" />
    </GenerateGuidFromName>

-    <GenerateGuidFromName Name="$(TemplatesMSIInstallerFile)">
+    <GenerateGuidFromName Name="$(Templates30MSIInstallerFile)">
      <Output TaskParameter="OutputGuid"
-          PropertyName="TemplatesInstallerUpgradeCode" />
+          PropertyName="Templates30InstallerUpgradeCode" />
+    </GenerateGuidFromName>
+
+    <GenerateGuidFromName Name="$(Templates22MSIInstallerFile)">
+      <Output TaskParameter="OutputGuid"
+          PropertyName="Templates22InstallerUpgradeCode" />
+    </GenerateGuidFromName>
+
+    <GenerateGuidFromName Name="$(Templates21MSIInstallerFile)">
+      <Output TaskParameter="OutputGuid"
+          PropertyName="Templates21InstallerUpgradeCode" />
    </GenerateGuidFromName>

    <GenerateGuidFromName Name="$(SdkBundleInstallerOutputGuidString)">
@ -127,28 +135,61 @@
                      -InformationAction Continue" />
  </Target>

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

    <Exec Command="powershell -NoProfile -NoLogo $(TemplatesGenerateMsiPowershellScript) ^
-                      '$(TemplatesLayoutPath.TrimEnd('\'))' ^
-                      '$(TemplatesMSIInstallerFile)' ^
+                      '%(TemplatesMsiComponent.LayoutPath)' ^
+                      '@(TemplatesMsiComponent->'%(MSIInstallerFile)')' ^
                      '$(WixRoot)' ^
-                      '$(SdkBrandName)' ^
-                      '$(MsiVersion)' ^
-                      '$(SDKBundleVersion)' ^
-                      '$(NugetVersion)' ^
-                      '$(TemplatesInstallerUpgradeCode)' ^
+                      '@(TemplatesMsiComponent->'%(BrandName)')' ^
+                      '@(TemplatesMsiComponent->'%(MsiVersion)')' ^
+                      '@(TemplatesMsiComponent->'%(MsiVersion)')' ^
+                      '@(TemplatesMsiComponent->'%(Version)')' ^
+                      '@(TemplatesMsiComponent->'%(UpgradeCode)')' ^
                      '$(Architecture)' ^
                      -InformationAction Continue" />
  </Target>

+  <Target Name="SetupTemplatesMsis">
+    <PropertyGroup>
+      <TemplatesGenerateMsiPowershellScript>$(MSBuildThisFileDirectory)packaging/windows/clisdk/generatetemplatesmsi.ps1</TemplatesGenerateMsiPowershellScript>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <TemplatesMsiComponent Include="NetCore30TemplatesMsi">
+        <LayoutPath>$(Templates30LayoutPath.TrimEnd('\'))</LayoutPath>
+        <MSIInstallerFile>$(Templates30MSIInstallerFile)</MSIInstallerFile>
+        <BrandName>$(BundledTemplates30BrandName)</BrandName>
+        <MsiVersion>$(BundledTemplates30MsiVersion)</MsiVersion>
+        <Version>$(BundledTemplates30Version)</Version>
+        <UpgradeCode>$(Templates30InstallerUpgradeCode)</UpgradeCode>
+      </TemplatesMsiComponent>
+      <TemplatesMsiComponent Include="NetCore22TemplatesMsi">
+        <LayoutPath>$(Templates22LayoutPath.TrimEnd('\'))</LayoutPath>
+        <MSIInstallerFile>$(Templates22MSIInstallerFile)</MSIInstallerFile>
+        <BrandName>$(BundledTemplates22BrandName)</BrandName>
+        <MsiVersion>$(BundledTemplates22MsiVersion)</MsiVersion>
+        <Version>$(BundledTemplates22Version)</Version>
+        <UpgradeCode>$(Templates22InstallerUpgradeCode)</UpgradeCode>
+      </TemplatesMsiComponent>
+      <TemplatesMsiComponent Include="NetCore21TemplatesMsi">
+        <LayoutPath>$(Templates21LayoutPath.TrimEnd('\'))</LayoutPath>
+        <MSIInstallerFile>$(Templates21MSIInstallerFile)</MSIInstallerFile>
+        <BrandName>$(BundledTemplates21BrandName)</BrandName>
+        <MsiVersion>$(BundledTemplates21MsiVersion)</MsiVersion>
+        <Version>$(BundledTemplates21Version)</Version>
+        <UpgradeCode>$(Templates21InstallerUpgradeCode)</UpgradeCode>
+      </TemplatesMsiComponent>
+    </ItemGroup>
+  </Target>
+
  <Target Name="GenerateSdkBundle"
-          DependsOnTargets="GenerateLayout;AcquireWix;MsiTargetsSetupInputOutputs;GenerateSdkMsi;SignSdkMsi;GenerateTemplatesMsi;SignTemplatesMsi"
+          DependsOnTargets="GenerateLayout;AcquireWix;MsiTargetsSetupInputOutputs;GenerateSdkMsi;SignSdkMsi;GenerateTemplatesMsis;SignTemplatesMsis"
          Condition=" '$(OS)' == 'Windows_NT' "
          Inputs="$(SdkMSIInstallerFile);
                    $(DownloadedSharedFrameworkInstallerFile);
@ -169,7 +210,7 @@
                      '$(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName)' ^
                      '$(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)' ^
                      '$(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)' ^
-                      '$(TemplatesMSIInstallerFile)' ^
+                      '$(Templates30MSIInstallerFile)' ^
                      '$(CombinedFrameworkSdkHostMSIInstallerFile)' ^
                      '$(WixRoot)' ^
                      '$(SdkBrandName)' ^
@ -194,29 +235,59 @@
          Outputs="$(ToolsetInstallerNupkgFile)">

    <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
+                      '$(ArtifactsDir)' ^
                      '$(SdkMSIInstallerFile)' ^
                      '$(FullNugetVersion)' ^
                      '$(ToolsetInstallerNuspecFile)' ^
                      '$(ToolsetInstallerNupkgFile)' ^
                      '$(Architecture)' ^
+                      '$(MajorMinorVersion)' ^
                      '$(SdkMSICabFile)'" />
  </Target>

-  <Target Name="GenerateTemplatesNupkg"
-          DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs;GenerateTemplatesMsi;SignTemplatesMsi"
-          Condition=" '$(OS)' == 'Windows_NT' "
-          Inputs="$(TemplatesMSIInstallerFile);
+  <Target Name="GenerateTemplatesNupkgs"
+          DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs;GenerateTemplatesMsis;SignTemplatesMsis;SetupTemplatesNupkgs"
+          Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))"
+          Inputs="@(TemplatesNupkgComponent->'%(MSIInstallerFile)');
                    $(TemplatesInstallerNuspecFile);
                    $(GenerateNupkgPowershellScript)"
-          Outputs="$(TemplatesInstallerNupkgFile)">
+          Outputs="@(TemplatesNupkgComponent->'%(NupkgFile)')">

    <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
-                      '$(TemplatesMSIInstallerFile)' ^
-                      '$(FullNugetVersion)' ^
+                      '$(ArtifactsDir)' ^
+                      '%(TemplatesNupkgComponent.MSIInstallerFile)' ^
+                      '@(TemplatesNupkgComponent->'%(Version)')' ^
                      '$(TemplatesInstallerNuspecFile)' ^
-                      '$(TemplatesInstallerNupkgFile)' ^
+                      '@(TemplatesNupkgComponent->'%(NupkgFile)')' ^
                      '$(Architecture)' ^
-                      '$(TemplatesMSICabFile)'" />
+                      '@(TemplatesNupkgComponent->'%(MajorMinorVersion)')'" />
+  </Target>
+
+  <Target Name="SetupTemplatesNupkgs">
+    <PropertyGroup>
+      <TemplatesInstallerNuspecFile>$(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Redist.Common.NetCore.Templates.nuspec</TemplatesInstallerNuspecFile>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <TemplatesNupkgComponent Include="NetCore30TemplatesNupkg">
+        <MSIInstallerFile>$(Templates30MSIInstallerFile)</MSIInstallerFile>
+        <NupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates30MajorMinorVersion).$(BundledTemplates30Version).nupkg</NupkgFile>
+        <Version>$(BundledTemplates30Version)</Version>
+        <MajorMinorVersion>$(BundledTemplates30MajorMinorVersion)</MajorMinorVersion>
+      </TemplatesNupkgComponent>
+      <TemplatesNupkgComponent Include="NetCore22TemplatesNupkg">
+        <MSIInstallerFile>$(Templates22MSIInstallerFile)</MSIInstallerFile>
+        <NupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates22MajorMinorVersion).$(BundledTemplates22Version).nupkg</NupkgFile>
+        <Version>$(BundledTemplates22Version)</Version>
+        <MajorMinorVersion>$(BundledTemplates22MajorMinorVersion)</MajorMinorVersion>
+      </TemplatesNupkgComponent>
+      <TemplatesNupkgComponent Include="NetCore21TemplatesNupkg">
+        <MSIInstallerFile>$(Templates21MSIInstallerFile)</MSIInstallerFile>
+        <NupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates21MajorMinorVersion).$(BundledTemplates21Version).nupkg</NupkgFile>
+        <Version>$(BundledTemplates21Version)</Version>
+        <MajorMinorVersion>$(BundledTemplates21MajorMinorVersion)</MajorMinorVersion>
+      </TemplatesNupkgComponent>
+    </ItemGroup>
  </Target>

  <Target Name="GenerateVSToolsNupkg"
@ -228,11 +299,12 @@
          Outputs="$(VSToolsNupkgFile)">

    <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
-                    '$(RedistLayoutPath.TrimEnd('\'))' ^
-                    '$(FullNugetVersion)' ^
-                    '$(VSToolsNuspecFile)' ^
-                    '$(VSToolsNupkgFile)' ^
-                    '$(Architecture)'" />
+                      '$(ArtifactsDir)' ^
+                      '$(RedistLayoutPath.TrimEnd('\'))' ^
+                      '$(FullNugetVersion)' ^
+                      '$(VSToolsNuspecFile)' ^
+                      '$(VSToolsNupkgFile)' ^
+                      '$(Architecture)'" />
  </Target>

  <Target Name="GenerateVSToolsResolverNupkg"
@ -244,10 +316,11 @@
          Outputs="$(VSToolsResolverNupkgFile)">

    <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
-                    '$(SdkResolverLayoutPath.TrimEnd('\'))' ^
-                    '$(FullNugetVersion)' ^
-                    '$(VSToolsResolverNuspecFile)' ^
-                    '$(VSToolsResolverNupkgFile)'" />
+                      '$(ArtifactsDir)' ^
+                      '$(SdkResolverLayoutPath.TrimEnd('\'))' ^
+                      '$(FullNugetVersion)' ^
+                      '$(VSToolsResolverNuspecFile)' ^
+                      '$(VSToolsResolverNupkgFile)'" />
  </Target>

  <Target Name="GenerateSdkMSBuildExtensionsNupkg"
@ -259,6 +332,7 @@
          Outputs="$(SdkMSBuildExtensionsNupkgFile);$(SdkMSBuildExtensionsSwrFile)">

    <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
+                      '$(ArtifactsDir)' ^
                      '$(MSBuildExtensionsLayoutDirectory.TrimEnd('\'))' ^
                      '$(FullNugetVersion)' ^
                      '$(SdkMSBuildExtensionsNuspecFile)' ^
@ -275,12 +349,12 @@
                            AcquireWix;
                            GenerateSdkMsi;
                            SignSdkMsi;
-                            GenerateTemplatesMsi;
-                            SignTemplatesMsi;
+                            GenerateTemplatesMsis;
+                            SignTemplatesMsis;
                            GenerateSdkBundle;
                            SignSdkBundle;
                            GenerateToolsetNupkg;
-                            GenerateTemplatesNupkg;
+                            GenerateTemplatesNupkgs;
                            GenerateVSToolsNupkg;
                            GenerateVSToolsResolverNupkg;
                            GenerateSdkMSBuildExtensionsNupkg"
--- a/src/redist/targets/GetRuntimeInformation.targets
+++ b/src/redist/targets/GetRuntimeInformation.targets
@ -46,7 +46,6 @@
      <ArtifactNameCombinedHostHostFxrFrameworkSdk>dotnet-sdk</ArtifactNameCombinedHostHostFxrFrameworkSdk>

      <ArtifactNameWithVersionSdk>$(ArtifactNameSdk)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdk>
-      <ArtifactNameWithVersionTemplates>$(ArtifactNameTemplates)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionTemplates>
      <ArtifactNameWithVersionMSBuildExtensions>dotnet-standard-support-vs2015-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionMSBuildExtensions>
      <ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
      <!-- Warning: changing the value "ProductBandCombinedHostHostFxrFrameworkSdkName" can only occur on a product-band boundary [CliProductBandVersion], 
--- a/src/redist/targets/Signing.targets
+++ b/src/redist/targets/Signing.targets
@ -147,7 +147,7 @@

    <ItemGroup>
      <SdkMsiFilesToSign Include="$(SdkMSIInstallerFile)" />
-      <SdkMsiFilesToSign Include="$(ArtifactsShippingPackagesDir)d*.cab" />
+      <SdkMsiFilesToSign Include="$(ArtifactsShippingPackagesDir)*.cab" />

      <SdkMsiFileSignInfo Include="@(SdkMsiFilesToSign->'%(Filename)%(Extension)')">
        <CertificateName>$(InternalCertificateId)</CertificateName>
@ -171,14 +171,15 @@

  </Target>

-  <Target Name="SignTemplatesMsi"
+  <Target Name="SignTemplatesMsis"
      Condition="'$(SignCoreSdk)' == 'true'"
      DependsOnTargets="SetSignProps">

    <ItemGroup>
-      <TemplatesMsiFilesToSign Include="$(TemplatesMSIInstallerFile)" />
-      <TemplatesMsiFilesToSign Include="$(ArtifactsShippingPackagesDir)t*.cab" />
-
+      <TemplatesMsiFilesToSign Include="$(Templates30MSIInstallerFile)" />
+      <TemplatesMsiFilesToSign Include="$(Templates22MSIInstallerFile)" />
+      <TemplatesMsiFilesToSign Include="$(Templates21MSIInstallerFile)" />
+      
      <TemplatesMsiFileSignInfo Include="@(TemplatesMsiFilesToSign->'%(Filename)%(Extension)')">
        <CertificateName>$(InternalCertificateId)</CertificateName>
      </TemplatesMsiFileSignInfo>
--- a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Templates.nuspec
+++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Templates.nuspec
@ -1,19 +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.NetCore.Templates.$ARCH$</id>
+        <id>VS.Redist.Common.NetCore.Templates.$ARCH$.$MAJOR_MINOR$</id>
        <version>1.0.0</version>
-        <title>VS.Redist.Common.NetCore.Templates.$ARCH$</title>
+        <title>VS.Redist.Common.NetCore.Templates.$ARCH$.$MAJOR_MINOR$</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>.NET Core SDK Templates ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
+        <description>.NET Core $MAJOR_MINOR$ Templates Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
        <copyright>© Microsoft Corporation. All rights reserved.</copyright>
    </metadata>
    <files>
        <file src="$PAYLOAD_FILES$" />
-        <file src="$DOTNET_CAB_FILE$" />
    </files>
 </package>
--- a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec
+++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec
@ -9,7 +9,7 @@
        <licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
        <projectUrl>https://github.com/dotnet/core-sdk</projectUrl>
        <requireLicenseAcceptance>true</requireLicenseAcceptance>
-        <description>.NET Core SDK Toolset ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
+        <description>.NET Core $MAJOR_MINOR$ SDK Toolset ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
        <copyright>© Microsoft Corporation. All rights reserved.</copyright>
    </metadata>
    <files>
--- a/src/redist/targets/packaging/windows/clisdk/generatenupkg.ps1
+++ b/src/redist/targets/packaging/windows/clisdk/generatenupkg.ps1
@ -2,16 +2,17 @@
 # Licensed under the MIT license. See LICENSE file in the project root for full license information.

 param(
+    [Parameter(Mandatory=$true)][string]$BinDir,
    [Parameter(Mandatory=$true)][string]$ContentPath,
    [Parameter(Mandatory=$true)][string]$NugetVersion,
    [Parameter(Mandatory=$true)][string]$NuspecFile,
    [Parameter(Mandatory=$true)][string]$NupkgFile,
    [Parameter(Mandatory=$false)][string]$Architecture,
+    [Parameter(Mandatory=$false)][string]$MmVersion,
    [Parameter(Mandatory=$false)][string]$CabPath
 )

-$RepoRoot = Convert-Path "$PSScriptRoot\..\..\..\..\..\.."
-$NuGetDir = Join-Path $RepoRoot "artifacts\Tools\nuget"
+$NuGetDir = Join-Path $BinDir  "nuget"
 $NuGetExe = Join-Path $NuGetDir "nuget.exe"
 $OutputDirectory = [System.IO.Path]::GetDirectoryName($NupkgFile)
 $ContentPath = [System.IO.Path]::GetFullPath($ContentPath)
@ -33,5 +34,5 @@ if (Test-Path $NupkgFile) {
    Remove-Item -Force $NupkgFile
 }

-& $NuGetExe pack $NuspecFile -Version $NugetVersion -OutputDirectory $OutputDirectory -NoDefaultExcludes -NoPackageAnalysis -Properties PAYLOAD_FILES=$ContentPath`;DOTNET_CAB_FILE=$CabPath`;ARCH=$Architecture
+& $NuGetExe pack $NuspecFile -Version $NugetVersion -OutputDirectory $OutputDirectory -NoDefaultExcludes -NoPackageAnalysis -Properties PAYLOAD_FILES=$ContentPath`;DOTNET_CAB_FILE=$CabPath`;ARCH=$Architecture`;MAJOR_MINOR=$MmVersion
 Exit $LastExitCode
--- a/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1
+++ b/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1
@ -13,8 +13,8 @@ param(
    [Parameter(Mandatory=$true)][string]$Architecture
 )

-$InstallFileswsx = ".\install-files.wxs"
-$InstallFilesWixobj = "install-files.wixobj"
+$InstallFileswsx = ".\template-install-files.wxs"
+$InstallFilesWixobj = "template-install-files.wixobj"

 function RunHeat
 {
@ -29,7 +29,7 @@ function RunHeat
        -cg InstallFiles  `
        -srd  `
        -dr DOTNETHOME  `
-        -out install-files.wxs
+        -out template-install-files.wxs

    Write-Information "Heat output: $heatOutput"

--- a/src/redist/targets/packaging/windows/clisdk/templates.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/templates.wxs
@ -10,12 +10,7 @@

    <MajorUpgrade DowngradeErrorMessage="$(var.DowngradeErrorMessage)" Schedule="afterInstallInitialize"/>

-    <?if $(var.Platform)=x86?>
-      <MediaTemplate CabinetTemplate="tx86-{0}.cab" CompressionLevel="high" />
-    <?elseif $(var.Platform)=x64?>
-      <MediaTemplate CabinetTemplate="tx64-{0}.cab" CompressionLevel="high" />
-    <?endif?>
-      
+    <MediaTemplate CompressionLevel="high" EmbedCab="yes" />
    <Feature Id="MainFeature" Title="Main Feature" Level="1">
      <ComponentGroupRef Id="InstallFiles" />
    </Feature>