From f55ddb8a1565c255b0877fc5f0f7f29ab6e030b5 Mon Sep 17 00:00:00 2001
From: jbeisner <jbeisner@microsoft.com>
Date: Mon, 22 Jul 2019 17:06:16 +0000
Subject: [PATCH] Adding 2.1 and 2.2 Templates MSIs, part 3

---
 src/redist/redist.csproj                      |  2 -
 src/redist/targets/Bundled21Templates.targets | 51 ----------
 src/redist/targets/Bundled22Templates.targets | 50 ----------
 src/redist/targets/BundledTemplates.targets   | 94 ++++++++++++++++---
 src/redist/targets/GenerateLayout.targets     |  3 -
 src/redist/targets/GenerateMSIs.targets       | 62 ++++++------
 6 files changed, 110 insertions(+), 152 deletions(-)
 delete mode 100644 src/redist/targets/Bundled21Templates.targets
 delete mode 100644 src/redist/targets/Bundled22Templates.targets

diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index a65627053..e9f84e078 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -26,8 +26,6 @@
   <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" />
diff --git a/src/redist/targets/Bundled21Templates.targets b/src/redist/targets/Bundled21Templates.targets
deleted file mode 100644
index 30a9172ab..000000000
--- a/src/redist/targets/Bundled21Templates.targets
+++ /dev/null
@@ -1,51 +0,0 @@
-<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>
diff --git a/src/redist/targets/Bundled22Templates.targets b/src/redist/targets/Bundled22Templates.targets
deleted file mode 100644
index 83359e6a3..000000000
--- a/src/redist/targets/Bundled22Templates.targets
+++ /dev/null
@@ -1,50 +0,0 @@
-<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>
diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets
index a40942dfc..522073b01 100644
--- a/src/redist/targets/BundledTemplates.targets
+++ b/src/redist/targets/BundledTemplates.targets
@@ -11,34 +11,84 @@
       <Templates30VersionPatchSeparatorIndex>$([MSBuild]::Add($(AspNetCore30VersionMajorMinorPatchVersion.IndexOf('.')), 1))</Templates30VersionPatchSeparatorIndex>
       <Templates30VersionPatchSeparatorIndex>$(AspNetCore30VersionMajorMinorPatchVersion.IndexOf('.', $(Templates30VersionPatchSeparatorIndex)))</Templates30VersionPatchSeparatorIndex>
       <Templates30MajorMinorVersion>$(AspNetCore30VersionMajorMinorPatchVersion.Substring(0, $(Templates30VersionPatchSeparatorIndex)))</Templates30MajorMinorVersion>
+
+      <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>
+
+      <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>
-    <Bundled30Templates Include="Microsoft.DotNet.Common.ItemTemplates" Version="$(MicrosoftDotNetCommonItemTemplatesPackageVersion)" />
-    <Bundled30Templates Include="Microsoft.DotNet.Common.ProjectTemplates.3.0" Version="$(MicrosoftDotNetCommonProjectTemplates30PackageVersion)" />
-    <Bundled30Templates Include="Microsoft.DotNet.Test.ProjectTemplates.3.0" Version="$(MicrosoftDotNetTestProjectTemplates30PackageVersion)" />
-    <Bundled30Templates Include="Microsoft.Dotnet.Wpf.ProjectTemplates" Version="$(MicrosoftDotnetWpfProjectTemplatesPackageVersion)" />
-    <Bundled30Templates Include="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)" />
-    <Bundled30Templates Include="Microsoft.DotNet.Web.ItemTemplates" Version="$(AspNetCoreVersion)" />
-    <Bundled30Templates Include="Microsoft.DotNet.Web.ProjectTemplates.3.0" Version="$(AspNetCoreVersion)" />
-    <Bundled30Templates Include="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0" Version="$(AspNetCoreVersion)" />
-    <Bundled30Templates Include="NUnit3.DotNetNew.Template" Version="$(NUnit3TemplatesVersion)" />
+    <Bundled30Templates Include="Microsoft.DotNet.Common.ItemTemplates" PackageVersion="$(MicrosoftDotNetCommonItemTemplatesPackageVersion)" />
+    <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="$(MicrosoftDotnetWpfProjectTemplatesPackageVersion)" />
+    <Bundled30Templates Include="Microsoft.Dotnet.WinForms.ProjectTemplates" PackageVersion="$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)" />
+    <Bundled30Templates Include="Microsoft.DotNet.Web.ItemTemplates" PackageVersion="$(AspNetCoreVersion)" />
+    <Bundled30Templates Include="Microsoft.DotNet.Web.ProjectTemplates.3.0" PackageVersion="$(AspNetCoreVersion)" />
+    <Bundled30Templates Include="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0" PackageVersion="$(AspNetCoreVersion)" />
+    <Bundled30Templates Include="NUnit3.DotNetNew.Template" PackageVersion="$(NUnit3TemplatesVersion)" />
   </ItemGroup>
