Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit c81f403

Browse files
dotnet-maestro[bot]lewingericstjrichlandersteveisok
authored
[release/10.0-preview2] Update dependencies from dotnet/arcade (#113381)
* Update dependencies from https://github.com/dotnet/arcade build 20250310.4 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 10.0.0-beta.25113.2 -> To Version 10.0.0-beta.25160.4 * Downgrade SDK and dotnet versions in global.json * Fix typo in global.json * Rolling back to 10.0.100-alpha.1.25077.2 * Pin SHAs for container images (#113185) * Bump MicrosoftDotNetApiCompatTaskVersion * Bump SdkVersionForWorkloadTesting individually instead * Revert MicrosoftDotNetApiCompatTaskVersion too * Update SdkVersionForWorkloadTesting value --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Larry Ewing <[email protected]> Co-authored-by: Eric StJohn <[email protected]> Co-authored-by: Rich Lander <[email protected]> Co-authored-by: Steve Pfister <[email protected]> Co-authored-by: Alexander Köplinger <[email protected]>
1 parent d6370ab commit c81f403

16 files changed

+130
-126
lines changed

‎eng/Version.Details.xml

+42-42
Original file line numberDiff line numberDiff line change
@@ -84,87 +84,87 @@
8484
</Dependency>
8585
</ProductDependencies>
8686
<ToolsetDependencies>
87-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25113.2">
87+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25160.4">
8888
<Uri>https://github.com/dotnet/arcade</Uri>
89-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
89+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
9090
</Dependency>
9191
<!-- Intermediate is necessary for source build. -->
92-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25113.2">
92+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25160.4">
9393
<Uri>https://github.com/dotnet/arcade</Uri>
94-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
94+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
9595
<SourceBuild RepoName="arcade" ManagedOnly="true" />
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25113.2">
97+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25160.4">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
99+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25113.2">
101+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25160.4">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
103+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25113.2">
105+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25160.4">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
107+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25113.2">
109+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25160.4">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
111+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25113.2">
113+
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25160.4">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
115+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25113.2">
117+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25160.4">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
119+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25113.2">
121+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25160.4">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
123+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25113.2">
125+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25160.4">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
127+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25113.2">
129+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25160.4">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
131+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25113.2">
133+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25160.4">
134134
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
135+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
136136
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25113.2">
137+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25160.4">
138138
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
139+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25113.2">
141+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25160.4">
142142
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
143+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25113.2">
145+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25160.4">
146146
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
147+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25113.2">
149+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25160.4">
150150
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
151+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
152152
</Dependency>
153-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25113.2">
153+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25160.4">
154154
<Uri>https://github.com/dotnet/arcade</Uri>
155-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
155+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
156156
</Dependency>
157-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25113.2">
157+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25160.4">
158158
<Uri>https://github.com/dotnet/arcade</Uri>
159-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
159+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
160160
</Dependency>
161-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25113.2">
161+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25160.4">
162162
<Uri>https://github.com/dotnet/arcade</Uri>
163-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
163+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
164164
</Dependency>
165-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25113.2">
165+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25160.4">
166166
<Uri>https://github.com/dotnet/arcade</Uri>
167-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
167+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
168168
</Dependency>
169169
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="10.0.0-beta.25110.1">
170170
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -348,9 +348,9 @@
348348
<Uri>https://github.com/dotnet/xharness</Uri>
349349
<Sha>cf1b2925785f504d4d52773bcab470044e35ea15</Sha>
350350
</Dependency>
351-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25113.2">
351+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25160.4">
352352
<Uri>https://github.com/dotnet/arcade</Uri>
353-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
353+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
354354
</Dependency>
355355
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25104.10">
356356
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

+18-18
Original file line numberDiff line numberDiff line change
@@ -83,24 +83,24 @@
8383
<PropertyGroup>
8484
<StaticCsVersion>0.2.0</StaticCsVersion>
8585
<!-- SDK dependencies (also used in wasm build tests -->
86-
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-preview.2.25108.4</MicrosoftDotNetApiCompatTaskVersion>
86+
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-alpha.1.25077.2</MicrosoftDotNetApiCompatTaskVersion>
8787
<!-- Arcade dependencies -->
88-
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksFeedVersion>
89-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25113.2</MicrosoftDotNetCodeAnalysisVersion>
90-
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25113.2</MicrosoftDotNetGenAPIVersion>
91-
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25113.2</MicrosoftDotNetGenFacadesVersion>
92-
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25113.2</MicrosoftDotNetXUnitAssertVersion>
93-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25113.2</MicrosoftDotNetXUnitExtensionsVersion>
94-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25113.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
95-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksArchivesVersion>
96-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksInstallersVersion>
97-
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksPackagingVersion>
98-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksTemplatingVersion>
100-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25113.2</MicrosoftDotNetRemoteExecutorVersion>
102-
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25113.2</MicrosoftDotNetVersionToolsTasksVersion>
103-
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25113.2</MicrosoftDotNetPackageTestingVersion>
88+
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25160.4</MicrosoftDotNetBuildTasksFeedVersion>
89+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25160.4</MicrosoftDotNetCodeAnalysisVersion>
90+
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25160.4</MicrosoftDotNetGenAPIVersion>
91+
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25160.4</MicrosoftDotNetGenFacadesVersion>
92+
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25160.4</MicrosoftDotNetXUnitAssertVersion>
93+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25160.4</MicrosoftDotNetXUnitExtensionsVersion>
94+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25160.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
95+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25160.4</MicrosoftDotNetBuildTasksArchivesVersion>
96+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25160.4</MicrosoftDotNetBuildTasksInstallersVersion>
97+
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25160.4</MicrosoftDotNetBuildTasksPackagingVersion>
98+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25160.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25160.4</MicrosoftDotNetBuildTasksTemplatingVersion>
100+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25160.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25160.4</MicrosoftDotNetRemoteExecutorVersion>
102+
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25160.4</MicrosoftDotNetVersionToolsTasksVersion>
103+
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25160.4</MicrosoftDotNetPackageTestingVersion>
104104
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
105105
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
106106
<!-- NuGet dependencies -->
@@ -269,7 +269,7 @@
269269
<MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
270270
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
271271
<!-- sdk version, for testing workloads -->
272-
<SdkVersionForWorkloadTesting>$(MicrosoftDotNetApiCompatTaskVersion)</SdkVersionForWorkloadTesting>
272+
<SdkVersionForWorkloadTesting>10.0.100-preview.2.25108.4</SdkVersionForWorkloadTesting>
273273
<runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>10.0.0-alpha.1.25116.1</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
274274
<EmsdkPackageVersion>$(MicrosoftNETRuntimeEmscriptenVersion)</EmsdkPackageVersion>
275275
<NodePackageVersion>$(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion)</NodePackageVersion>

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

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ parameters:
2323
enablePublishBuildArtifacts: false
2424
enablePublishBuildAssets: false
2525
enablePublishTestResults: false
26-
enablePublishUsingPipelines: false
2726
enableBuildRetry: false
2827
mergeTestResults: false
2928
testRunTitle: ''

‎eng/common/core-templates/job/publish-build-assets.yml

+4-9
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ parameters:
2020
# if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
2121
runAsPublic: false
2222

23-
# Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
24-
publishUsingPipelines: false
25-
2623
# Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
2724
publishAssetsImmediately: false
2825

@@ -76,12 +73,11 @@ jobs:
7673
fetchDepth: 3
7774
clean: true
7875

79-
- task: DownloadBuildArtifacts@0
80-
displayName: Download artifact
76+
- task: DownloadPipelineArtifact@2
77+
displayName: Download Asset Manifests
8178
inputs:
8279
artifactName: AssetManifests
83-
downloadPath: '$(Build.StagingDirectory)/Download'
84-
checkDownloadedFiles: true
80+
targetPath: '$(Build.StagingDirectory)/AssetManifests'
8581
condition: ${{ parameters.condition }}
8682
continueOnError: ${{ parameters.continueOnError }}
8783

@@ -95,9 +91,8 @@ jobs:
9591
scriptLocation: scriptPath
9692
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
9793
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
98-
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
94+
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
9995
/p:MaestroApiEndpoint=https://maestro.dot.net
100-
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
10196
/p:OfficialBuildId=$(Build.BuildNumber)
10297
condition: ${{ parameters.condition }}
10398
continueOnError: ${{ parameters.continueOnError }}

‎eng/common/core-templates/jobs/codeql-build.yml

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
enablePublishBuildArtifacts: false
1616
enablePublishTestResults: false
1717
enablePublishBuildAssets: false
18-
enablePublishUsingPipelines: false
1918
enableTelemetry: true
2019

2120
variables:

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

-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ parameters:
55
# Optional: Include PublishBuildArtifacts task
66
enablePublishBuildArtifacts: false
77

8-
# Optional: Enable publishing using release pipelines
9-
enablePublishUsingPipelines: false
10-
118
# Optional: Enable running the source-build jobs to build repo from source
129
enableSourceBuild: false
1310

@@ -112,7 +109,6 @@ jobs:
112109
- Source_Build_Complete
113110

114111
runAsPublic: ${{ parameters.runAsPublic }}
115-
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
116112
publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
117113
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
118114
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}

‎eng/common/core-templates/steps/generate-sbom.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector.
66

77
parameters:
8-
PackageVersion: 9.0.0
8+
PackageVersion: 10.0.0
99
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
1010
PackageName: '.NET'
1111
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
@@ -38,7 +38,7 @@ steps:
3838
PackageName: ${{ parameters.packageName }}
3939
BuildDropPath: ${{ parameters.buildDropPath }}
4040
PackageVersion: ${{ parameters.packageVersion }}
41-
ManifestDirPath: ${{ parameters.manifestDirPath }}
41+
ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME)
4242
${{ if ne(parameters.IgnoreDirectories, '') }}:
4343
AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}'
4444

