Skip to content

Commit 3743a1b

Browse files
[release/11.0-preview4] Source code updates from dotnet/dotnet (#420)
* Update dependencies from build 311857 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.26210.111 -> 11.0.0-beta.26224.122) [[ commit created by automation ]] * Update dependencies from build 312694 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.26224.122 -> 11.0.0-beta.26230.115) [[ commit created by automation ]] --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent ddef017 commit 3743a1b

29 files changed

Lines changed: 218 additions & 731 deletions

eng/Version.Details.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet-dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26210.111</MicrosoftDotNetArcadeSdkPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26230.115</MicrosoftDotNetArcadeSdkPackageVersion>
1010
</PropertyGroup>
1111
<!--Property group for alternate package version names-->
1212
<PropertyGroup>

eng/Version.Details.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="symreader" Sha="5bed4499b04cbbaec57ac4209ae993acca3648cc" BarId="309919" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="symreader" Sha="4370ea16341331f045fa9b89cc46e03aed27195c" BarId="312694" />
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26210.111">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26230.115">
88
<Uri>https://github.com/dotnet/dotnet</Uri>
9-
<Sha>5bed4499b04cbbaec57ac4209ae993acca3648cc</Sha>
9+
<Sha>4370ea16341331f045fa9b89cc46e03aed27195c</Sha>
1010
</Dependency>
1111
</ToolsetDependencies>
1212
</Dependencies>

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ parameters:
2626
enablePublishBuildArtifacts: false
2727
enablePublishBuildAssets: false
2828
enablePublishTestResults: false
29+
enablePublishing: false
2930
enableBuildRetry: false
3031
mergeTestResults: false
3132
testRunTitle: ''
3233
testResultsFormat: ''
3334
name: ''
34-
componentGovernanceSteps: []
3535
preSteps: []
3636
artifactPublishSteps: []
3737
runAsPublic: false
@@ -152,9 +152,6 @@ jobs:
152152
- ${{ each step in parameters.steps }}:
153153
- ${{ step }}
154154

155-
- ${{ each step in parameters.componentGovernanceSteps }}:
156-
- ${{ step }}
157-
158155
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
159156
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
160157
parameters:

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,17 +172,18 @@ jobs:
172172
targetPath: '$(Build.ArtifactStagingDirectory)/MergedManifest.xml'
173173
artifactName: AssetManifests
174174
displayName: 'Publish Merged Manifest'
175-
retryCountOnTaskFailure: 10 # for any logs being locked
176-
sbomEnabled: false # we don't need SBOM for logs
175+
retryCountOnTaskFailure: 10 # for any files being locked
176+
isProduction: false # just metadata for publishing
177177

178-
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
178+
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
179179
parameters:
180180
is1ESPipeline: ${{ parameters.is1ESPipeline }}
181181
args:
182182
displayName: Publish ReleaseConfigs Artifact
183-
pathToPublish: '$(Build.StagingDirectory)/ReleaseConfigs'
184-
publishLocation: Container
183+
targetPath: '$(Build.StagingDirectory)/ReleaseConfigs'
185184
artifactName: ReleaseConfigs
185+
retryCountOnTaskFailure: 10 # for any files being locked
186+
isProduction: false # just metadata for publishing
186187

187188
- ${{ if or(eq(parameters.publishAssetsImmediately, 'true'), eq(parameters.isAssetlessBuild, 'true')) }}:
188189
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
@@ -218,4 +219,5 @@ jobs:
218219
- template: /eng/common/core-templates/steps/publish-logs.yml
219220
parameters:
220221
is1ESPipeline: ${{ parameters.is1ESPipeline }}
222+
StageLabel: 'BuildAssetRegistry'
221223
JobLabel: 'Publish_Artifacts_Logs'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ jobs:
135135
condition: succeededOrFailed()
136136
targetPath: $(Build.ArtifactStagingDirectory)
137137
artifactName: $(Agent.JobName)_Logs_Attempt$(System.JobAttempt)
138-
sbomEnabled: false
138+
isProduction: false # logs are non-production artifacts
139139

140140
steps:
141141
- checkout: self

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ parameters:
4343

4444
artifacts: {}
4545
is1ESPipeline: ''
46+
47+
# Publishing version w/default.
48+
publishingVersion: 3
49+
4650
repositoryAlias: self
4751
officialBuildId: ''
4852

