Skip to content

Commit 567edaf

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/7.0' changes
2 parents 2ffe97a + 342951d commit 567edaf

File tree

49 files changed

+629
-164
lines changed

Some content is hidden

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

49 files changed

+629
-164
lines changed

‎NuGet.config

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
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-ca51060" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ca510604/nuget/v3/index.json" />
1213
<add key="darc-pub-dotnet-emsdk-33b038b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-33b038b5/nuget/v3/index.json" />
1314
<add key="darc-pub-dotnet-emsdk-33b038b-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-33b038b5-2/nuget/v3/index.json" />
1415
<add key="darc-pub-dotnet-emsdk-33b038b-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-33b038b5-1/nuget/v3/index.json" />

‎docs/workflow/testing/libraries/testing-android.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ Android SDK and NDK can be automatically installed via the following script:
2323
set -e
2424

2525
NDK_VER=r23c
26-
SDK_VER=6200805_latest
27-
SDK_API_LEVEL=29
28-
SDK_BUILD_TOOLS=29.0.3
26+
SDK_VER=9123335_latest
27+
SDK_API_LEVEL=33
28+
SDK_BUILD_TOOLS=33.0.1
2929

3030
if [[ "$OSTYPE" == "darwin"* ]]; then
3131
HOST_OS=darwin
@@ -63,7 +63,7 @@ Android Studio offers a convenient UI:
6363
Before running a build you might want to set the Android SDK and NDK environment variables:
6464
```
6565
export ANDROID_SDK_ROOT=<PATH-TO-ANDROID-SDK>
66-
export ANDROID_NDK_ROOT=<PATH-TO-ANDROID-NDK>
66+
export ANDROID_NDK_ROOT=<PATH-TO-ANDROID-NDK>
6767
```
6868

6969
Now we're ready to build everything for Android:

‎eng/Version.Details.xml