‎eng/common/generate-sbom-prep.ps1

+14-6
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,26 @@ Param(
44

55
. $PSScriptRoot\pipeline-logging-functions.ps1
66

7+
# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
8+
# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
9+
$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM"
10+
$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_'
11+
$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName
12+
13+
Write-Host "Artifact name before : $ArtifactName"
14+
Write-Host "Artifact name after : $SafeArtifactName"
15+
716
Write-Host "Creating dir $ManifestDirPath"
17+
818
# create directory for sbom manifest to be placed
9-
if (!(Test-Path -path $ManifestDirPath))
19+
if (!(Test-Path -path $SbomGenerationDir))
1020
{
11-
New-Item -ItemType Directory -path $ManifestDirPath
12-
Write-Host "Successfully created directory $ManifestDirPath"
21+
New-Item -ItemType Directory -path $SbomGenerationDir
22+
Write-Host "Successfully created directory $SbomGenerationDir"
1323
}
1424
else{
1525
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
1626
}
1727

1828
Write-Host "Updating artifact name"
19-
$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_'
20-
Write-Host "Artifact name $artifact_name"
21-
Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name"
29+
Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName"

‎eng/common/generate-sbom-prep.sh

+11-6
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,24 @@ done
1414
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
1515
. $scriptroot/pipeline-logging-functions.sh
1616

17+
18+
# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
19+
artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
20+
safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
1721
manifest_dir=$1
1822

19-
if [ ! -d "$manifest_dir" ] ; then
20-
mkdir -p "$manifest_dir"
21-
echo "Sbom directory created." $manifest_dir
23+
# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
24+
# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
25+
sbom_generation_dir="$manifest_dir/$safe_artifact_name"
26+
27+
if [ ! -d "$sbom_generation_dir" ] ; then
28+
mkdir -p "$sbom_generation_dir"
29+
echo "Sbom directory created." $sbom_generation_dir
2230
else
2331
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
2432
fi
2533

26-
artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
2734
echo "Artifact name before : "$artifact_name
28-
# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
29-
safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
3035
echo "Artifact name after : "$safe_artifact_name
3136
export ARTIFACT_NAME=$safe_artifact_name
3237
echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name"

0 commit comments

Comments
 (0)