Skip to content

Commit b77fd34

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#9163)
[main] Update dependencies from dotnet/arcade
1 parent e4141f8 commit b77fd34

14 files changed

+69
-43
lines changed

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,25 +157,25 @@
157157
</Dependency>
158158
</ProductDependencies>
159159
<ToolsetDependencies>
160-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24272.5">
160+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24279.3">
161161
<Uri>https://github.com/dotnet/arcade</Uri>
162-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
162+
<Sha>65865784677315fb97874d3934875e19179c4029</Sha>
163163
</Dependency>
164-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24272.5">
164+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24279.3">
165165
<Uri>https://github.com/dotnet/arcade</Uri>
166-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
166+
<Sha>65865784677315fb97874d3934875e19179c4029</Sha>
167167
</Dependency>
168-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24272.5">
168+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24279.3">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
170+
<Sha>65865784677315fb97874d3934875e19179c4029</Sha>
171171
</Dependency>
172172
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174174
<Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24272.5">
176+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24279.3">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
178+
<Sha>65865784677315fb97874d3934875e19179c4029</Sha>
179179
</Dependency>
180180
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
181181
<Uri>https://github.com/dotnet/sourcelink</Uri>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<!-- Packages that come from https://github.com/dotnet/arcade -->
5050
<PropertyGroup>
5151
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
52-
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.24272.5</MicrosoftDotNetCodeAnalysisPackageVersion>
52+
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.24279.3</MicrosoftDotNetCodeAnalysisPackageVersion>
5353
</PropertyGroup>
5454
<!-- Sourcelink -->
5555
<PropertyGroup>

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

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -200,29 +200,28 @@ jobs:
200200
publishArtifacts: false
201201

202202
# Publish test results
203-
- ${{ if and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')) }}:
204-
- ${{ if eq(parameters.testResultsFormat, 'xunit') }}:
205-
- task: PublishTestResults@2
206-
displayName: Publish XUnit Test Results
207-
inputs:
208-
testResultsFormat: 'xUnit'
209-
testResultsFiles: '*.xml'
210-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
211-
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
212-
mergeTestResults: ${{ parameters.mergeTestResults }}
213-
continueOnError: true
214-
condition: always()
215-
- ${{ if eq(parameters.testResultsFormat, 'vstest') }}:
216-
- task: PublishTestResults@2
217-
displayName: Publish TRX Test Results
218-
inputs:
219-
testResultsFormat: 'VSTest'
220-
testResultsFiles: '*.trx'
221-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
222-
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
223-
mergeTestResults: ${{ parameters.mergeTestResults }}
224-
continueOnError: true
225-
condition: always()
203+
- ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}:
204+
- task: PublishTestResults@2
205+
displayName: Publish XUnit Test Results
206+
inputs:
207+
testResultsFormat: 'xUnit'
208+
testResultsFiles: '*.xml'
209+
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
210+
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
211+
mergeTestResults: ${{ parameters.mergeTestResults }}
212+
continueOnError: true
213+
condition: always()
214+
- ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}:
215+
- task: PublishTestResults@2
216+
displayName: Publish TRX Test Results
217+
inputs:
218+
testResultsFormat: 'VSTest'
219+
testResultsFiles: '*.trx'
220+
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
221+
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
222+
mergeTestResults: ${{ parameters.mergeTestResults }}
223+
continueOnError: true
224+
condition: always()
226225

227226
# gather artifacts
228227
- ${{ if ne(parameters.artifacts.publish, '') }}:
@@ -246,6 +245,8 @@ jobs:
246245
SourceFolder: 'artifacts/log'
247246
Contents: '**'
248247
TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log'
248+
continueOnError: true
249+
condition: always()
249250

250251
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
251252
- task: CopyFiles@2
@@ -254,13 +255,16 @@ jobs:
254255
SourceFolder: 'artifacts/log/$(_BuildConfig)'
255256
Contents: '**'
256257
TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
258+
continueOnError: true
259+
condition: always()
257260
- ${{ if eq(parameters.enableBuildRetry, 'true') }}:
258261
- task: CopyFiles@2
259262
displayName: Gather buildconfiguration for build retry
260263
inputs:
261264
SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration'
262265
Contents: '**'
263266
TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration'
264-
267+
continueOnError: true
268+
condition: always()
265269
- ${{ each step in parameters.artifactPublishSteps }}:
266270
- ${{ step }}

‎eng/common/templates/steps/get-delegate-sas.yml renamed to ‎eng/common/core-templates/steps/get-delegation-sas.yml

File renamed without changes.

