Skip to content

Commit d4a4e25

Browse files
committed
Merge upstream/release/11.0-rc2 into feature/openharmony (rc2 migration)
Conflict resolution follows docs/plans/2026-09-28-rc2-conflict-sharding-plan.md and the four shard decision tables (67 files): - take-rc2 (42): version/Darc pins, CI pipeline config, the Bcl.Cryptography and DecimalIeee754 backports, and the System.Text.Json classifier fixes. - take-ours (21): files where the mainline version already carries the rc2 backport byte-identically or as a strict superset. - merge (4): gentree.cpp takes theirs' gtExtractSideEffectsFromUnusedNode variant (byte-verified replay of the three mainline fixes); Microsoft.NETCore.App.Crossgen2.props is the union; Regression_ro_2.csproj is ours plus the Runtime_133550 entry; System.Security.Cryptography.csproj is theirs plus the ours-only Interop.BCrypt.Types.cs entry (Windows build). - Cross-file fix: ReadyToRunTypeMapManager.cs stays at ours. Git merges rc2's blob silently (base..ours empty for the file), but rc2's manager calls the 5-arg node constructor and reads the ExternalTypeMapEntry shape that the ours-side ReadyToRun node implementations do not provide (CS1729/CS1061). Shadow branch: verified by a paired dispatch (runtime_ref=aspnetcore_ref= fix/ohos-rc2, upload_release=false) before it can replace feature/openharmony; the pin group (anchors, workload bundle, device reinstall) follows the landing checklist in the plan.
2 parents 856b804 + 474ed96 commit d4a4e25

300 files changed

Lines changed: 24135 additions & 1493 deletions

File tree

Some content is hidden

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