-  
-  <!-- Restore bundled templates via PackageReference -->
   <ItemGroup>
-    <PackageReference Include="@(Bundled30Templates)" />
+    <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>
+
   <ItemGroup>
     <Bundled30Templates Update="@(Bundled30Templates)">
-      <NupkgPathRelativeToPackageRoot>%(Identity)/%(Version)/%(Identity).%(Version).nupkg</NupkgPathRelativeToPackageRoot>
+      <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>
+
+  <!-- Restore bundled templates via PackageDownload -->
+  <ItemGroup>
+    <PackageDownload Include="@(Bundled30Templates);@(Bundled22Templates);@(Bundled21Templates)" />
+  </ItemGroup>
+
   <Target Name="LayoutTemplates"
+        DependsOnTargets="LayoutTemplatesForSDK;LayoutTemplatesFor30MSI;LayoutTemplatesFor22MSI;LayoutTemplatesFor21MSI" />
+    
+  <Target Name="LayoutTemplatesForSDK"
           DependsOnTargets="SetupBundledComponents;Calculate30TemplatesVersion">
     <ItemGroup Condition="!$(ProductMonikerRid.StartsWith('win'))">
       <BundledTemplate Remove="Microsoft.Dotnet.Wpf.ProjectTemplates" />
@@ -54,4 +104,18 @@
     <Copy SourceFiles="%(Bundled30Templates.RestoredNupkgPath)"
           DestinationFolder="$(Templates30LayoutPath)templates/$(BundledTemplates30Version)"/>
   </Target>
+
+  <Target Name="LayoutTemplatesFor22MSI"
+        DependsOnTargets="SetupBundledComponents;Calculate22TemplatesVersion"
+        Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))">
+    <Copy SourceFiles="%(Bundled22Templates.RestoredNupkgPath)"
+          DestinationFolder="$(Templates22LayoutPath)templates/$(BundledTemplates22InstallPath)"/>
+  </Target>
+
+  <Target Name="LayoutTemplatesFor22MSI"
+        DependsOnTargets="SetupBundledComponents;Calculate22TemplatesVersion"
+        Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))">
+    <Copy SourceFiles="%(Bundled22Templates.RestoredNupkgPath)"
+          DestinationFolder="$(Templates22LayoutPath)templates/$(BundledTemplates22InstallPath)"/>
+  </Target>
 </Project>
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 9129e7f5f..f7937d6fb 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -418,9 +418,6 @@
                             GenerateBundledVersions;
                             LayoutRuntimeGraph;
                             LayoutTemplates;
-                            LayoutTemplatesFor30MSI;
-                            LayoutTemplatesFor22MSI;
-                            LayoutTemplatesFor21MSI;
                             LayoutBundledTools;
                             RetargetTools;
                             CrossgenLayout;
diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets
index f84d062ee..87962f739 100644
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@@ -34,12 +34,12 @@
     </PropertyGroup>
 
     <PropertyGroup>
-      <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>
+      <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>
@@ -54,7 +54,7 @@
           DependsOnTargets="GenerateLayout;SetupWixProperties;GetCoreSdkGitCommitInfo">
     <!-- Consumed By Publish -->
     <ItemGroup>
