Skip to content

Commit c96e1a0

Browse files
dotnet-maestro[bot]radekdoulik
dotnet-maestro[bot]
authored and
radekdoulik
committed
Update dependencies from https://github.com/dotnet/arcade build 20240702.2 (#591)
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Helix.Sdk From Version 9.0.0-beta.24327.1 -> To Version 9.0.0-beta.24352.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent fc3d38c commit c96e1a0

File tree

7 files changed

+43
-47
lines changed

7 files changed

+43
-47
lines changed

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24327.1">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24352.2">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>ede13bd35571c0c8b0c01edcb057031904c5c955</Sha>
13+
<Sha>4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944</Sha>
1414
</Dependency>
1515
<!-- Intermediate is necessary for source build. -->
16-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24327.1">
16+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24352.2">
1717
<Uri>https://github.com/dotnet/arcade</Uri>
18-
<Sha>ede13bd35571c0c8b0c01edcb057031904c5c955</Sha>
18+
<Sha>4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944</Sha>
1919
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2020
</Dependency>
21-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24327.1">
21+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24352.2">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>ede13bd35571c0c8b0c01edcb057031904c5c955</Sha>
23+
<Sha>4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24327.1">
25+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24352.2">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>ede13bd35571c0c8b0c01edcb057031904c5c955</Sha>
27+
<Sha>4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944</Sha>
2828
</Dependency>
2929
</ToolsetDependencies>
3030
</Dependencies>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
77
</PropertyGroup>
88
<PropertyGroup>
9-
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24327.1</MicrosoftDotNetBuildTasksPackagingVersion>
9+
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24352.2</MicrosoftDotNetBuildTasksPackagingVersion>
1010
</PropertyGroup>
1111
</Project>

‎eng/common/core-templates/job/job.yml

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,11 @@ parameters:
2424
enablePublishTestResults: false
2525
enablePublishUsingPipelines: false
2626
enableBuildRetry: false
27-
disableComponentGovernance: ''
28-
componentGovernanceIgnoreDirectories: ''
2927
mergeTestResults: false
3028
testRunTitle: ''
3129
testResultsFormat: ''
3230
name: ''
31+
componentGovernanceSteps: []
3332
preSteps: []
3433
artifactPublishSteps: []
3534
runAsPublic: false
@@ -170,17 +169,8 @@ jobs:
170169
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
171170
continueOnError: true
172171

173-
- template: /eng/common/core-templates/steps/component-governance.yml
174-
parameters:
175-
is1ESPipeline: ${{ parameters.is1ESPipeline }}
176-
${{ if eq(parameters.disableComponentGovernance, '') }}:
177-
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
178-
disableComponentGovernance: false
179-
${{ else }}:
180-
disableComponentGovernance: true
181-
${{ else }}:
182-
disableComponentGovernance: ${{ parameters.disableComponentGovernance }}
183-
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
172+
- ${{ each step in parameters.componentGovernanceSteps }}:
173+
- ${{ step }}
184174

185175
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
186176
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
@@ -190,14 +180,6 @@ jobs:
190180
continueOnError: ${{ parameters.continueOnError }}
191181
env:
192182
TeamName: $(_TeamName)
193-
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
194-
- template: /eng/common/core-templates/steps/generate-sbom.yml
195-
parameters:
196-
is1ESPipeline: ${{ parameters.is1ESPipeline }}
197-
PackageVersion: ${{ parameters.packageVersion}}
198-
BuildDropPath: ${{ parameters.buildDropPath }}
199-
IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
200-
publishArtifacts: false
201183

202184
# Publish test results
203185
- ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}:

‎eng/common/core-templates/job/source-index-stage1.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -69,23 +69,11 @@ jobs:
6969

7070
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
7171
- task: AzureCLI@2
72-
displayName: Get stage 1 auth token
72+
displayName: Log in to Azure and upload stage1 artifacts to source index
7373
inputs:
7474
azureSubscription: 'SourceDotNet Stage1 Publish'
7575
addSpnToEnvironment: true
7676
scriptType: 'ps'
7777
scriptLocation: 'inlineScript'
7878
inlineScript: |
79-
echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId"
80-
echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken"
81-
echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId"
82-
83-
- script: |
84-
echo "Client ID: $(ARM_CLIENT_ID)"
85-
echo "ID Token: $(ARM_ID_TOKEN)"
86-
echo "Tenant ID: $(ARM_TENANT_ID)"
87-
az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN)
88-
displayName: "Login to Azure"
89-
90-
- script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
91-
displayName: Upload stage1 artifacts to source index
79+
$(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1

‎eng/common/core-templates/steps/component-governance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ steps:
1313
continueOnError: true
1414
displayName: ${{ parameters.displayName }}
1515
inputs:
16-
ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
16+
ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}

‎eng/common/templates/job/job.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
parameters:
22
enablePublishBuildArtifacts: false
3+
disableComponentGovernance: ''
4+
componentGovernanceIgnoreDirectories: ''
5+
# Sbom related params
6+
enableSbom: true
7+
PackageVersion: 9.0.0
8+
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
39

410
jobs:
511
- template: /eng/common/core-templates/job/job.yml
@@ -13,6 +19,26 @@ jobs:
1319
steps:
1420
- ${{ each step in parameters.steps }}:
1521
- ${{ step }}
22+
23+
componentGovernanceSteps:
24+
- template: /eng/common/templates/steps/component-governance.yml
25+
parameters:
26+
${{ if eq(parameters.disableComponentGovernance, '') }}:
27+
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
28+
disableComponentGovernance: false
29+
${{ else }}:
30+
disableComponentGovernance: true
31+
${{ else }}:
32+
disableComponentGovernance: ${{ parameters.disableComponentGovernance }}
33+
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
34+
35+
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
36+
- template: /eng/common/templates/steps/generate-sbom.yml
37+
parameters:
38+
PackageVersion: ${{ parameters.packageVersion }}
39+
BuildDropPath: ${{ parameters.buildDropPath }}
40+
publishArtifacts: false
41+
1642

1743
artifactPublishSteps:
1844
- ${{ if ne(parameters.artifacts.publish, '') }}:

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"dotnet": "9.0.100-preview.5.24307.3"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24327.1",
7-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24327.1",
6+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24352.2",
7+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24352.2",
88
"Microsoft.Build.Traversal": "3.4.0"
99
}
1010
}

0 commit comments

Comments
 (0)