From 1d12ea7f1edfada566e2bc67a7d9f4660bc13467 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Tue, 12 Jun 2018 15:55:16 -0700
Subject: [PATCH 1/5] Update VS insertion package name for x64 package

---
 ...pec => VS.Redist.Common.Net.Core.SDK.x64.2.1.2xx.nuspec} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename packaging/windows/clisdk/{VS.Redist.Common.Net.Core.SDK.x64.nuspec => VS.Redist.Common.Net.Core.SDK.x64.2.1.2xx.nuspec} (74%)

diff --git a/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.nuspec b/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.2.1.2xx.nuspec
similarity index 74%
rename from packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.nuspec
rename to packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.2.1.2xx.nuspec
index 1e5f870e8..785a650a2 100644
--- a/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.nuspec
+++ b/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.2.1.2xx.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.Net.Core.SDK.x64</id>
+        <id>VS.Redist.Common.Net.Core.SDK.x64.2.1.2xx</id>
         <version>1.0.0</version>
-        <title>VS.Redist.Common.Net.Core.SDK.x64</title>
+        <title>VS.Redist.Common.Net.Core.SDK.x64.2.1.2xx</title>
         <authors>Microsoft</authors>
         <owners>Microsoft</owners>
         <licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
         <projectUrl>https://github.com/dotnet/cli</projectUrl>
         <requireLicenseAcceptance>true</requireLicenseAcceptance>
-        <description>Windows Installers (x64) for .Net Core SDK</description>
+        <description>Windows Installers (x64) for .Net Core SDK 2.1.2xx</description>
         <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     </metadata>
     <files>

From 4ef09279d223d0b7c4bb034b41c7b768ddfb88c1 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Tue, 12 Jun 2018 15:55:49 -0700
Subject: [PATCH 2/5] Update VS insertion package name for x86 package

---
 ...pec => VS.Redist.Common.Net.Core.SDK.x86.2.1.2xx.nuspec} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename packaging/windows/clisdk/{VS.Redist.Common.Net.Core.SDK.x86.nuspec => VS.Redist.Common.Net.Core.SDK.x86.2.1.2xx.nuspec} (74%)

diff --git a/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.nuspec b/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.2.1.2xx.nuspec
similarity index 74%
rename from packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.nuspec
rename to packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.2.1.2xx.nuspec
index c9b9f73cd..e8bd5cd0f 100644
--- a/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.nuspec
+++ b/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.2.1.2xx.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.Net.Core.SDK.x86</id>
+        <id>VS.Redist.Common.Net.Core.SDK.x86.2.1.2xx</id>
         <version>1.0.0</version>
-        <title>VS.Redist.Common.Net.Core.SDK.x86</title>
+        <title>VS.Redist.Common.Net.Core.SDK.x86.2.1.2xx</title>
         <authors>Microsoft</authors>
         <owners>Microsoft</owners>
         <licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
         <projectUrl>https://github.com/dotnet/cli</projectUrl>
         <requireLicenseAcceptance>true</requireLicenseAcceptance>
-        <description>Windows Installer (x86) for .Net Core SDK</description>
+        <description>Windows Installer (x86) for .Net Core SDK 2.1.2xx</description>
         <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     </metadata>
     <files>

From ac9b4579ce4d21faa3830e0b0fed6f3b5e61849d Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Tue, 12 Jun 2018 16:05:04 -0700
Subject: [PATCH 3/5] Update VS Insertion NuGet package IDs in
 Installer.MSI.targets

---
 build/package/Installer.MSI.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/package/Installer.MSI.targets b/build/package/Installer.MSI.targets
index e1baf462d..68fc9c15a 100644
--- a/build/package/Installer.MSI.targets
+++ b/build/package/Installer.MSI.targets
@@ -19,8 +19,8 @@
 
       <MSBuildExtensionsGenerateMsiPowershellScript>$(RepoRoot)/packaging/windows/msbuildextensions/generatemsi.ps1</MSBuildExtensionsGenerateMsiPowershellScript>
 
