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

Author: wtgodbe

Directory.Build.props

@@ -21,6 +21,8 @@
     <ArtifactsBinDir>$(ArtifactsConfigurationDir)bin\</ArtifactsBinDir>
     <PackageOutputPath>$(ArtifactsDir)build\</PackageOutputPath>
 
+    <InstallersOutputPath>$(RepositoryRoot)artifacts/bin/$(Configuration)/installers/</InstallersOutputPath>
+
     <RepoRelativeProjectDir>$([MSBuild]::MakeRelative($(RepositoryRoot), $(MSBuildProjectDirectory)))</RepoRelativeProjectDir>
 
     <IsBenchmarkProject Condition="$(MSBuildProjectName.EndsWith('.Performance')) OR $(RepoRelativeProjectDir.Contains('perf'))">true</IsBenchmarkProject>
@@ -42,6 +44,11 @@
     <MvcTestingTargets>$(MSBuildThisFileDirectory)src\Mvc\Mvc.Testing\src\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Testing.targets</MvcTestingTargets>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!-- Publishing.targets & SharedFramework.wixproj both use this property, so putting it here in a common location -->
+    <SharedFrameworkRedistPackageId>VS.Redist.Common.AspNetCore.SharedFramework</SharedFrameworkRedistPackageId>
+  </PropertyGroup>
+
   <Import Project="eng\Dependencies.props" />
   <Import Project="eng\PatchConfig.props" />
   <Import Project="eng\ProjectReferences.props" />

build/Publish.targets

@@ -174,6 +174,10 @@
       <PackageToPublish Include="%(_SymbolsPackageArtifactInfo.ArtifactPath)" Category="symbols" IsSymbolsPackage="true" />
     </ItemGroup>
 
+    <ItemGroup>
+      <RedistPackageToPublish Include="$(InstallersOutputPath)(SharedFrameworkRedistPackageId)*" />
+    </ItemGroup>
+
     <ItemGroup>
       <_MissingArtifactFile Include="@(FilesToPublish)" Condition="!Exists(%(FilesToPublish.Identity))" />
       <_MissingArtifactFile Include="@(NpmPackageToPublish)" Condition="!Exists(%(NpmPackageToPublish.Identity))" />
@@ -276,6 +280,10 @@
         ManifestArtifactData="NonShipping=true"
         Condition="'%(PackageToPublish.Category)' != 'ship'" />
 
+      <PackageToPublishToTransport
+        Include="@(RedistPackageToPublish)"
+        ManifestArtifactData="NonShipping=true" />
+
       <FilesToPublishToTransport Include="@(NpmPackageToPublish)"
         RelativeBlobPath="$(BlobFileRelativePathBase)%(NpmPackageToPublish.RelativeBlobPath)"
         ManifestArtifactData="%(NpmPackageToPublish.ManifestArtifactData)" />

korebuild-lock.txt

@@ -1,2 +1,2 @@
 version:2.1.7-build-20190110.2
-commithash:00aefcfd284db33352f35bfa2c74c65f8580e372
+commithash:00aefcfd284db33352f35bfa2c74c65f8580e372

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

src/Installers/Windows/SharedFramework/SharedFramework.wixproj

@@ -18,7 +18,6 @@
     <DefineConstants>$(DefineConstants);AspNetCoreSharedFrameworkSource=$(HarvestSource)</DefineConstants>
     <NamespaceGuid>$(SharedFrameworkNamespaceGuid)</NamespaceGuid>
     <ToolsetInstallerNuspecFile>$(RepositoryRoot)\src\Installers\Windows\SharedFramework\SharedFrameworkPackage.nuspec</ToolsetInstallerNuspecFile>
-    <InstallersOutputPath>$(RepositoryRoot)artifacts/bin/$(Configuration)/installers/</InstallersOutputPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -64,7 +63,8 @@
                       '$(PackageVersion)' ^
                       '$(RepositoryRoot)' ^
                       '$(AspNetCoreMajorVersion)' ^
-                      '$(AspNetCoreMinorVersion)'" />
+                      '$(AspNetCoreMinorVersion)' ^
+                      '$(SharedFrameworkRedistPackageId)'" />
   </Target>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />

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>