Skip to content

Commit de693b4

Browse files
cincuranetcincuranet
authored
Merge pull request #36800 from dotnet/release/9.0
[release/9.0-staging] Merge release/9.0 to release/9.0-staging
2 parents efb7602 + b401088 commit de693b4

25 files changed

+132
-108
lines changed

‎NuGet.config‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7-
<add key="darc-int-dotnet-runtime-aae90fa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-aae90fa0/nuget/v3/index.json" />
8-
<add key="darc-int-dotnet-runtime-aae90fa-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-aae90fa0-2/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-runtime-aae90fa-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-aae90fa0-1/nuget/v3/index.json" />
107
<!-- End: Package sources from dotnet-runtime -->
118
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
129
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -23,9 +20,6 @@
2320
<clear />
2421
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2522
<!-- Begin: Package sources from dotnet-runtime -->
26-
<add key="darc-int-dotnet-runtime-aae90fa-1" value="true" />
27-
<add key="darc-int-dotnet-runtime-aae90fa-2" value="true" />
28-
<add key="darc-int-dotnet-runtime-aae90fa" value="true" />
2923
<!-- End: Package sources from dotnet-runtime -->
3024
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3125
</disabledPackageSources>

‎azure-pipelines.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ extends:
4747
parameters:
4848
featureFlags:
4949
autoBaseline: false
50+
autoEnableRoslynWithNewRuleset: false
5051
sdl:
5152
sourceAnalysisPool:
5253
name: $(DncEngInternalBuildPool)
@@ -238,4 +239,4 @@ extends:
238239
enableSourceLinkValidation: false
239240
publishAssetsImmediately: true
240241
SDLValidationParameters:
241-
enable: false
242+
enable: false

‎eng/Version.Details.xml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,83 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.8">
4+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.9">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6-
<Sha>aae90fa09086a9be09dac83fa66542232c7269d8</Sha>
6+
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.8">
8+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.9">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
10-
<Sha>aae90fa09086a9be09dac83fa66542232c7269d8</Sha>
10+
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.8">
12+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.9">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
14-
<Sha>aae90fa09086a9be09dac83fa66542232c7269d8</Sha>
14+
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.8">
16+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.9">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
18-
<Sha>aae90fa09086a9be09dac83fa66542232c7269d8</Sha>
18+
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.8">
20+
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.9">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22-
<Sha>aae90fa09086a9be09dac83fa66542232c7269d8</Sha>
22+
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.8">
24+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.9">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
26-
<Sha>aae90fa09086a9be09dac83fa66542232c7269d8</Sha>
26+
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.8">
28+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.9">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
30-
<Sha>aae90fa09086a9be09dac83fa66542232c7269d8</Sha>
30+
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.8-servicing.25365.11">
32+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.9-servicing.25419.16">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
34-
<Sha>aae90fa09086a9be09dac83fa66542232c7269d8</Sha>
34+
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.8">
36+
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.9">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
38-
<Sha>aae90fa09086a9be09dac83fa66542232c7269d8</Sha>
38+
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.8">
40+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.9">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
42-
<Sha>aae90fa09086a9be09dac83fa66542232c7269d8</Sha>
42+
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
4343
</Dependency>
44-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="9.0.8-servicing.25365.11">
44+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="9.0.9-servicing.25419.16">
4545
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
46-
<Sha>aae90fa09086a9be09dac83fa66542232c7269d8</Sha>
46+
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
4747
</Dependency>
4848
<!--
4949
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
5050
All Runtime.$rid packages should have the same version.
5151
-->
52-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.8">
52+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.9">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
54-
<Sha>aae90fa09086a9be09dac83fa66542232c7269d8</Sha>
54+
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
5555
</Dependency>
56-
<Dependency Name="System.Text.Json" Version="9.0.8">
56+
<Dependency Name="System.Text.Json" Version="9.0.9">
5757
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
58-
<Sha>aae90fa09086a9be09dac83fa66542232c7269d8</Sha>
58+
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
5959
</Dependency>
60-
<Dependency Name="System.Text.Encodings.Web" Version="9.0.8">
60+
<Dependency Name="System.Text.Encodings.Web" Version="9.0.9">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
62-
<Sha>aae90fa09086a9be09dac83fa66542232c7269d8</Sha>
62+
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
6363
</Dependency>
64-
<Dependency Name="System.Formats.Asn1" Version="9.0.8">
64+
<Dependency Name="System.Formats.Asn1" Version="9.0.9">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>aae90fa09086a9be09dac83fa66542232c7269d8</Sha>
66+
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
6767
</Dependency>
6868
</ProductDependencies>
6969
<ToolsetDependencies>
70-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25407.2">
70+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25462.4">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
72+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25407.2">
74+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25462.4">
7575
<Uri>https://github.com/dotnet/arcade</Uri>
76-
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
76+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
7777
</Dependency>
78-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25407.2">
78+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25462.4">
7979
<Uri>https://github.com/dotnet/arcade</Uri>
80-
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
80+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
8181
</Dependency>
8282
</ToolsetDependencies>
8383
</Dependencies>

