diff --git a/build/Targets/Packages.props b/build/Targets/Packages.props
index fc5be54ec3f7fac945dd6cc5663c1fb7b06ab0f5..0c09c9832edf59a5a847a657063a80456b7c6afb 100644
--- a/build/Targets/Packages.props
+++ b/build/Targets/Packages.props
@@ -43,7 +43,7 @@
1.4.0
4.7.2-alpha-00001
1.0.27-prerelease-01811-02
- 2.1.0-prerelease-02221-02
+ 2.1.0-prerelease-02419-02
3.13.8
15.0.26730-alpha
14.3.25407-alpha
diff --git a/src/Tools/MicroBuild/Build.proj b/src/Tools/MicroBuild/Build.proj
index 81b4b75d1ab87a7a7b2ff7276ed96e40c89a7cf1..47e763c3fb0350c92404b3852e52e54e3622cf0d 100644
--- a/src/Tools/MicroBuild/Build.proj
+++ b/src/Tools/MicroBuild/Build.proj
@@ -20,6 +20,8 @@
+
+
diff --git a/src/Tools/MicroBuild/PublishBlobAssets.proj b/src/Tools/MicroBuild/PublishBlobAssets.proj
index d5469287dc3e9f2fadc1b84e5f53afc94509687c..1218b8454cfec934546a38f7825bedcfc38e7f43 100644
--- a/src/Tools/MicroBuild/PublishBlobAssets.proj
+++ b/src/Tools/MicroBuild/PublishBlobAssets.proj
@@ -1,7 +1,6 @@
-
-
+
false
@@ -18,10 +17,15 @@
-
+ Overwrite="$(PublishOverwrite)"
+ ManifestBranch="$(BUILD_SOURCEBRANCH)"
+ ManifestBuildId="$(BUILD_BUILDNUMBER)"
+ ManifestCommit="$(CommitHashDisplay)"
+ ManifestName="roslyn"
+ SkipCreateManifest="false" />
diff --git a/src/Tools/MicroBuild/microbuild.ps1 b/src/Tools/MicroBuild/microbuild.ps1
index 91f0b8a56b630f30630709e41239a6663ff9892f..b9f08e29e6835a8d2462bae45012cb28a2afef3f 100644
--- a/src/Tools/MicroBuild/microbuild.ps1
+++ b/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;
}
}
diff --git a/src/Tools/MicroBuild/publish-blob.ps1 b/src/Tools/MicroBuild/publish-blob.ps1
deleted file mode 100644
index 47b645726c2571ccb9aaf1faa66047c3ade7ff4a..0000000000000000000000000000000000000000
--- a/src/Tools/MicroBuild/publish-blob.ps1
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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
-}