+36-36
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="7.0.0-rtm.23565.2">
3+
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="7.0.0-rtm.24060.3">
44
<Uri>https://github.com/dotnet/icu</Uri>
5-
<Sha>d89651b995bbb9565a3674ddf77b187cb6f9f26d</Sha>
5+
<Sha>bdaa3a0b2a204574ef4ab63bae2c4b5c6d607849</Sha>
66
</Dependency>
77
<Dependency Name="System.Net.MsQuic.Transport" Version="7.0.0-alpha.1.22459.1">
88
<Uri>https://github.com/dotnet/msquic</Uri>
@@ -48,13 +48,13 @@
4848
<Uri>https://github.com/dotnet/command-line-api</Uri>
4949
<Sha>5618b2d243ccdeb5c7e50a298b33b13036b4351b</Sha>
5050
</Dependency>
51-
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.15">
51+
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.16">
5252
<Uri>https://github.com/dotnet/emsdk</Uri>
53-
<Sha>33b038b591f6e19c32a390333d41292cbd86d93c</Sha>
53+
<Sha>ca510604d1667f32b4fa4653e3d3b64be8136bdc</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.15">
55+
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.16">
5656
<Uri>https://github.com/dotnet/emsdk</Uri>
57-
<Sha>33b038b591f6e19c32a390333d41292cbd86d93c</Sha>
57+
<Sha>ca510604d1667f32b4fa4653e3d3b64be8136bdc</Sha>
5858
</Dependency>
5959
</ProductDependencies>
6060
<ToolsetDependencies>
@@ -130,57 +130,57 @@
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131131
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
132132
</Dependency>
133-
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.23566.2">
133+
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.24060.3">
134134
<Uri>https://github.com/dotnet/runtime-assets</Uri>
135-
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
135+
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
136136
</Dependency>
137-
<Dependency Name="System.Data.Common.TestData" Version="7.0.0-beta.23566.2">
137+
<Dependency Name="System.Data.Common.TestData" Version="7.0.0-beta.24060.3">
138138
<Uri>https://github.com/dotnet/runtime-assets</Uri>
139-
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
139+
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
140140
</Dependency>
141-
<Dependency Name="System.Drawing.Common.TestData" Version="7.0.0-beta.23566.2">
141+
<Dependency Name="System.Drawing.Common.TestData" Version="7.0.0-beta.24060.3">
142142
<Uri>https://github.com/dotnet/runtime-assets</Uri>
143-
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
143+
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
144144
</Dependency>
145-
<Dependency Name="System.Formats.Tar.TestData" Version="7.0.0-beta.23566.2">
145+
<Dependency Name="System.Formats.Tar.TestData" Version="7.0.0-beta.24060.3">
146146
<Uri>https://github.com/dotnet/runtime-assets</Uri>
147-
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
147+
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
148148
</Dependency>
149-
<Dependency Name="System.IO.Compression.TestData" Version="7.0.0-beta.23566.2">
149+
<Dependency Name="System.IO.Compression.TestData" Version="7.0.0-beta.24060.3">
150150
<Uri>https://github.com/dotnet/runtime-assets</Uri>
151-
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
151+
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
152152
</Dependency>
153-
<Dependency Name="System.IO.Packaging.TestData" Version="7.0.0-beta.23566.2">
153+
<Dependency Name="System.IO.Packaging.TestData" Version="7.0.0-beta.24060.3">
154154
<Uri>https://github.com/dotnet/runtime-assets</Uri>
155-
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
155+
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
156156
</Dependency>
157-
<Dependency Name="System.Net.TestData" Version="7.0.0-beta.23566.2">
157+
<Dependency Name="System.Net.TestData" Version="7.0.0-beta.24060.3">
158158
<Uri>https://github.com/dotnet/runtime-assets</Uri>
159-
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
159+
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
160160
</Dependency>
161-
<Dependency Name="System.Private.Runtime.UnicodeData" Version="7.0.0-beta.23566.2">
161+
<Dependency Name="System.Private.Runtime.UnicodeData" Version="7.0.0-beta.24060.3">
162162
<Uri>https://github.com/dotnet/runtime-assets</Uri>
163-
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
163+
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
164164
</Dependency>
165-
<Dependency Name="System.Runtime.TimeZoneData" Version="7.0.0-beta.23566.2">
165+
<Dependency Name="System.Runtime.TimeZoneData" Version="7.0.0-beta.24060.3">
166166
<Uri>https://github.com/dotnet/runtime-assets</Uri>
167-
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
167+
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
168168
</Dependency>
169-
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="7.0.0-beta.23566.2">
169+
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="7.0.0-beta.24060.3">
170170
<Uri>https://github.com/dotnet/runtime-assets</Uri>
171-
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
171+
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
172172
</Dependency>
173-
<Dependency Name="System.Text.RegularExpressions.TestData" Version="7.0.0-beta.23566.2">
173+
<Dependency Name="System.Text.RegularExpressions.TestData" Version="7.0.0-beta.24060.3">
174174
<Uri>https://github.com/dotnet/runtime-assets</Uri>
175-
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
175+
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
176176
</Dependency>
177-
<Dependency Name="System.Windows.Extensions.TestData" Version="7.0.0-beta.23566.2">
177+
<Dependency Name="System.Windows.Extensions.TestData" Version="7.0.0-beta.24060.3">
178178
<Uri>https://github.com/dotnet/runtime-assets</Uri>
179-
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
179+
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
180180
</Dependency>
181-
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="7.0.0-beta.23566.2">
181+
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="7.0.0-beta.24060.3">
182182
<Uri>https://github.com/dotnet/runtime-assets</Uri>
183-
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
183+
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
184184
</Dependency>
185185
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.23115.1">
186186
<Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -278,13 +278,13 @@
278278
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
279279
<Sha>5e0b0da43f660de5798186f4fd3bc900fc90576c</Sha>
280280
</Dependency>
281-
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="7.0.0-alpha.0.23566.1">
281+
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="7.0.0-alpha.0.24060.2">
282282
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
283-
<Sha>6d7ba7d63a9c246a6477bda4d19c3315fd91868f</Sha>
283+
<Sha>74472cc407fe757b9479fd78cdb64d7d6e67935f</Sha>
284284
</Dependency>
285-
<Dependency Name="System.Runtime.Numerics.TestData" Version="7.0.0-beta.23566.2">
285+
<Dependency Name="System.Runtime.Numerics.TestData" Version="7.0.0-beta.24060.3">
286286
<Uri>https://github.com/dotnet/runtime-assets</Uri>
287-
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
287+
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
288288
</Dependency>
289289
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22559.1">
290290
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>

