Skip to content

Commit d1731e0

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#37228)
* Backflow from https://github.com/dotnet/dotnet / cc7f6e8 build 291900 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 291900 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25565.104 -> 11.0.0-beta.25571.109) Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 10.0.0-rc.3.25565.104 -> 10.0.0-rc.3.25571.109) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 5544d0f commit d1731e0

17 files changed

+106
-188
lines changed

‎eng/Version.Details.props‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25565.104</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25565.104</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25565.104</MicrosoftDotNetHelixSdkPackageVersion>
12-
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.3.25565.104</MicrosoftExtensionsCachingMemoryPackageVersion>
13-
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.3.25565.104</MicrosoftExtensionsConfigurationPackageVersion>
14-
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.3.25565.104</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
15-
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.3.25565.104</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
16-
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.3.25565.104</MicrosoftExtensionsConfigurationJsonPackageVersion>
17-
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.3.25565.104</MicrosoftExtensionsDependencyInjectionPackageVersion>
18-
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.3.25565.104</MicrosoftExtensionsDependencyModelPackageVersion>
19-
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.3.25565.104</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
20-
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.3.25565.104</MicrosoftExtensionsLoggingPackageVersion>
21-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.3.25565.104</MicrosoftNETCoreAppRefPackageVersion>
22-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.3.25565.104</MicrosoftNETCorePlatformsPackageVersion>
23-
<SystemFormatsAsn1PackageVersion>10.0.0-rc.3.25565.104</SystemFormatsAsn1PackageVersion>
24-
<SystemRuntimeCachingPackageVersion>10.0.0-rc.3.25565.104</SystemRuntimeCachingPackageVersion>
25-
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.3.25565.104</SystemTextEncodingsWebPackageVersion>
26-
<SystemTextJsonPackageVersion>10.0.0-rc.3.25565.104</SystemTextJsonPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25571.109</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25571.109</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25571.109</MicrosoftDotNetHelixSdkPackageVersion>
12+
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.3.25571.109</MicrosoftExtensionsCachingMemoryPackageVersion>
13+
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.3.25571.109</MicrosoftExtensionsConfigurationPackageVersion>
14+
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.3.25571.109</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
15+
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.3.25571.109</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
16+
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.3.25571.109</MicrosoftExtensionsConfigurationJsonPackageVersion>
17+
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.3.25571.109</MicrosoftExtensionsDependencyInjectionPackageVersion>
18+
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.3.25571.109</MicrosoftExtensionsDependencyModelPackageVersion>
19+
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.3.25571.109</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
20+
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.3.25571.109</MicrosoftExtensionsLoggingPackageVersion>
21+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.3.25571.109</MicrosoftNETCoreAppRefPackageVersion>
22+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.3.25571.109</MicrosoftNETCorePlatformsPackageVersion>
23+
<SystemFormatsAsn1PackageVersion>10.0.0-rc.3.25571.109</SystemFormatsAsn1PackageVersion>
24+
<SystemRuntimeCachingPackageVersion>10.0.0-rc.3.25571.109</SystemRuntimeCachingPackageVersion>
25+
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.3.25571.109</SystemTextEncodingsWebPackageVersion>
26+
<SystemTextJsonPackageVersion>10.0.0-rc.3.25571.109</SystemTextJsonPackageVersion>
2727
</PropertyGroup>
2828
<!--Property group for alternate package version names-->
2929
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="88c87899e74aebbd27371d84597630ba3c25d4fd" BarId="291022" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="cc7f6e84d8dae36ad9ea51a5112627b8235982cc" BarId="291900" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.3.25565.104">
5+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.3.25571.109">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>88c87899e74aebbd27371d84597630ba3c25d4fd</Sha>
7+
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.3.25565.104">
9+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.3.25571.109">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>88c87899e74aebbd27371d84597630ba3c25d4fd</Sha>
11+
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.3.25565.104">
13+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.3.25571.109">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>88c87899e74aebbd27371d84597630ba3c25d4fd</Sha>
15+
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.3.25565.104">
17+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.3.25571.109">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>88c87899e74aebbd27371d84597630ba3c25d4fd</Sha>
19+
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.3.25565.104">
21+
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.3.25571.109">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>88c87899e74aebbd27371d84597630ba3c25d4fd</Sha>
23+
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.3.25565.104">
25+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.3.25571.109">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>88c87899e74aebbd27371d84597630ba3c25d4fd</Sha>
27+
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.3.25565.104">
29+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.3.25571.109">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>88c87899e74aebbd27371d84597630ba3c25d4fd</Sha>
31+
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.3.25565.104">
33+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.3.25571.109">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>88c87899e74aebbd27371d84597630ba3c25d4fd</Sha>
35+
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.3.25565.104">
37+
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.3.25571.109">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>88c87899e74aebbd27371d84597630ba3c25d4fd</Sha>
39+
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.3.25565.104">
41+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.3.25571.109">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>88c87899e74aebbd27371d84597630ba3c25d4fd</Sha>
43+
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.3.25565.104">
45+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.3.25571.109">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>88c87899e74aebbd27371d84597630ba3c25d4fd</Sha>
47+
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Text.Json" Version="10.0.0-rc.3.25565.104">
49+
<Dependency Name="System.Text.Json" Version="10.0.0-rc.3.25571.109">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>88c87899e74aebbd27371d84597630ba3c25d4fd</Sha>
51+
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
5252
</Dependency>
53-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.3.25565.104">
53+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.3.25571.109">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>88c87899e74aebbd27371d84597630ba3c25d4fd</Sha>
55+
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.3.25565.104">
57+
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.3.25571.109">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>88c87899e74aebbd27371d84597630ba3c25d4fd</Sha>
59+
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
6060
</Dependency>
61-
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.3.25565.104">
61+
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.3.25571.109">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>88c87899e74aebbd27371d84597630ba3c25d4fd</Sha>
63+
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
6464
</Dependency>
6565
</ProductDependencies>
6666
<ToolsetDependencies>
67-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25565.104">
67+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25571.109">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>88c87899e74aebbd27371d84597630ba3c25d4fd</Sha>
69+
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25565.104">
71+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25571.109">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>88c87899e74aebbd27371d84597630ba3c25d4fd</Sha>
73+
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
7474
</Dependency>
75-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25565.104">
75+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25571.109">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>88c87899e74aebbd27371d84597630ba3c25d4fd</Sha>
77+
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
7878
</Dependency>
7979
</ToolsetDependencies>
8080
</Dependencies>

