From f72c06c4755f44bd192b3c97eca1d6b4457b22c1 Mon Sep 17 00:00:00 2001 From: Rakesh Ranjan Singh Date: Mon, 15 May 2017 19:55:18 -0700 Subject: [PATCH] Pass required checksum properties during publish step Commit migrated from https://github.com/dotnet/core-setup/commit/99f0543a6729421ffc82f50e753eeb71273d7e1e --- src/installer/buildpipeline/Core-Setup-Linux-Arm-BT.json | 2 +- src/installer/buildpipeline/Core-Setup-Linux-BT.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/installer/buildpipeline/Core-Setup-Linux-Arm-BT.json b/src/installer/buildpipeline/Core-Setup-Linux-Arm-BT.json index 677afc0..a9d87b2 100644 --- a/src/installer/buildpipeline/Core-Setup-Linux-Arm-BT.json +++ b/src/installer/buildpipeline/Core-Setup-Linux-Arm-BT.json @@ -177,7 +177,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --privileged --rm $(DockerCommonRunArgs) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:DistroRid=$(PB_DistroRid) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:ConfigurationGroup=$(BuildConfiguration) /p:PortableBuild=$(PB_PortableBuild) /p:OSGroup=Linux /p:DebRepoUser=$(PB_DebRepoUser) /p:DebRepoServer=$(PB_DebRepoServer) /p:DebRepoPass=$(DEB_REPO_PASSWORD) /p:DebianId_ubuntu1404-x64=$(PB_DebianId_ubuntu1404-x64) /p:DebianId_debian8-x64=$(PB_DebianId_debian8-x64) /p:DebianId_ubuntu1604-x64=$(PB_DebianId_ubuntu1604-x64) /p:DebianId_ubuntu1610-x64=$(PB_DebianId_ubuntu1610-x64)", + "arguments": "run --privileged --rm $(DockerCommonRunArgs) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:DistroRid=$(PB_DistroRid) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:ConfigurationGroup=$(BuildConfiguration) /p:PortableBuild=$(PB_PortableBuild) /p:OSGroup=Linux /p:DebRepoUser=$(PB_DebRepoUser) /p:DebRepoServer=$(PB_DebRepoServer) /p:DebRepoPass=$(DEB_REPO_PASSWORD) /p:DebianId_ubuntu1404-x64=$(PB_DebianId_ubuntu1404-x64) /p:DebianId_debian8-x64=$(PB_DebianId_debian8-x64) /p:DebianId_ubuntu1604-x64=$(PB_DebianId_ubuntu1604-x64) /p:DebianId_ubuntu1610-x64=$(PB_DebianId_ubuntu1610-x64)", "workingFolder": "$(PB_SourcesDirectory)", "failOnStandardError": "false" } diff --git a/src/installer/buildpipeline/Core-Setup-Linux-BT.json b/src/installer/buildpipeline/Core-Setup-Linux-BT.json index 3e24f24..e306975 100644 --- a/src/installer/buildpipeline/Core-Setup-Linux-BT.json +++ b/src/installer/buildpipeline/Core-Setup-Linux-BT.json @@ -820,7 +820,7 @@ "value": "/flp:v=diag /p:TargetArchitecture=$(PB_TargetArchitecture) /p:ConfigurationGroup=$(BuildConfiguration) /p:OSGroup=Linux" }, "CommonMSBuildPublishArgs": { - "value": "/p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:DebRepoUser=$(PB_DebRepoUser) /p:DebRepoServer=$(PB_DebRepoServer) /p:DebRepoPass=$(DEB_REPO_PASSWORD) $(PB_DebianKeys)" + "value": "/p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:DebRepoUser=$(PB_DebRepoUser) /p:DebRepoServer=$(PB_DebRepoServer) /p:DebRepoPass=$(DEB_REPO_PASSWORD) $(PB_DebianKeys)" }, "PB_DebianKeys": { "value": "/p:DebianId_ubuntu1404-x64=$(PB_DebianId_ubuntu1404-x64) /p:DebianId_debian8-x64=$(PB_DebianId_debian8-x64) /p:DebianId_ubuntu1604-x64=$(PB_DebianId_ubuntu1604-x64) /p:DebianId_ubuntu1610-x64=$(PB_DebianId_ubuntu1610-x64)" -- 2.7.4