Skip to content

Commit 064a36d

Browse files
carlossanlopcarlossanlop
authored
Merge pull request #106300 from carlossanlop/release/6.0-staging
[manual] Merge release/6.0-staging into release/6.0
2 parents 05a1487 + 82a262f commit 064a36d

File tree

9 files changed

+101
-90
lines changed

9 files changed

+101
-90
lines changed

‎NuGet.config‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
12+
<add key="darc-pub-dotnet-emsdk-849e1a6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-849e1a63/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-emsdk-849e1a6-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-849e1a63-9/nuget/v3/index.json" />
14+
<add key="darc-pub-dotnet-emsdk-849e1a6-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-849e1a63-8/nuget/v3/index.json" />
15+
<add key="darc-pub-dotnet-emsdk-849e1a6-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-849e1a63-7/nuget/v3/index.json" />
16+
<add key="darc-pub-dotnet-emsdk-849e1a6-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-849e1a63-6/nuget/v3/index.json" />
17+
<add key="darc-pub-dotnet-emsdk-849e1a6-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-849e1a63-5/nuget/v3/index.json" />
18+
<add key="darc-pub-dotnet-emsdk-849e1a6-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-849e1a63-4/nuget/v3/index.json" />
19+
<add key="darc-pub-dotnet-emsdk-849e1a6-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-849e1a63-3/nuget/v3/index.json" />
20+
<add key="darc-pub-dotnet-emsdk-849e1a6-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-849e1a63-2/nuget/v3/index.json" />
21+
<add key="darc-pub-dotnet-emsdk-849e1a6-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-849e1a63-1/nuget/v3/index.json" />
1222
<add key="darc-pub-dotnet-emsdk-ec74ec8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f/nuget/v3/index.json" />
1323
<!-- End: Package sources from dotnet-emsdk -->
1424
<!-- Begin: Package sources from dotnet-wcf -->

‎eng/Version.Details.xml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -102,49 +102,49 @@
102102
<Uri>https://github.com/microsoft/vstest</Uri>
103103
<Sha>140434f7109d357d0158ade9e5164a4861513965</Sha>
104104
</Dependency>
105-
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="6.0.0-beta.24271.2">
105+
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="6.0.0-beta.24362.1">
106106
<Uri>https://github.com/dotnet/runtime-assets</Uri>
107-
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
107+
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
108108
</Dependency>
109-
<Dependency Name="System.Data.Common.TestData" Version="6.0.0-beta.24271.2">
109+
<Dependency Name="System.Data.Common.TestData" Version="6.0.0-beta.24362.1">
110110
<Uri>https://github.com/dotnet/runtime-assets</Uri>
111-
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
111+
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
112112
</Dependency>
113-
<Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.24271.2">
113+
<Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.24362.1">
114114
<Uri>https://github.com/dotnet/runtime-assets</Uri>
115-
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
115+
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
116116
</Dependency>
117-
<Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.24271.2">
117+
<Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.24362.1">
118118
<Uri>https://github.com/dotnet/runtime-assets</Uri>
119-
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
119+
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
120120
</Dependency>
121-
<Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.24271.2">
121+
<Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.24362.1">
122122
<Uri>https://github.com/dotnet/runtime-assets</Uri>
123-
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
123+
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
124124
</Dependency>
125-
<Dependency Name="System.Net.TestData" Version="6.0.0-beta.24271.2">
125+
<Dependency Name="System.Net.TestData" Version="6.0.0-beta.24362.1">
126126
<Uri>https://github.com/dotnet/runtime-assets</Uri>
127-
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
127+
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
128128
</Dependency>
129-
<Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.24271.2">
129+
<Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.24362.1">
130130
<Uri>https://github.com/dotnet/runtime-assets</Uri>
131-
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
131+
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
132132
</Dependency>
133-
<Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.24271.2">
133+
<Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.24362.1">
134134
<Uri>https://github.com/dotnet/runtime-assets</Uri>
135-
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
135+
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
136136
</Dependency>
137-
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.24271.2">
137+
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.24362.1">
138138
<Uri>https://github.com/dotnet/runtime-assets</Uri>
139-
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
139+
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
140140
</Dependency>
141-
<Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.24271.2">
141+
<Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.24362.1">
142142
<Uri>https://github.com/dotnet/runtime-assets</Uri>
143-
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
143+
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="6.0.0-beta.24271.2">
145+
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="6.0.0-beta.24362.1">
146146
<Uri>https://github.com/dotnet/runtime-assets</Uri>
147-
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
147+
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
148148
</Dependency>
149149
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.21416.1">
150150
<Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -242,13 +242,13 @@
242242
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
243243
<Sha>d50065944d8b41d804448a7056351481d583ad3d</Sha>
244244
</Dependency>
245-
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="6.0.0-alpha.0.24362.1">
245+
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="6.0.0-alpha.0.24402.2">
246246
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
247-
<Sha>279b1ac2439ff27e32eb574a4b8e0d1087c09c8e</Sha>
247+
<Sha>036e630c228a06e61db385ecbe2b96ad995b0f61</Sha>
248248
</Dependency>
249-
<Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.24271.2">
249+
<Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.24362.1">
250250
<Uri>https://github.com/dotnet/runtime-assets</Uri>
251-
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
251+
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
252252
</Dependency>
253253
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0-rc1.21413.4">
254254
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>

