Adding 2.1 and 2.2 Templates MSIs, part 2

2019-07-22 15:55:23 +00:00 · 2019-07-22 15:55:23 +00:00 · 4de1b875e5
commit 4de1b875e5
parent 49ad1e8dd5
14 changed files with 271 additions and 167 deletions
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -14,14 +14,6 @@
  <PropertyGroup>
    <MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-preview8.19367.9</MicrosoftDotnetToolsetInternalPackageVersion>
  </PropertyGroup>
-  <PropertyGroup>
-    <!-- Dependency from https://github.com/dotnet/winforms -->
-    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.0-preview8.19359.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <!-- Dependency from https://github.com/dotnet/wpf -->
-    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.0.0-preview8.19359.5</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
-  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-preview8.19367.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
@ -61,7 +53,11 @@
  </PropertyGroup>
  <PropertyGroup>
    <!-- 3.0 Template versions -->
-    <NUnit3Templates30PackageVersion>1.6.1</NUnit3Templates30PackageVersion>
+    <!-- Dependency from https://github.com/dotnet/winforms -->
+    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.0-preview8.19359.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
+    <!-- Dependency from https://github.com/dotnet/wpf -->
+    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.0.0-preview8.19359.5</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
+    <NUnit3TemplatesVersion>1.6.1</NUnit3TemplatesVersion>
    <MicrosoftDotNetCommonItemTemplatesPackageVersion>2.0.0-preview8.19365.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
    <MicrosoftDotNetCommonProjectTemplates30PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates30PackageVersion>
    <MicrosoftDotNetTestProjectTemplates30PackageVersion>1.0.2-beta4.19155.2</MicrosoftDotNetTestProjectTemplates30PackageVersion>
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@ -26,6 +26,8 @@
  <Import Project="targets\SetBuildDefaults.targets" />
  <Import Project="targets\Branding.targets" />
  <Import Project="targets\BundledTemplates.targets" />
+  <Import Project="targets\Bundled21Templates.targets" />
+  <Import Project="targets\Bundled22Templates.targets" />
  <Import Project="targets\BundledDotnetTools.targets" />
  <Import Project="targets\GenerateBundledVersions.targets" />
  <Import Project="targets\Crossgen.targets" />
