Skip to content

Commit e36e4d1

Browse files
author
Mirroring
committed
Merge commit '34e64ad57037093849bbb60a79666b2a3f3746c2'
2 parents ea67322 + 34e64ad commit e36e4d1

File tree

83 files changed

+1822
-618
lines changed

Some content is hidden

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

83 files changed

+1822
-618
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": "9.0.0-prerelease.25113.3",
18+
"version": "9.0.0-prerelease.25209.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
- 'release/**'
1111

.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

NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<add key="darc-pub-dotnet-emsdk-78f6f07" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-78f6f07d/nuget/v3/index.json" />
1313
<!-- End: Package sources from dotnet-emsdk -->
1414
<!-- Begin: Package sources from dotnet-sdk -->
15+
<add key="darc-pub-dotnet-sdk-fe6d1ce" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-sdk-fe6d1ced/nuget/v3/index.json" />
1516
<!-- End: Package sources from dotnet-sdk -->
1617
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1718
<!--

eng/Version.Details.xml

Lines changed: 94 additions & 94 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@
3636
</ItemGroup>
3737
<PropertyGroup>
3838
<!-- dotnet/roslyn-analyzers dependencies -->
39-
<MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.25123.3</MicrosoftCodeAnalysisAnalyzersVersion>
40-
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25123.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
39+
<MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.25173.3</MicrosoftCodeAnalysisAnalyzersVersion>
40+
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25173.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
4141
<!-- dotnet/roslyn dependencies -->
4242
<!--
4343
These versions should not be used by any project that contributes to the design-time experience in VS, such as an analyzer, code-fix, or generator assembly.
4444
Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
4545
they do not break the local dev experience.
4646
-->
47-
<MicrosoftCodeAnalysisCSharpVersion>4.12.0-3.25124.2</MicrosoftCodeAnalysisCSharpVersion>
48-
<MicrosoftCodeAnalysisVersion>4.12.0-3.25124.2</MicrosoftCodeAnalysisVersion>
49-
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.25124.2</MicrosoftNetCompilersToolsetVersion>
47+
<MicrosoftCodeAnalysisCSharpVersion>4.12.0-3.25173.5</MicrosoftCodeAnalysisCSharpVersion>
48+
<MicrosoftCodeAnalysisVersion>4.12.0-3.25173.5</MicrosoftCodeAnalysisVersion>
49+
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.25173.5</MicrosoftNetCompilersToolsetVersion>
5050
</PropertyGroup>
5151
<!--
5252
For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.
@@ -83,24 +83,24 @@
8383
<PropertyGroup>
8484
<StaticCsVersion>0.2.0</StaticCsVersion>
8585
<!-- SDK dependencies (also used in wasm build tests -->
86-
<MicrosoftDotNetApiCompatTaskVersion>9.0.104</MicrosoftDotNetApiCompatTaskVersion>
86+
<MicrosoftDotNetApiCompatTaskVersion>9.0.106</MicrosoftDotNetApiCompatTaskVersion>
8787
<!-- Arcade dependencies -->
88-
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksFeedVersion>
89-
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25161.4</MicrosoftDotNetCodeAnalysisVersion>
90-
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.25161.4</MicrosoftDotNetGenAPIVersion>
91-
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.25161.4</MicrosoftDotNetGenFacadesVersion>
92-
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.25161.4</MicrosoftDotNetXUnitAssertVersion>
93-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25161.4</MicrosoftDotNetXUnitExtensionsVersion>
94-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.25161.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
95-
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksArchivesVersion>
96-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksInstallersVersion>
97-
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksPackagingVersion>
98-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksTemplatingVersion>
100-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25161.4</MicrosoftDotNetRemoteExecutorVersion>
102-
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.25161.4</MicrosoftDotNetVersionToolsTasksVersion>
103-
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.25161.4</MicrosoftDotNetPackageTestingVersion>
88+
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.25208.6</MicrosoftDotNetBuildTasksFeedVersion>
89+
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25208.6</MicrosoftDotNetCodeAnalysisVersion>
90+
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.25208.6</MicrosoftDotNetGenAPIVersion>
91+
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.25208.6</MicrosoftDotNetGenFacadesVersion>
92+
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.25208.6</MicrosoftDotNetXUnitAssertVersion>
93+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25208.6</MicrosoftDotNetXUnitExtensionsVersion>
94+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.25208.6</MicrosoftDotNetXUnitConsoleRunnerVersion>
95+
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25208.6</MicrosoftDotNetBuildTasksArchivesVersion>
96+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25208.6</MicrosoftDotNetBuildTasksInstallersVersion>
97+
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.25208.6</MicrosoftDotNetBuildTasksPackagingVersion>
98+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.25208.6</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25208.6</MicrosoftDotNetBuildTasksTemplatingVersion>
100+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25208.6</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25208.6</MicrosoftDotNetRemoteExecutorVersion>
102+
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.25208.6</MicrosoftDotNetVersionToolsTasksVersion>
103+
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.25208.6</MicrosoftDotNetPackageTestingVersion>
104104
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
105105
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
106106
<!-- NuGet dependencies -->
@@ -141,20 +141,20 @@
141141
<SystemReflectionMetadataToolsetVersion>8.0.0</SystemReflectionMetadataToolsetVersion>
142142
<SystemReflectionMetadataLoadContextToolsetVersion>8.0.0</SystemReflectionMetadataLoadContextToolsetVersion>
143143
<!-- Runtime-Assets dependencies -->
144-
<SystemRuntimeNumericsTestDataVersion>9.0.0-beta.25113.2</SystemRuntimeNumericsTestDataVersion>
145-
<SystemComponentModelTypeConverterTestDataVersion>9.0.0-beta.25113.2</SystemComponentModelTypeConverterTestDataVersion>
146-
<SystemDataCommonTestDataVersion>9.0.0-beta.25113.2</SystemDataCommonTestDataVersion>
147-
<SystemDrawingCommonTestDataVersion>9.0.0-beta.25113.2</SystemDrawingCommonTestDataVersion>
148-
<SystemFormatsTarTestDataVersion>9.0.0-beta.25113.2</SystemFormatsTarTestDataVersion>
149-
<SystemIOCompressionTestDataVersion>9.0.0-beta.25113.2</SystemIOCompressionTestDataVersion>
150-
<SystemIOPackagingTestDataVersion>9.0.0-beta.25113.2</SystemIOPackagingTestDataVersion>
151-
<SystemNetTestDataVersion>9.0.0-beta.25113.2</SystemNetTestDataVersion>
152-
<SystemPrivateRuntimeUnicodeDataVersion>9.0.0-beta.25113.2</SystemPrivateRuntimeUnicodeDataVersion>
153-
<SystemRuntimeTimeZoneDataVersion>9.0.0-beta.25113.2</SystemRuntimeTimeZoneDataVersion>
154-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>9.0.0-beta.25113.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
155-
<SystemTextRegularExpressionsTestDataVersion>9.0.0-beta.25113.2</SystemTextRegularExpressionsTestDataVersion>
156-
<SystemWindowsExtensionsTestDataVersion>9.0.0-beta.25113.2</SystemWindowsExtensionsTestDataVersion>
157-
<MicrosoftDotNetCilStripSourcesVersion>9.0.0-beta.25113.2</MicrosoftDotNetCilStripSourcesVersion>
144+
<SystemRuntimeNumericsTestDataVersion>9.0.0-beta.25211.3</SystemRuntimeNumericsTestDataVersion>
145+
<SystemComponentModelTypeConverterTestDataVersion>9.0.0-beta.25211.3</SystemComponentModelTypeConverterTestDataVersion>
146+
<SystemDataCommonTestDataVersion>9.0.0-beta.25211.3</SystemDataCommonTestDataVersion>
147+
<SystemDrawingCommonTestDataVersion>9.0.0-beta.25211.3</SystemDrawingCommonTestDataVersion>
148+
<SystemFormatsTarTestDataVersion>9.0.0-beta.25211.3</SystemFormatsTarTestDataVersion>
149+
<SystemIOCompressionTestDataVersion>9.0.0-beta.25211.3</SystemIOCompressionTestDataVersion>
150+
<SystemIOPackagingTestDataVersion>9.0.0-beta.25211.3</SystemIOPackagingTestDataVersion>
151+
<SystemNetTestDataVersion>9.0.0-beta.25211.3</SystemNetTestDataVersion>
152+
<SystemPrivateRuntimeUnicodeDataVersion>9.0.0-beta.25211.3</SystemPrivateRuntimeUnicodeDataVersion>
153+
<SystemRuntimeTimeZoneDataVersion>9.0.0-beta.25211.3</SystemRuntimeTimeZoneDataVersion>
154+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>9.0.0-beta.25211.3</SystemSecurityCryptographyX509CertificatesTestDataVersion>
155+
<SystemTextRegularExpressionsTestDataVersion>9.0.0-beta.25211.3</SystemTextRegularExpressionsTestDataVersion>
156+
<SystemWindowsExtensionsTestDataVersion>9.0.0-beta.25211.3</SystemWindowsExtensionsTestDataVersion>
157+
<MicrosoftDotNetCilStripSourcesVersion>9.0.0-beta.25211.3</MicrosoftDotNetCilStripSourcesVersion>
158158
<!-- dotnet-optimization dependencies -->
159159
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.24462.2</optimizationwindows_ntx64MIBCRuntimeVersion>
160160
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.24462.2</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -184,10 +184,10 @@
184184
<!-- Testing -->
185185
<MicrosoftNETCoreCoreDisToolsVersion>1.4.0</MicrosoftNETCoreCoreDisToolsVersion>
186186
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
187-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.25113.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
188-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.25113.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
189-
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.25113.3</MicrosoftDotNetXHarnessCLIVersion>
190-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.25153.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
187+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.25209.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
188+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.25209.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
189+
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.25209.2</MicrosoftDotNetXHarnessCLIVersion>
190+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.25209.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
191191
<NUnitVersion>3.12.0</NUnitVersion>
192192
<NUnit3TestAdapterVersion>4.5.0</NUnit3TestAdapterVersion>
193193
<CoverletCollectorVersion>6.0.0</CoverletCollectorVersion>
@@ -215,11 +215,11 @@
215215
<!-- Docs -->
216216
<MicrosoftPrivateIntellisenseVersion>9.0.0-preview-20241010.1</MicrosoftPrivateIntellisenseVersion>
217217
<!-- Mono Cecil -->
218-
<MicrosoftDotNetCecilVersion>0.11.5-alpha.25112.2</MicrosoftDotNetCecilVersion>
218+
<MicrosoftDotNetCecilVersion>0.11.5-alpha.25213.4</MicrosoftDotNetCecilVersion>
219219
<!-- ILCompiler -->
220220
<MicrosoftDotNetILCompilerVersion>9.0.0-rtm.24511.16</MicrosoftDotNetILCompilerVersion>
221221
<!-- ICU -->
222-
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.25157.1</MicrosoftNETCoreRuntimeICUTransportVersion>
222+
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.25212.1</MicrosoftNETCoreRuntimeICUTransportVersion>
223223
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.24466.4</MicrosoftNETCoreRuntimeICUTransportVersion>
224224
<!-- MsQuic -->
225225
<MicrosoftNativeQuicMsQuicSchannelVersion>2.4.8</MicrosoftNativeQuicMsQuicSchannelVersion>
@@ -262,8 +262,8 @@
262262
<MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
263263
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
264264
<!-- sdk version, for testing workloads -->
265-
<SdkVersionForWorkloadTesting>$(MicrosoftDotNetApiCompatTaskVersion)</SdkVersionForWorkloadTesting>
266-
<!--<SdkVersionForWorkloadTesting>9.0.102</SdkVersionForWorkloadTesting>-->
265+
<!--<SdkVersionForWorkloadTesting>$(MicrosoftDotNetApiCompatTaskVersion)</SdkVersionForWorkloadTesting>-->
266+
<SdkVersionForWorkloadTesting>9.0.105</SdkVersionForWorkloadTesting>
267267
<runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>9.0.0-alpha.1.24175.1</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
268268
<EmsdkPackageVersion>$(MicrosoftNETRuntimeEmscriptenVersion)</EmsdkPackageVersion>
269269
<NodePackageVersion>$(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion)</NodePackageVersion>

eng/common/tools.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
[bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true }
4343

4444
# Enable repos to use a particular version of the on-line dotnet-install scripts.
45-
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1
45+
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1
4646
[string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' }
4747

4848
# True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -262,7 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
262262
if (!(Test-Path $installScript)) {
263263
Create-Directory $dotnetRoot
264264
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
265-
$uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
265+
$uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
266266

267267
Retry({
268268
Write-Host "GET $uri"

eng/common/tools.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true}
5454
use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
5555

5656
# Enable repos to use a particular version of the on-line dotnet-install scripts.
57-
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh
57+
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh
5858
dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}
5959

6060
# True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -295,7 +295,7 @@ function with_retries {
295295
function GetDotNetInstallScript {
296296
local root=$1
297297
local install_script="$root/dotnet-install.sh"
298-
local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
298+
local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
299299

300300
if [[ ! -a "$install_script" ]]; then
301301
mkdir -p "$root"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ jobs:
3434

3535
# iOS Simulator/Mac Catalyst arm64
3636
- ${{ if in(parameters.platform, 'maccatalyst_arm64', 'iossimulator_arm64') }}:
37-
- OSX.1200.Arm64.Open
37+
- OSX.14.Arm64.Open
3838

3939
# iOS/tvOS Simulator x64 & MacCatalyst x64
4040
- ${{ if in(parameters.platform, 'iossimulator_x64', 'tvossimulator_x64', 'maccatalyst_x64') }}:
41-
- OSX.1200.Amd64.Open
41+
- OSX.15.Amd64.Open
4242

4343
# Android arm64
4444
- ${{ if in(parameters.platform, 'android_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

eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,9 @@ jobs:
3737
isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
3838
# Don't trim tests on rolling builds
3939
${{ if eq(variables['isRollingBuild'], true) }}:
40-
buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg) /p:BuildTestsOnHelix=true /p:EnableAdditionalTimezoneChecks=true /p:UsePortableRuntimePack=true /p:BuildDarwinFrameworks=true /p:IsManualOrRollingBuild=true /p:EnableAggressiveTrimming=false
40+
buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg) /p:BuildTestsOnHelix=true /p:EnableAdditionalTimezoneChecks=true /p:UsePortableRuntimePack=false /p:BuildDarwinFrameworks=true /p:IsManualOrRollingBuild=true /p:EnableAggressiveTrimming=false
4141
${{ else }}:
42-
# Tracking issue: https://github.com/dotnet/runtime/issues/82637
43-
buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg) /p:BuildTestsOnHelix=true /p:EnableAdditionalTimezoneChecks=true /p:UsePortableRuntimePack=true /p:BuildDarwinFrameworks=true /p:IsManualOrRollingBuild=true /p:EnableAggressiveTrimming=false
42+
buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg) /p:BuildTestsOnHelix=true /p:EnableAdditionalTimezoneChecks=true /p:UsePortableRuntimePack=false /p:BuildDarwinFrameworks=true /p:IsManualOrRollingBuild=true /p:EnableAggressiveTrimming=true
4443
timeoutInMinutes: 480
4544
# extra steps, run tests
4645
postBuildSteps:

eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ jobs:
2525
platforms:
2626
- iossimulator_x64
2727
- tvossimulator_x64
28-
# don't run tests on arm64 PRs until we can get significantly more devices
29-
- ${{ if eq(variables['isRollingBuild'], true) }}:
30-
- iossimulator_arm64
28+
- iossimulator_arm64
3129
variables:
3230
# map dependencies variables to local variables
3331
- name: librariesContainsChange
@@ -61,9 +59,7 @@ jobs:
6159
platforms:
6260
- iossimulator_x64
6361
- tvossimulator_x64
64-
# don't run tests on arm64 PRs until we can get significantly more devices
65-
- ${{ if eq(variables['isRollingBuild'], true) }}:
66-
- iossimulator_arm64
62+
- iossimulator_arm64
6763
variables:
6864
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
6965
- name: _HelixSource
@@ -109,9 +105,7 @@ jobs:
109105
platforms:
110106
- iossimulator_x64
111107
- tvossimulator_x64
112-
# don't run tests on arm64 PRs until we can get significantly more devices
113-
- ${{ if eq(variables['isRollingBuild'], true) }}:
114-
- iossimulator_arm64
108+
- iossimulator_arm64
115109
variables:
116110
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
117111
- name: _HelixSource

0 commit comments

Comments
 (0)