-      <GeneratedInstallers Include="$(SdkMsiInstallerFile);$(Templates30MsiInstallerFile);$(Templates22MsiInstallerFile);$(Templates21MsiInstallerFile);$(CombinedFrameworkSdkHostMsiInstallerFile)" />
+      <GeneratedInstallers Include="$(SdkMSIInstallerFile);$(Templates30MSIInstallerFile);$(Templates22MSIInstallerFile);$(Templates21MSIInstallerFile);$(CombinedFrameworkSdkHostMSIInstallerFile)" />
     </ItemGroup>
 
     <GenerateMsiVersion CommitCount="$(GitCommitCount)"
@@ -64,22 +64,22 @@
       <Output TaskParameter="MsiVersion" PropertyName="MsiVersion" />
     </GenerateMsiVersion>
 
-    <GenerateGuidFromName Name="$(SdkMsiInstallerFile)">
+    <GenerateGuidFromName Name="$(SdkMSIInstallerFile)">
       <Output TaskParameter="OutputGuid"
           PropertyName="SdkInstallerUpgradeCode" />
     </GenerateGuidFromName>
 
-    <GenerateGuidFromName Name="$(Templates30MsiInstallerFile)">
+    <GenerateGuidFromName Name="$(Templates30MSIInstallerFile)">
       <Output TaskParameter="OutputGuid"
           PropertyName="Templates30InstallerUpgradeCode" />
     </GenerateGuidFromName>
 
-    <GenerateGuidFromName Name="$(Templates22MsiInstallerFile)">
+    <GenerateGuidFromName Name="$(Templates22MSIInstallerFile)">
       <Output TaskParameter="OutputGuid"
           PropertyName="Templates22InstallerUpgradeCode" />
     </GenerateGuidFromName>
 
-    <GenerateGuidFromName Name="$(Templates21MsiInstallerFile)">
+    <GenerateGuidFromName Name="$(Templates21MSIInstallerFile)">
       <Output TaskParameter="OutputGuid"
           PropertyName="Templates21InstallerUpgradeCode" />
     </GenerateGuidFromName>
@@ -119,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)' ^
@@ -140,11 +140,11 @@
           Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))"
           Inputs="@(TemplatesMsiComponent->'%(LayoutPath)');
                     $(TemplatesGenerateMsiPowershellScript)"
-          Outputs="@(TemplatesMsiComponent->'%(MsiInstallerFile)')">
+          Outputs="@(TemplatesMsiComponent->'%(MSIInstallerFile)')">
 
     <Exec Command="powershell -NoProfile -NoLogo $(TemplatesGenerateMsiPowershellScript) ^
                       '@(TemplatesMsiComponent->'%(LayoutPath)')' ^
-                      '%(TemplatesMsiComponent.MsiInstallerFile)' ^
+                      '%(TemplatesMsiComponent.MSIInstallerFile)' ^
                       '$(WixRoot)' ^
                       '@(TemplatesMsiComponent->'%(BrandName)')' ^
                       '@(TemplatesMsiComponent->'%(MsiVersion)')' ^