‎eng/common/core-templates/steps/source-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ steps:
123123
artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
124124
continueOnError: true
125125
condition: succeededOrFailed()
126+
sbomEnabled: false # we don't need SBOM for logs
126127

127128
# Manually inject component detection so that we can ignore the source build upstream cache, which contains
128129
# a nupkg cache of input packages (a local feed).

‎eng/common/cross/tizen-fetch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ fi
77

88
Log()
99
{
10-
if [ $VERBOSE -ge $1 ]; then
10+
if [ $VERBOSE -ge 1 ]; then
1111
echo ${@:2}
1212
fi
1313
}

‎eng/common/dotnet-install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then
8282
dotnetRoot="$dotnetRoot/$architecture"
8383
fi
8484

85-
InstallDotNet $dotnetRoot $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || {
85+
InstallDotNet "$dotnetRoot" $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || {
8686
local exit_code=$?
8787
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2
8888
ExitWithExitCode $exit_code

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
displayName: 'Publish logs'
2424
continueOnError: true
2525
condition: always()
26+
sbomEnabled: false # we don't need SBOM for logs
2627

2728
- ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}:
2829
- output: buildArtifacts
@@ -32,13 +33,15 @@ jobs:
3233
ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
3334
continueOnError: true
3435
condition: always()
36+
sbomEnabled: false # we don't need SBOM for logs
3537

3638
- ${{ if eq(parameters.enableBuildRetry, 'true') }}:
3739
- output: pipelineArtifact
3840
targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/eng/common/BuildConfiguration'
3941
artifactName: 'BuildConfiguration'
4042
displayName: 'Publish build retry configuration'
41-
continueOnError: true
43+
continueOnError: true
44+
sbomEnabled: false # we don't need SBOM for BuildConfiguration
4245

4346
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
4447
- output: pipelineArtifact

‎eng/common/templates-official/steps/get-delegation-sas.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
steps:
2+
- template: /eng/common/core-templates/steps/get-delegate-sas.yml
3+
parameters:
4+
is1ESPipeline: true
5+
6+
${{ each parameter in parameters }}:
7+
${{ parameter.key }}: ${{ parameter.value }}

‎eng/common/templates-official/steps/publish-pipeline-artifacts.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,6 @@ steps:
2323
${{ if parameters.args.artifactName }}:
2424
artifactName: ${{ parameters.args.artifactName }}
2525
${{ if parameters.args.properties }}:
26-
properties: ${{ parameters.args.properties }}
26+
properties: ${{ parameters.args.properties }}
27+
${{ if parameters.args.sbomEnabled }}:
28+
sbomEnabled: ${{ parameters.args.sbomEnabled }}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
displayName: 'Publish logs'
3838
continueOnError: true
3939
condition: always()
40+
sbomEnabled: false # we don't need SBOM for logs
4041

4142
- ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
4243
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
@@ -59,3 +60,4 @@ jobs:
5960
artifactName: 'BuildConfiguration'
6061
displayName: 'Publish build retry configuration'
6162
continueOnError: true
63+
sbomEnabled: false # we don't need SBOM for BuildConfiguration

‎eng/common/templates/steps/get-delegation-sas.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
steps:
2+
- template: /eng/common/core-templates/steps/get-delegate-sas.yml
3+
parameters:
4+
is1ESPipeline: false
5+
6+
${{ each parameter in parameters }}:
7+
${{ parameter.key }}: ${{ parameter.value }}

‎eng/common/tools.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ function StopProcesses {
438438
}
439439

440440
function MSBuild {
441-
local args=$@
441+
local args=( "$@" )
442442
if [[ "$pipelines_log" == true ]]; then
443443
InitializeBuildTool
444444
InitializeToolset
@@ -473,7 +473,7 @@ function MSBuild {
473473
args+=( "-logger:$selectedPath" )
474474
fi
475475

476-
MSBuild-Core ${args[@]}
476+
MSBuild-Core "${args[@]}"
477477
}
478478

479479
function MSBuild-Core {

‎global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100-preview.3.24204.13",
3+
"dotnet": "9.0.100-preview.4.24267.66",
44
"runtimes": {
55
"dotnet": [
66
"2.1.7",
@@ -12,11 +12,11 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24272.5",
16-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24272.5"
15+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24279.3",
16+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24279.3"
1717
},
1818
"sdk": {
19-
"version": "9.0.100-preview.3.24204.13"
19+
"version": "9.0.100-preview.4.24267.66"
2020
},
2121
"native-tools": {
2222
"strawberry-perl": "5.38.0.1",

0 commit comments

Comments
 (0)