‎eng/Versions.props

+18-18
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
<UsingToolIbcOptimization>false</UsingToolIbcOptimization>
2323
<UsingToolXliff>false</UsingToolXliff>
2424
<LastReleasedStableAssemblyVersion>$(AssemblyVersion)</LastReleasedStableAssemblyVersion>
25-
<MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.15</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
26-
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.15</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
25+
<MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.16</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
26+
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.16</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
2727
</PropertyGroup>
2828
<ItemGroup>
2929
<!-- The bands we want to produce workload manifests for -->
@@ -118,20 +118,20 @@
118118
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
119119
<runtimenativeSystemIOPortsVersion>7.0.0-rc.1.22414.6</runtimenativeSystemIOPortsVersion>
120120
<!-- Runtime-Assets dependencies -->
121-
<SystemRuntimeNumericsTestDataVersion>7.0.0-beta.23566.2</SystemRuntimeNumericsTestDataVersion>
122-
<SystemComponentModelTypeConverterTestDataVersion>7.0.0-beta.23566.2</SystemComponentModelTypeConverterTestDataVersion>
123-
<SystemDataCommonTestDataVersion>7.0.0-beta.23566.2</SystemDataCommonTestDataVersion>
124-
<SystemDrawingCommonTestDataVersion>7.0.0-beta.23566.2</SystemDrawingCommonTestDataVersion>
125-
<SystemFormatsTarTestDataVersion>7.0.0-beta.23566.2</SystemFormatsTarTestDataVersion>
126-
<SystemIOCompressionTestDataVersion>7.0.0-beta.23566.2</SystemIOCompressionTestDataVersion>
127-
<SystemIOPackagingTestDataVersion>7.0.0-beta.23566.2</SystemIOPackagingTestDataVersion>
128-
<SystemNetTestDataVersion>7.0.0-beta.23566.2</SystemNetTestDataVersion>
129-
<SystemPrivateRuntimeUnicodeDataVersion>7.0.0-beta.23566.2</SystemPrivateRuntimeUnicodeDataVersion>
130-
<SystemRuntimeTimeZoneDataVersion>7.0.0-beta.23566.2</SystemRuntimeTimeZoneDataVersion>
131-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>7.0.0-beta.23566.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
132-
<SystemTextRegularExpressionsTestDataVersion>7.0.0-beta.23566.2</SystemTextRegularExpressionsTestDataVersion>
133-
<SystemWindowsExtensionsTestDataVersion>7.0.0-beta.23566.2</SystemWindowsExtensionsTestDataVersion>
134-
<MicrosoftDotNetCilStripSourcesVersion>7.0.0-beta.23566.2</MicrosoftDotNetCilStripSourcesVersion>
121+
<SystemRuntimeNumericsTestDataVersion>7.0.0-beta.24060.3</SystemRuntimeNumericsTestDataVersion>
122+
<SystemComponentModelTypeConverterTestDataVersion>7.0.0-beta.24060.3</SystemComponentModelTypeConverterTestDataVersion>
123+
<SystemDataCommonTestDataVersion>7.0.0-beta.24060.3</SystemDataCommonTestDataVersion>
124+
<SystemDrawingCommonTestDataVersion>7.0.0-beta.24060.3</SystemDrawingCommonTestDataVersion>
125+
<SystemFormatsTarTestDataVersion>7.0.0-beta.24060.3</SystemFormatsTarTestDataVersion>
126+
<SystemIOCompressionTestDataVersion>7.0.0-beta.24060.3</SystemIOCompressionTestDataVersion>
127+
<SystemIOPackagingTestDataVersion>7.0.0-beta.24060.3</SystemIOPackagingTestDataVersion>
128+
<SystemNetTestDataVersion>7.0.0-beta.24060.3</SystemNetTestDataVersion>
129+
<SystemPrivateRuntimeUnicodeDataVersion>7.0.0-beta.24060.3</SystemPrivateRuntimeUnicodeDataVersion>
130+
<SystemRuntimeTimeZoneDataVersion>7.0.0-beta.24060.3</SystemRuntimeTimeZoneDataVersion>
131+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>7.0.0-beta.24060.3</SystemSecurityCryptographyX509CertificatesTestDataVersion>
132+
<SystemTextRegularExpressionsTestDataVersion>7.0.0-beta.24060.3</SystemTextRegularExpressionsTestDataVersion>
133+
<SystemWindowsExtensionsTestDataVersion>7.0.0-beta.24060.3</SystemWindowsExtensionsTestDataVersion>
134+
<MicrosoftDotNetCilStripSourcesVersion>7.0.0-beta.24060.3</MicrosoftDotNetCilStripSourcesVersion>
135135
<!-- dotnet-optimization dependencies -->
136136
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationwindows_ntx64MIBCRuntimeVersion>
137137
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -157,7 +157,7 @@
157157
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>7.0.0-prerelease.24054.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
158158
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>7.0.0-prerelease.24054.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
159159
<MicrosoftDotNetXHarnessCLIVersion>7.0.0-prerelease.24054.3</MicrosoftDotNetXHarnessCLIVersion>
160-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>7.0.0-alpha.0.23566.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
160+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>7.0.0-alpha.0.24060.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
161161
<XUnitVersion>2.4.2</XUnitVersion>
162162
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
163163
<XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>
@@ -177,7 +177,7 @@
177177
<MicrosoftNETILLinkTasksVersion>7.0.100-1.23401.1</MicrosoftNETILLinkTasksVersion>
178178
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
179179
<!-- ICU -->
180-
<MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-rtm.23565.2</MicrosoftNETCoreRuntimeICUTransportVersion>
180+
<MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-rtm.24060.3</MicrosoftNETCoreRuntimeICUTransportVersion>
181181
<!-- MsQuic -->
182182
<MicrosoftNativeQuicMsQuicVersion>2.2.3</MicrosoftNativeQuicMsQuicVersion>
183183
<SystemNetMsQuicTransportVersion>7.0.0-alpha.1.22459.1</SystemNetMsQuicTransportVersion>

