Merge pull request #23249 from dotnet/dev/jaredpar/fix-blob

Publishing to blob storage

build/Targets/Packages.props

@@ -42,6 +42,7 @@
     <MicrosoftDiaSymReaderPortablePdbVersion>1.4.0</MicrosoftDiaSymReaderPortablePdbVersion>
     <MicrosoftDotNetIBCMerge>4.7.2-alpha-00001</MicrosoftDotNetIBCMerge>
     <MicrosoftDotNetVersionToolsVersion>1.0.27-prerelease-01811-02</MicrosoftDotNetVersionToolsVersion>
+    <MicrosoftDotNetBuildTasksFeedVersion>1.0.0-prerelease-02202-02</MicrosoftDotNetBuildTasksFeedVersion>
     <MicrosoftIdentityModelClientsActiveDirectoryVersion>3.13.8</MicrosoftIdentityModelClientsActiveDirectoryVersion>
     <MicrosoftInternalPerformanceCodeMarkersDesignTimeVersion>15.0.26606-alpha</MicrosoftInternalPerformanceCodeMarkersDesignTimeVersion>
     <MicrosoftInternalVisualStudioShellInterop140DesignTimeVersion>14.3.25407-alpha</MicrosoftInternalVisualStudioShellInterop140DesignTimeVersion>

build/ToolsetPackages/BaseToolset.csproj

@@ -12,6 +12,7 @@
     <PackageReference Include="MicroBuild.Plugins.SwixBuild" Version="$(MicroBuildPluginsSwixBuildVersion)" />
     <PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" />
     <PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativeVersion)" />
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedVersion)" />
     <PackageReference Include="Microsoft.Net.Compilers" Version="$(MicrosoftNetCompilersVersion)" />
     <PackageReference Include="Microsoft.NETCore.Compilers" Version="$(MicrosoftNETCoreCompilersVersion)" />
     <PackageReference Include="Microsoft.Net.RoslynDiagnostics" Version="$(MicrosoftNetRoslynDiagnosticsVersion)" />

src/Tools/MicroBuild/Build.proj

@@ -13,7 +13,9 @@
     <ScriptArgs Condition="'$(PB_SkipTests)' != 'true'">$(ScriptArgs) -testDesktop</ScriptArgs>
     <ScriptArgs Condition="'$(PB_SignType)' == 'real'">$(ScriptArgs) -signType "real"</ScriptArgs>
     <ScriptArgs Condition="'$(PB_SignType)' == 'test'">$(ScriptArgs) -signType "test"</ScriptArgs>
-    <ScriptArgs Condition="$(PB_PublishType.Contains('vsts'))">$(ScriptArgs) -publish</ScriptArgs>
+    <ScriptArgs Condition="'$(PB_PublishType)' == 'vsts'">$(ScriptArgs) -publishType "vsts"</ScriptArgs>
+    <ScriptArgs Condition="'$(PB_PublishType)' == 'blob'">$(ScriptArgs) -publishType "blob"</ScriptArgs>
+    <ScriptArgs Condition="'$(PB_PublishBlobFeedUrl)' != ''">$(ScriptArgs) -blobFeedUrl $(PB_PublishBlobFeedUrl) -blobFeedKey $(PB_PublishBlobFeedKey)</ScriptArgs>
   </PropertyGroup>
 
   <Target Name="Build">

src/Tools/MicroBuild/PublishBlobAssets.proj

+<Project>
+
+  <Import Project="..\..\..\build\Targets\Versions.props" />
+  <Import Project="..\..\..\build\Targets\Packages.props" />
+
+  <PropertyGroup>
+    <PublishOverwrite Condition="'$(PublishOverwrite)' == ''">false</PublishOverwrite>
+  </PropertyGroup>
+
+  <!--
+  This is for the internal orchestrated build scenarios and will likely never be run on a
+  developer's machine.  The official build definition builds this file directly.
+  -->
+  <Import Project="$(NuGetPackageRoot)\Microsoft.DotNet.Build.Tasks.Feed\$(MicrosoftDotNetBuildTasksFeedVersion)\build\Microsoft.DotNet.Build.Tasks.Feed.targets" />
+
+  <ItemGroup>
+    <ItemsToPush Include="$(OutputPath)\NuGet\**\*.nupkg" />
+  </ItemGroup>
+
+  <Target Name="Build">
+    <PushToBlobFeed ExpectedFeedUrl="$(ExpectedFeedUrl)"
+                    AccountKey="$(AccountKey)"
+                    ItemsToPush="@(ItemsToPush)"
+                    Overwrite="$(PublishOverwrite)" />
+  </Target>
+
+</Project>

src/Tools/MicroBuild/microbuild.ps1

@@ -7,7 +7,7 @@ param (
     [switch]$cibuild = $false,
     [string]$branchName = "master",
     [switch]$testDesktop = $false,
-    [switch]$publish = $false,
+    [string]$publishType = "",
     [switch]$help = $false,
     [string]$signType = "",
 
@@ -17,6 +17,8 @@ param (
     [string]$gitHubUserName = "",
     [string]$gitHubToken = "",
     [string]$gitHubEmail = "",
+    [string]$blobFeedUrl = "",
+    [string]$blobFeedKey = "",
     [parameter(ValueFromRemainingArguments=$true)] $badArgs)
 
 Set-StrictMode -version 2.0
@@ -30,9 +32,10 @@ function Print-Usage() {
     Write-Host "  -msbuildDir               MSBuild to use for operations"
     Write-Host "  -cibuild                  Run CI specific operations"
     Write-Host "  -testDesktop              Run unit tests"
-    Write-Host "  -publish                  Run the pubish step"
+    Write-Host "  -publishType              Publish to run: vsts, blob or none (default is none)"
     Write-Host "  -branchName               Branch being built"
     Write-Host "  -nugetApiKey              Key for NuGet publishing"
+    Write-Host "  -signType                 Signing type: real, test or public (default is public)"
     Write-Host "  -help                     Print this message"
 }
 
@@ -133,8 +136,18 @@ try {
 
     Get-Process vbcscompiler -ErrorAction SilentlyContinue | Stop-Process
 
-    if ($publish) { 
-        Exec-Block { & .\publish-assets.ps1 -configDir $configDir -branchName $branchName -mygetApiKey $mygetApiKey -nugetApiKey $nugetApiKey -gitHubUserName $githubUserName -gitHubToken $gitHubToken -gitHubEmail $gitHubEmail -test:$(-not $official) }
+    switch ($publishType) {
+        "vsts" {
+            Exec-Block { & .\publish-assets.ps1 -configDir $configDir -branchName $branchName -mygetApiKey $mygetApiKey -nugetApiKey $nugetApiKey -gitHubUserName $githubUserName -gitHubToken $gitHubToken -gitHubEmail $gitHubEmail -test:$(-not $official) }
+            break;
+        }
+        "blob" {
+            Exec-Block { & .\publish-blob.ps1 -configDir $configDir -blobFeedUrl $blobFeedUrl -blobFeedKey $blobFeedKey }
+            break;
+        }
+        default {
+            break;
+        }
     }
 
     exit 0

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, $msbuildDir = Ensure-MSBuildAndDir -msbuildDir $msbuildDir
+
+    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 PublishBlobAssets.proj"
+}
+catch {
+    Write-Host $_
+    Write-Host $_.Exception
+    Write-Host $_.ScriptStackTrace
+    exit 1
+}