Skip to content

Commit 2f677f9

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#14070)
[main] Source code updates from dotnet/dotnet
1 parent e237b3c commit 2f677f9

18 files changed

+284
-117
lines changed

‎eng/Version.Details.props‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,31 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25569.110</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25569.110</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftDotNetCMakeSdkPackageVersion>11.0.0-beta.25569.110</MicrosoftDotNetCMakeSdkPackageVersion>
12-
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.25569.110</MicrosoftDotNetGenFacadesPackageVersion>
13-
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25569.110</MicrosoftDotNetHelixSdkPackageVersion>
14-
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.25569.110</MicrosoftDotNetRemoteExecutorPackageVersion>
15-
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.25569.110</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
16-
<MicrosoftNETSdkILPackageVersion>10.0.0-rc.3.25569.110</MicrosoftNETSdkILPackageVersion>
17-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.3.25569.110</MicrosoftNETCoreAppRefPackageVersion>
18-
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.3.25569.110</MicrosoftNETCoreILAsmPackageVersion>
19-
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.3.25569.110</MicrosoftNETCoreILDAsmPackageVersion>
20-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.3.25569.110</MicrosoftNETCorePlatformsPackageVersion>
21-
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-rc.3.25569.110</MicrosoftWin32SystemEventsPackageVersion>
22-
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.3.25569.110</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
23-
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.3.25569.110</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
24-
<SystemCodeDomPackageVersion>10.0.0-rc.3.25569.110</SystemCodeDomPackageVersion>
25-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.3.25569.110</SystemConfigurationConfigurationManagerPackageVersion>
26-
<SystemFormatsNrbfPackageVersion>10.0.0-rc.3.25569.110</SystemFormatsNrbfPackageVersion>
27-
<SystemIOHashingPackageVersion>10.0.0-rc.3.25569.110</SystemIOHashingPackageVersion>
28-
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.3.25569.110</SystemReflectionMetadataLoadContextPackageVersion>
29-
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.3.25569.110</SystemResourcesExtensionsPackageVersion>
30-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.3.25569.110</SystemRuntimeSerializationFormattersPackageVersion>
31-
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.3.25569.110</SystemTextEncodingsWebPackageVersion>
32-
<SystemTextJsonPackageVersion>10.0.0-rc.3.25569.110</SystemTextJsonPackageVersion>
33-
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.3.25569.110</SystemWindowsExtensionsPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25570.101</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25570.101</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftDotNetCMakeSdkPackageVersion>11.0.0-beta.25570.101</MicrosoftDotNetCMakeSdkPackageVersion>
12+
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.25570.101</MicrosoftDotNetGenFacadesPackageVersion>
13+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25570.101</MicrosoftDotNetHelixSdkPackageVersion>
14+
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.25570.101</MicrosoftDotNetRemoteExecutorPackageVersion>
15+
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.25570.101</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
16+
<MicrosoftNETSdkILPackageVersion>10.0.0-rc.3.25570.101</MicrosoftNETSdkILPackageVersion>
17+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.3.25570.101</MicrosoftNETCoreAppRefPackageVersion>
18+
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.3.25570.101</MicrosoftNETCoreILAsmPackageVersion>
19+
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.3.25570.101</MicrosoftNETCoreILDAsmPackageVersion>
20+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.3.25570.101</MicrosoftNETCorePlatformsPackageVersion>
21+
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-rc.3.25570.101</MicrosoftWin32SystemEventsPackageVersion>
22+
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.3.25570.101</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
23+
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.3.25570.101</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
24+
<SystemCodeDomPackageVersion>10.0.0-rc.3.25570.101</SystemCodeDomPackageVersion>
25+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.3.25570.101</SystemConfigurationConfigurationManagerPackageVersion>
26+
<SystemFormatsNrbfPackageVersion>10.0.0-rc.3.25570.101</SystemFormatsNrbfPackageVersion>
27+
<SystemIOHashingPackageVersion>10.0.0-rc.3.25570.101</SystemIOHashingPackageVersion>
28+
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.3.25570.101</SystemReflectionMetadataLoadContextPackageVersion>
29+
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.3.25570.101</SystemResourcesExtensionsPackageVersion>
30+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.3.25570.101</SystemRuntimeSerializationFormattersPackageVersion>
31+
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.3.25570.101</SystemTextEncodingsWebPackageVersion>
32+
<SystemTextJsonPackageVersion>10.0.0-rc.3.25570.101</SystemTextJsonPackageVersion>
33+
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.3.25570.101</SystemWindowsExtensionsPackageVersion>
3434
</PropertyGroup>
3535
<!--Property group for alternate package version names-->
3636
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -6,110 +6,110 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
66
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
77
-->
88
<Dependencies>
9-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="ea77dd1498eeaae360c4309d07ccd68c8936fe48" BarId="291548" />
9+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="e9a2ab63ad60de1afff34ddc3f09257093ea034a" BarId="291616" />
1010
<ProductDependencies>
11-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.3.25569.110">
11+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.3.25570.101">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
13+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
1414
</Dependency>
15-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.3.25569.110">
15+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.3.25570.101">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
17+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
1818
</Dependency>
19-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.3.25569.110">
19+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.3.25570.101">
2020
<Uri>https://github.com/dotnet/dotnet</Uri>
21-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
21+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-rc.3.25569.110">
23+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-rc.3.25570.101">
2424
<Uri>https://github.com/dotnet/dotnet</Uri>
25-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
25+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.3.25569.110">
27+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.3.25570.101">
2828
<Uri>https://github.com/dotnet/dotnet</Uri>
29-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
29+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
3030
</Dependency>
31-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.3.25569.110">
31+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.3.25570.101">
3232
<Uri>https://github.com/dotnet/dotnet</Uri>
33-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
33+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
3434
</Dependency>
35-
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.3.25569.110">
35+
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.3.25570.101">
3636
<Uri>https://github.com/dotnet/dotnet</Uri>
37-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
37+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
3838
</Dependency>
39-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.3.25569.110">
39+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.3.25570.101">
4040
<Uri>https://github.com/dotnet/dotnet</Uri>
41-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
41+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
4242
</Dependency>
43-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.3.25569.110">
43+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.3.25570.101">
4444
<Uri>https://github.com/dotnet/dotnet</Uri>
45-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
45+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
4646
</Dependency>
47-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.3.25569.110">
47+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.3.25570.101">
4848
<Uri>https://github.com/dotnet/dotnet</Uri>
49-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
49+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
5050
</Dependency>
51-
<Dependency Name="System.Text.Json" Version="10.0.0-rc.3.25569.110">
51+
<Dependency Name="System.Text.Json" Version="10.0.0-rc.3.25570.101">
5252
<Uri>https://github.com/dotnet/dotnet</Uri>
53-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
53+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.3.25569.110">
55+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.3.25570.101">
5656
<Uri>https://github.com/dotnet/dotnet</Uri>
57-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
57+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
5858
</Dependency>
59-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.3.25569.110">
59+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.3.25570.101">
6060
<Uri>https://github.com/dotnet/dotnet</Uri>
61-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
61+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-rc.3.25569.110">
63+
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-rc.3.25570.101">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
65+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
6666
</Dependency>
67-
<Dependency Name="System.CodeDom" Version="10.0.0-rc.3.25569.110">
67+
<Dependency Name="System.CodeDom" Version="10.0.0-rc.3.25570.101">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
69+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
7070
</Dependency>
71-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.3.25569.110">
71+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.3.25570.101">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
73+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
7474
</Dependency>
75-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.3.25569.110">
75+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.3.25570.101">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
77+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
7878
</Dependency>
79-
<Dependency Name="System.IO.Hashing" Version="10.0.0-rc.3.25569.110">
79+
<Dependency Name="System.IO.Hashing" Version="10.0.0-rc.3.25570.101">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
81+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
8282
</Dependency>
8383
</ProductDependencies>
8484
<ToolsetDependencies>
8585
<!-- Arcade -->
86-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25569.110">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25570.101">
8787
<Uri>https://github.com/dotnet/dotnet</Uri>
88-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
88+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.25569.110">
90+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.25570.101">
9191
<Uri>https://github.com/dotnet/dotnet</Uri>
92-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
92+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="11.0.0-beta.25569.110">
94+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="11.0.0-beta.25570.101">
9595
<Uri>https://github.com/dotnet/dotnet</Uri>
96-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
96+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25569.110">
98+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25570.101">
9999
<Uri>https://github.com/dotnet/dotnet</Uri>
100-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
100+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.25569.110">
102+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.25570.101">
103103
<Uri>https://github.com/dotnet/dotnet</Uri>
104-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
104+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.25569.110">
106+
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.25570.101">
107107
<Uri>https://github.com/dotnet/dotnet</Uri>
108-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
108+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25569.110">
110+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25570.101">
111111
<Uri>https://github.com/dotnet/dotnet</Uri>
112-
<Sha>ea77dd1498eeaae360c4309d07ccd68c8936fe48</Sha>
112+
<Sha>e9a2ab63ad60de1afff34ddc3f09257093ea034a</Sha>
113113
</Dependency>
114114
</ToolsetDependencies>
115115
</Dependencies>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ parameters:
3131
testRunTitle: ''
3232
testResultsFormat: ''
3333
name: ''
34+
componentGovernanceSteps: []
3435
preSteps: []
3536
artifactPublishSteps: []
3637
runAsPublic: false
@@ -149,6 +150,9 @@ jobs:
149150
- ${{ each step in parameters.steps }}:
150151
- ${{ step }}
151152