‎eng/Versions.props‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -108,18 +108,18 @@
108108
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
109109
<runtimenativeSystemIOPortsVersion>6.0.0-rc.1.21415.6</runtimenativeSystemIOPortsVersion>
110110
<!-- Runtime-Assets dependencies -->
111-
<SystemRuntimeNumericsTestDataVersion>6.0.0-beta.24271.2</SystemRuntimeNumericsTestDataVersion>
112-
<SystemComponentModelTypeConverterTestDataVersion>6.0.0-beta.24271.2</SystemComponentModelTypeConverterTestDataVersion>
113-
<SystemDataCommonTestDataVersion>6.0.0-beta.24271.2</SystemDataCommonTestDataVersion>
114-
<SystemDrawingCommonTestDataVersion>6.0.0-beta.24271.2</SystemDrawingCommonTestDataVersion>
115-
<SystemIOCompressionTestDataVersion>6.0.0-beta.24271.2</SystemIOCompressionTestDataVersion>
116-
<SystemIOPackagingTestDataVersion>6.0.0-beta.24271.2</SystemIOPackagingTestDataVersion>
117-
<SystemNetTestDataVersion>6.0.0-beta.24271.2</SystemNetTestDataVersion>
118-
<SystemPrivateRuntimeUnicodeDataVersion>6.0.0-beta.24271.2</SystemPrivateRuntimeUnicodeDataVersion>
119-
<SystemRuntimeTimeZoneDataVersion>6.0.0-beta.24271.2</SystemRuntimeTimeZoneDataVersion>
120-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.24271.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
121-
<SystemWindowsExtensionsTestDataVersion>6.0.0-beta.24271.2</SystemWindowsExtensionsTestDataVersion>
122-
<MicrosoftDotNetCilStripSourcesVersion>6.0.0-beta.24271.2</MicrosoftDotNetCilStripSourcesVersion>
111+
<SystemRuntimeNumericsTestDataVersion>6.0.0-beta.24362.1</SystemRuntimeNumericsTestDataVersion>
112+
<SystemComponentModelTypeConverterTestDataVersion>6.0.0-beta.24362.1</SystemComponentModelTypeConverterTestDataVersion>
113+
<SystemDataCommonTestDataVersion>6.0.0-beta.24362.1</SystemDataCommonTestDataVersion>
114+
<SystemDrawingCommonTestDataVersion>6.0.0-beta.24362.1</SystemDrawingCommonTestDataVersion>
115+
<SystemIOCompressionTestDataVersion>6.0.0-beta.24362.1</SystemIOCompressionTestDataVersion>
116+
<SystemIOPackagingTestDataVersion>6.0.0-beta.24362.1</SystemIOPackagingTestDataVersion>
117+
<SystemNetTestDataVersion>6.0.0-beta.24362.1</SystemNetTestDataVersion>
118+
<SystemPrivateRuntimeUnicodeDataVersion>6.0.0-beta.24362.1</SystemPrivateRuntimeUnicodeDataVersion>
119+
<SystemRuntimeTimeZoneDataVersion>6.0.0-beta.24362.1</SystemRuntimeTimeZoneDataVersion>
120+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.24362.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
121+
<SystemWindowsExtensionsTestDataVersion>6.0.0-beta.24362.1</SystemWindowsExtensionsTestDataVersion>
122+
<MicrosoftDotNetCilStripSourcesVersion>6.0.0-beta.24362.1</MicrosoftDotNetCilStripSourcesVersion>
123123
<!-- dotnet-optimization dependencies -->
124124
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.21416.5</optimizationwindows_ntx64MIBCRuntimeVersion>
125125
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.21416.5</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -145,7 +145,7 @@
145145
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
146146
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>6.0.0-prerelease.24224.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
147147
<MicrosoftDotNetXHarnessCLIVersion>6.0.0-prerelease.24224.2</MicrosoftDotNetXHarnessCLIVersion>
148-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>6.0.0-alpha.0.24362.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
148+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>6.0.0-alpha.0.24402.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
149149
<XUnitVersion>2.4.2-pre.9</XUnitVersion>
150150
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
151151
<CoverletCollectorVersion>1.3.0</CoverletCollectorVersion>

‎eng/pipelines/coreclr/templates/helix-queues-setup.yml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -36,68 +36,68 @@ jobs:
3636

3737
# Android x64
3838
- ${{ if in(parameters.platform, 'Android_x64') }}:
39-
- Ubuntu.1804.Amd64.Android.29.Open
39+
- Ubuntu.2204.Amd64.Android.29.Open
4040

4141
# Browser wasm
4242
- ${{ if eq(parameters.platform, 'Browser_wasm') }}:
43-
- Ubuntu.1804.Amd64.Open
43+
- Ubuntu.2204.Amd64.Open
4444

