Skip to content

Commit a207560

Browse files
author
Mirroring
committed
Merge commit 'd0ccb5423d12af19e65deb5556ba5a72c8cee59f'
2 parents 1ca6044 + d0ccb54 commit a207560

File tree

57 files changed

+582
-319
lines changed

Some content is hidden

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

57 files changed

+582
-319
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": "8.0.0-prerelease.25103.2",
18+
"version": "8.0.0-prerelease.25207.2",
1919
"commands": [
2020
"xharness"
2121
]

‎.github/workflows/check-no-merge-label.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ permissions:
55

66
on:
77
pull_request_target:
8-
types: [opened, reopened, labeled, unlabeled]
8+
types: [opened, edited, reopened, labeled, unlabeled, synchronize]
99
branches:
1010
- 'main'
1111
- 'release/**'

‎.github/workflows/check-service-labels.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ permissions:
55

66
on:
77
pull_request_target:
8-
types: [opened, reopened, labeled, unlabeled]
8+
types: [opened, edited, reopened, labeled, unlabeled, synchronize]
99
branches:
1010
- 'release/**'
1111

‎eng/PackageDownloadAndReference.targets‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<Project>
2+
3+
<!-- This file supports using PackageDownloadAndReference items.
4+
5+
The PackageDownloadAndReference item is used to download a package and reference it in the project, without restoring the package's dependency closure.
6+
7+
When using PackageDownloadAndReference you are responsible for selecting the correct assets from the package and ensuring that the package and it's
8+
dependencies are available at runtime.
9+
10+
The PackageDownloadAndReference item has the following metadata:
11+
- Folder: The folder in the package where the assembly is located.
12+
- AssemblyName: The name of the assembly to reference.
13+
- Private: Whether the reference should be private (copied to the output directory) or not. Default is false.
14+
15+
A common use case for PackageDownloadAndReference is to reference assemblies provided by MSBuild or the .NET SDK.
16+
-->
17+
18+
<ItemDefinitionGroup>
19+
<PackageDownloadAndReference>
20+
<Folder>lib/$(TargetFramework)</Folder>
21+
<AssemblyName>%(Identity)</AssemblyName>
22+
<Private>false</Private>
23+
</PackageDownloadAndReference>
24+
</ItemDefinitionGroup>
25+
26+
<ItemGroup>
27+
<PackageDownload Include="@(PackageDownloadAndReference)" />
28+
<PackageDownload Update="@(PackageDownloadAndReference)" Version="[%(Version)]"/>
29+
<PackageDownloadAndReference Update="@(PackageDownloadAndReference)" PackageFolder="$([System.String]::new(%(Identity)).ToLowerInvariant())" />
30+
<Reference Include="@(PackageDownloadAndReference->'$(NuGetPackageRoot)%(PackageFolder)/%(Version)/%(Folder)/%(AssemblyName).dll')" />
31+
</ItemGroup>
32+
33+
</Project>

