diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38b39484bae..fd49b02e64d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,9 +2,9 @@ - + https://github.com/dotnet/arcade - 7ac8b155c0e77a97848f376c54d54305404fc2b9 + 3919b63dedd65c22154483afed5cfe7df73c9562 \ No newline at end of file diff --git a/eng/Versions.props b/eng/Versions.props index 7382a90e5ad..42631b5c461 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,4 +12,4 @@ 0.3.2 - + \ No newline at end of file diff --git a/eng/common/templates/phases/base.yml b/eng/common/templates/phases/base.yml index f3988d22ea1..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'), not(contains(variables['Build.DefinitionName'], 'github'))) }}: + - ${{ 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 and(ne(variables['System.TeamProject'], 'public'), not(contains(variables['Build.DefinitionName'], 'github'))) }}: + - ${{ 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'), not(contains(variables['Build.DefinitionName'], 'github'))) }}: + - ${{ 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 f73f372baa1..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'), not(contains(variables['Build.DefinitionName'], 'github'))) }}: + - ${{ 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 2cb7cdc3fb9..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 and(not(eq(variables['System.TeamProject'], 'public')), not(contains(variables['Build.DefinitionName'], 'github'))) }}: +- ${{ 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 8820f142829..6c68af8f495 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.18530.4" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18551.8" } } \ No newline at end of file