‎eng/Versions.props‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<Project>
2-
<Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
2+
3+
<Import Project="Version.Details.props" />
4+
35
<PropertyGroup Label="Version settings">
46
<VersionPrefix>10.0.1</VersionPrefix>
57
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
68
<PreReleaseVersionIteration></PreReleaseVersionIteration>
9+
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
10+
<DotNetFinalVersionKind></DotNetFinalVersionKind>
11+
712
<IncludeSourceRevisionInInformationalVersion>False</IncludeSourceRevisionInInformationalVersion>
8-
<IsServicingBuild Condition="'$(PreReleaseVersionLabel)' == 'servicing'">true</IsServicingBuild>
9-
<!--
10-
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
11-
-->
12-
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
13-
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
1413
<DefaultNetCoreTargetFramework>net10.0</DefaultNetCoreTargetFramework>
14+
15+
<!-- Arcade features -->
16+
<UsingToolXliff>false</UsingToolXliff>
1517
</PropertyGroup>
16-
<PropertyGroup Label="Arcade settings">
17-
<UsingToolXliff>False</UsingToolXliff>
18-
</PropertyGroup>
19-
<PropertyGroup Label="MSBuild and Roslyn" Condition="'$(IsServicingBuild)' == 'true'">
18+
19+
<PropertyGroup Label="MSBuild and Roslyn" Condition="'$(PreReleaseVersionLabel)' == 'servicing'">
2020
<!-- For MSBuild and Roslyn packages use the previous stable version until the current stable build is released. -->
2121
<MicrosoftBuildFrameworkVersion>17.14.28</MicrosoftBuildFrameworkVersion>
2222
<MicrosoftBuildUtilitiesCoreVersion>17.14.28</MicrosoftBuildUtilitiesCoreVersion>
@@ -25,19 +25,22 @@
2525
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.14.0</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
2626
<MicrosoftCodeAnalysisWorkspacesMSBuildVersion>4.14.0</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
2727
</PropertyGroup>
28+
2829
<!-- Revert once roslyn publishes 5.0.0 packages
29-
<PropertyGroup Label="MSBuild and Roslyn" Condition="'$(IsServicingBuild)' == 'true'">
30+
<PropertyGroup Label="MSBuild and Roslyn" Condition="'$(PreReleaseVersionLabel)' == 'servicing'">
3031
<MicrosoftBuildFrameworkVersion>17.15.0</MicrosoftBuildFrameworkVersion>
3132
<MicrosoftBuildUtilitiesCoreVersion>17.15.0</MicrosoftBuildUtilitiesCoreVersion>
3233
<MicrosoftBuildTasksCoreVersion>17.15.0</MicrosoftBuildTasksCoreVersion>
3334
<MicrosoftCodeAnalysisCSharpVersion>5.0.0</MicrosoftCodeAnalysisCSharpVersion>
3435
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>5.0.0</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
3536
<MicrosoftCodeAnalysisWorkspacesMSBuildVersion>5.0.0</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
3637
</PropertyGroup> -->
38+
3739
<PropertyGroup Label="Analyzers">
3840
<StyleCopAnalyzersVersion>1.1.118</StyleCopAnalyzersVersion>
3941
<DotNetAnalyzersDocumentationAnalyzersVersion>1.0.0-beta.59</DotNetAnalyzersDocumentationAnalyzersVersion>
4042
</PropertyGroup>
43+
4144
<PropertyGroup Label="Test dependencies">
4245
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.3-beta1.24423.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
4346
<MicrosoftCodeAnalysisCSharpTestingVersion>1.1.3-beta1.24352.1</MicrosoftCodeAnalysisCSharpTestingVersion>
@@ -46,4 +49,5 @@
4649
<OpenTelemetryExporterInMemoryVersion>1.12.0</OpenTelemetryExporterInMemoryVersion>
4750
<SQLitePCLRawVersion>3.0.2</SQLitePCLRawVersion>
4851
</PropertyGroup>
52+
4953
</Project>

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