--- a/src/redist/targets/Bundled21Templates.targets
+++ b/src/redist/targets/Bundled21Templates.targets
@ -0,0 +1,51 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="Calculate21TemplatesVersion"
+          DependsOnTargets="SetSdkVersionInfo">
+    <PropertyGroup>
+      <BundledTemplates21InstallPath>$(AspNetCorePackageVersionFor21Templates)</BundledTemplates21InstallPath>
+      <BundledTemplates21MSIVersion>$(AspNetCorePackageVersionFor21Templates).$(GitCommitCount)</BundledTemplates21MSIVersion>
+      <BundledTemplates21Version>$(AspNetCorePackageVersionFor21Templates)-$(VersionSuffix)</BundledTemplates21Version>
+      <Templates21VersionPatchSeparatorIndex>$([MSBuild]::Add($(BundledTemplates21InstallPath.IndexOf('.')), 1))</Templates21VersionPatchSeparatorIndex>
+      <Templates21VersionPatchSeparatorIndex>$(BundledTemplates21InstallPath.IndexOf('.', $(Templates21VersionPatchSeparatorIndex)))</Templates21VersionPatchSeparatorIndex>
+      <Templates21MajorMinorVersion>$(BundledTemplates21InstallPath.Substring(0, $(Templates21VersionPatchSeparatorIndex)))</Templates21MajorMinorVersion>
+    </PropertyGroup>
+  </Target>
+
+  <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>
+  
+
+  
+
+  
+  
+  <ItemGroup>
+    <Bundled21Templates Update="@(Bundled21Templates)">
+      <NupkgPathRelativeToPackageRoot>%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg</NupkgPathRelativeToPackageRoot>
+      <RestoredNupkgPath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower())</RestoredNupkgPath>
+      <Version>[%(PackageVersion)]</Version>
+    </Bundled21Templates>
+  </ItemGroup>
+
+
+  
+  
+  <ItemGroup>
+    <PackageDownload Include="@(Bundled21Templates)" />
+  </ItemGroup>
+  
+  
+  <Target Name="LayoutTemplatesFor21MSI"
+          DependsOnTargets="SetupBundledComponents;Calculate21TemplatesVersion"
+          Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))">
+    <Copy SourceFiles="%(Bundled21Templates.RestoredNupkgPath)"
+          DestinationFolder="$(Templates21LayoutPath)templates/$(BundledTemplates21InstallPath)"/>
+  </Target>
+</Project>
--- a/src/redist/targets/Bundled22Templates.targets
+++ b/src/redist/targets/Bundled22Templates.targets
@ -0,0 +1,50 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="Calculate22TemplatesVersion"
+          DependsOnTargets="SetSdkVersionInfo">
+    <PropertyGroup>
+      <BundledTemplates22InstallPath>$(AspNetCorePackageVersionFor22Templates)</BundledTemplates22InstallPath>
+      <BundledTemplates22MSIVersion>$(AspNetCorePackageVersionFor22Templates).$(GitCommitCount)</BundledTemplates22MSIVersion>
+      <BundledTemplates22Version>$(AspNetCorePackageVersionFor22Templates)-$(VersionSuffix)</BundledTemplates22Version>
+      <Templates22VersionPatchSeparatorIndex>$([MSBuild]::Add($(BundledTemplates22InstallPath.IndexOf('.')), 1))</Templates22VersionPatchSeparatorIndex>
+      <Templates22VersionPatchSeparatorIndex>$(BundledTemplates22InstallPath.IndexOf('.', $(Templates22VersionPatchSeparatorIndex)))</Templates22VersionPatchSeparatorIndex>
+      <Templates22MajorMinorVersion>$(BundledTemplates22InstallPath.Substring(0, $(Templates22VersionPatchSeparatorIndex)))</Templates22MajorMinorVersion>
+    </PropertyGroup>
+  </Target>
+
+  <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>
+    <Bundled22Templates Update="@(Bundled22Templates)">
+      <NupkgPathRelativeToPackageRoot>%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg</NupkgPathRelativeToPackageRoot>
+      <RestoredNupkgPath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower())</RestoredNupkgPath>
+      <Version>[%(PackageVersion)]</Version>
+    </Bundled22Templates>
+  </ItemGroup>
+
+
+
+
+  <ItemGroup>
+    <PackageDownload Include="@(Bundled22Templates)" />
+  </ItemGroup>
+
+  <Target Name="LayoutTemplatesFor22MSI"
+          DependsOnTargets="SetupBundledComponents;Calculate22TemplatesVersion"
+          Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))">
+    <Copy SourceFiles="%(Bundled22Templates.RestoredNupkgPath)"
+          DestinationFolder="$(Templates22LayoutPath)templates/$(BundledTemplates22InstallPath)"/>
+  </Target>
+</Project>
--- a/src/redist/targets/BundledTemplates.targets
+++ b/src/redist/targets/BundledTemplates.targets
@ -1,27 +1,16 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="CalculateTemplatesVersion"
+  <Target Name="Calculate30TemplatesVersion"
          DependsOnTargets="SetSdkVersionInfo">
    <PropertyGroup>
      <AspNetCore30VersionPreReleaseSeparator>$(AspNetCorePackageVersionFor30Templates.IndexOf('-'))</AspNetCore30VersionPreReleaseSeparator>
      <AspNetCore30VersionMajorMinorPatchVersion>$(AspNetCorePackageVersionFor30Templates)</AspNetCore30VersionMajorMinorPatchVersion>
      <AspNetCore30VersionMajorMinorPatchVersion Condition=" '$(AspNetCore30VersionPreReleaseSeparator)' != -1 ">$(AspNetCorePackageVersionFor30Templates.Substring(0, $(AspNetCore30VersionPreReleaseSeparator)))</AspNetCore30VersionMajorMinorPatchVersion>
