8000 Update dependencies from https://github.com/dotnet/arcade build 20240… · dotnet/wpf-test@fc9ca72 · GitHub
[go: up one dir, main page]
Skip to content

Commit fc9ca72

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20240701.5 (#319)
[main] Update dependencies from dotnet/arcade
1 parent e7b1859 commit fc9ca72

File tree

6 files changed

+35
-39
lines changed

6 files changed

+35
-39
lines changed

‎eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24327.1">
4+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24351.5">
55
<Uri>https://github.com/dotnet/arcade</Uri>
6-
<Sha>ede13bd35571c0c8b0c01edcb057031904c5c955</Sha>
6+
<Sha>48f3eafb2fa9dddb1ca655b9ea96ebf4b5a2ba0a</Sha>
77
</Dependency>
88
<Dependency Name="Microsoft.DotNet.Arcade.Wpf.Sdk" Version="6.0.0-preview.5.21220.1">
99
<Uri>https://github.com/dotnet/wpf</Uri>

‎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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24327.1",
15+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24351.5",
1616
"Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6",
1717
"Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7"
1818
},

0 commit comments

Comments
 (0)
0