Merge pull request #8122 from livarcocc/produce_v1_packages

Making the 1.1.x CLI produce a .v1 nupkg for VS insertion.

Author: Livar

build/package/Microsoft.DotNet.Cli.Installer.MSI.targets

@@ -24,6 +24,8 @@
         <CombinedFrameworkSdkHostInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)</CombinedFrameworkSdkHostInstallerFile>
         <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>
+        <SdkInstallerNuspecV1File>$(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.$(Architecture).v1.nuspec</SdkInstallerNuspecV1File>
+        <SdkInstallerNupkgV1File>$(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).v1.$(FullNugetVersion).nupkg</SdkInstallerNupkgV1File>
       </PropertyGroup>
 
       <!-- Generate SDK MSI Inputs -->
@@ -129,14 +131,22 @@
             Condition=" '$(OS)' == 'Windows_NT'"
             Inputs="$(CombinedFrameworkSdkHostInstallerFile);
                     $(SdkInstallerNuspecFile);
+                    $(SdkInstallerNuspecV1File);
                     $(SdkGenerateNupkgPowershellScript)"
-            Outputs="$(SdkInstallerNupkgFile)">
+            Outputs="$(SdkInstallerNupkgFile);
+                     $(SdkInstallerNupkgV1File)">
 
       <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript)
                       '$(CombinedFrameworkSdkHostInstallerFile)'
                       '$(FullNugetVersion)'
                       '$(SdkInstallerNuspecFile)'
                       '$(SdkInstallerNupkgFile)'" />
+
+      <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript)
+                      '$(CombinedFrameworkSdkHostInstallerFile)'
+                      '$(FullNugetVersion)'
+                      '$(SdkInstallerNuspecV1File)'
+                      '$(SdkInstallerNupkgV1File)'" />
     </Target>
 
     <Target Name="TestSdkMsi"

packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.v1.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.v1</id>
+        <version>1.0.0</version>
+        <title>VS.Redist.Common.Net.Core.SDK.x64.v1</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]" target="[DOTNET_BUNDLE]" />
+    </files>
+</package>

packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.v1.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.v1</id>
+        <version>1.0.0</version>
+        <title>VS.Redist.Common.Net.Core.SDK.x86.v1</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]" target="[DOTNET_BUNDLE]" />
+    </files>
+</package>