-      <BundledTemplates30Version>$(AspNetCore30VersionMajorMinorPatchVersion)</BundledTemplates30Version>
      <BundledTemplates30MSIVersion>$(AspNetCore30VersionMajorMinorPatchVersion).$(GitCommitCount)</BundledTemplates30MSIVersion>
+      <BundledTemplates30Version>$(AspNetCore30VersionMajorMinorPatchVersion)</BundledTemplates30Version>
      <BundledTemplates30Version Condition=" '$(DropSuffix)' != 'true' And '$(VersionSuffix)' != '' ">$(BundledTemplates30Version)-$(VersionSuffix)</BundledTemplates30Version>
-
-      <AspNetCore22VersionPreReleaseSeparator>$(AspNetCorePackageVersionFor22Templates.IndexOf('-'))</AspNetCore22VersionPreReleaseSeparator>
-      <AspNetCore22VersionMajorMinorPatchVersion>$(AspNetCorePackageVersionFor22Templates)</AspNetCore22VersionMajorMinorPatchVersion>
-      <AspNetCore22VersionMajorMinorPatchVersion Condition=" '$(AspNetCore22VersionPreReleaseSeparator)' != -1 ">$(AspNetCorePackageVersionFor22Templates.Substring(0, $(AspNetCore22VersionPreReleaseSeparator)))</AspNetCore22VersionMajorMinorPatchVersion>
-      <BundledTemplates22Version>$(AspNetCore22VersionMajorMinorPatchVersion)</BundledTemplates22Version>
-      <BundledTemplates22MSIVersion>$(AspNetCore22VersionMajorMinorPatchVersion).$(GitCommitCount)</BundledTemplates22MSIVersion>
-      <BundledTemplates22Version Condition=" '$(DropSuffix)' != 'true' And '$(VersionSuffix)' != '' ">$(BundledTemplates22Version)-$(VersionSuffix)</BundledTemplates22Version>
-
-      <AspNetCore21VersionPreReleaseSeparator>$(AspNetCorePackageVersionFor21Templates.IndexOf('-'))</AspNetCore21VersionPreReleaseSeparator>
-      <AspNetCore21VersionMajorMinorPatchVersion>$(AspNetCorePackageVersionFor21Templates)</AspNetCore21VersionMajorMinorPatchVersion>
-      <AspNetCore21VersionMajorMinorPatchVersion Condition=" '$(AspNetCore21VersionPreReleaseSeparator)' != -1 ">$(AspNetCorePackageVersionFor21Templates.Substring(0, $(AspNetCore21VersionPreReleaseSeparator)))</AspNetCore21VersionMajorMinorPatchVersion>
-      <BundledTemplates21Version>$(AspNetCore21VersionMajorMinorPatchVersion)</BundledTemplates21Version>
-      <BundledTemplates21MSIVersion>$(AspNetCore21VersionMajorMinorPatchVersion).$(GitCommitCount)</BundledTemplates21MSIVersion>
-      <BundledTemplates21Version Condition=" '$(DropSuffix)' != 'true' And '$(VersionSuffix)' != '' ">$(BundledTemplates21Version)-$(VersionSuffix)</BundledTemplates21Version>
+      <Templates30VersionPatchSeparatorIndex>$([MSBuild]::Add($(AspNetCore30VersionMajorMinorPatchVersion.IndexOf('.')), 1))</Templates30VersionPatchSeparatorIndex>
+      <Templates30VersionPatchSeparatorIndex>$(AspNetCore30VersionMajorMinorPatchVersion.IndexOf('.', $(Templates30VersionPatchSeparatorIndex)))</Templates30VersionPatchSeparatorIndex>
+      <Templates30MajorMinorVersion>$(AspNetCore30VersionMajorMinorPatchVersion.Substring(0, $(Templates30VersionPatchSeparatorIndex)))</Templates30MajorMinorVersion>
    </PropertyGroup>
  </Target>

