Skip to content

Commit e8e553b

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authoredMay 28, 2024··
Update dependencies from https://github.com/dotnet/arcade build 20240524.1 (#102744)
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24272.5 -> To Version 9.0.0-beta.24274.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
·
v10.0.0-preview.2.25163.2v9.0.0-preview.6.24327.7
1 parent 03bc51f commit e8e553b

File tree

11 files changed

+103
-91
lines changed

11 files changed

+103
-91
lines changed
 

‎eng/Version.Details.xml

+42-42
Original file line numberDiff line numberDiff line change
@@ -92,87 +92,87 @@
9292
</Dependency>
9393
</ProductDependencies>
9494
<ToolsetDependencies>
95-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24272.5">
95+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24274.1">
9696
<Uri>https://github.com/dotnet/arcade</Uri>
97-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
97+
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
9898
</Dependency>
9999
<!-- Intermediate is necessary for source build. -->
100-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24272.5">
100+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24274.1">
101101
<Uri>https://github.com/dotnet/arcade</Uri>
102-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
102+
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
103103
<SourceBuild RepoName="arcade" ManagedOnly="true" />
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24272.5">
105+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24274.1">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
107+
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24272.5">
109+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24274.1">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
111+
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24272.5">
113+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24274.1">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
115+
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24272.5">
117+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24274.1">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
119+
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24272.5">
121+
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24274.1">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
123+
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24272.5">
125+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24274.1">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
127+
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24272.5">
129+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24274.1">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
131+
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24272.5">
133+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24274.1">
134134
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
135+
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
136136
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24272.5">
137+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24274.1">
138138
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
139+
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24272.5">
141+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24274.1">
142142
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
143+
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24272.5">
145+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24274.1">
146146
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
147+
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24272.5">
149+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24274.1">
150150
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
151+
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
152152
</Dependency>
153-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24272.5">
153+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24274.1">
154154
<Uri>https://github.com/dotnet/arcade</Uri>
155-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
155+
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
156156
</Dependency>
157-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24272.5">
157+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24274.1">
158158
<Uri>https://github.com/dotnet/arcade</Uri>
159-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
159+
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
160160
</Dependency>
161-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24272.5">
161+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24274.1">
162162
<Uri>https://github.com/dotnet/arcade</Uri>
163-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
163+
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
164164
</Dependency>
165-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24272.5">
165+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24274.1">
166166
<Uri>https://github.com/dotnet/arcade</Uri>
167-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
167+
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
168168
</Dependency>
169-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24272.5">
169+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24274.1">
170170
<Uri>https://github.com/dotnet/arcade</Uri>
171-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
171+
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
172172
</Dependency>
173-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24272.5">
173+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24274.1">
174174
<Uri>https://github.com/dotnet/arcade</Uri>
175-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
175+
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
176176
</Dependency>
177177
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24271.1">
178178
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -332,9 +332,9 @@
332332
<Uri>https://github.com/dotnet/xharness</Uri>
333333
<Sha>8478d1a9a531e6b1cd26fb8c86400e2efbb8f2f3</Sha>
334334
</Dependency>
335-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24272.5">
335+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24274.1">
336336
<Uri>https://github.com/dotnet/arcade</Uri>
337-
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
337+
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
338338
</Dependency>
339339
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24223.3">
340340
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

+16-16
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,22 @@
8383
<!-- SDK dependencies (also used in wasm build tests -->
8484
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.5.24272.19</MicrosoftDotNetApiCompatTaskVersion>
8585
<!-- Arcade dependencies -->
86-
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksFeedVersion>
87-
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24272.5</MicrosoftDotNetCodeAnalysisVersion>
88-
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenAPIVersion>
89-
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenFacadesVersion>
90-
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitAssertVersion>
91-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24272.5</MicrosoftDotNetXUnitExtensionsVersion>
92-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
93-
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksArchivesVersion>
94-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksInstallersVersion>
95-
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksPackagingVersion>
96-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
97-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTemplatingVersion>
98-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
99-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24272.5</MicrosoftDotNetRemoteExecutorVersion>
100-
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24272.5</MicrosoftDotNetVersionToolsTasksVersion>
101-
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24272.5</MicrosoftDotNetPackageTestingVersion>
86+
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksFeedVersion>
87+
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24274.1</MicrosoftDotNetCodeAnalysisVersion>
88+
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24274.1</MicrosoftDotNetGenAPIVersion>
89+
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24274.1</MicrosoftDotNetGenFacadesVersion>
90+
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24274.1</MicrosoftDotNetXUnitAssertVersion>
91+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24274.1</MicrosoftDotNetXUnitExtensionsVersion>
92+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24274.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
93+
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksArchivesVersion>
94+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksInstallersVersion>
95+
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksPackagingVersion>
96+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
97+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksTemplatingVersion>
98+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
99+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24274.1</MicrosoftDotNetRemoteExecutorVersion>
100+
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24274.1</MicrosoftDotNetVersionToolsTasksVersion>
101+
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24274.1</MicrosoftDotNetPackageTestingVersion>
102102
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
103103
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
104104
<!-- NuGet dependencies -->

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

+28-24
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/core-templates/steps/source-build.yml

+1
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

+1-1
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

+1-1
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

+4-1
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/publish-pipeline-artifacts.yml

+3-1
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

+2
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/tools.sh

+2-2
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

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"dotnet": "9.0.100-preview.4.24267.66"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24272.5",
12-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24272.5",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24272.5",
11+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24274.1",
12+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24274.1",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24274.1",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "9.0.0-preview.5.24272.3"

0 commit comments

Comments
 (0)
Please sign in to comment.