@@ -102,6 +106,7 @@ jobs:
102106
parameters:
103107
is1ESPipeline: ${{ parameters.is1ESPipeline }}
104108
continueOnError: ${{ parameters.continueOnError }}
109+
publishingVersion: ${{ parameters.publishingVersion }}
105110
dependsOn:
106111
- ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}:
107112
- ${{ each job in parameters.publishBuildAssetsDependsOn }}:

eng/common/core-templates/post-build/common-variables.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ variables:
1111
- name: MaestroApiVersion
1212
value: "2020-02-20"
1313

14-
- name: SourceLinkCLIVersion
15-
value: 3.0.0
1614
- name: SymbolToolVersion
1715
value: 1.0.1
1816
- name: BinlogToolVersion

eng/common/core-templates/post-build/post-build.yml

Lines changed: 65 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ parameters:
99
default: 3
1010
values:
1111
- 3
12+
- 4
1213

1314
- name: BARBuildId
1415
displayName: BAR Build Id
@@ -130,16 +131,30 @@ stages:
130131
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
131132
is1ESPipeline: ${{ parameters.is1ESPipeline }}
132133

133-
- task: DownloadBuildArtifacts@0
134-
displayName: Download Package Artifacts
135-
inputs:
136-
buildType: specific
137-
buildVersionToDownload: specific
138-
project: $(AzDOProjectName)
139-
pipeline: $(AzDOPipelineId)
140-
buildId: $(AzDOBuildId)
141-
artifactName: PackageArtifacts
142-
checkDownloadedFiles: true
134+
- ${{ if ne(parameters.publishingInfraVersion, 4) }}:
135+
- task: DownloadBuildArtifacts@0
136+
displayName: Download Package Artifacts
137+
inputs:
138+
buildType: specific
139+
buildVersionToDownload: specific
140+
project: $(AzDOProjectName)
141+
pipeline: $(AzDOPipelineId)
142+
buildId: $(AzDOBuildId)
143+
artifactName: PackageArtifacts
144+
checkDownloadedFiles: true
145+
- ${{ if eq(parameters.publishingInfraVersion, 4) }}:
146+
- task: DownloadPipelineArtifact@2
147+
displayName: Download Pipeline Artifacts (V4)
148+
inputs:
149+
itemPattern: '*/packages/**/*.nupkg'
150+
targetPath: '$(Build.ArtifactStagingDirectory)/PipelineArtifactsDownload'
151+
- task: CopyFiles@2
152+
displayName: Flatten packages to PackageArtifacts
153+
inputs:
154+
SourceFolder: '$(Build.ArtifactStagingDirectory)/PipelineArtifactsDownload'
155+
Contents: '**/*.nupkg'
156+
TargetFolder: '$(Build.ArtifactStagingDirectory)/PackageArtifacts'
157+
flattenFolders: true
143158

144159
- task: PowerShell@2
145160
displayName: Validate
@@ -173,16 +188,30 @@ stages:
173188
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
174189
is1ESPipeline: ${{ parameters.is1ESPipeline }}
175190

176-
- task: DownloadBuildArtifacts@0
177-
displayName: Download Package Artifacts
178-
inputs:
179-
buildType: specific
180-
buildVersionToDownload: specific
181-
project: $(AzDOProjectName)
182-
pipeline: $(AzDOPipelineId)
183-
buildId: $(AzDOBuildId)
184-
artifactName: PackageArtifacts
185-
checkDownloadedFiles: true
191+
- ${{ if ne(parameters.publishingInfraVersion, 4) }}:
192+
- task: DownloadBuildArtifacts@0
193+
displayName: Download Package Artifacts
194+
inputs:
195+
buildType: specific
196+
buildVersionToDownload: specific
197+
project: $(AzDOProjectName)
198+
pipeline: $(AzDOPipelineId)
199+
buildId: $(AzDOBuildId)
200+
artifactName: PackageArtifacts
201+
checkDownloadedFiles: true
202+
- ${{ if eq(parameters.publishingInfraVersion, 4) }}:
203+
- task: DownloadPipelineArtifact@2
204+
displayName: Download Pipeline Artifacts (V4)
205+
inputs:
206+
itemPattern: '*/packages/**/*.nupkg'
207+
targetPath: '$(Build.ArtifactStagingDirectory)/PipelineArtifactsDownload'
208+
- task: CopyFiles@2
209+
displayName: Flatten packages to PackageArtifacts
210+
inputs:
211+
SourceFolder: '$(Build.ArtifactStagingDirectory)/PipelineArtifactsDownload'
212+
Contents: '**/*.nupkg'
213+
TargetFolder: '$(Build.ArtifactStagingDirectory)/PackageArtifacts'
214+
flattenFolders: true
186215

