From ce97a5b864b743cdff14870352e0958304f3931d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 30 Oct 2018 12:02:56 +0000 Subject: [PATCH] Updating version files --- eng/Version.Details.xml | 4 ++-- eng/common/templates/phases/base.yml | 6 +++--- eng/common/templates/phases/publish-build-assets.yml | 2 +- eng/common/templates/steps/telemetry-start.yml | 2 +- global.json | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cda5f2a472..3b358894e7f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,9 +2,9 @@ - + https://github.com/dotnet/arcade - 9dc448a876231c49fa5962ce76695322b4bd632e + 1bd69581da9d5a4744d60ccfcb929a9c25496599 \ No newline at end of file diff --git a/eng/common/templates/phases/base.yml b/eng/common/templates/phases/base.yml index f5b3fa13e52..92a7933eb5d 100644 --- a/eng/common/templates/phases/base.yml +++ b/eng/common/templates/phases/base.yml @@ -59,7 +59,7 @@ phases: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: # Internal only resource, and Microbuild signing shouldn't be applied to PRs. - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(variables['Build.Repository.Provider'], 'GitHub')) }}: - task: MicroBuildSigningPlugin@2 displayName: Install MicroBuild plugin inputs: @@ -77,7 +77,7 @@ phases: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: # Internal only resources - - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Repository.Provider'], 'GitHub')) }}: - task: MicroBuildCleanup@1 displayName: Execute Microbuild cleanup tasks condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) @@ -90,7 +90,7 @@ phases: helixSource: $(_HelixSource) helixType: $(_HelixType) - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(variables['Build.Repository.Provider'], 'GitHub')) }}: - task: CopyFiles@2 displayName: Gather Asset Manifests inputs: diff --git a/eng/common/templates/phases/publish-build-assets.yml b/eng/common/templates/phases/publish-build-assets.yml index 08f4949cb13..c7ed5caa5d4 100644 --- a/eng/common/templates/phases/publish-build-assets.yml +++ b/eng/common/templates/phases/publish-build-assets.yml @@ -12,7 +12,7 @@ phases: variables: config: ${{ parameters.configuration }} steps: - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(variables['Build.Repository.Provider'], 'GitHub')) }}: - task: DownloadBuildArtifacts@0 displayName: Download artifact inputs: diff --git a/eng/common/templates/steps/telemetry-start.yml b/eng/common/templates/steps/telemetry-start.yml index 696956af229..109b4f5d888 100644 --- a/eng/common/templates/steps/telemetry-start.yml +++ b/eng/common/templates/steps/telemetry-start.yml @@ -4,7 +4,7 @@ parameters: buildConfig: '' steps: -- ${{ if not(eq(variables['System.TeamProject'], 'public')) }}: +- ${{ if and(not(eq(variables['System.TeamProject'], 'public')), ne(variables['Build.Repository.Provider'], 'GitHub')) }}: - task: AzureKeyVault@1 inputs: azureSubscription: 'HelixProd_KeyVault' diff --git a/global.json b/global.json index 2d5b013f586..329c6ec9c8b 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "2.1.300" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18526.9" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18529.8" } } \ No newline at end of file