Skip to content

Commit 5984311

Browse files
v-wuzhaiv-wuzhai
authored
[main] Update dependencies from dotnet/arcade (#18837)
2 parents a088c65 + 6bac1f4 commit 5984311

24 files changed

+1660
-13
lines changed

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -243,17 +243,17 @@
243243
</Dependency>
244244
</ProductDependencies>
245245
<ToolsetDependencies>
246-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24128.1">
246+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24151.5">
247247
<Uri>https://github.com/dotnet/arcade</Uri>
248-
<Sha>7582b5deefe451b6453a7693197df02ef1558d4b</Sha>
248+
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
249249
</Dependency>
250-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24128.1">
250+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24151.5">
251251
<Uri>https://github.com/dotnet/arcade</Uri>
252-
<Sha>7582b5deefe451b6453a7693197df02ef1558d4b</Sha>
252+
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
253253
</Dependency>
254-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24128.1">
254+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24151.5">
255255
<Uri>https://github.com/dotnet/arcade</Uri>
256-
<Sha>7582b5deefe451b6453a7693197df02ef1558d4b</Sha>
256+
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
257257
</Dependency>
258258
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24112.3">
259259
<Uri>https://github.com/dotnet/arcade-services</Uri>
@@ -263,14 +263,14 @@
263263
<Uri>https://github.com/dotnet/arcade-services</Uri>
264264
<Sha>c041bcdab75f5447be8bd11ddcfbe8e639f13f32</Sha>
265265
</Dependency>
266-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24128.1">
266+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24151.5">
267267
<Uri>https://github.com/dotnet/arcade</Uri>
268-
<Sha>7582b5deefe451b6453a7693197df02ef1558d4b</Sha>
268+
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
269269
</Dependency>
270270
<!-- Intermediate is necessary for source build. -->
271-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24128.1">
271+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24151.5">
272272
<Uri>https://github.com/dotnet/arcade</Uri>
273-
<Sha>7582b5deefe451b6453a7693197df02ef1558d4b</Sha>
273+
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
274274
<SourceBuild RepoName="arcade" ManagedOnly="true" />
275275
</Dependency>
276276
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</PropertyGroup>
4040
<PropertyGroup>
4141
<!-- Dependency from https://github.com/dotnet/arcade -->
42-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24128.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
42+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24151.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
4343
</PropertyGroup>
4444
<PropertyGroup>
4545
<!-- Dependency from https://github.com/dotnet/arcade-services -->

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

Lines changed: 255 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,255 @@
1+
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
2+
# and some (Microbuild) should only be applied to non-PR cases for internal builds.
3+
4+
parameters:
5+
# Job schema parameters - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job
6+
cancelTimeoutInMinutes: ''
7+
condition: ''
8+
container: ''
9+
continueOnError: false
10+
dependsOn: ''
11+
displayName: ''
12+
pool: ''
13+
steps: []
14+
strategy: ''
15+
timeoutInMinutes: ''
16+
variables: []
17+
workspace: ''
18+
19+
# Job base template specific parameters
20+
# See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md
21+
artifacts: ''
22+
enableMicrobuild: false
23+
enablePublishBuildArtifacts: false
24+
enablePublishBuildAssets: false
25+
enablePublishTestResults: false
26+
enablePublishUsingPipelines: false
27+
enableBuildRetry: false
28+
disableComponentGovernance: ''
29+
componentGovernanceIgnoreDirectories: ''
30+
mergeTestResults: false
31+
testRunTitle: ''
32+
testResultsFormat: ''
33+
name: ''
34+
preSteps: []
35+
runAsPublic: false
36+
# Sbom related params
37+
enableSbom: true
38+
PackageVersion: 7.0.0
39+
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
40+
41+
jobs:
42+
- job: ${{ parameters.name }}
43+
44+
${{ if ne(parameters.cancelTimeoutInMinutes, '') }}:
45+
cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }}
46+
47+
${{ if ne(parameters.condition, '') }}:
48+
condition: ${{ parameters.condition }}
49+
50+
${{ if ne(parameters.container, '') }}:
51+
container: ${{ parameters.container }}
52+
53+
${{ if ne(parameters.continueOnError, '') }}:
54+
continueOnError: ${{ parameters.continueOnError }}
55+
56+
${{ if ne(parameters.dependsOn, '') }}:
57+
dependsOn: ${{ parameters.dependsOn }}
58+
59+
${{ if ne(parameters.displayName, '') }}:
60+
displayName: ${{ parameters.displayName }}
61+
62+
${{ if ne(parameters.pool, '') }}:
63+
pool: ${{ parameters.pool }}
64+
65+
${{ if ne(parameters.strategy, '') }}:
66+
strategy: ${{ parameters.strategy }}
67+
68+
${{ if ne(parameters.timeoutInMinutes, '') }}:
69+
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
70+
71+
variables:
72+
- ${{ if ne(parameters.enableTelemetry, 'false') }}:
73+
- name: DOTNET_CLI_TELEMETRY_PROFILE
74+
value: '$(Build.Repository.Uri)'
75+
- ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}:
76+
- name: EnableRichCodeNavigation
77+
value: 'true'
78+
# Retry signature validation up to three times, waiting 2 seconds between attempts.
79+
# See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures
80+
- name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY
81+
value: 3,2000
82+
- ${{ each variable in parameters.variables }}:
83+
# handle name-value variable syntax
84+
# example:
85+
# - name: [key]
86+
# value: [value]
87+
- ${{ if ne(variable.name, '') }}:
88+
- name: ${{ variable.name }}
89+
value: ${{ variable.value }}
90+
91+
# handle variable groups
92+
- ${{ if ne(variable.group, '') }}:
93+
- group: ${{ variable.group }}
94+
95+
# handle template variable syntax
96+
# example:
97+
# - template: path/to/template.yml
98+
# parameters:
99+
# [key]: [value]
100+
- ${{ if ne(variable.template, '') }}:
101+
- template: ${{ variable.template }}
102+
${{ if ne(variable.parameters, '') }}:
103+
parameters: ${{ variable.parameters }}
104+
105+
# handle key-value variable syntax.
106+
# example:
107+
# - [key]: [value]
108+
- ${{ if and(eq(variable.name, ''), eq(variable.group, ''), eq(variable.template, '')) }}:
109+
- ${{ each pair in variable }}:
110+
- name: ${{ pair.key }}
111+
value: ${{ pair.value }}
112+
113+
# DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds
114+
- ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
115+
- group: DotNet-HelixApi-Access
116+
117+
${{ if ne(parameters.workspace, '') }}:
118+
workspace: ${{ parameters.workspace }}
119+
120+
steps:
121+
- ${{ if ne(parameters.preSteps, '') }}:
122+
- ${{ each preStep in parameters.preSteps }}:
123+
- ${{ preStep }}
124+
125+
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
126+
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
127+
- task: MicroBuildSigningPlugin@3
128+
displayName: Install MicroBuild plugin
129+
inputs:
130+
signType: $(_SignType)
131+
zipSources: false
132+
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
133+
env:
134+
TeamName: $(_TeamName)
135+
continueOnError: ${{ parameters.continueOnError }}
136+
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
137+
138+
- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
139+
- task: NuGetAuthenticate@1
140+
141+
- ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}:
142+
- task: DownloadPipelineArtifact@2
143+
inputs:
144+
buildType: current
145+
artifactName: ${{ coalesce(parameters.artifacts.download.name, 'Artifacts_$(Agent.OS)_$(_BuildConfig)') }}
146+
targetPath: ${{ coalesce(parameters.artifacts.download.path, 'artifacts') }}
147+
itemPattern: ${{ coalesce(parameters.artifacts.download.pattern, '**') }}
148+
149+
- ${{ each step in parameters.steps }}:
150+
- ${{ step }}
151+
152+
- ${{ if eq(parameters.enableRichCodeNavigation, true) }}:
153+
- task: RichCodeNavIndexer@0
154+
displayName: RichCodeNav Upload
155+
inputs:
156+
languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
157+
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }}
158+
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
159+
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
160+
continueOnError: true
161+
162+
- template: /eng/common/templates-official/steps/component-governance.yml
163+
parameters:
164+
${{ if eq(parameters.disableComponentGovernance, '') }}:
165+
${{ 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'))) }}:
166+
disableComponentGovernance: false
167+
${{ else }}:
168+
disableComponentGovernance: true
169+
${{ else }}:
170+
disableComponentGovernance: ${{ parameters.disableComponentGovernance }}
171+
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
172+
173+
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
174+
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
175+
- task: MicroBuildCleanup@1
176+
displayName: Execute Microbuild cleanup tasks
177+
condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
178+
continueOnError: ${{ parameters.continueOnError }}
179+
env:
180+
TeamName: $(_TeamName)
181+
182+
- ${{ if ne(parameters.artifacts.publish, '') }}:
183+
- ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}:
184+
- task: CopyFiles@2
185+
displayName: Gather binaries for publish to artifacts
186+
inputs:
187+
SourceFolder: 'artifacts/bin'
188+
Contents: '**'
189+
TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/bin'
190+
- task: CopyFiles@2
191+
displayName: Gather packages for publish to artifacts
192+
inputs:
193+
SourceFolder: 'artifacts/packages'
194+
Contents: '**'
195+
TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/packages'
196+
- task: 1ES.PublishBuildArtifacts@1
197+
displayName: Publish pipeline artifacts
198+
inputs:
199+
PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
200+
PublishLocation: Container
201+
ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}
202+
continueOnError: true
203+
condition: always()
204+
- ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
205+
- publish: artifacts/log
206+
artifact: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }}
207+
displayName: Publish logs
208+
continueOnError: true
209+
condition: always()
210+
211+
- ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
212+
- task: 1ES.PublishBuildArtifacts@1
213+
displayName: Publish Logs
214+
inputs:
215+
PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)'
216+
PublishLocation: Container
217+
ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
218+
continueOnError: true
219+
condition: always()
220+
221+
- ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}:
222+
- task: PublishTestResults@2
223+
displayName: Publish XUnit Test Results
224+
inputs:
225+
testResultsFormat: 'xUnit'
226+
testResultsFiles: '*.xml'
227+
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
228+
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
229+
mergeTestResults: ${{ parameters.mergeTestResults }}
230+
continueOnError: true
231+
condition: always()
232+
- ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}:
233+
- task: PublishTestResults@2
234+
displayName: Publish TRX Test Results
235+
inputs:
236+
testResultsFormat: 'VSTest'
237+
testResultsFiles: '*.trx'
238+
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
239+
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
240+
mergeTestResults: ${{ parameters.mergeTestResults }}
241+
continueOnError: true
242+
condition: always()
243+
244+
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
245+
- template: /eng/common/templates-official/steps/generate-sbom.yml
246+
parameters:
247+
PackageVersion: ${{ parameters.packageVersion}}
248+
BuildDropPath: ${{ parameters.buildDropPath }}
249+
IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
250+
251+
- ${{ if eq(parameters.enableBuildRetry, 'true') }}:
252+
- publish: $(Build.SourcesDirectory)\eng\common\BuildConfiguration
253+
artifact: BuildConfiguration
254+
displayName: Publish build retry configuration
255+
continueOnError: true

0 commit comments

Comments
 (0)