‎eng/Version.Details.xml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -185,57 +185,57 @@
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186186
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
187187
</Dependency>
188-
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.25113.1">
188+
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.25211.2">
189189
<Uri>https://github.com/dotnet/runtime-assets</Uri>
190-
<Sha>88293463a34f5451d8a01b77b292b059bcacc3e4</Sha>
190+
<Sha>611d6c8595694c9755c9f0cc36ae6018c4c15143</Sha>
191191
</Dependency>
192-
<Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.25113.1">
192+
<Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.25211.2">
193193
<Uri>https://github.com/dotnet/runtime-assets</Uri>
194-
<Sha>88293463a34f5451d8a01b77b292b059bcacc3e4</Sha>
194+
<Sha>611d6c8595694c9755c9f0cc36ae6018c4c15143</Sha>
195195
</Dependency>
196-
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.25113.1">
196+
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.25211.2">
197197
<Uri>https://github.com/dotnet/runtime-assets</Uri>
198-
<Sha>88293463a34f5451d8a01b77b292b059bcacc3e4</Sha>
198+
<Sha>611d6c8595694c9755c9f0cc36ae6018c4c15143</Sha>
199199
</Dependency>
200-
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.25113.1">
200+
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.25211.2">
201201
<Uri>https://github.com/dotnet/runtime-assets</Uri>
202-
<Sha>88293463a34f5451d8a01b77b292b059bcacc3e4</Sha>
202+
<Sha>611d6c8595694c9755c9f0cc36ae6018c4c15143</Sha>
203203
</Dependency>
204-
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.25113.1">
204+
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.25211.2">
205205
<Uri>https://github.com/dotnet/runtime-assets</Uri>
206-
<Sha>88293463a34f5451d8a01b77b292b059bcacc3e4</Sha>
206+
<Sha>611d6c8595694c9755c9f0cc36ae6018c4c15143</Sha>
207207
</Dependency>
208-
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.25113.1">
208+
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.25211.2">
209209
<Uri>https://github.com/dotnet/runtime-assets</Uri>
210-
<Sha>88293463a34f5451d8a01b77b292b059bcacc3e4</Sha>
210+
<Sha>611d6c8595694c9755c9f0cc36ae6018c4c15143</Sha>
211211
</Dependency>
212-
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.25113.1">
212+
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.25211.2">
213213
<Uri>https://github.com/dotnet/runtime-assets</Uri>
214-
<Sha>88293463a34f5451d8a01b77b292b059bcacc3e4</Sha>
214+
<Sha>611d6c8595694c9755c9f0cc36ae6018c4c15143</Sha>
215215
</Dependency>
216-
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.25113.1">
216+
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.25211.2">
217217
<Uri>https://github.com/dotnet/runtime-assets</Uri>
218-
<Sha>88293463a34f5451d8a01b77b292b059bcacc3e4</Sha>
218+
<Sha>611d6c8595694c9755c9f0cc36ae6018c4c15143</Sha>
219219
</Dependency>
220-
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.25113.1">
220+
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.25211.2">
221221
<Uri>https://github.com/dotnet/runtime-assets</Uri>
222-
<Sha>88293463a34f5451d8a01b77b292b059bcacc3e4</Sha>
222+
<Sha>611d6c8595694c9755c9f0cc36ae6018c4c15143</Sha>
223223
</Dependency>
224-
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.25113.1">
224+
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.25211.2">
225225
<Uri>https://github.com/dotnet/runtime-assets</Uri>
226-
<Sha>88293463a34f5451d8a01b77b292b059bcacc3e4</Sha>
226+
<Sha>611d6c8595694c9755c9f0cc36ae6018c4c15143</Sha>
227227
</Dependency>
228-
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.25113.1">
228+
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.25211.2">
229229
<Uri>https://github.com/dotnet/runtime-assets</Uri>
230-
<Sha>88293463a34f5451d8a01b77b292b059bcacc3e4</Sha>
230+
<Sha>611d6c8595694c9755c9f0cc36ae6018c4c15143</Sha>
231231
</Dependency>
232-
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.25113.1">
232+
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.25211.2">
233233
<Uri>https://github.com/dotnet/runtime-assets</Uri>
234-
<Sha>88293463a34f5451d8a01b77b292b059bcacc3e4</Sha>
234+
<Sha>611d6c8595694c9755c9f0cc36ae6018c4c15143</Sha>
235235
</Dependency>
236-
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.25113.1">
236+
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.25211.2">
237237
<Uri>https://github.com/dotnet/runtime-assets</Uri>
238-
<Sha>88293463a34f5451d8a01b77b292b059bcacc3e4</Sha>
238+
<Sha>611d6c8595694c9755c9f0cc36ae6018c4c15143</Sha>
239239
</Dependency>
240240
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.24362.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100">
241241
<Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -322,17 +322,17 @@
322322
<Uri>https://github.com/dotnet/runtime</Uri>
323323
<Sha>edbd5c769a19798b6955050baccf99e6797d3208</Sha>
324324
</Dependency>
325-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.25103.2">
325+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.25207.2">
326326
<Uri>https://github.com/dotnet/xharness</Uri>
327-
<Sha>d33548342ade8e537d891c8f0f593aa206418625</Sha>
327+
<Sha>6dbf15dc48cde2bde6f62811ba73241b067b3683</Sha>
328328
</Dependency>
329-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.25103.2">
329+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.25207.2">
330330
<Uri>https://github.com/dotnet/xharness</Uri>
331-
<Sha>d33548342ade8e537d891c8f0f593aa206418625</Sha>
331+
<Sha>6dbf15dc48cde2bde6f62811ba73241b067b3683</Sha>
332332
</Dependency>
333-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.25103.2">
333+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.25207.2">
334334
<Uri>https://github.com/dotnet/xharness</Uri>
335-
<Sha>d33548342ade8e537d891c8f0f593aa206418625</Sha>
335+
<Sha>6dbf15dc48cde2bde6f62811ba73241b067b3683</Sha>
336336
</Dependency>
337337
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.25164.5">
338338
<Uri>https://github.com/dotnet/arcade</Uri>
@@ -354,13 +354,13 @@
354354
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
355355
<Sha>67613417f5e1af250e6ddfba79f8f2885d8e90fb</Sha>
356356
</Dependency>
357-
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.25124.2">
357+
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.25214.2">
358358
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
359-
<Sha>232793be175603f21989ca3be5dbe53dc41fc96d</Sha>
359+
<Sha>2dd1cedb9d30de03b034d3856c33a2cdf5f42b6c</Sha>
360360
</Dependency>
361-
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.25113.1">
361+
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.25211.2">
362362
<Uri>https://github.com/dotnet/runtime-assets</Uri>
363-
<Sha>88293463a34f5451d8a01b77b292b059bcacc3e4</Sha>
363+
<Sha>611d6c8595694c9755c9f0cc36ae6018c4c15143</Sha>
364364
</Dependency>
365365
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.23566.2">
366366
<Uri>https://github.com/dotnet/roslyn</Uri>