187216
# This is necessary whenever we want to publish/restore to an AzDO private feed
188217
# Since sdk-task.ps1 tries to restore packages we need to do this authentication here
@@ -196,7 +225,7 @@ stages:
196225
displayName: Validate
197226
inputs:
198227
filePath: eng\common\sdk-task.ps1
199-
arguments: -task SigningValidation -restore
228+
arguments: -task SigningValidation -restore -msbuildEngine dotnet
200229
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts'
201230
/p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt'
202231
${{ parameters.signingValidationAdditionalParameters }}
@@ -208,53 +237,20 @@ stages:
208237
JobLabel: 'Signing'
209238
BinlogToolVersion: $(BinlogToolVersion)
210239

211-
- job:
212-
displayName: SourceLink Validation
213-
condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true')
214-
pool:
215-
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
216-
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
217-
name: AzurePipelines-EO
218-
image: 1ESPT-Windows2025
219-
demands: Cmd
220-
os: windows
221-
# If it's not devdiv, it's dnceng
222-
${{ else }}:
223-
${{ if eq(parameters.is1ESPipeline, true) }}:
224-
name: $(DncEngInternalBuildPool)
225-
image: windows.vs2026.amd64
226-
os: windows
227-
${{ else }}:
228-
name: $(DncEngInternalBuildPool)
229-
demands: ImageOverride -equals windows.vs2026.amd64
230-
steps:
231-
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
232-
parameters:
233-
BARBuildId: ${{ parameters.BARBuildId }}
234-
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
235-
is1ESPipeline: ${{ parameters.is1ESPipeline }}
236-
237-
- task: DownloadBuildArtifacts@0
238-
displayName: Download Blob Artifacts
239-
inputs:
240-
buildType: specific
241-
buildVersionToDownload: specific
242-
project: $(AzDOProjectName)
243-
pipeline: $(AzDOPipelineId)
244-
buildId: $(AzDOBuildId)
245-
artifactName: BlobArtifacts
246-
checkDownloadedFiles: true
247-
248-
- task: PowerShell@2
249-
displayName: Validate
250-
inputs:
251-
filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1
252-
arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/
253-
-ExtractPath $(Agent.BuildDirectory)/Extract/
254-
-GHRepoName $(Build.Repository.Name)
255-
-GHCommit $(Build.SourceVersion)
256-
-SourcelinkCliVersion $(SourceLinkCLIVersion)
257-
continueOnError: true
240+
# SourceLink validation has been removed — the underlying CLI tool
241+
# (targeting netcoreapp2.1) has not functioned for years.
242+
# The enableSourceLinkValidation parameter is kept but ignored so
243+
# existing pipelines that pass it are not broken.
244+
# See https://github.com/dotnet/arcade/issues/16647
245+
- ${{ if eq(parameters.enableSourceLinkValidation, 'true') }}:
246+
- job:
247+
displayName: 'SourceLink Validation Removed - please remove enableSourceLinkValidation from your pipeline'
248+
pool: server
249+
steps:
250+
- task: Delay@1
251+
displayName: 'Warning: SourceLink validation removed (see https://github.com/dotnet/arcade/issues/16647)'
252+
inputs:
253+
delayForMinutes: '0'
258254

259255
- ${{ if ne(parameters.publishAssetsImmediately, 'true') }}:
260256
- stage: publish_using_darc
@@ -317,7 +313,7 @@ stages:
317313
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1
318314
arguments: >
319315
-BuildId $(BARBuildId)
320-
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
316+
-PublishingInfraVersion 3
321317
-AzdoToken '$(System.AccessToken)'
322318
-WaitPublishingFinish true
323319
-RequireDefaultChannels ${{ parameters.requireDefaultChannels }}

eng/common/core-templates/post-build/setup-maestro-vars.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ steps:
88
- 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error
99

1010
- ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}:
11-
- task: DownloadBuildArtifacts@0
11+
- task: DownloadPipelineArtifact@2
1212
displayName: Download Release Configs
1313
inputs:
14-
buildType: current
1514
artifactName: ReleaseConfigs
16-
checkDownloadedFiles: true
15+
targetPath: '$(Build.StagingDirectory)/ReleaseConfigs'
1716

1817
- task: AzureCLI@2
1918
name: setReleaseVars

eng/common/core-templates/steps/component-governance.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)