Skip to content

Commit c1ef1f1

Browse files
tarekghtarekgh
authored
Merge pull request #119966 from dotnet/release/9.0-staging
[manual] Merge release/9.0-staging into release/9.0
2 parents 7501cab + ae5e3f8 commit c1ef1f1

File tree

41 files changed

+321
-216
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+321
-216
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "9.0.0-prerelease.25375.3",
18+
"version": "9.0.0-prerelease.25426.1",
1919
"commands": [
2020
"xharness"
2121
]

‎eng/Version.Details.xml‎

Lines changed: 94 additions & 94 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 42 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
4545
they do not break the local dev experience.
4646
-->
47-
<MicrosoftCodeAnalysisCSharpVersion>4.12.0-3.25377.4</MicrosoftCodeAnalysisCSharpVersion>
48-
<MicrosoftCodeAnalysisVersion>4.12.0-3.25377.4</MicrosoftCodeAnalysisVersion>
49-
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.25377.4</MicrosoftNetCompilersToolsetVersion>
47+
<MicrosoftCodeAnalysisCSharpVersion>4.12.0-3.25467.18</MicrosoftCodeAnalysisCSharpVersion>
48+
<MicrosoftCodeAnalysisVersion>4.12.0-3.25467.18</MicrosoftCodeAnalysisVersion>
49+
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.25467.18</MicrosoftNetCompilersToolsetVersion>
5050
</PropertyGroup>
5151
<!--
5252
For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.
@@ -85,22 +85,22 @@
8585
<!-- SDK dependencies (also used in wasm build tests -->
8686
<MicrosoftDotNetApiCompatTaskVersion>9.0.109</MicrosoftDotNetApiCompatTaskVersion>
8787
<!-- Arcade dependencies -->
88-
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.25366.1</MicrosoftDotNetBuildTasksFeedVersion>
89-
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25366.1</MicrosoftDotNetCodeAnalysisVersion>
90-
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.25366.1</MicrosoftDotNetGenAPIVersion>
91-
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.25366.1</MicrosoftDotNetGenFacadesVersion>
92-
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.25366.1</MicrosoftDotNetXUnitAssertVersion>
93-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25366.1</MicrosoftDotNetXUnitExtensionsVersion>
94-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.25366.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
95-
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25366.1</MicrosoftDotNetBuildTasksArchivesVersion>
96-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25366.1</MicrosoftDotNetBuildTasksInstallersVersion>
97-
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.25366.1</MicrosoftDotNetBuildTasksPackagingVersion>
98-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.25366.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25366.1</MicrosoftDotNetBuildTasksTemplatingVersion>
100-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25366.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25366.1</MicrosoftDotNetRemoteExecutorVersion>
102-
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.25366.1</MicrosoftDotNetVersionToolsTasksVersion>
103-
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.25366.1</MicrosoftDotNetPackageTestingVersion>
88+
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.25465.2</MicrosoftDotNetBuildTasksFeedVersion>
89+
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25465.2</MicrosoftDotNetCodeAnalysisVersion>
90+
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.25465.2</MicrosoftDotNetGenAPIVersion>
91+
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.25465.2</MicrosoftDotNetGenFacadesVersion>
92+
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.25465.2</MicrosoftDotNetXUnitAssertVersion>
93+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25465.2</MicrosoftDotNetXUnitExtensionsVersion>
94+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.25465.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
95+
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25465.2</MicrosoftDotNetBuildTasksArchivesVersion>
96+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25465.2</MicrosoftDotNetBuildTasksInstallersVersion>
97+
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.25465.2</MicrosoftDotNetBuildTasksPackagingVersion>
98+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.25465.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25465.2</MicrosoftDotNetBuildTasksTemplatingVersion>
100+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25465.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25465.2</MicrosoftDotNetRemoteExecutorVersion>
102+
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.25465.2</MicrosoftDotNetVersionToolsTasksVersion>
103+
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.25465.2</MicrosoftDotNetPackageTestingVersion>
104104
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
105105
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
106106
<!-- NuGet dependencies -->
@@ -141,20 +141,20 @@
141141
<SystemReflectionMetadataToolsetVersion>8.0.0</SystemReflectionMetadataToolsetVersion>
142142
<SystemReflectionMetadataLoadContextToolsetVersion>8.0.0</SystemReflectionMetadataLoadContextToolsetVersion>
143143
<!-- Runtime-Assets dependencies -->
144-
<SystemRuntimeNumericsTestDataVersion>9.0.0-beta.25313.1</SystemRuntimeNumericsTestDataVersion>
145-
<SystemComponentModelTypeConverterTestDataVersion>9.0.0-beta.25313.1</SystemComponentModelTypeConverterTestDataVersion>
146-
<SystemDataCommonTestDataVersion>9.0.0-beta.25313.1</SystemDataCommonTestDataVersion>
147-
<SystemDrawingCommonTestDataVersion>9.0.0-beta.25313.1</SystemDrawingCommonTestDataVersion>
148-
<SystemFormatsTarTestDataVersion>9.0.0-beta.25313.1</SystemFormatsTarTestDataVersion>
149-
<SystemIOCompressionTestDataVersion>9.0.0-beta.25313.1</SystemIOCompressionTestDataVersion>
150-
<SystemIOPackagingTestDataVersion>9.0.0-beta.25313.1</SystemIOPackagingTestDataVersion>
151-
<SystemNetTestDataVersion>9.0.0-beta.25313.1</SystemNetTestDataVersion>
152-
<SystemPrivateRuntimeUnicodeDataVersion>9.0.0-beta.25313.1</SystemPrivateRuntimeUnicodeDataVersion>
153-
<SystemRuntimeTimeZoneDataVersion>9.0.0-beta.25313.1</SystemRuntimeTimeZoneDataVersion>
154-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>9.0.0-beta.25313.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
155-
<SystemTextRegularExpressionsTestDataVersion>9.0.0-beta.25313.1</SystemTextRegularExpressionsTestDataVersion>
156-
<SystemWindowsExtensionsTestDataVersion>9.0.0-beta.25313.1</SystemWindowsExtensionsTestDataVersion>
157-
<MicrosoftDotNetCilStripSourcesVersion>9.0.0-beta.25313.1</MicrosoftDotNetCilStripSourcesVersion>
144+
<SystemRuntimeNumericsTestDataVersion>9.0.0-beta.25462.1</SystemRuntimeNumericsTestDataVersion>
145+
<SystemComponentModelTypeConverterTestDataVersion>9.0.0-beta.25462.1</SystemComponentModelTypeConverterTestDataVersion>
146+
<SystemDataCommonTestDataVersion>9.0.0-beta.25462.1</SystemDataCommonTestDataVersion>
147+
<SystemDrawingCommonTestDataVersion>9.0.0-beta.25462.1</SystemDrawingCommonTestDataVersion>
148+
<SystemFormatsTarTestDataVersion>9.0.0-beta.25462.1</SystemFormatsTarTestDataVersion>
149+
<SystemIOCompressionTestDataVersion>9.0.0-beta.25462.1</SystemIOCompressionTestDataVersion>
150+
<SystemIOPackagingTestDataVersion>9.0.0-beta.25462.1</SystemIOPackagingTestDataVersion>
151+
<SystemNetTestDataVersion>9.0.0-beta.25462.1</SystemNetTestDataVersion>
152+
<SystemPrivateRuntimeUnicodeDataVersion>9.0.0-beta.25462.1</SystemPrivateRuntimeUnicodeDataVersion>
153+
<SystemRuntimeTimeZoneDataVersion>9.0.0-beta.25462.1</SystemRuntimeTimeZoneDataVersion>
154+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>9.0.0-beta.25462.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
155+
<SystemTextRegularExpressionsTestDataVersion>9.0.0-beta.25462.1</SystemTextRegularExpressionsTestDataVersion>
156+
<SystemWindowsExtensionsTestDataVersion>9.0.0-beta.25462.1</SystemWindowsExtensionsTestDataVersion>
157+
<MicrosoftDotNetCilStripSourcesVersion>9.0.0-beta.25462.1</MicrosoftDotNetCilStripSourcesVersion>
158158
<!-- dotnet-optimization dependencies -->
159159
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.24462.2</optimizationwindows_ntx64MIBCRuntimeVersion>
160160
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.24462.2</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -184,10 +184,12 @@
184184
<!-- Testing -->
185185
<MicrosoftNETCoreCoreDisToolsVersion>1.4.0</MicrosoftNETCoreCoreDisToolsVersion>
186186
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
187-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.25375.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
188-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.25375.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
189-
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.25375.3</MicrosoftDotNetXHarnessCLIVersion>
190-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.25330.3</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
187+
<!-- xharness -->
188+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.25426.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
189+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.25426.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
190+
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.25426.1</MicrosoftDotNetXHarnessCLIVersion>
191+
<!-- hotreload-utils -->
192+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.25462.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
191193
<NUnitVersion>3.12.0</NUnitVersion>
192194
<NUnit3TestAdapterVersion>4.5.0</NUnit3TestAdapterVersion>
193195
<CoverletCollectorVersion>6.0.0</CoverletCollectorVersion>
@@ -215,11 +217,11 @@
215217
<!-- Docs -->
216218
<MicrosoftPrivateIntellisenseVersion>9.0.0-preview-20241010.1</MicrosoftPrivateIntellisenseVersion>
217219
<!-- Mono Cecil -->
218-
<MicrosoftDotNetCecilVersion>0.11.5-alpha.25370.2</MicrosoftDotNetCecilVersion>
220+
<MicrosoftDotNetCecilVersion>0.11.5-alpha.25464.3</MicrosoftDotNetCecilVersion>
219221
<!-- ILCompiler -->
220222
<MicrosoftDotNetILCompilerVersion>9.0.0-rtm.24511.16</MicrosoftDotNetILCompilerVersion>
221223
<!-- ICU -->
222-
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.25371.1</MicrosoftNETCoreRuntimeICUTransportVersion>
224+
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.25469.1</MicrosoftNETCoreRuntimeICUTransportVersion>
223225
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.24466.4</MicrosoftNETCoreRuntimeICUTransportVersion>
224226
<!-- MsQuic -->
225227
<MicrosoftNativeQuicMsQuicSchannelVersion>2.4.8</MicrosoftNativeQuicMsQuicSchannelVersion>
@@ -263,7 +265,7 @@
263265
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
264266
<!-- sdk version, for testing workloads -->
265267
<!-- <SdkVersionForWorkloadTesting>$(MicrosoftDotNetApiCompatTaskVersion)</SdkVersionForWorkloadTesting> -->
266-
<SdkVersionForWorkloadTesting>9.0.107</SdkVersionForWorkloadTesting>
268+
<SdkVersionForWorkloadTesting>9.0.110</SdkVersionForWorkloadTesting>
267269
<runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>9.0.0-alpha.1.24175.1</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
268270
<EmsdkPackageVersion>$(MicrosoftNETRuntimeEmscriptenVersion)</EmsdkPackageVersion>
269271
<NodePackageVersion>$(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion)</NodePackageVersion>

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
# displayName: Setup Private Feeds Credentials
1111
# condition: eq(variables['Agent.OS'], 'Windows_NT')
1212
# inputs:
13-
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
14-
# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
13+
# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1
14+
# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token
1515
# env:
1616
# Token: $(dn-bot-dnceng-artifact-feeds-rw)
1717
#

‎eng/common/SetupNugetSources.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
# - task: Bash@3
1212
# displayName: Setup Internal Feeds
1313
# inputs:
14-
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
15-
# arguments: $(Build.SourcesDirectory)/NuGet.config
14+
# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh
15+
# arguments: $(System.DefaultWorkingDirectory)/NuGet.config
1616
# condition: ne(variables['Agent.OS'], 'Windows_NT')
1717
# - task: NuGetAuthenticate@1
1818
#

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ parameters:
1919
# publishing defaults
2020
artifacts: ''
2121
enableMicrobuild: false
22+
microbuildUseESRP: true
2223
enablePublishBuildArtifacts: false
2324
enablePublishBuildAssets: false
2425
enablePublishTestResults: false
@@ -134,10 +135,11 @@ jobs:
134135
signType: $(_SignType)
135136
zipSources: false
136137
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
137-
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
138-
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
139-
${{ else }}:
140-
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
138+
${{ if eq(parameters.microbuildUseESRP, true) }}:
139+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
140+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
141+
${{ else }}:
142+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
141143
env:
142144
TeamName: $(_TeamName)
143145
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
@@ -164,7 +166,7 @@ jobs:
164166
inputs:
165167
languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
166168
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }}
167-
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
169+
richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin
168170
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
169171
continueOnError: true
170172