‎eng/Versions.props‎

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -136,29 +136,37 @@
136136
<SystemSecurityCryptographyOpenSslVersion>5.0.0</SystemSecurityCryptographyOpenSslVersion>
137137
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
138138
<SystemSecurityPermissionsVersion>7.0.0</SystemSecurityPermissionsVersion>
139-
<!-- The JSON version that's present in minimum MSBuild / VS version that this release is supported on -->
139+
<!-- The following package versions are present in minimum MSBuild / VS version that this release is supported on -->
140+
<MicrosoftBclAsyncInterfacesToolsetVersion>7.0.0</MicrosoftBclAsyncInterfacesToolsetVersion>
141+
<SystemBuffersToolsetVersion>4.5.1</SystemBuffersToolsetVersion>
142+
<SystemCollectionsImmutableToolsetVersion>7.0.0</SystemCollectionsImmutableToolsetVersion>
143+
<SystemMemoryToolsetVersion>4.5.5</SystemMemoryToolsetVersion>
144+
<SystemReflectionMetadataLoadContextToolsetVersion>7.0.0</SystemReflectionMetadataLoadContextToolsetVersion>
145+
<SystemReflectionMetadataToolsetVersion>7.0.0</SystemReflectionMetadataToolsetVersion>
146+
<SystemTextEncodingsWebToolsetVersion>7.0.0</SystemTextEncodingsWebToolsetVersion>
140147
<SystemTextJsonToolsetVersion>7.0.3</SystemTextJsonToolsetVersion>
148+
<SystemThreadingTasksExtensionsToolsetVersion>4.5.4</SystemThreadingTasksExtensionsToolsetVersion>
141149
<SystemTextJsonVersion>8.0.0-rc.1.23406.6</SystemTextJsonVersion>
142150
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
143151
<SystemThreadingAccessControlVersion>7.0.0</SystemThreadingAccessControlVersion>
144152
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
145153
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
146154
<runtimenativeSystemIOPortsVersion>8.0.0-rc.1.23406.6</runtimenativeSystemIOPortsVersion>
147155
<!-- Runtime-Assets dependencies -->
148-
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.25113.1</SystemRuntimeNumericsTestDataVersion>
149-
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.25113.1</SystemComponentModelTypeConverterTestDataVersion>
150-
<SystemDataCommonTestDataVersion>8.0.0-beta.25113.1</SystemDataCommonTestDataVersion>
151-
<SystemDrawingCommonTestDataVersion>8.0.0-beta.25113.1</SystemDrawingCommonTestDataVersion>
152-
<SystemFormatsTarTestDataVersion>8.0.0-beta.25113.1</SystemFormatsTarTestDataVersion>
153-
<SystemIOCompressionTestDataVersion>8.0.0-beta.25113.1</SystemIOCompressionTestDataVersion>
154-
<SystemIOPackagingTestDataVersion>8.0.0-beta.25113.1</SystemIOPackagingTestDataVersion>
155-
<SystemNetTestDataVersion>8.0.0-beta.25113.1</SystemNetTestDataVersion>
156-
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.25113.1</SystemPrivateRuntimeUnicodeDataVersion>
157-
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.25113.1</SystemRuntimeTimeZoneDataVersion>
158-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.25113.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
159-
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.25113.1</SystemTextRegularExpressionsTestDataVersion>
160-
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.25113.1</SystemWindowsExtensionsTestDataVersion>
161-
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.25113.1</MicrosoftDotNetCilStripSourcesVersion>
156+
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.25211.2</SystemRuntimeNumericsTestDataVersion>
157+
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.25211.2</SystemComponentModelTypeConverterTestDataVersion>
158+
<SystemDataCommonTestDataVersion>8.0.0-beta.25211.2</SystemDataCommonTestDataVersion>
159+
<SystemDrawingCommonTestDataVersion>8.0.0-beta.25211.2</SystemDrawingCommonTestDataVersion>
160+
<SystemFormatsTarTestDataVersion>8.0.0-beta.25211.2</SystemFormatsTarTestDataVersion>
161+
<SystemIOCompressionTestDataVersion>8.0.0-beta.25211.2</SystemIOCompressionTestDataVersion>
162+
<SystemIOPackagingTestDataVersion>8.0.0-beta.25211.2</SystemIOPackagingTestDataVersion>
163+
<SystemNetTestDataVersion>8.0.0-beta.25211.2</SystemNetTestDataVersion>
164+
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.25211.2</SystemPrivateRuntimeUnicodeDataVersion>
165+
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.25211.2</SystemRuntimeTimeZoneDataVersion>
166+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.25211.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
167+
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.25211.2</SystemTextRegularExpressionsTestDataVersion>
168+
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.25211.2</SystemWindowsExtensionsTestDataVersion>
169+
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.25211.2</MicrosoftDotNetCilStripSourcesVersion>
162170
<!-- dotnet-optimization dependencies -->
163171
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx64MIBCRuntimeVersion>
164172
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -178,17 +186,19 @@
178186
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildTasksCoreVersion>
179187
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>
180188
<MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildUtilitiesCoreVersion>
189+
<NugetFrameworksVersion>6.2.4</NugetFrameworksVersion>
181190
<NugetProjectModelVersion>6.2.4</NugetProjectModelVersion>
182191
<NugetPackagingVersion>6.2.4</NugetPackagingVersion>
192+
<NugetVersioningVersion>6.2.4</NugetVersioningVersion>
183193
<DotnetSosVersion>7.0.412701</DotnetSosVersion>
184194
<DotnetSosTargetFrameworkVersion>6.0</DotnetSosTargetFrameworkVersion>
185195
<!-- Testing -->
186196
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
187197
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
188-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.25103.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
189-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.25103.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
190-
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.25103.2</MicrosoftDotNetXHarnessCLIVersion>
191-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.25124.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
198+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.25207.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
199+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.25207.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
200+
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.25207.2</MicrosoftDotNetXHarnessCLIVersion>
201+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.25214.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
192202
<XUnitVersion>2.4.2</XUnitVersion>
193203
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
194204
<XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>