4545
# Linux arm
4646
- ${{ if eq(parameters.platform, 'Linux_arm') }}:
4747
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
48-
- (Ubuntu.1804.Arm32.Open)Ubuntu.1804.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7
48+
- (Ubuntu.1804.Arm32.Open)Ubuntu.2204.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7
4949
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
50-
- (Debian.10.Arm32)Ubuntu.1804.Armarch@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-arm32v7
51-
- (Debian.11.Arm32)Ubuntu.1804.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm32v7
52-
- (Ubuntu.1804.Arm32)Ubuntu.1804.Armarch@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7
50+
- (Debian.12.Arm32)Ubuntu.2204.Armarch@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-arm32v7
51+
- (Debian.11.Arm32)Ubuntu.2204.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm32v7
52+
- (Ubuntu.2004.Arm32)Ubuntu.1804.Armarch@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7
5353

5454
# Linux arm64
5555
- ${{ if eq(parameters.platform, 'Linux_arm64') }}:
5656
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
57-
- (Ubuntu.1804.Arm64.Open)Ubuntu.1804.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8
57+
- (Ubuntu.1804.Arm64.Open)Ubuntu.2204.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8
5858
- ${{ if and(eq(variables['System.TeamProject'], 'public'), notIn(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}:
59-
- (Debian.10.Arm64.Open)Ubuntu.1804.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-arm64v8
60-
- (Debian.11.Arm64.Open)Ubuntu.1804.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8
59+
- (Debian.12.Arm64.Open)Ubuntu.2204.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-arm64v8
60+
- (Debian.11.Arm64.Open)Ubuntu.2204.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8
6161
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
62-
- (Debian.10.Arm64)Ubuntu.1804.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-arm64v8
63-
- (Debian.11.Arm64)Ubuntu.1804.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8
64-
- (Ubuntu.1804.Arm64)Ubuntu.1804.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8
62+
- (Debian.12.Arm64)Ubuntu.2204.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-arm64v8
63+
- (Debian.11.Arm64)Ubuntu.2204.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8
64+
- (Ubuntu.1804.Arm64)Ubuntu.2204.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8
6565

6666
# Linux musl x64
6767
- ${{ if eq(parameters.platform, 'linux_musl_x64') }}:
6868
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
69-
- (Alpine.317.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17-helix-amd64
69+
- (Alpine.318.Amd64.Open)ubuntu.2204.amd64.open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.18-helix-amd64
7070
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
71-
- (Alpine.319.Amd64)Ubuntu.2204.Amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-helix-amd64
71+
- (Alpine.318.Amd64)ubuntu.2204.amd64.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.18-helix-amd64
7272

7373
# Linux musl arm32
7474
- ${{ if eq(parameters.platform, 'linux_musl_arm') }}:
7575
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
76-
- (Alpine.317.Arm32.Open)Ubuntu.2204.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17-helix-arm32v7
76+
- (Alpine.318.Arm32.Open)Ubuntu.2204.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.18-helix-arm32v7
7777
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
78-
- (Alpine.319.Arm32)Ubuntu.2204.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-helix-arm32v7
78+
- (Alpine.318.Arm32)Ubuntu.2204.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.18-helix-arm32v7
7979

8080
# Linux musl arm64
8181
- ${{ if eq(parameters.platform, 'linux_musl_arm64') }}:
8282
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
83-
- (Alpine.317.Arm64.Open)Ubuntu.2204.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17-helix-arm64v8
83+
- (Alpine.318.Arm64.Open)Ubuntu.2204.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.18-helix-arm64v8
8484
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
85-
- (Alpine.319.Arm64)Ubuntu.2204.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-helix-arm64v8
85+
- (Alpine.318.Arm64)Ubuntu.2204.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.18-helix-arm64v8
8686

8787
# Linux x64
8888
- ${{ if eq(parameters.platform, 'Linux_x64') }}:
8989
- ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}:
90-
- Ubuntu.1804.Amd64.Open
90+
- Ubuntu.2004.Amd64.Open
9191
- ${{ if and(eq(variables['System.TeamProject'], 'public'), notIn(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}:
92-
- (Debian.10.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64
93-
- (Debian.11.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
94-
- Ubuntu.1804.Amd64.Open
92+
- (Debian.12.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-amd64
93+
- (Debian.11.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
94+
- Ubuntu.2004.Amd64.Open
9595
- RedHat.7.Amd64.Open
9696
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
97-
- (Debian.10.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64
98-
- (Debian.11.Amd64)Ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
99-
- Ubuntu.1804.Amd64
100-
- (Fedora.34.Amd64)Ubuntu.2204.amd64.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-34-helix
97+
- (Debian.12.Amd64)Ubuntu.2204.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-amd64
98+
- (Debian.11.Amd64)Ubuntu.2204.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
99+
- Ubuntu.2004.Amd64
100+
- (Fedora.39.Amd64)Ubuntu.2204.amd64.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39-helix
101101
- RedHat.7.Amd64
102102

103103
# OSX arm64

0 commit comments

Comments
 (0)