From a1f88d1c0ec150661113ee5bedf25c0b25f50020 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Thu, 2 Nov 2017 14:53:17 -0700 Subject: [PATCH] Support PB_SignType property in our build definitions Commit migrated from https://github.com/dotnet/core-setup/commit/a065ab81d352962c1791707cb36cd20b66344079 --- src/installer/buildpipeline/Core-Setup-Publish.json | 1 + src/installer/buildpipeline/Core-Setup-Windows-Arm-BT.json | 2 ++ src/installer/buildpipeline/Core-Setup-Windows-BT.json | 1 + 3 files changed, 4 insertions(+) diff --git a/src/installer/buildpipeline/Core-Setup-Publish.json b/src/installer/buildpipeline/Core-Setup-Publish.json index b096e8f..1c73d58 100644 --- a/src/installer/buildpipeline/Core-Setup-Publish.json +++ b/src/installer/buildpipeline/Core-Setup-Publish.json @@ -6,6 +6,7 @@ "alwaysRun": false, "displayName": "Install Signing Plugin", "timeoutInMinutes": 0, + "condition": "and(succeeded(), in(variables.PB_SignType, 'real', 'test'))", "task": { "id": "30666190-6959-11e5-9f96-f56098202fef", "versionSpec": "1.*", diff --git a/src/installer/buildpipeline/Core-Setup-Windows-Arm-BT.json b/src/installer/buildpipeline/Core-Setup-Windows-Arm-BT.json index 6437f8c..18bd7ab 100644 --- a/src/installer/buildpipeline/Core-Setup-Windows-Arm-BT.json +++ b/src/installer/buildpipeline/Core-Setup-Windows-Arm-BT.json @@ -62,6 +62,7 @@ "alwaysRun": false, "displayName": "Install Signing Plugin", "timeoutInMinutes": 0, + "condition": "and(succeeded(), in(variables.PB_SignType, 'real', 'test'))", "task": { "id": "30666190-6959-11e5-9f96-f56098202fef", "versionSpec": "1.*", @@ -76,6 +77,7 @@ }, { "enabled": true, + "continueOnError": false, "alwaysRun": false, "displayName": "Build traversal build dependencies", diff --git a/src/installer/buildpipeline/Core-Setup-Windows-BT.json b/src/installer/buildpipeline/Core-Setup-Windows-BT.json index 8e44590..a6887cd 100644 --- a/src/installer/buildpipeline/Core-Setup-Windows-BT.json +++ b/src/installer/buildpipeline/Core-Setup-Windows-BT.json @@ -62,6 +62,7 @@ "alwaysRun": false, "displayName": "Install Signing Plugin", "timeoutInMinutes": 0, + "condition": "and(succeeded(), in(variables.PB_SignType, 'real', 'test'))", "task": { "id": "30666190-6959-11e5-9f96-f56098202fef", "versionSpec": "1.*", -- 2.7.4