Merge pull request #24483 from dotnet/dev/jaredpar/fix-manifest

Publish manifest for orchestrated build

build/Targets/Packages.props

@@ -43,7 +43,7 @@
     <MicrosoftDiaSymReaderPortablePdbVersion>1.4.0</MicrosoftDiaSymReaderPortablePdbVersion>
     <MicrosoftDotNetIBCMerge>4.7.2-alpha-00001</MicrosoftDotNetIBCMerge>
     <MicrosoftDotNetVersionToolsVersion>1.0.27-prerelease-01811-02</MicrosoftDotNetVersionToolsVersion>
-    <MicrosoftDotNetBuildTasksFeedVersion>2.1.0-prerelease-02221-02</MicrosoftDotNetBuildTasksFeedVersion>
+    <MicrosoftDotNetBuildTasksFeedVersion>2.1.0-prerelease-02419-02</MicrosoftDotNetBuildTasksFeedVersion>
     <MicrosoftIdentityModelClientsActiveDirectoryVersion>3.13.8</MicrosoftIdentityModelClientsActiveDirectoryVersion>
     <MicrosoftInternalPerformanceCodeMarkersDesignTimeVersion>15.0.26730-alpha</MicrosoftInternalPerformanceCodeMarkersDesignTimeVersion>
     <MicrosoftInternalVisualStudioShellInterop140DesignTimeVersion>14.3.25407-alpha</MicrosoftInternalVisualStudioShellInterop140DesignTimeVersion>

src/Tools/MicroBuild/Build.proj

@@ -20,6 +20,8 @@
 
   <Target Name="Build">
     <Exec Command="powershell -noprofile -executionPolicy ByPass -file $(MSBuildThisFileDirectory)microbuild.ps1 -restore -official $(ScriptArgs) " />
+
+    <MSBuild Projects="PublishBlobAssets.proj" Condition="'$(PB_PublishType)' == 'blob'" />
   </Target>
 
 </Project>

src/Tools/MicroBuild/PublishBlobAssets.proj

 <Project>
 
-  <Import Project="..\..\..\build\Targets\Versions.props" />
-  <Import Project="..\..\..\build\Targets\Packages.props" />
+  <Import Project="..\..\..\build\Targets\Settings.props" />
 
   <PropertyGroup>
     <PublishOverwrite Condition="'$(PublishOverwrite)' == ''">false</PublishOverwrite>
@@ -18,10 +17,15 @@
   </ItemGroup>
 
   <Target Name="Build">
-    <PushToBlobFeed ExpectedFeedUrl="$(ExpectedFeedUrl)"
-                    AccountKey="$(AccountKey)"
+    <PushToBlobFeed ExpectedFeedUrl="$(PB_PublishBlobFeedUrl)"
+                    AccountKey="$(PB_PublishBlobFeedKey)"
                     ItemsToPush="@(ItemsToPush)"
-                    Overwrite="$(PublishOverwrite)" />
+                    Overwrite="$(PublishOverwrite)"
+                    ManifestBranch="$(BUILD_SOURCEBRANCH)"
+                    ManifestBuildId="$(BUILD_BUILDNUMBER)"
+                    ManifestCommit="$(CommitHashDisplay)"
+                    ManifestName="roslyn"
+                    SkipCreateManifest="false" />
   </Target>
 
 </Project>

src/Tools/MicroBuild/microbuild.ps1

@@ -113,10 +113,15 @@ try {
             break;
         }
         "blob" {
-            Exec-Block { & .\publish-blob.ps1 -configDir $configDir -blobFeedUrl $blobFeedUrl -blobFeedKey $blobFeedKey }
+            # This is handled by the Build.proj file directly
+            break;
+        }
+        "" {
+            # Explicit don't publish
             break;
         }
         default {
+            throw "Unexpected publish type: $publishType"
             break;
         }
     }

src/Tools/MicroBuild/publish-blob.ps1

-# Publishes our assets to our blob containers
-#
-# Repeatable is important here because we have to assume that publishes can and will fail with some 
-# degree of regularity. 
-[CmdletBinding(PositionalBinding=$false)]
-Param(
-    # Standard options
-    [string]$configDir = "",
-
-    # Credentials 
-    [string]$blobFeedUrl = "",
-    [string]$blobFeedKey = ""
-)
-
-Set-StrictMode -version 2.0
-$ErrorActionPreference="Stop"
-
-try {
-    . (Join-Path $PSScriptRoot "..\..\..\build\scripts\build-utils.ps1")
-
-    $msbuild = Ensure-MSBuild
-
-    if ($blobFeedUrl -eq "") {
-        Write-Host "Need a value for -blobFeedUrl"
-        exit 1
-    }
-
-    if ($blobFeedKey -eq "") {
-        Write-Host "Need a value for -blobFeedKey"
-        exit 1
-    }
-
-    if ($configDir -eq "") {
-        Write-Host "Need a value for -configDir"
-        exit 1
-    }
-
-    Exec-Console $msbuild "/p:ConfigDir=$configDir /p:ExpectedFeedUrl=$blobFeedUrl /p:AccountKey=$blobFeedKey /p:OutputPath=$configDir /t:Build PublishBlobAssets.proj"
-}
-catch {
-    Write-Host $_
-    Write-Host $_.Exception
-    Write-Host $_.ScriptStackTrace
-    exit 1
-}