From 59aeb12d21c03b46c2c5f108bf8782bf081966ab Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Mon, 8 Jan 2018 09:15:41 -0600 Subject: [PATCH] Pass manifest details to PushToBlobFeed (dotnet/core-setup#3572) Commit migrated from https://github.com/dotnet/core-setup/commit/49085c8d96ce637193063848b9c0ef227f8c3c62 --- src/installer/buildpipeline/Core-Setup-Publish.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/installer/buildpipeline/Core-Setup-Publish.json b/src/installer/buildpipeline/Core-Setup-Publish.json index de43c1d..4f26859 100644 --- a/src/installer/buildpipeline/Core-Setup-Publish.json +++ b/src/installer/buildpipeline/Core-Setup-Publish.json @@ -262,7 +262,7 @@ "solution": "$(PB_SourcesDirectory)\\publish\\publish-type.proj", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", - "msbuildArguments": "/p:Configuration=$(BuildConfiguration) $(PB_CommonMSBuildArgs) /p:PublishType=$(PB_PublishType) /p:SignType=$(PB_SignType) /p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:PublishBlobFeedUrl=$(PB_PublishBlobFeedUrl) /p:PublishBlobFeedKey=$(PB_PublishBlobFeedKey) /p:OfficialPublish=true /p:GitHubUser=$(PB_GitHubUser) /p:GitHubEmail=$(PB_GitHubEmail) /p:GitHubAuthToken=$(GITHUB_PASSWORD) /p:VersionsRepoOwner=$(PB_VersionsRepoOwner) /p:VersionsRepo=$(PB_VersionsRepo) /p:VersionsRepoPath=build-info/dotnet/$(PB_RepoName)/$(SourceBranch) /p:DotNetToolDir=$(DotNetToolDir) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\publish-blob.log", + "msbuildArguments": "/p:Configuration=$(BuildConfiguration) $(PB_CommonMSBuildArgs) $(PB_BuildOutputManifestArguments) /p:PublishType=$(PB_PublishType) /p:SignType=$(PB_SignType) /p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:PublishBlobFeedUrl=$(PB_PublishBlobFeedUrl) /p:PublishBlobFeedKey=$(PB_PublishBlobFeedKey) /p:OfficialPublish=true /p:GitHubUser=$(PB_GitHubUser) /p:GitHubEmail=$(PB_GitHubEmail) /p:GitHubAuthToken=$(GITHUB_PASSWORD) /p:VersionsRepoOwner=$(PB_VersionsRepoOwner) /p:VersionsRepo=$(PB_VersionsRepo) /p:VersionsRepoPath=build-info/dotnet/$(PB_RepoName)/$(SourceBranch) /p:DotNetToolDir=$(DotNetToolDir) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\publish-blob.log", "clean": "false", "maximumCpuCount": "false", "restoreNugetPackages": "false", @@ -497,6 +497,9 @@ }, "PB_SymbolExpirationInDays": { "value": "" + }, + "PB_BuildOutputManifestArguments": { + "value": "/p:ManifestBuildId=$(OfficialBuildId) /p:ManifestBranch=$(SourceBranch) /p:ManifestCommit=$(SourceVersion)" } }, "demands": [ -- 2.7.4