You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit d4a4e25
Browse filesBrowse the repository at this point in the historyBrowse files
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.
Copy file name to clipboardExpand all lines: eng/common/core-templates/job/onelocbuild.yml
+17-29Lines changed: 17 additions & 29 deletions
Original file line number
Diff line number
Diff line change
@@ -5,19 +5,10 @@ parameters:
5
5
# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
6
6
pool: ''
7
7
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.
Copy file name to clipboardExpand all lines: eng/common/core-templates/steps/send-to-helix.yml
+39-4Lines changed: 39 additions & 4 deletions
Original file line number
Diff line number
Diff line change
@@ -4,7 +4,9 @@ parameters:
4
4
HelixType: 'tests/default/'# required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/'
5
5
HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number
6
6
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
8
10
HelixProjectPath: 'eng/common/helixpublish.proj'# optional -- path to the project file to build relative to BUILD_SOURCESDIRECTORY
9
11
HelixProjectArguments: ''# optional -- arguments passed to the build command
10
12
HelixConfiguration: ''# optional -- additional property attached to a job
@@ -32,12 +34,35 @@ parameters:
32
34
continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false
33
35
34
36
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) }}:
0 commit comments