‎eng/Versions.props‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup Label="Version settings">
3-
<VersionPrefix>9.0.9</VersionPrefix>
3+
<VersionPrefix>9.0.10</VersionPrefix>
44
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
55
<PreReleaseVersionIteration>
66
</PreReleaseVersionIteration>
@@ -17,24 +17,24 @@
1717
<UsingToolXliff>False</UsingToolXliff>
1818
</PropertyGroup>
1919
<PropertyGroup Label="Dependencies from dotnet/runtime">
20-
<MicrosoftExtensionsCachingMemoryVersion>9.0.8</MicrosoftExtensionsCachingMemoryVersion>
21-
<MicrosoftExtensionsConfigurationVersion>9.0.8</MicrosoftExtensionsConfigurationVersion>
22-
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.8</MicrosoftExtensionsConfigurationAbstractionsVersion>
23-
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.8</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
24-
<MicrosoftExtensionsConfigurationJsonVersion>9.0.8</MicrosoftExtensionsConfigurationJsonVersion>
25-
<MicrosoftExtensionsDependencyInjectionVersion>9.0.8</MicrosoftExtensionsDependencyInjectionVersion>
26-
<MicrosoftExtensionsDependencyModelVersion>9.0.8</MicrosoftExtensionsDependencyModelVersion>
27-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.8-servicing.25365.11</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
28-
<MicrosoftExtensionsLoggingVersion>9.0.8</MicrosoftExtensionsLoggingVersion>
29-
<MicrosoftNETCoreAppRefVersion>9.0.8</MicrosoftNETCoreAppRefVersion>
30-
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.8</MicrosoftNETCoreAppRuntimewinx64Version>
31-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>9.0.8-servicing.25365.11</MicrosoftNETCoreBrowserDebugHostTransportVersion>
32-
<SystemTextEncodingsWebVersion>9.0.8</SystemTextEncodingsWebVersion>
33-
<SystemTextJsonVersion>9.0.8</SystemTextJsonVersion>
34-
<SystemFormatsAsn1Version>9.0.8</SystemFormatsAsn1Version>
20+
<MicrosoftExtensionsCachingMemoryVersion>9.0.9</MicrosoftExtensionsCachingMemoryVersion>
21+
<MicrosoftExtensionsConfigurationVersion>9.0.9</MicrosoftExtensionsConfigurationVersion>
22+
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.9</MicrosoftExtensionsConfigurationAbstractionsVersion>
23+
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.9</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
24+
<MicrosoftExtensionsConfigurationJsonVersion>9.0.9</MicrosoftExtensionsConfigurationJsonVersion>
25+
<MicrosoftExtensionsDependencyInjectionVersion>9.0.9</MicrosoftExtensionsDependencyInjectionVersion>
26+
<MicrosoftExtensionsDependencyModelVersion>9.0.9</MicrosoftExtensionsDependencyModelVersion>
27+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.9-servicing.25419.16</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
28+
<MicrosoftExtensionsLoggingVersion>9.0.9</MicrosoftExtensionsLoggingVersion>
29+
<MicrosoftNETCoreAppRefVersion>9.0.9</MicrosoftNETCoreAppRefVersion>
30+
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.9</MicrosoftNETCoreAppRuntimewinx64Version>
31+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>9.0.9-servicing.25419.16</MicrosoftNETCoreBrowserDebugHostTransportVersion>
32+
<SystemTextEncodingsWebVersion>9.0.9</SystemTextEncodingsWebVersion>
33+
<SystemTextJsonVersion>9.0.9</SystemTextJsonVersion>
34+
<SystemFormatsAsn1Version>9.0.9</SystemFormatsAsn1Version>
3535
</PropertyGroup>
3636
<PropertyGroup Label="Dependencies from dotnet/arcade">
37-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25407.2</MicrosoftDotNetBuildTasksTemplatingVersion>
37+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25462.4</MicrosoftDotNetBuildTasksTemplatingVersion>
3838
</PropertyGroup>
3939
<PropertyGroup Label="Other dependencies">
4040
<MicrosoftBuildFrameworkVersion>17.8.3</MicrosoftBuildFrameworkVersion>

‎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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ jobs:
166166
inputs:
167167
languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
168168
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }}
169-
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
169+
richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin
170170
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
171171
continueOnError: true
172172

@@ -189,7 +189,7 @@ jobs:
189189
inputs:
190190
testResultsFormat: 'xUnit'
191191
testResultsFiles: '*.xml'
192-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
192+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
193193
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
194194
mergeTestResults: ${{ parameters.mergeTestResults }}
195195
continueOnError: true
@@ -200,7 +200,7 @@ jobs:
200200
inputs:
201201
testResultsFormat: 'VSTest'
202202
testResultsFiles: '*.trx'
203-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
203+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
204204
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
205205
mergeTestResults: ${{ parameters.mergeTestResults }}
206206
continueOnError: true
@@ -244,7 +244,7 @@ jobs:
244244
- task: CopyFiles@2
245245
displayName: Gather buildconfiguration for build retry
246246
inputs:
247-
SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration'
247+
SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration'
248248
Contents: '**'
249249
TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration'
250250
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)