@ -36,83 +25,33 @@
    <Bundled30Templates Include="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0" Version="$(AspNetCoreVersion)" />
    <Bundled30Templates Include="NUnit3.DotNetNew.Template" Version="$(NUnit3TemplatesVersion)" />
  </ItemGroup>
-
-  <ItemGroup>
-    <Bundled22Templates Include="Microsoft.DotNet.Common.ItemTemplates" Version="$(MicrosoftDotNetCommonItemTemplatesPackageVersion)" />
-    <Bundled22Templates Include="Microsoft.DotNet.Common.ProjectTemplates.2.2" Version="$(MicrosoftDotNetCommonProjectTemplates22PackageVersion)" />
-    <Bundled22Templates Include="Microsoft.DotNet.Test.ProjectTemplates.2.2" Version="$(MicrosoftDotNetTestProjectTemplates22PackageVersion)" />
-    <Bundled22Templates Include="Microsoft.DotNet.Web.ItemTemplates" Version="$(AspNetCoreVersion)" />
-    <Bundled22Templates Include="Microsoft.DotNet.Web.ProjectTemplates.2.2" Version="$(AspNetCoreVersion)" />
-    <Bundled22Templates Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="$(AspNetCoreVersion)" />
-    <Bundled22Templates Include="NUnit3.DotNetNew.Template" Version="$(NUnit3TemplatesVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Bundled21Templates Include="Microsoft.DotNet.Common.ItemTemplates" Version="$(MicrosoftDotNetCommonItemTemplatesPackageVersion)" />
-    <Bundled21Templates Include="Microsoft.DotNet.Common.ProjectTemplates.2.1" Version="$(MicrosoftDotNetCommonProjectTemplates20PackageVersion)" />
-    <Bundled21Templates Include="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="$(MicrosoftDotNetTestProjectTemplates20PackageVersion)" />
-    <Bundled21Templates Include="Microsoft.DotNet.Web.ItemTemplates" Version="$(AspNetCoreVersion)" />
-    <Bundled21Templates Include="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="$(AspNetCoreVersion)" />
-    <Bundled21Templates Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="$(AspNetCoreVersion)" />
-    <Bundled21Templates Include="NUnit3.DotNetNew.Template" Version="$(NUnit3TemplatesVersion)" />
-  </ItemGroup>
  
  <!-- Restore bundled templates via PackageReference -->
  <ItemGroup>
    <PackageReference Include="@(Bundled30Templates)" />
-    <PackageReference Include="@(Bundled22Templates)" />
-    <PackageReference Include="@(Bundled21Templates)" />
  </ItemGroup>
-
+  
  <ItemGroup>
    <Bundled30Templates Update="@(Bundled30Templates)">
      <NupkgPathRelativeToPackageRoot>%(Identity)/%(Version)/%(Identity).%(Version).nupkg</NupkgPathRelativeToPackageRoot>
      <RestoredNupkgPath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower())</RestoredNupkgPath>
    </Bundled30Templates>
  </ItemGroup>
-
-  <ItemGroup>
-    <Bundled22Templates Update="@(Bundled22Templates)">
-      <NupkgPathRelativeToPackageRoot>%(Identity)/%(Version)/%(Identity).%(Version).nupkg</NupkgPathRelativeToPackageRoot>
-      <RestoredNupkgPath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower())</RestoredNupkgPath>
-    </Bundled22Templates>
-  </ItemGroup>
-  
-  <ItemGroup>
-    <Bundled21Templates Update="@(Bundled21Templates)">
-      <NupkgPathRelativeToPackageRoot>%(Identity)/%(Version)/%(Identity).%(Version).nupkg</NupkgPathRelativeToPackageRoot>
-      <RestoredNupkgPath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower())</RestoredNupkgPath>
-    </Bundled21Templates>
-  </ItemGroup>
  
  <Target Name="LayoutTemplates"