-      <SdkInstallerNuspecFile>$(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.$(Architecture).nuspec</SdkInstallerNuspecFile>
-      <SdkInstallerNupkgFile>$(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg</SdkInstallerNupkgFile>
+      <SdkInstallerNuspecFile>$(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.$(Architecture).2.1.2xx.nuspec</SdkInstallerNuspecFile>
+      <SdkInstallerNupkgFile>$(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).2.1.2xx.$(FullNugetVersion).nupkg</SdkInstallerNupkgFile>
 
       <SdkMSBuildExtensionsNuspecFile>$(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec</SdkMSBuildExtensionsNuspecFile>
       <SdkMSBuildExtensionsNupkgFile>$(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$(FullNugetVersion).nupkg</SdkMSBuildExtensionsNupkgFile>

From 80f143dd0834978de16b3772bc935ff3dc5b660f Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Wed, 13 Jun 2018 17:59:54 -0700
Subject: [PATCH 4/5] Bring back old package IDs

---
 .../VS.Redist.Common.Net.Core.SDK.x64.nuspec   | 18 ++++++++++++++++++
 .../VS.Redist.Common.Net.Core.SDK.x86.nuspec   | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.nuspec
 create mode 100644 packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.nuspec

diff --git a/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.nuspec b/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.nuspec
new file mode 100644
index 000000000..1e5f870e8
--- /dev/null
+++ b/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.nuspec
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+    <metadata>
+        <id>VS.Redist.Common.Net.Core.SDK.x64</id>
+        <version>1.0.0</version>
+        <title>VS.Redist.Common.Net.Core.SDK.x64</title>
+        <authors>Microsoft</authors>
+        <owners>Microsoft</owners>
+        <licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
+        <projectUrl>https://github.com/dotnet/cli</projectUrl>
+        <requireLicenseAcceptance>true</requireLicenseAcceptance>
+        <description>Windows Installers (x64) for .Net Core SDK</description>
+        <copyright>© Microsoft Corporation. All rights reserved.</copyright>
+    </metadata>
+    <files>
+        <file src="[DOTNET_BUNDLE]" />
+    </files>
+</package>
\ No newline at end of file
diff --git a/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.nuspec b/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.nuspec
new file mode 100644
index 000000000..c9b9f73cd
--- /dev/null
+++ b/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.nuspec
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+    <metadata>
+        <id>VS.Redist.Common.Net.Core.SDK.x86</id>
+        <version>1.0.0</version>
+        <title>VS.Redist.Common.Net.Core.SDK.x86</title>
+        <authors>Microsoft</authors>
+        <owners>Microsoft</owners>
+        <licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
+        <projectUrl>https://github.com/dotnet/cli</projectUrl>
+        <requireLicenseAcceptance>true</requireLicenseAcceptance>
+        <description>Windows Installer (x86) for .Net Core SDK</description>
+        <copyright>© Microsoft Corporation. All rights reserved.</copyright>
+    </metadata>
+    <files>
+        <file src="[DOTNET_BUNDLE]" />
+    </files>
+</package>
\ No newline at end of file

From bcbfbffced9b30f0d2d659179c87f3663650883c Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Wed, 13 Jun 2018 18:25:59 -0700
Subject: [PATCH 5/5] Update Installer build to create both old and new package
 identities

---
 build/package/Installer.MSI.targets | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/build/package/Installer.MSI.targets b/build/package/Installer.MSI.targets
index 68fc9c15a..2b1b5285d 100644
--- a/build/package/Installer.MSI.targets
+++ b/build/package/Installer.MSI.targets
@@ -19,8 +19,10 @@
 
       <MSBuildExtensionsGenerateMsiPowershellScript>$(RepoRoot)/packaging/windows/msbuildextensions/generatemsi.ps1</MSBuildExtensionsGenerateMsiPowershellScript>
 
-      <SdkInstallerNuspecFile>$(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.$(Architecture).2.1.2xx.nuspec</SdkInstallerNuspecFile>
-      <SdkInstallerNupkgFile>$(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).2.1.2xx.$(FullNugetVersion).nupkg</SdkInstallerNupkgFile>
+      <SdkInstallerNuspecFile>$(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.$(Architecture).nuspec</SdkInstallerNuspecFile>
+      <SdkInstallerNupkgFile>$(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg</SdkInstallerNupkgFile>
+      <SdkInstallerNuspecFile2xx>$(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.$(Architecture).2.1.2xx.nuspec</SdkInstallerNuspecFile2xx>
+      <SdkInstallerNupkgFile2xx>$(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).2.1.2xx.$(FullNugetVersion).nupkg</SdkInstallerNupkgFile2xx>
 
       <SdkMSBuildExtensionsNuspecFile>$(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec</SdkMSBuildExtensionsNuspecFile>
       <SdkMSBuildExtensionsNupkgFile>$(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$(FullNugetVersion).nupkg</SdkMSBuildExtensionsNupkgFile>
@@ -162,14 +164,21 @@
             Condition=" '$(OS)' == 'Windows_NT'"
             Inputs="$(CombinedFrameworkSdkHostInstallerFile);
                     $(SdkInstallerNuspecFile);
+                    $(SdkInstallerNuspecFile2xx);
                     $(SdkGenerateNupkgPowershellScript)"
-            Outputs="$(SdkInstallerNupkgFile)">
+            Outputs="$(SdkInstallerNupkgFile);$(SdkInstallerNupkgFile2xx)">
 
       <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript)
                       '$(CombinedFrameworkSdkHostInstallerFile)'
                       '$(FullNugetVersion)'
                       '$(SdkInstallerNuspecFile)'
                       '$(SdkInstallerNupkgFile)'" />
+
+      <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript)
+                      '$(CombinedFrameworkSdkHostInstallerFile)'
+                      '$(FullNugetVersion)'
+                      '$(SdkInstallerNuspecFile2xx)'
+                      '$(SdkInstallerNupkgFile2xx)'" />
     </Target>
 
     <Target Name="GenerateSdkMSBuildExtensionsNupkg"