‎eng/pipelines/common/xplat-setup.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
- name: _BuildConfig
4747
value: $(buildConfigUpper)
48-
48+
4949
- name: archType
5050
value: ${{ parameters.archType }}
5151

@@ -163,7 +163,7 @@ jobs:
163163
# Public Linux Build Pool
164164
${{ if and(or(in(parameters.osGroup, 'linux', 'freebsd', 'android', 'tizen'), eq(parameters.jobParameters.hostedOs, 'linux')), eq(variables['System.TeamProject'], 'public')) }}:
165165
name: $(DncEngPublicBuildPool)
166-
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
166+
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
167167

168168
# Official Build Linux Pool
169169
${{ if and(or(in(parameters.osGroup, 'linux', 'freebsd', 'android', 'tizen'), eq(parameters.jobParameters.hostedOs, 'linux')), ne(variables['System.TeamProject'], 'public')) }}:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
# Browser wasm
5454
- ${{ if eq(parameters.platform, 'browser_wasm') }}:
55-
- (Ubuntu.1804.Amd64)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-webassembly
55+
- (Ubuntu.2204.Amd64)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-webassembly
5656

5757
# iOS devices
5858
- ${{ if in(parameters.platform, 'ios_arm64') }}:
@@ -65,9 +65,9 @@ jobs:
6565
# Linux arm
6666
- ${{ if eq(parameters.platform, 'linux_arm') }}:
6767
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
68-
- (Ubuntu.1804.Arm32.Open)Ubuntu.2204.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7
68+
- (Ubuntu.2204.Arm32.Open)Ubuntu.2204.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-arm32v7
6969
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
70-
- (Ubuntu.1804.Arm32)Ubuntu.2204.Armarch@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7
70+
- (Ubuntu.2204.Arm32)Ubuntu.2204.Armarch@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-arm32v7
7171