-          DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersion">
+          DependsOnTargets="SetupBundledComponents;Calculate30TemplatesVersion">
    <ItemGroup Condition="!$(ProductMonikerRid.StartsWith('win'))">
      <BundledTemplate Remove="Microsoft.Dotnet.Wpf.ProjectTemplates" />
      <BundledTemplate Remove="Microsoft.Dotnet.WinForms.ProjectTemplates" />
    </ItemGroup>
-    <Copy SourceFiles="%(BundledTemplate.RestoredNupkgPath)"
+    <Copy SourceFiles="%(Bundled30Templates.RestoredNupkgPath)"
          DestinationFolder="$(RedistLayoutPath)templates/$(BundledTemplates30Version)"/>
  </Target>

  <Target Name="LayoutTemplatesFor30MSI"
-          DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersion"
-          Condition="$(ProductMonikerRid.StartsWith('win'))">
+          DependsOnTargets="SetupBundledComponents;Calculate30TemplatesVersion"
+          Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))">
    <Copy SourceFiles="%(Bundled30Templates.RestoredNupkgPath)"
          DestinationFolder="$(Templates30LayoutPath)templates/$(BundledTemplates30Version)"/>
  </Target>
-
-  <Target Name="LayoutTemplatesFor22MSI"
-        DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersion"
-        Condition="$(ProductMonikerRid.StartsWith('win'))">
-    <Copy SourceFiles="%(Bundled22Templates.RestoredNupkgPath)"
-          DestinationFolder="$(Templates22LayoutPath)templates/$(BundledTemplates22Version)"/>
-  </Target>
-
-  <Target Name="LayoutTemplatesFor21MSI"
-        DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersion"
-        Condition="$(ProductMonikerRid.StartsWith('win'))">
-    <Copy SourceFiles="%(Bundled21Templates.RestoredNupkgPath)"
-          DestinationFolder="$(Templates21LayoutPath)templates/$(BundledTemplates21Version)"/>
-  </Target>
 </Project>
--- 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>

@ -37,11 +34,12 @@
    </PropertyGroup>

    <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>
-      <CombinedFrameworkSdkHostMSIInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)</CombinedFrameworkSdkHostMSIInstallerFile>
+      <SdkMsiInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkMsiInstallerFile>
+      <SdkMsiCabFile>$(ArtifactsShippingPackagesDir)d$(Architecture)-1.cab</SdkMsiCabFile>
+      <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>

      <!--<SdkDebianIntermediateDirectory>$(IntermediateOutputPath)debian/sdk/</SdkDebianIntermediateDirectory>
@ -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)"
@ -66,14 +64,24 @@
      <Output TaskParameter="MsiVersion" PropertyName="MsiVersion" />
    </GenerateMsiVersion>

-    <GenerateGuidFromName Name="$(SdkMSIInstallerFile)">
+    <GenerateGuidFromName Name="$(SdkMsiInstallerFile)">
      <Output TaskParameter="OutputGuid"
          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)">
@ -111,11 +119,11 @@
          Condition=" '$(OS)' == 'Windows_NT' "
          Inputs="$(SdkInternalLayoutPath)**/*;
                    $(SdkGenerateMsiPowershellScript)"
-          Outputs="$(SdkMSIInstallerFile)">
+          Outputs="$(SdkMsiInstallerFile)">

    <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateMsiPowershellScript) ^
                      '$(SdkInternalLayoutPath.TrimEnd('\'))' ^
-                      '$(SdkMSIInstallerFile)' ^
+                      '$(SdkMsiInstallerFile)' ^
                      '$(WixRoot)' ^
                      '$(SdkBrandName)' ^
                      '$(MsiVersion)' ^
@ -127,38 +135,71 @@
                      -InformationAction Continue" />
  </Target>

-  <Target Name="GenerateTemplatesMsi"
-        DependsOnTargets="GenerateLayout;AcquireWix;MsiTargetsSetupInputOutputs;SetSdkBrandingInfo"
-        Condition=" '$(OS)' == 'Windows_NT' "
-        Inputs="$(Templates30LayoutPath)**/*;
-                  $(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) ^
-                      '$(Templates30LayoutPath.TrimEnd('\'))' ^
-                      '$(TemplatesMSIInstallerFile)' ^
+                      '@(TemplatesMsiComponent->'%(LayoutPath)')' ^
+                      '%(TemplatesMsiComponent.MsiInstallerFile)' ^
                      '$(WixRoot)' ^