‎.config/dotnet-tools.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "11.0.0-prerelease.26413.1",
18+
"version": "11.0.0-prerelease.26466.1",
1919
"commands": [
2020
"xharness"
2121
]
@@ -27,7 +27,7 @@
2727
]
2828
},
2929
"microsoft.dotnet.helix.jobmonitor": {
30-
"version": "11.0.0-beta.26431.109",
30+
"version": "11.0.0-beta.26465.108",
3131
"commands": [
3232
"dotnet-helix-job-monitor"
3333
]

‎docs/project/list-of-diagnostics.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,3 +333,4 @@ Diagnostic id values for experimental APIs must not be recycled, as that could s
333333
| __`SYSLIB5006`__ | .NET 10 | TBD | Types for Post-Quantum Cryptography (PQC) are experimental. |
334334
| __`SYSLIB5007`__ | .NET 11 | TBD | Low-level TLS engine types (`TlsContext`, `TlsSession`) in `System.Net.Security` are experimental. |
335335
| __`SYSLIB5008`__ | .NET 11 | TBD | `SocketsHttpHandler` connection eviction control and `HttpRequestMessage.ConnectionId` APIs are experimental. |
336+
| __`SYSLIB5009`__ | .NET 11 | TBD | Types for HPKE (Hybrid Public Key Encryption) are experimental. |

‎eng/Version.Details.props‎

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

‎eng/Version.Details.xml‎

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

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PackageVersionNet7>7.0.20</PackageVersionNet7>
1616
<PackageVersionNet6>6.0.36</PackageVersionNet6>
1717
<PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
18-
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
18+
<PreReleaseVersionIteration>2</PreReleaseVersionIteration>
1919
<!-- Enable to remove prerelease label. -->
2020
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
2121
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
@@ -126,7 +126,7 @@
126126
<SystemThreadingTasksExtensionsToolsetVersion>4.5.4</SystemThreadingTasksExtensionsToolsetVersion>
127127
<!-- Not auto-updated. -->
128128
<MicrosoftDiaSymReaderVersion>2.0.0</MicrosoftDiaSymReaderVersion>
129-
<MicrosoftDiaSymReaderNativeVersion>17.10.0-beta1.24272.1</MicrosoftDiaSymReaderNativeVersion>
129+
<MicrosoftDiaSymReaderNativeVersion>18.9.0-beta1.26405.2</MicrosoftDiaSymReaderNativeVersion>
130130
<TraceEventVersion>3.1.28</TraceEventVersion>
131131
<MicrosoftDiagnosticsNetCoreClientVersion>0.2.741601</MicrosoftDiagnosticsNetCoreClientVersion>
132132
<NETStandardLibraryRefVersion>2.1.0</NETStandardLibraryRefVersion>

‎eng/common/core-templates/job/helix-job-monitor.yml‎

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,23 @@ parameters:
5252
type: string
5353
default: https://helix.dot.net/
5454

55-
# Helix API access token forwarded to the tool via the HELIX_ACCESSTOKEN environment variable.
55+
# Helix API access token forwarded via HELIX_ACCESSTOKEN. Not forwarded when
56+
# useEntraAuthentication is true.
5657
- name: helixAccessToken
5758
type: string
5859
default: ''
5960

61+
# Use a refreshable Entra credential instead of a PAT or anonymous access.
62+
- name: useEntraAuthentication
63+
type: boolean
64+
default: false
65+
66+
# Azure service connection ID authorized for Helix. Required when
67+
# useEntraAuthentication is true.
68+
- name: azureSubscription
69+
type: string
70+
default: ''
71+
6072
# Polling interval in seconds (--polling-interval-seconds).
6173
- name: pollingIntervalSeconds
6274
type: number
@@ -141,6 +153,26 @@ jobs:
141153
- checkout: self
142154
fetchDepth: 1
143155

156+
- ${{ if and(eq(parameters.useEntraAuthentication, true), eq(parameters.azureSubscription, '')) }}:
157+
- pwsh: throw "azureSubscription must be set when useEntraAuthentication is true."
158+
displayName: Validate Helix Entra authentication
159+
160+
- ${{ if eq(parameters.useEntraAuthentication, true) }}:
161+
- task: AzureCLI@2
162+
displayName: Initialize Helix Entra authentication
163+
inputs:
164+
azureSubscription: ${{ parameters.azureSubscription }}
165+
addSpnToEnvironment: true
166+
scriptType: pscore
167+
scriptLocation: inlineScript
168+
inlineScript: |
169+
if ([string]::IsNullOrWhiteSpace($env:servicePrincipalId) -or [string]::IsNullOrWhiteSpace($env:tenantId)) {
170+
throw "The Helix Azure service connection did not provide a service principal or tenant ID."
171+
}
172+
173+
Write-Host "##vso[task.setvariable variable=HelixEntraClientId]$env:servicePrincipalId"
174+
Write-Host "##vso[task.setvariable variable=HelixEntraTenantId]$env:tenantId"
175+
144176
- ${{ if ne(parameters.toolNupkgArtifactName, '') }}:
145177
- task: DownloadPipelineArtifact@2
146178
displayName: Download Helix Job Monitor artifact
@@ -214,6 +246,7 @@ jobs:
214246
215247
toolArgs=(
216248
--helix-base-uri '${{ parameters.helixBaseUri }}'
249+
--use-entra-authentication '${{ parameters.useEntraAuthentication }}'
217250
--polling-interval-seconds '${{ parameters.pollingIntervalSeconds }}'
218251
--fail-on-failed-tests '${{ parameters.failWorkItemsWithFailedTests }}'
219252
--allow-no-helix-jobs '${{ parameters.allowNoHelixJobs }}'
@@ -275,4 +308,9 @@ jobs:
275308
displayName: Monitor Helix Jobs
276309
env:
277310
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
278-
HELIX_ACCESSTOKEN: ${{ parameters.helixAccessToken }}
311+
${{ if eq(parameters.useEntraAuthentication, false) }}:
312+
HELIX_ACCESSTOKEN: ${{ parameters.helixAccessToken }}
313+
${{ if eq(parameters.useEntraAuthentication, true) }}:
314+
AZURESUBSCRIPTION_CLIENT_ID: $(HelixEntraClientId)
315+
AZURESUBSCRIPTION_TENANT_ID: $(HelixEntraTenantId)
316+
AZURESUBSCRIPTION_SERVICE_CONNECTION_ID: ${{ parameters.azureSubscription }}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ jobs:
119119
- name: ${{ pair.key }}
120120
value: ${{ pair.value }}
121121

122-
# DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds
122+
# DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds.
123+
# Entra-enabled Helix templates do not forward this value to their processes.
123124
- ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
124125
- group: DotNet-HelixApi-Access
125126

‎eng/common/core-templates/job/onelocbuild.yml‎

Lines changed: 17 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,10 @@ parameters:
55
# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
66
pool: ''
77

8-
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
9-
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
10-
11-
# Service connection for WIF-based Entra authentication to ceapex feeds (replaces CeapexPat).
12-
# dnceng/internal and DevDiv/DevDiv have same-named, project-scoped connections. Other projects,
13-
# and any pipeline that sets this to '', fall back to PAT-based auth via the CeapexPat parameter.
8+
# Project-scoped WIF service connection for Ceapex feed authentication.
149
CeapexServiceConnection: 'dnceng-onelocbuild-ceapex'
1510

1611
# GitHub App authentication for the OneLoc check-in PR.
17-
# dnceng/internal and DevDiv/DevDiv are enabled by default with their project-scoped service
18-
# connections. Other projects must explicitly opt in after provisioning equivalent infrastructure.
19-
UseGitHubAppAuthentication: true
20-
UseGitHubAppAuthenticationInOtherProjects: false
2112
GitHubAppServiceConnection: 'dnceng-oneloc-githubapp'
2213
GitHubAppClientId: 'Iv23lijBU8x3gc9lDOc9'
2314
GitHubAppKeyVaultName: 'EngKeyVault'
@@ -49,7 +40,6 @@ jobs:
4940
displayName: OneLocBuild${{ parameters.JobNameSuffix }}
5041

5142
variables:
52-
- group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
5343
- name: _GenerateLocProjectArguments
5444
value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
5545
-LanguageSet "${{ parameters.LanguageSet }}"
@@ -80,6 +70,12 @@ jobs:
8070
steps:
8171
- ${{ if eq(parameters.is1ESPipeline, '') }}:
8272
- 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error
73+
- ${{ if notin(variables['System.TeamProject'], 'internal', 'DevDiv') }}:
74+
- 'OneLocBuild is supported only in dnceng/internal and DevDiv/DevDiv.': error
75+
- ${{ if eq(parameters.CeapexServiceConnection, '') }}:
76+
- 'CeapexServiceConnection must identify a WIF service connection.': error
77+
- ${{ if and(eq(parameters.RepoType, 'gitHub'), eq(parameters.GitHubAppServiceConnection, '')) }}:
78+
- 'GitHubAppServiceConnection must identify a WIF service connection for GitHub repositories.': error
8379

8480
- ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
8581
- task: Powershell@2
@@ -89,17 +85,15 @@ jobs:
8985
displayName: Generate LocProject.json
9086
condition: ${{ parameters.condition }}
9187

92-
# Acquire an Entra token for ceapex feed access in the supported internal and DevDiv projects.
93-
- ${{ if and(ne(parameters.CeapexServiceConnection, ''), or(eq(variables['System.TeamProject'], 'internal'), eq(variables['System.TeamProject'], 'DevDiv'))) }}:
94-
- template: /eng/common/templates/steps/get-federated-access-token.yml
95-
parameters:
96-
federatedServiceConnection: ${{ parameters.CeapexServiceConnection }}
97-
outputVariableName: 'CeapexEntraToken'
98-
condition: ${{ parameters.condition }}
88+
# Acquire a short-lived Entra token for Ceapex feed access.
89+
- template: /eng/common/templates/steps/get-federated-access-token.yml
90+
parameters:
91+
federatedServiceConnection: ${{ parameters.CeapexServiceConnection }}
92+
outputVariableName: 'CeapexEntraToken'
93+
condition: ${{ parameters.condition }}
9994

100-
# Mint a short-lived GitHub App installation token for the loc check-in PR. Use the connection
101-
# provisioned in each supported project; other projects must explicitly opt in and override it.
102-
- ${{ if and(eq(parameters.RepoType, 'gitHub'), eq(parameters.UseGitHubAppAuthentication, true), or(eq(variables['System.TeamProject'], 'internal'), eq(variables['System.TeamProject'], 'DevDiv'), eq(parameters.UseGitHubAppAuthenticationInOtherProjects, true))) }}:
95+
# Mint a short-lived GitHub App installation token for the loc check-in PR.
96+
- ${{ if eq(parameters.RepoType, 'gitHub') }}:
10397
- template: /eng/common/core-templates/steps/get-github-app-token.yml
10498
parameters:
10599
is1ESPipeline: ${{ parameters.is1ESPipeline }}
@@ -129,16 +123,10 @@ jobs:
129123
isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
130124
isShouldReusePrSelected: ${{ parameters.ReusePr }}
131125
packageSourceAuth: patAuth
132-
${{ if and(ne(parameters.CeapexServiceConnection, ''), or(eq(variables['System.TeamProject'], 'internal'), eq(variables['System.TeamProject'], 'DevDiv'))) }}:
133-
patVariable: $(CeapexEntraToken)
134-
${{ if or(eq(parameters.CeapexServiceConnection, ''), and(ne(variables['System.TeamProject'], 'internal'), ne(variables['System.TeamProject'], 'DevDiv'))) }}:
135-
patVariable: ${{ parameters.CeapexPat }}
126+
patVariable: $(CeapexEntraToken)
136127
${{ if eq(parameters.RepoType, 'gitHub') }}:
137128
repoType: ${{ parameters.RepoType }}
138-
${{ if and(eq(parameters.UseGitHubAppAuthentication, true), or(eq(variables['System.TeamProject'], 'internal'), eq(variables['System.TeamProject'], 'DevDiv'), eq(parameters.UseGitHubAppAuthenticationInOtherProjects, true))) }}:
139-
gitHubPatVariable: "$(GitHubAppInstallationToken)"
140-
${{ else }}:
141-
gitHubPatVariable: "${{ parameters.GithubPat }}"
129+
gitHubPatVariable: "$(GitHubAppInstallationToken)"
142130
${{ if ne(parameters.MirrorRepo, '') }}:
143131
isMirrorRepoSelected: true
144132
gitHubOrganization: ${{ parameters.GitHubOrg }}

‎eng/common/core-templates/steps/send-to-helix.yml‎

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ parameters:
44
HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/'
55
HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number
66
HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues
7-
HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group
7+
HelixAccessToken: '' # optional -- legacy access token; not forwarded when HelixUseEntraAuthentication is true
8+
HelixUseEntraAuthentication: false # optional -- use refreshable Entra authentication instead of a PAT or anonymous access
9+
HelixAzureSubscription: '' # required when HelixUseEntraAuthentication is true -- Azure service connection ID authorized for Helix
810
HelixProjectPath: 'eng/common/helixpublish.proj' # optional -- path to the project file to build relative to BUILD_SOURCESDIRECTORY
911
HelixProjectArguments: '' # optional -- arguments passed to the build command
1012
HelixConfiguration: '' # optional -- additional property attached to a job
@@ -32,12 +34,35 @@ parameters:
3234
continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false
3335

3436
steps:
37+
- ${{ if and(eq(parameters.HelixUseEntraAuthentication, true), eq(parameters.HelixAzureSubscription, '')) }}:
38+
- pwsh: throw "HelixAzureSubscription must be set when HelixUseEntraAuthentication is true."
39+
displayName: Validate Helix Entra authentication
40+
condition: ${{ parameters.condition }}
41+
42+
- ${{ if eq(parameters.HelixUseEntraAuthentication, true) }}:
43+
- task: AzureCLI@2
44+
displayName: Initialize Helix Entra authentication
45+
inputs:
46+
azureSubscription: ${{ parameters.HelixAzureSubscription }}
47+
addSpnToEnvironment: true
48+
scriptType: pscore
49+
scriptLocation: inlineScript
50+
inlineScript: |
51+
if ([string]::IsNullOrWhiteSpace($env:servicePrincipalId) -or [string]::IsNullOrWhiteSpace($env:tenantId)) {
52+
throw "The Helix Azure service connection did not provide a service principal or tenant ID."
53+
}
54+
55+
Write-Host "##vso[task.setvariable variable=HelixEntraClientId]$env:servicePrincipalId"
56+
Write-Host "##vso[task.setvariable variable=HelixEntraTenantId]$env:tenantId"
57+
condition: ${{ parameters.condition }}
58+
3559
- powershell: >
3660
$(Build.SourcesDirectory)\eng\common\msbuild.ps1
3761
$(Build.SourcesDirectory)/${{ parameters.HelixProjectPath }}
3862
/restore
3963
/p:TreatWarningsAsErrors=false
4064
/p:EnableHelixJobMonitor=${{ parameters.UseHelixMonitor }}
65+
/p:HelixUseEntraAuthentication=${{ parameters.HelixUseEntraAuthentication }}
4166
${{ parameters.HelixProjectArguments }}
4267
/t:Test
4368
/bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
@@ -49,7 +74,12 @@ steps:
4974
HelixBuild: ${{ parameters.HelixBuild }}
5075
HelixConfiguration: ${{ parameters.HelixConfiguration }}
5176
HelixTargetQueues: ${{ parameters.HelixTargetQueues }}
52-
HelixAccessToken: ${{ parameters.HelixAccessToken }}
77+
${{ if eq(parameters.HelixUseEntraAuthentication, false) }}:
78+
HelixAccessToken: ${{ parameters.HelixAccessToken }}
79+
${{ if eq(parameters.HelixUseEntraAuthentication, true) }}:
80+
AZURESUBSCRIPTION_CLIENT_ID: $(HelixEntraClientId)
81+
AZURESUBSCRIPTION_TENANT_ID: $(HelixEntraTenantId)
82+
AZURESUBSCRIPTION_SERVICE_CONNECTION_ID: ${{ parameters.HelixAzureSubscription }}
5383
HelixPreCommands: ${{ parameters.HelixPreCommands }}
5484
HelixPostCommands: ${{ parameters.HelixPostCommands }}
5585
WorkItemDirectory: ${{ parameters.WorkItemDirectory }}
@@ -76,6 +106,7 @@ steps:
76106
/restore
77107
/p:TreatWarningsAsErrors=false
78108
/p:EnableHelixJobMonitor=${{ parameters.UseHelixMonitor }}
109+
/p:HelixUseEntraAuthentication=${{ parameters.HelixUseEntraAuthentication }}
79110
${{ parameters.HelixProjectArguments }}
80111
/t:Test
81112
/bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
@@ -87,7 +118,12 @@ steps:
87118
HelixBuild: ${{ parameters.HelixBuild }}
88119
HelixConfiguration: ${{ parameters.HelixConfiguration }}
89120
HelixTargetQueues: ${{ parameters.HelixTargetQueues }}
90-
HelixAccessToken: ${{ parameters.HelixAccessToken }}
121+
${{ if eq(parameters.HelixUseEntraAuthentication, false) }}:
122+
HelixAccessToken: ${{ parameters.HelixAccessToken }}
123+
${{ if eq(parameters.HelixUseEntraAuthentication, true) }}:
124+
AZURESUBSCRIPTION_CLIENT_ID: $(HelixEntraClientId)
125+
AZURESUBSCRIPTION_TENANT_ID: $(HelixEntraTenantId)
126+
AZURESUBSCRIPTION_SERVICE_CONNECTION_ID: ${{ parameters.HelixAzureSubscription }}
91127
HelixPreCommands: ${{ parameters.HelixPreCommands }}
92128
HelixPostCommands: ${{ parameters.HelixPostCommands }}
93129
WorkItemDirectory: ${{ parameters.WorkItemDirectory }}
@@ -108,4 +144,3 @@ steps:
108144
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
109145
condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT'))
110146
continueOnError: ${{ parameters.continueOnError }}
111-

‎eng/native/configureplatform.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/functions.cmake)
22

33
# If set, indicates that this is not an officially supported release.
44
# Release branches should set this to false.
5-
set(PRERELEASE 1)
5+
set(PRERELEASE 0)
66

77
#----------------------------------------
88
# Detect and set platform variable names

0 commit comments

Comments
 (0)