7272
# Linux arm64
7373
- ${{ if eq(parameters.platform, 'linux_arm64') }}:

‎eng/pipelines/coreclr/templates/sign-diagnostic-files.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ steps:
1515
- task: EsrpCodeSigning@5
1616
displayName: Sign Diagnostic Binaries
1717
inputs:
18-
ConnectedServiceName: 'diagnostics-esrp-kvcertuser'
19-
AppRegistrationClientId: '2234cdec-a13f-4bb2-aa63-04c57fd7a1f9'
20-
AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
21-
AuthAKVName: 'clrdiag-esrp-id'
22-
AuthCertName: 'dotnetesrp-diagnostics-aad-ssl-cert'
23-
AuthSignCertName: 'dotnet-diagnostics-esrp-pki-onecert'
18+
ConnectedServiceName: 'diagnostics-esrp-kvcertuser-pme'
19+
AppRegistrationClientId: '22346933-af99-4e94-97d5-7fa1dcf4bba6'
20+
AppRegistrationTenantId: '975f013f-7f24-47e8-a7d3-abc4752bf346'
21+
AuthAKVName: 'clrdiag-esrp-pme'
22+
AuthCertName: 'dac-dnceng-ssl-cert'
23+
AuthSignCertName: 'dac-dnceng-esrpclient-cert'
2424
FolderPath: ${{ parameters.basePath }}
2525
Pattern: |
2626
**/mscordaccore*.dll

0 commit comments

Comments
 (0)