‎eng/native/ijw/IJW.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ if (CLR_CMAKE_HOST_WIN32)
4646

4747
# 4365 - signed/unsigned mismatch
4848
# 4679 - Could not import member. This is an issue with IJW and static abstract methods in interfaces.
49-
add_compile_options(/wd4365 /wd4679)
49+
add_compile_options(/wd4365 /wd4679 /wd5271)
5050

5151
# IJW
5252
add_compile_options(/clr:netcore)

‎eng/pipelines/common/platform-matrix.yml

+23
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,29 @@ jobs:
580580
helixQueueGroup: ${{ parameters.helixQueueGroup }}
581581
${{ insert }}: ${{ parameters.jobParameters }}
582582

583+
- ${{ if containsValue(parameters.platforms, 'Android_arm64_perf_specific') }}:
584+
- template: xplat-setup.yml
585+
parameters:
586+
jobTemplate: ${{ parameters.jobTemplate }}
587+
helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
588+
variables: ${{ parameters.variables }}
589+
osGroup: Android
590+
archType: arm64
591+
targetRid: android-arm64
592+
platform: Android_arm64
593+
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
594+
container:
595+
image: cbl-mariner-2.0-cross-android-amd64
596+
registry: mcr
597+
jobParameters:
598+
runtimeFlavor: mono
599+
stagedBuild: ${{ parameters.stagedBuild }}
600+
buildConfig: ${{ parameters.buildConfig }}
601+
${{ if eq(parameters.passPlatforms, true) }}:
602+
platforms: ${{ parameters.platforms }}
603+
helixQueueGroup: ${{ parameters.helixQueueGroup }}
604+
${{ insert }}: ${{ parameters.jobParameters }}
605+
583606
# Mac Catalyst x64
584607

585608
- ${{ if containsValue(parameters.platforms, 'MacCatalyst_x64') }}:

‎eng/pipelines/common/restore-internal-tools.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
steps:
2-
- task: NuGetAuthenticate@0
2+
- task: NuGetAuthenticate@1
33
inputs:
44
nuGetServiceConnections: 'devdiv/dotnet-core-internal-tooling'
55
forceReinstallCredentialProvider: true

