From 901abb94916f035ff66b6f28ce79058d41221375 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 11 Oct 2017 16:23:42 -0700 Subject: Fix final issues with publish in pipeline --- buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json | 2 +- buildpipeline/DotNet-CoreClr-Trusted-Linux.json | 2 +- buildpipeline/DotNet-CoreClr-Trusted-Mac.json | 2 +- buildpipeline/DotNet-CoreClr-Trusted-Windows.json | 2 +- buildpipeline/DotNet-Trusted-Publish-Symbols.json | 10 ++++------ buildpipeline/DotNet-Trusted-Publish.json | 4 +++- buildpipeline/pipelines.json | 7 +++++-- 7 files changed, 16 insertions(+), 13 deletions(-) (limited to 'buildpipeline') diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json b/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json index 572a6a0a8d..55bcdc7c4f 100644 --- a/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json +++ b/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json @@ -193,7 +193,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs) ./publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -Container=$(PB_ContainerName) -distroRid=$(Rid) -PublishPackages -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/pkg /p:PublishFlatContainer=false /p:OverwriteOnPublish=true", + "arguments": "run --rm $(DockerCommonRunArgs) ./publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -Container=$(PB_ContainerName) -distroRid=$(Rid) -PublishPackages -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/pkg /p:PublishFlatContainer=$(PublishFlat) /p:OverwriteOnPublish=true", "workingFolder": "", "failOnStandardError": "false" } diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Linux.json b/buildpipeline/DotNet-CoreClr-Trusted-Linux.json index 317f64eeb5..2942b70cb0 100644 --- a/buildpipeline/DotNet-CoreClr-Trusted-Linux.json +++ b/buildpipeline/DotNet-CoreClr-Trusted-Linux.json @@ -157,7 +157,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs) ./publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Platform) -Container=$(PB_ContainerName) -distroRid=$(Rid) -PublishPackages -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/pkg /p:PublishFlatContainer=false /p:OverwriteOnPublish=true", + "arguments": "run --rm $(DockerCommonRunArgs) ./publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Platform) -Container=$(PB_ContainerName) -distroRid=$(Rid) -PublishPackages -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/pkg /p:PublishFlatContainer=$(PublishFlat) /p:OverwriteOnPublish=true", "workingFolder": "", "failOnStandardError": "false" } diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Mac.json b/buildpipeline/DotNet-CoreClr-Trusted-Mac.json index e13250a66f..9e39b42b5e 100644 --- a/buildpipeline/DotNet-CoreClr-Trusted-Mac.json +++ b/buildpipeline/DotNet-CoreClr-Trusted-Mac.json @@ -85,7 +85,7 @@ }, "inputs": { "filename": "$(Agent.BuildDirectory)/s/publish-packages.sh", - "arguments": "-AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -Container=$(PB_ContainerName) -distroRid=$(Rid) -PublishPackages -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/pkg /p:PublishFlatContainer=false /p:OverwriteOnPublish=true", + "arguments": "-AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -Container=$(PB_ContainerName) -distroRid=$(Rid) -PublishPackages -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/pkg /p:PublishFlatContainer=$(PublishFlat) /p:OverwriteOnPublish=true", "workingFolder": "", "failOnStandardError": "false" } diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Windows.json b/buildpipeline/DotNet-CoreClr-Trusted-Windows.json index 3a51472b1e..ac7e3850ac 100644 --- a/buildpipeline/DotNet-CoreClr-Trusted-Windows.json +++ b/buildpipeline/DotNet-CoreClr-Trusted-Windows.json @@ -150,7 +150,7 @@ }, "inputs": { "filename": "publish-packages.cmd", - "arguments": "-AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildArch=$(Architecture) -BuildType=$(PB_BuildType) -Container=$(PB_ContainerName) -PublishPackages -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/pkg /p:PublishFlatContainer=false /p:OverwriteOnPublish=true", + "arguments": "-AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildArch=$(Architecture) -BuildType=$(PB_BuildType) -Container=$(PB_ContainerName) -PublishPackages -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/pkg /p:PublishFlatContainer=$(PublishFlat) /p:OverwriteOnPublish=true", "workingFolder": "", "failOnStandardError": "false" } diff --git a/buildpipeline/DotNet-Trusted-Publish-Symbols.json b/buildpipeline/DotNet-Trusted-Publish-Symbols.json index e6c6970f6d..31b58f638e 100644 --- a/buildpipeline/DotNet-Trusted-Publish-Symbols.json +++ b/buildpipeline/DotNet-Trusted-Publish-Symbols.json @@ -24,19 +24,17 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "sync -ab", + "displayName": "Sync packages", "timeoutInMinutes": 0, "task": { - "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", "definitionType": "task" }, "inputs": { - "scriptType": "inlineScript", - "scriptName": "", - "arguments": "$(PB_CloudDropAccountName) $(CloudDropAccessToken) $(Label)", + "filename": "sync.cmd", + "arguments": "-ab -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(PB_ContainerName) -BlobNamePrefix=$(PB_BlobNamePrefix)", "workingFolder": "$(Pipeline.SourcesDirectory)", - "inlineScript": "param($account, $token, $container)\n.\\sync.cmd -ab -- /p:CloudDropAccountName=$account /p:CloudDropAccessToken=$token /p:ContainerName=$container", "failOnStandardError": "false" } }, diff --git a/buildpipeline/DotNet-Trusted-Publish.json b/buildpipeline/DotNet-Trusted-Publish.json index 63fade85ca..4d945f5183 100644 --- a/buildpipeline/DotNet-Trusted-Publish.json +++ b/buildpipeline/DotNet-Trusted-Publish.json @@ -92,7 +92,7 @@ "inputs": { "filename": "sync.cmd", "arguments": "-ab -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(PB_ContainerName) -BlobNamePrefix=$(PB_BlobNamePrefix)", - "workingFolder": "", + "workingFolder": "$(Pipeline.SourcesDirectory)", "failOnStandardError": "false" } }, @@ -219,6 +219,7 @@ "alwaysRun": false, "displayName": "Packages -> Azure", "timeoutInMinutes": 0, + "condition": "and(succeeded(), ne(variables['ConfigurationGroup'], 'Release'))", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -237,6 +238,7 @@ "alwaysRun": false, "displayName": "Symbol Packages -> Azure", "timeoutInMinutes": 0, + "condition": "and(succeeded(), ne(variables['ConfigurationGroup'], 'Release'))", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", diff --git a/buildpipeline/pipelines.json b/buildpipeline/pipelines.json index 076d5d990b..de5a218676 100644 --- a/buildpipeline/pipelines.json +++ b/buildpipeline/pipelines.json @@ -133,6 +133,7 @@ }, "BuildParameters": { "PB_BuildType": "Release", + "PublishFlat": "false", "PB_EnforcePGO": "enforcepgo" }, "ReportingParameters": { @@ -148,7 +149,8 @@ "TreatWarningsAsErrors": "false" }, "BuildParameters": { - "PB_BuildType": "Debug" + "PB_BuildType": "Debug", + "PublishFlat": "true" }, "ReportingParameters": { "PB_BuildType": "Debug" @@ -163,7 +165,8 @@ "TreatWarningsAsErrors": "false" }, "BuildParameters": { - "PB_BuildType": "Checked" + "PB_BuildType": "Checked", + "PublishFlat": "true" }, "ReportingParameters": { "PB_BuildType": "Checked" -- cgit v1.2.3