@@ -187,7 +189,7 @@ jobs:
187189
inputs:
188190
testResultsFormat: 'xUnit'
189191
testResultsFiles: '*.xml'
190-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
192+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
191193
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
192194
mergeTestResults: ${{ parameters.mergeTestResults }}
193195
continueOnError: true
@@ -198,7 +200,7 @@ jobs:
198200
inputs:
199201
testResultsFormat: 'VSTest'
200202
testResultsFiles: '*.trx'
201-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
203+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
202204
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
203205
mergeTestResults: ${{ parameters.mergeTestResults }}
204206
continueOnError: true
@@ -242,7 +244,7 @@ jobs:
242244
- task: CopyFiles@2
243245
displayName: Gather buildconfiguration for build retry
244246
inputs:
245-
SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration'
247+
SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration'
246248
Contents: '**'
247249
TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration'
248250
continueOnError: true

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ parameters:
88
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
99
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
1010

11-
SourcesDirectory: $(Build.SourcesDirectory)
11+
SourcesDirectory: $(System.DefaultWorkingDirectory)
1212
CreatePr: true
1313
AutoCompletePr: false
1414
ReusePr: true
@@ -68,7 +68,7 @@ jobs:
6868
- ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
6969
- task: Powershell@2
7070
inputs:
71-
filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
71+
filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1
7272
arguments: $(_GenerateLocProjectArguments)
7373
displayName: Generate LocProject.json
7474
condition: ${{ parameters.condition }}
@@ -115,7 +115,7 @@ jobs:
115115
is1ESPipeline: ${{ parameters.is1ESPipeline }}
116116
args:
117117
displayName: Publish LocProject.json
118-
pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/'
118+
pathToPublish: '$(System.DefaultWorkingDirectory)/eng/Localize/'
119119
publishLocation: Container
120120
artifactName: Loc
121121
condition: ${{ parameters.condition }}

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ parameters:
3232

