Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,14 @@
<Dependencies>
<ProductDependencies></ProductDependencies>
<ToolsetDependencies>
<!--
Commenting this out to "pause" our subscription to the arcade sdk, because it's blowing away changes
needed to support private github repo CI builds. Uncomment once this is fixed in the arcade sdk.

<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.18530.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7ac8b155c0e77a97848f376c54d54305404fc2b9</Sha>
</Dependency>
-->
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/common/templates/phases/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'), ne(variables['Build.Repository.Provider'], 'GitHub')) }}:
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), not(contains(variables['Build.DefinitionName'], 'github'))) }}:
- task: MicroBuildSigningPlugin@2
displayName: Install MicroBuild plugin
inputs:
Expand All @@ -77,7 +77,7 @@ phases:

- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
# Internal only resources
- ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Repository.Provider'], 'GitHub')) }}:
- ${{ if and(ne(variables['System.TeamProject'], 'public'), not(contains(variables['Build.DefinitionName'], 'github'))) }}:
- task: MicroBuildCleanup@1
displayName: Execute Microbuild cleanup tasks
condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
Expand All @@ -90,7 +90,7 @@ phases:
helixSource: $(_HelixSource)
helixType: $(_HelixType)

- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(variables['Build.Repository.Provider'], 'GitHub')) }}:
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), not(contains(variables['Build.DefinitionName'], 'github'))) }}:
- task: CopyFiles@2
displayName: Gather Asset Manifests
inputs:
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/phases/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ phases:
variables:
config: ${{ parameters.configuration }}
steps:
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(variables['Build.Repository.Provider'], 'GitHub')) }}:
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), not(contains(variables['Build.DefinitionName'], 'github'))) }}:
- task: DownloadBuildArtifacts@0
displayName: Download artifact
inputs:
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/steps/telemetry-start.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ parameters:
buildConfig: ''

steps:
- ${{ if and(not(eq(variables['System.TeamProject'], 'public')), ne(variables['Build.Repository.Provider'], 'GitHub')) }}:
- ${{ if and(not(eq(variables['System.TeamProject'], 'public')), not(contains(variables['Build.DefinitionName'], 'github'))) }}:
- task: AzureKeyVault@1
inputs:
azureSubscription: 'HelixProd_KeyVault'
Expand Down