Lines changed: 3 additions & 7 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

@@ -195,11 +196,6 @@ jobs:
195196
inputs:
196197
version: 8.0.x
197198

198-
# Darc is targeting 8.0, so make sure it's installed
199-
- task: UseDotNet@2
200-
inputs:
201-
version: 8.0.x
202-
203199
- task: AzureCLI@2
204200
displayName: Publish Using Darc
205201
inputs:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ 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')]
66-
image: 1es-mariner-2
66+
image: 1es-azurelinux-3
6767
os: linux
6868
${{ else }}:
6969
pool:

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

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -299,27 +299,33 @@ stages:
299299
name: NetCore1ESPool-Publishing-Internal
300300
demands: ImageOverride -equals windows.vs2019.amd64
301301
steps:
302-
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
303-
parameters:
304-
BARBuildId: ${{ parameters.BARBuildId }}
305-
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
306-
is1ESPipeline: ${{ parameters.is1ESPipeline }}
307-
308-
- task: NuGetAuthenticate@1
309-
310-
# Darc is targeting 8.0, so make sure it's installed
311-
- task: UseDotNet@2
312-
inputs:
313-
version: 8.0.x
314-
315-
- task: AzureCLI@2
316-
displayName: Publish Using Darc
317-
inputs:
318-
azureSubscription: "Darc: Maestro Production"
319-
scriptType: ps
320-
scriptLocation: scriptPath
321-
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1
322-
arguments: >
302+
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
303+
parameters:
304+
BARBuildId: ${{ parameters.BARBuildId }}
305+
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
306+
is1ESPipeline: ${{ parameters.is1ESPipeline }}
307+
308+
- task: NuGetAuthenticate@1
309+
310+
# Populate internal runtime variables.
311+
- template: /eng/common/templates/steps/enable-internal-sources.yml
312+
parameters:
313+
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
314+
315+
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
316+
317+
- task: UseDotNet@2
318+
inputs:
319+
version: 8.0.x
320+
321+
- task: AzureCLI@2
322+
displayName: Publish Using Darc
323+
inputs:
324+
azureSubscription: "Darc: Maestro Production"
325+
scriptType: ps
326+
scriptLocation: scriptPath
327+
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1
328+
arguments: >
323329
-BuildId $(BARBuildId)
324330
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
325331
-AzdoToken '$(System.AccessToken)'

‎eng/common/cross/arm/sources.list.focal‎

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

‎eng/common/cross/arm/sources.list.jammy‎

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

0 commit comments

Comments
 (0)