-                      '$(SdkBrandName)' ^
-                      '$(BundledTemplates30MSIVersion)' ^
-                      '$(BundledTemplates30MSIVersion)' ^
-                      '$(BundledTemplates30Version)' ^
-                      '$(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>Microsoft .NET Core 3.0 Templates</BrandName>
+        <MsiVersion>$(BundledTemplates30MsiVersion)</MsiVersion>
+        <Version>$(BundledTemplates30Version)</Version>
+        <UpgradeCode>$(Templates30InstallerUpgradeCode)</UpgradeCode>
+      </TemplatesMsiComponent>
+      <TemplatesMsiComponent Include="NetCore22TemplatesMsi">
+        <LayoutPath>$(Templates22LayoutPath.TrimEnd('\'))</LayoutPath>
+        <MsiInstallerFile>$(Templates22MsiInstallerFile)</MsiInstallerFile>
+        <BrandName>Microsoft .NET Core 2.2 Templates</BrandName>
+        <MsiVersion>$(BundledTemplates22MsiVersion)</MsiVersion>
+        <Version>$(BundledTemplates22Version)</Version>
+        <UpgradeCode>$(Templates22InstallerUpgradeCode)</UpgradeCode>
+      </TemplatesMsiComponent>
+      <TemplatesMsiComponent Include="NetCore21TemplatesMsi">
+        <LayoutPath>$(Templates21LayoutPath.TrimEnd('\'))</LayoutPath>
+        <MsiInstallerFile>$(Templates21MsiInstallerFile)</MsiInstallerFile>
+        <BrandName>Microsoft .NET Core 2.1 Templates</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);
+          Inputs="$(SdkMsiInstallerFile);
                    $(DownloadedSharedFrameworkInstallerFile);
                    $(DownloadedHostFxrInstallerFile);
                    $(DownloadedSharedHostInstallerFile);
                    $(SdkGenerateBundlePowershellScript)"
-          Outputs="$(CombinedFrameworkSdkHostMSIInstallerFile)">
+          Outputs="$(CombinedFrameworkSdkHostMsiInstallerFile)">
    
    <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateBundlePowershellScript) ^
-                      '$(SdkMSIInstallerFile)' ^
+                      '$(SdkMsiInstallerFile)' ^
                      '$(DownloadsFolder)$(DownloadedAspNetCoreSharedFxInstallerFileName)' ^
                      '$(DownloadsFolder)$(DownloadedSharedFrameworkInstallerFileName)' ^
                      '$(DownloadsFolder)$(DownloadedHostFxrInstallerFileName)' ^
@ -169,8 +210,8 @@
                      '$(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName)' ^
                      '$(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)' ^
                      '$(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)' ^
-                      '$(TemplatesMSIInstallerFile)' ^
-                      '$(CombinedFrameworkSdkHostMSIInstallerFile)' ^
+                      '$(Templates30MsiInstallerFile)' ^
+                      '$(CombinedFrameworkSdkHostMsiInstallerFile)' ^
                      '$(WixRoot)' ^
                      '$(SdkBrandName)' ^
                      '$(MsiVersion)' ^
@ -188,35 +229,63 @@
  <Target Name="GenerateToolsetNupkg"
          DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs;GenerateSdkMsi;SignSdkMsi"
          Condition=" '$(OS)' == 'Windows_NT' "
-          Inputs="$(SdkMSIInstallerFile);
+          Inputs="$(SdkMsiInstallerFile);
                    $(ToolsetInstallerNuspecFile);
                    $(GenerateNupkgPowershellScript)"
          Outputs="$(ToolsetInstallerNupkgFile)">

    <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
-                      '$(SdkMSIInstallerFile)' ^
+                      '$(ArtifactsDir)' ^
+                      '$(SdkMsiInstallerFile)' ^
                      '$(FullNugetVersion)' ^
                      '$(ToolsetInstallerNuspecFile)' ^
                      '$(ToolsetInstallerNupkgFile)' ^
                      '$(Architecture)' ^
-                      '$(SdkMSICabFile)'" />
+                      '$(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)' ^
-                      '$(Architecture)' ^
-                      '$(TemplatesMSICabFile)'" />
+                      '@(TemplatesNupkgComponent->'%(NupkgFile)')' ^
+                      '@(TemplatesNupkgComponent->'%(IDSuffix)')'" />
+  </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.$(Templates30MajorMinorVersion).$(BundledTemplates30Version).nupkg</NupkgFile>
+        <Version>$(BundledTemplates30Version)</Version>
+        <IDSuffix>$(Architecture).$(Templates30MajorMinorVersion)</IDSuffix>
+      </TemplatesNupkgComponent>
+      <TemplatesNupkgComponent Include="NetCore22TemplatesNupkg">
+        <MsiInstallerFile>$(Templates22MsiInstallerFile)</MsiInstallerFile>
+        <NupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(Templates22MajorMinorVersion).$(BundledTemplates22Version).nupkg</NupkgFile>
+        <Version>$(BundledTemplates22Version)</Version>
+        <IDSuffix>$(Architecture).$(Templates22MajorMinorVersion)</IDSuffix>
+      </TemplatesNupkgComponent>
+      <TemplatesNupkgComponent Include="NetCore21TemplatesNupkg">
+        <MsiInstallerFile>$(Templates21MsiInstallerFile)</MsiInstallerFile>
+        <NupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(Templates21MajorMinorVersion).$(BundledTemplates21Version).nupkg</NupkgFile>
+        <Version>$(BundledTemplates21Version)</Version>
+        <IDSuffix>$(Architecture).$(Templates21MajorMinorVersion)</IDSuffix>
+      </TemplatesNupkgComponent>
+    </ItemGroup>
  </Target>

  <Target Name="GenerateVSToolsNupkg"
@ -228,11 +297,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 +314,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 +330,7 @@
          Outputs="$(SdkMSBuildExtensionsNupkgFile);$(SdkMSBuildExtensionsSwrFile)">

    <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
+                      '$(ArtifactsDir)' ^
                      '$(MSBuildExtensionsLayoutDirectory.TrimEnd('\'))' ^
                      '$(FullNugetVersion)' ^
                      '$(SdkMSBuildExtensionsNuspecFile)' ^
@ -275,12 +347,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.$DATA$</id>
        <version>1.0.0</version>
-        <title>VS.Redist.Common.NetCore.Templates.$ARCH$</title>
+        <title>VS.Redist.Common.NetCore.Templates.$DATA$</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 $DATA$ 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
@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
    <metadata>
-        <id>VS.Redist.Common.NetCore.Toolset.$ARCH$</id>
+        <id>VS.Redist.Common.NetCore.Toolset.$DATA$</id>
        <version>1.0.0</version>
-        <title>VS.Redist.Common.NetCore.Toolset.$ARCH$</title>
+        <title>VS.Redist.Common.NetCore.Toolset.$DATA$</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 Toolset ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
+        <description>.NET Core SDK Toolset ($DATA$) 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/VS.Tools.Net.Core.SDK.nuspec
+++ b/src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.nuspec
@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
    <metadata>
-        <id>VS.Tools.Net.Core.SDK.$ARCH$</id>
+        <id>VS.Tools.Net.Core.SDK.$DATA$</id>
        <version>1.0.0</version>
-        <title>VS.Tools.Net.Core.SDK.$ARCH$</title>
+        <title>VS.Tools.Net.Core.SDK.$DATA$</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 ($ARCH$) as a .nupkg for internal Visual Studio build consumption</description>
+        <description>.NET Core SDK ($DATA$) 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,16 @@
 # 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]$AdditionalData,
    [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 +33,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`;DATA=$AdditionalData
 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>