From d9c2f744fa0b09968f1fb4721dbdf6875ae42d8e Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Wed, 1 Apr 2020 14:45:39 -0700
Subject: [PATCH] Attempt to auto-publish vs.redist packages to orchestrated
 feed (#20211)

* Attempt to auto-publish vs.redist packages to orchestrated feed

* Use non-stable packageVersion for vs.redist

* Fix typo

* Update build/Publish.targets

- should trigger a build that's more likely to succeed

* Print what we're trying to publish

* More debug prints

* Set RedistPackageId in publishing.targets

* Reference variable correctly

* Remove unnecessary messages

* Respond to feedback

Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>
---
 build/Publish.targets                                 | 11 ++++++++++-
 .../Windows/GenerateNugetPackageWithMsi.ps1           |  5 +++--
 .../Windows/SharedFramework/SharedFramework.wixproj   |  6 +++++-
 .../SharedFramework/SharedFrameworkPackage.nuspec     |  4 ++--
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/build/Publish.targets b/build/Publish.targets
index 9c73f75d15..444c1a606f 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -66,6 +66,8 @@
       <InstallerAliasBaseFileName>aspnetcore-runtime-latest</InstallerAliasBaseFileName>
       <IntermediateInstallerBaseFileName>aspnetcore-runtime-internal-$(PackageVersion)</IntermediateInstallerBaseFileName>
       <WindowsHostingBundleInstallerFileName>dotnet-hosting-$(PackageVersion)-win.exe</WindowsHostingBundleInstallerFileName>
+      <!-- This matches the property set in SharedFramework.wixproj -->
+      <SharedFrameworkRedistPackageId>VS.Redist.Common.AspNetCore.SharedFramework</SharedFrameworkRedistPackageId>
     </PropertyGroup>
 
     <ItemGroup>
@@ -174,6 +176,10 @@
       <PackageToPublish Include="%(_SymbolsPackageArtifactInfo.ArtifactPath)" Category="symbols" IsSymbolsPackage="true" />
     </ItemGroup>
 
+    <ItemGroup>
+      <RedistPackageToPublish Include="$(DependencyAssetsDir)$(SharedFrameworkRedistPackageId)*" />
+    </ItemGroup>
+
     <ItemGroup>
       <_MissingArtifactFile Include="@(FilesToPublish)" Condition="!Exists(%(FilesToPublish.Identity))" />
       <_MissingArtifactFile Include="@(NpmPackageToPublish)" Condition="!Exists(%(NpmPackageToPublish.Identity))" />
@@ -276,6 +282,10 @@
         ManifestArtifactData="NonShipping=true"
         Condition="'%(PackageToPublish.Category)' != 'ship'" />
 
+      <PackageToPublishToTransport
+        Include="@(RedistPackageToPublish)"
+        ManifestArtifactData="NonShipping=true" />
+
       <FilesToPublishToTransport Include="@(NpmPackageToPublish)"
         RelativeBlobPath="$(BlobFileRelativePathBase)%(NpmPackageToPublish.RelativeBlobPath)"
         ManifestArtifactData="%(NpmPackageToPublish.ManifestArtifactData)" />
@@ -287,7 +297,6 @@
         Condition=" '%(FilesToPublish.IsDuplicateUpload)' != 'true' " />
     </ItemGroup>
 
-
     <PushToBlobFeed ExpectedFeedUrl="$(PublishBlobFeedUrl)"
                     AccountKey="$(PublishBlobFeedKey)"
                     ItemsToPush="@(PackageToPublishToTransport)"
diff --git a/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 b/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1
index 1b86aed1c4..53e56c20af 100644
--- a/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1
+++ b/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1
@@ -11,7 +11,8 @@ param(
     [Parameter(Mandatory=$true)][string]$PackageVersion,
     [Parameter(Mandatory=$true)][string]$RepoRoot,
     [Parameter(Mandatory=$true)][string]$MajorVersion,
-    [Parameter(Mandatory=$true)][string]$MinorVersion
+    [Parameter(Mandatory=$true)][string]$MinorVersion,
+    [Parameter(Mandatory=$true)][string]$PackageId
 )
 
 $NuGetDir = Join-Path $RepoRoot "obj\Tools\nuget\$Name\$Architecture"
@@ -27,5 +28,5 @@ if (-not (Test-Path $NuGetExe)) {
     wget https://dist.nuget.org/win-x86-commandline/v3.5.0/nuget.exe -OutFile $NuGetExe
 }
 
-& $NuGetExe pack $NuspecFile -Version $PackageVersion -OutputDirectory $OutputDirectory -NoDefaultExcludes -NoPackageAnalysis -Properties ASPNETCORE_RUNTIME_MSI=$MsiPath`;ASPNETCORE_CAB_FILE=$CabPath`;ARCH=$Architecture`;MAJOR=$MajorVersion`;MINOR=$MinorVersion`;
+& $NuGetExe pack $NuspecFile -Version $PackageVersion -OutputDirectory $OutputDirectory -NoDefaultExcludes -NoPackageAnalysis -Properties ASPNETCORE_RUNTIME_MSI=$MsiPath`;ASPNETCORE_CAB_FILE=$CabPath`;ARCH=$Architecture`;MAJOR=$MajorVersion`;MINOR=$MinorVersion`;ID=$PackageId`;
 Exit $LastExitCode
\ No newline at end of file
diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
index 0abe1a3242..c497717f2e 100644
--- a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
+++ b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
@@ -19,6 +19,9 @@
     <NamespaceGuid>$(SharedFrameworkNamespaceGuid)</NamespaceGuid>
     <ToolsetInstallerNuspecFile>$(RepositoryRoot)\src\Installers\Windows\SharedFramework\SharedFrameworkPackage.nuspec</ToolsetInstallerNuspecFile>
     <InstallersOutputPath>$(RepositoryRoot)artifacts/bin/$(Configuration)/installers/</InstallersOutputPath>
+    <SharedFrameworkRedistPackageId>VS.Redist.Common.AspNetCore.SharedFramework</SharedFrameworkRedistPackageId>
+    <!-- Use non-stable versioning for this package, but keep the stable version in OutputName above -->
+    <PackageVersion>$(VersionPrefix)-$(VersionSuffix)</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -64,7 +67,8 @@
                       '$(PackageVersion)' ^
                       '$(RepositoryRoot)' ^
                       '$(AspNetCoreMajorVersion)' ^
-                      '$(AspNetCoreMinorVersion)'" />
+                      '$(AspNetCoreMinorVersion)' ^
+                      '$(SharedFrameworkRedistPackageId)'" />
   </Target>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
diff --git a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec b/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec
index b5b8c43d9e..d1c1471367 100644
--- a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec
+++ b/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
-        <id>VS.Redist.Common.AspNetCore.SharedFramework.$ARCH$.$MAJOR$.$MINOR$</id>
+        <id>$ID$.$ARCH$.$MAJOR$.$MINOR$</id>
         <version>1.0.0</version>
-        <title>VS.Redist.Common.AspNetCore.SharedFramework.$ARCH$.$MAJOR$.$MINOR$</title>
+        <title>$ID$.$ARCH$.$MAJOR$.$MINOR$</title>
         <authors>Microsoft</authors>
         <owners>Microsoft</owners>
         <licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>