153+
- ${{ each step in parameters.componentGovernanceSteps }}:
154+
- ${{ step }}
155+
152156
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
153157
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
154158
parameters:

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,9 @@ jobs:
122122

123123
# Populate internal runtime variables.
124124
- template: /eng/common/templates/steps/enable-internal-sources.yml
125-
parameters:
126-
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
125+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
126+
parameters:
127+
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
127128

128129
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
129130

@@ -172,7 +173,7 @@ jobs:
172173
artifactName: AssetManifests
173174
displayName: 'Publish Merged Manifest'
174175
retryCountOnTaskFailure: 10 # for any logs being locked
175-
isProduction: false
176+
sbomEnabled: false # we don't need SBOM for logs
176177

177178
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
178179
parameters:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
pool:
6161
${{ if eq(variables['System.TeamProject'], 'public') }}:
6262
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
63-
demands: ImageOverride -equals build.ubuntu.2004.amd64
63+
demands: ImageOverride -equals build.ubuntu.2204.amd64
6464
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6565
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
6666
image: 1es-mariner-2

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,9 @@ stages:
305305
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
306306
is1ESPipeline: ${{ parameters.is1ESPipeline }}
307307

308-
- task: NuGetAuthenticate@1 # Populate internal runtime variables.
308+
- task: NuGetAuthenticate@1
309309

310+
# Populate internal runtime variables.
310311
- template: /eng/common/templates/steps/enable-internal-sources.yml
311312
parameters:
312313
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
parameters:
2+
disableComponentGovernance: false
3+
componentGovernanceIgnoreDirectories: ''
4+
is1ESPipeline: false
5+
displayName: 'Component Detection'
6+
7+
steps:
8+
- ${{ if eq(parameters.disableComponentGovernance, 'true') }}:
9+
- script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
10+
displayName: Set skipComponentGovernanceDetection variable
11+
- ${{ if ne(parameters.disableComponentGovernance, 'true') }}:
12+
- task: ComponentGovernanceComponentDetection@0
13+
continueOnError: true
14+
displayName: ${{ parameters.displayName }}
15+
inputs:
16+
ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}

0 commit comments

Comments
 (0)