From 41ef6e2cac15af6411c96ab5f4f9d0bb67655695 Mon Sep 17 00:00:00 2001
From: Sarah Oslund <sfoslund@microsoft.com>
Date: Wed, 9 Jun 2021 12:57:17 -0700
Subject: [PATCH] Adding SDK manifests vs package

---
 src/redist/targets/GenerateMSIs.targets       | 22 +++++++++++++++++++
 .../VS.Redist.Common.NetCore.Manifest.nuspec  | 18 +++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Manifest.nuspec

diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets
index 4d4fb0032..29d519270 100644
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@@ -37,6 +37,9 @@
       <SdkPlaceholderInstallerNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.SdkPlaceholder.$(Architecture).$(FullNugetVersion).nupkg</SdkPlaceholderInstallerNupkgFile>
       <VSToolsNuspecFile>$(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Tools.Net.Core.SDK.nuspec</VSToolsNuspecFile>
       <VSToolsNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Tools.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg</VSToolsNupkgFile>
+      
+      <ManifestInstallerNuspecFile>$(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Redist.Common.NetCore.Manifest.nuspec</ManifestInstallerNuspecFile>
+      <ManifestInstallerNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Manifest.$(Architecture).$(FullNugetVersion).nupkg</ManifestInstallerNupkgFile>
 
       <SdkResolverLayoutPath>$(ArtifactsDir)bin/SdkResolver/$(Configuration)</SdkResolverLayoutPath>
       <VSToolsResolverNuspecFile>$(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Tools.Net.Core.SDK.Resolver.nuspec</VSToolsResolverNuspecFile>
@@ -451,6 +454,24 @@
 
   </Target>
 
+  <Target Name="GenerateManifestNupkg"
+          DependsOnTargets="GenerateLayout;GenerateManifestsMsi"
+          Condition=" '$(OS)' == 'Windows_NT' "
+          Inputs="$(ManifestsMSIInstallerFile);
+                    $(ManifestInstallerNuspecFile);
+                    $(GenerateNupkgPowershellScript)"
+          Outputs="$(ManifestInstallerNupkgFile)">
+
+    <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
+                      '$(ArtifactsDir)' ^
+                      '$(ManifestsMSIInstallerFile)' ^
+                      '$(FullNugetVersion)' ^
+                      '$(ManifestInstallerNuspecFile)' ^
+                      '$(ManifestInstallerNupkgFile)' ^
+                      '$(Architecture)' ^
+                      '$(MajorMinorVersion)'" />
+  </Target>
+
   <Target Name="GenerateVSToolsNupkg"
           DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs"
           Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x86' "
@@ -535,6 +556,7 @@
                             GenerateSdkPlaceholderMsi;
                             SignSdkPlaceholderMsi;
                             GenerateToolsetNupkg;
+                            GenerateManifestNupkg;
                             GenerateTemplatesNupkgs;
                             GenerateSdkPlaceholderNupkg;
                             GenerateVSToolsNupkg;
diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Manifest.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Manifest.nuspec
new file mode 100644
index 000000000..d32a3d0d8
--- /dev/null
+++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Manifest.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.NetCore.Manifest.$ARCH$</id>
+        <version>1.0.0</version>
+        <title>VS.Redist.Common.NetCore.Manifest.$ARCH$</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 $MAJOR_MINOR$ SDK Manifests ($ARCH$) 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$" />
+    </files>
+</package>