@@ -163,7 +163,7 @@
     <ItemGroup>
       <TemplatesMsiComponent Include="NetCore30TemplatesMsi">
         <LayoutPath>$(Templates30LayoutPath.TrimEnd('\'))</LayoutPath>
-        <MsiInstallerFile>$(Templates30MsiInstallerFile)</MsiInstallerFile>
+        <MSIInstallerFile>$(Templates30MSIInstallerFile)</MSIInstallerFile>
         <BrandName>Microsoft .NET Core 3.0 Templates</BrandName>
         <MsiVersion>$(BundledTemplates30MsiVersion)</MsiVersion>
         <Version>$(BundledTemplates30Version)</Version>
@@ -171,7 +171,7 @@
       </TemplatesMsiComponent>
       <TemplatesMsiComponent Include="NetCore22TemplatesMsi">
         <LayoutPath>$(Templates22LayoutPath.TrimEnd('\'))</LayoutPath>
-        <MsiInstallerFile>$(Templates22MsiInstallerFile)</MsiInstallerFile>
+        <MSIInstallerFile>$(Templates22MSIInstallerFile)</MSIInstallerFile>
         <BrandName>Microsoft .NET Core 2.2 Templates</BrandName>
         <MsiVersion>$(BundledTemplates22MsiVersion)</MsiVersion>
         <Version>$(BundledTemplates22Version)</Version>
@@ -179,7 +179,7 @@
       </TemplatesMsiComponent>
       <TemplatesMsiComponent Include="NetCore21TemplatesMsi">
         <LayoutPath>$(Templates21LayoutPath.TrimEnd('\'))</LayoutPath>
-        <MsiInstallerFile>$(Templates21MsiInstallerFile)</MsiInstallerFile>
+        <MSIInstallerFile>$(Templates21MSIInstallerFile)</MSIInstallerFile>
         <BrandName>Microsoft .NET Core 2.1 Templates</BrandName>
         <MsiVersion>$(BundledTemplates21MsiVersion)</MsiVersion>
         <Version>$(BundledTemplates21Version)</Version>
@@ -191,15 +191,15 @@
   <Target Name="GenerateSdkBundle"
           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)' ^
@@ -210,8 +210,8 @@
                       '$(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName)' ^
                       '$(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)' ^
                       '$(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)' ^
-                      '$(Templates30MsiInstallerFile)' ^
-                      '$(CombinedFrameworkSdkHostMsiInstallerFile)' ^
+                      '$(Templates30MSIInstallerFile)' ^
+                      '$(CombinedFrameworkSdkHostMSIInstallerFile)' ^
                       '$(WixRoot)' ^
                       '$(SdkBrandName)' ^
                       '$(MsiVersion)' ^
@@ -229,32 +229,32 @@
   <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) ^
                       '$(ArtifactsDir)' ^
-                      '$(SdkMsiInstallerFile)' ^
+                      '$(SdkMSIInstallerFile)' ^
                       '$(FullNugetVersion)' ^
                       '$(ToolsetInstallerNuspecFile)' ^
                       '$(ToolsetInstallerNupkgFile)' ^
                       '$(Architecture)' ^
-                      '$(SdkMsiCabFile)'" />
+                      '$(SdkMSICabFile)'" />
   </Target>
 
   <Target Name="GenerateTemplatesNupkgs"
           DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs;GenerateTemplatesMsis;SignTemplatesMsis;SetupTemplatesNupkgs"
           Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))"
-          Inputs="@(TemplatesNupkgComponent->'%(MsiInstallerFile)');
+          Inputs="@(TemplatesNupkgComponent->'%(MSIInstallerFile)');
                     $(TemplatesInstallerNuspecFile);
                     $(GenerateNupkgPowershellScript)"
           Outputs="@(TemplatesNupkgComponent->'%(NupkgFile)')">
 
     <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
                       '$(ArtifactsDir)' ^
-                      '%(TemplatesNupkgComponent.MsiInstallerFile)' ^
+                      '%(TemplatesNupkgComponent.MSIInstallerFile)' ^
                       '@(TemplatesNupkgComponent->'%(Version)')' ^
                       '$(TemplatesInstallerNuspecFile)' ^
                       '@(TemplatesNupkgComponent->'%(NupkgFile)')' ^
@@ -268,19 +268,19 @@
 
     <ItemGroup>
       <TemplatesNupkgComponent Include="NetCore30TemplatesNupkg">
-        <MsiInstallerFile>$(Templates30MsiInstallerFile)</MsiInstallerFile>
+        <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>
+        <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>
+        <MSIInstallerFile>$(Templates21MSIInstallerFile)</MSIInstallerFile>
         <NupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(Templates21MajorMinorVersion).$(BundledTemplates21Version).nupkg</NupkgFile>
         <Version>$(BundledTemplates21Version)</Version>
         <IDSuffix>$(Architecture).$(Templates21MajorMinorVersion)</IDSuffix>