3333
is1ESPipeline: ''
3434

35+
repositoryAlias: self
36+
37+
officialBuildId: ''
38+
3539
jobs:
3640
- job: Asset_Registry_Publish
3741

@@ -54,6 +58,11 @@ jobs:
5458
value: false
5559
# unconditional - needed for logs publishing (redactor tool version)
5660
- template: /eng/common/core-templates/post-build/common-variables.yml
61+
- name: OfficialBuildId
62+
${{ if ne(parameters.officialBuildId, '') }}:
63+
value: ${{ parameters.officialBuildId }}
64+
${{ else }}:
65+
value: $(Build.BuildNumber)
5766

5867
pool:
5968
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
@@ -72,7 +81,7 @@ jobs:
7281
- 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error
7382

7483
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
75-
- checkout: self
84+
- checkout: ${{ parameters.repositoryAlias }}
7685
fetchDepth: 3
7786
clean: true
7887

@@ -93,12 +102,12 @@ jobs:
93102
azureSubscription: "Darc: Maestro Production"
94103
scriptType: ps
95104
scriptLocation: scriptPath
96-
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
105+
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1
97106
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
98107
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
99108
/p:MaestroApiEndpoint=https://maestro.dot.net
100109
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
101-
/p:OfficialBuildId=$(Build.BuildNumber)
110+
/p:OfficialBuildId=$(OfficialBuildId)
102111
condition: ${{ parameters.condition }}
103112
continueOnError: ${{ parameters.continueOnError }}
104113

@@ -113,7 +122,7 @@ jobs:
113122
Add-Content -Path $filePath -Value "$(DefaultChannels)"
114123
Add-Content -Path $filePath -Value $(IsStableBuild)
115124
116-
$symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt"
125+
$symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt"
117126
if (Test-Path -Path $symbolExclusionfile)
118127
{
119128
Write-Host "SymbolExclusionFile exists"
@@ -142,7 +151,7 @@ jobs:
142151
azureSubscription: "Darc: Maestro Production"
143152
scriptType: ps
144153
scriptLocation: scriptPath
145-
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
154+
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1
146155
arguments: >
147156
-BuildId $(BARBuildId)
148157
-PublishingInfraVersion 3

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ parameters:
3333
# container and pool.
3434
platform: {}
3535

36+
# Optional list of directories to ignore for component governance scans.
37+
componentGovernanceIgnoreDirectories: []
38+
3639
is1ESPipeline: ''
3740

3841
# If set to true and running on a non-public project,
@@ -93,3 +96,4 @@ jobs:
9396
parameters:
9497
is1ESPipeline: ${{ parameters.is1ESPipeline }}
9598
platform: ${{ parameters.platform }}
99+
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}

0 commit comments

Comments
 (0)