‎eng/pipelines/coreclr/ci.yml

-10
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,3 @@ jobs:
153153
crossgen2: true
154154
displayNameArgs: R2R_CG2
155155
liveLibrariesBuildConfig: Release
156-
157-
#
158-
# Formatting
159-
#
160-
- template: /eng/pipelines/common/platform-matrix.yml
161-
parameters:
162-
jobTemplate: /eng/pipelines/coreclr/templates/format-job.yml
163-
platforms:
164-
- Linux_x64
165-
- windows_x64

‎eng/pipelines/coreclr/perf-non-wasm-jobs.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
buildConfig: release
6666
runtimeFlavor: mono
6767
platforms:
68-
- Android_arm64
68+
- Android_arm64_perf_specific
6969
jobParameters:
7070
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
7171
nameSuffix: AndroidMono
@@ -314,4 +314,4 @@ jobs:
314314
projectFile: crossgen_perf.proj
315315
runKind: crossgen_scenarios
316316
runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
317-
logicalmachine: 'perftiger_crossgen'
317+
logicalmachine: 'perftiger_crossgen'

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
# Android arm64
3333
- ${{ if in(parameters.platform, 'Android_arm64') }}:
34-
- Windows.10.Amd64.Android.Open
34+
- Windows.11.Amd64.Android.Open
3535

3636
# Android x64
3737
- ${{ if in(parameters.platform, 'Android_x64') }}:

‎eng/pipelines/installer/jobs/base-job.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ jobs:
345345
displayName: Clean up old artifacts owned by root
346346
347347
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
348-
- task: NuGetAuthenticate@0
348+
- task: NuGetAuthenticate@1
349349

350350
- ${{ if eq(parameters.osGroup, 'windows') }}:
351351
# NuGet's http cache lasts 30 minutes. If we're on a static machine, this may interfere with

‎eng/pipelines/libraries/helix-queues-setup.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
- ${{ if in(parameters.platform, 'Android_x86', 'Android_x64', 'Linux_bionic_x64') }}:
103103
- Ubuntu.1804.Amd64.Android.29.Open
104104
- ${{ if in(parameters.platform, 'Android_arm', 'Android_arm64', 'Linux_bionic_arm64') }}:
105-
- Windows.10.Amd64.Android.Open
105+
- Windows.11.Amd64.Android.Open
106106

107107
# iOS Simulator/Mac Catalyst arm64
108108
- ${{ if in(parameters.platform, 'MacCatalyst_arm64', 'iOSSimulator_arm64') }}:

‎eng/pipelines/official/jobs/prepare-signed-artifacts.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
fetchDepth: 20
2727

2828
- ${{ if eq(parameters.isOfficialBuild, true) }}:
29-
- task: NuGetAuthenticate@0
29+
- task: NuGetAuthenticate@1
3030

3131
- task: MicroBuildSigningPlugin@2
3232
displayName: Install MicroBuild plugin for Signing

‎eng/testing/performance/performance-setup.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ if ($Internal) {
5050
"perftiger_crossgen" { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" }
5151
"perfowl" { $Queue = "Windows.10.Amd64.20H2.Owl.Perf" }
5252
"perfsurf" { $Queue = "Windows.10.Arm64.Perf.Surf" }
53-
"perfpixel4a" { $Queue = "Windows.10.Amd64.Pixel.Perf" }
53+
"perfpixel4a" { $Queue = "Windows.11.Amd64.Pixel.Perf" }
5454
"perfampere" { $Queue = "Windows.Server.Arm64.Perf" }
5555
Default { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" }
5656
}

‎eng/testing/performance/performance-setup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ if [[ "$internal" == true ]]; then
245245
extra_benchmark_dotnet_arguments=
246246

247247
if [[ "$logical_machine" == "perfiphone12mini" ]]; then
248-
queue=OSX.1015.Amd64.Iphone.Perf
248+
queue=OSX.13.Amd64.Iphone.Perf
249249
elif [[ "$logical_machine" == "perfampere" ]]; then
250250
queue=Ubuntu.2004.Arm64.Perf
251251
elif [[ "$architecture" == "arm64" ]]; then

0 commit comments

Comments
 (0)