[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' #50077
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
…otnet-aspnetcore build 20250611.13 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.17-servicing.25266.9 -> To Version 8.0.18-servicing.25311.13
…otnet-runtime build 20250611.17 Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.Text.Json , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.17-servicing.25266.2 -> To Version 8.0.18-servicing.25311.17 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.17 -> To Version 8.0.18 (parent: Microsoft.NETCore.App.Runtime.win-x64
…otnet-windowsdesktop build 20250611.3 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.17 -> To Version 8.0.18
…3 repositories This pull request updates the following dependencies [marker]: <> (Begin:5ae73aca-14b4-4570-17b0-08dbd53e3897) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: [5ae73aca-14b4-4570-17b0-08dbd53e3897](https://maestro.dot.net/subscriptions?search=5ae73aca-14b4-4570-17b0-08dbd53e3897) - **Build**: [20250611.13](https://dev.azure.com/dnceng/internal/_build/results?buildId=2728335) - **Date Produced**: June 12, 2025 2:01:28 AM UTC - **Commit**: [1988c37e68bc83b1a0d3d230276a1ae8f89da38b](https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore?_a=history&version=GC1988c37e68bc83b1a0d3d230276a1ae8f89da38b) - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 8.0.17-servicing.25266.9 to 8.0.18-servicing.25311.13][1] - **dotnet-user-jwts**: [from 8.0.17-servicing.25266.9 to 8.0.18-servicing.25311.13][1] - **dotnet-user-secrets**: [from 8.0.17-servicing.25266.9 to 8.0.18-servicing.25311.13][1] - **Microsoft.AspNetCore.Analyzers**: [from 8.0.17-servicing.25266.9 to 8.0.18-servicing.25311.13][1] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.17 to 8.0.18][1] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.17-servicing.25266.9 to 8.0.18-servicing.25311.13][1] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.17 to 8.0.18][1] - **Microsoft.AspNetCore.Authorization**: [from 8.0.17 to 8.0.18][1] - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 8.0.17-servicing.25266.9 to 8.0.18-servicing.25311.13][1] - **Microsoft.AspNetCore.Components.Web**: [from 8.0.17 to 8.0.18][1] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 8.0.17-servicing.25266.9 to 8.0.18-servicing.25311.13][1] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 8.0.17-servicing.25266.9 to 8.0.18-servicing.25311.13][1] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 8.0.17-servicing.25266.9 to 8.0.18-servicing.25311.13][1] - **Microsoft.AspNetCore.TestHost**: [from 8.0.17 to 8.0.18][1] - **Microsoft.Extensions.FileProviders.Embedded**: [from 8.0.17 to 8.0.18][1] - **Microsoft.Extensions.ObjectPool**: [from 8.0.17 to 8.0.18][1] - **Microsoft.JSInterop**: [from 8.0.17 to 8.0.18][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.17-servicing.25266.9 to 8.0.18-servicing.25311.13][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCfa4d80b76c2431a825be026f6bbabca63e1f42ef&targetVersion=GC1988c37e68bc83b1a0d3d230276a1ae8f89da38b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:5ae73aca-14b4-4570-17b0-08dbd53e3897) [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescripti...
…otnet-windowsdesktop build 20250613.2 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.18 -> To Version 8.0.18 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.17-servicing.25266.9 -> To Version 8.0.18-servicing.25313.2 (parent: Microsoft.WindowsDesktop.App.Ref
…dnceng/internal/dotnet-windowsdesktop This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Sdk.WindowsDesktop**: from 8.0.17-servicing.25266.9 to 8.0.18-servicing.25313.2 (parent: Microsoft.WindowsDesktop.App.Ref) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:43ca46dd-3142-499e-f076-08dbd5a5cbe7) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: [43ca46dd-3142-499e-f076-08dbd5a5cbe7](https://maestro.dot.net/subscriptions?search=43ca46dd-3142-499e-f076-08dbd5a5cbe7) - **Build**: [20250613.2](https://dev.azure.com/dnceng/internal/_build/results?buildId=2729588) - **Date Produced**: June 13, 2025 1:26:11 PM UTC - **Commit**: [0bec0d55c9b799a612a838e8887d710bbeed487b](https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop?_a=history&version=GC0bec0d55c9b799a612a838e8887d710bbeed487b) - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.18 to 8.0.18][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.18 to 8.0.18][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.18-servicing.25311.3 to 8.0.18-servicing.25313.2][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.18-servicing.25311.3 to 8.0.18-servicing.25313.2][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 8.0.17-servicing.25266.9 to 8.0.18-servicing.25313.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCa6f159eb263aa0b45be92800081f53cac9684dd2&targetVersion=GC0bec0d55c9b799a612a838e8887d710bbeed487b&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC3385cf1d42f4e488140452369a247a4a16183ce4&targetVersion=GCc8ef90c1fc2ee2778b82b40148c04cd4880e0c35&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:43ca46dd-3142-499e-f076-08dbd5a5cbe7)
…otnet-windowsdesktop build 20250617.2 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.18 -> To Version 8.0.18 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.18-servicing.25313.2 -> To Version 8.0.18-servicing.25317.3 (parent: Microsoft.WindowsDesktop.App.Ref
…dnceng/internal/dotnet-windowsdesktop This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Sdk.WindowsDesktop**: from 8.0.18-servicing.25313.2 to 8.0.18-servicing.25317.3 (parent: Microsoft.WindowsDesktop.App.Ref) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:43ca46dd-3142-499e-f076-08dbd5a5cbe7) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: [43ca46dd-3142-499e-f076-08dbd5a5cbe7](https://maestro.dot.net/subscriptions?search=43ca46dd-3142-499e-f076-08dbd5a5cbe7) - **Build**: [20250617.2](https://dev.azure.com/dnceng/internal/_build/results?buildId=2732253) - **Date Produced**: June 17, 2025 6:54:17 PM UTC - **Commit**: [c4a3ad74410330b2a4004886916f56253d88fd1d](https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop?_a=history&version=GCc4a3ad74410330b2a4004886916f56253d88fd1d) - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.18 to 8.0.18][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.18 to 8.0.18][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.18-servicing.25313.2 to 8.0.18-servicing.25317.2][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.18-servicing.25313.2 to 8.0.18-servicing.25317.2][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 8.0.18-servicing.25313.2 to 8.0.18-servicing.25317.3][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC0bec0d55c9b799a612a838e8887d710bbeed487b&targetVersion=GCc4a3ad74410330b2a4004886916f56253d88fd1d&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCc8ef90c1fc2ee2778b82b40148c04cd4880e0c35&targetVersion=GC480ddbb714f16a09b74e75cff57e1da769e9d82d&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:43ca46dd-3142-499e-f076-08dbd5a5cbe7)
…otnet-aspnetcore build 20250617.6 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.18-servicing.25311.13 -> To Version 8.0.18-servicing.25317.6
#### AI description (iteration 1) #### PR Classification Dependency update. #### PR Summary This pull request merges changes from the release branch to update a build dependency reference in the version details metadata. - `/eng/Version.Details.xml`: Updated the `Microsoft.SourceBuild.Intermediate.source-build-reference-packages` dependency from version 8.0.0-alpha.1.25269.2 to 8.0.0-alpha.1.25316.2 and modified its corresponding SHA. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
…dnceng/internal/dotnet-aspnetcore This pull request updates the following dependencies [marker]: <> (Begin:5ae73aca-14b4-4570-17b0-08dbd53e3897) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: [5ae73aca-14b4-4570-17b0-08dbd53e3897](https://maestro.dot.net/subscriptions?search=5ae73aca-14b4-4570-17b0-08dbd53e3897) - **Build**: [20250617.6](https://dev.azure.com/dnceng/internal/_build/results?buildId=2732261) - **Date Produced**: June 17, 2025 8:38:34 PM UTC - **Commit**: [cea5fa610dba4e0c024727f4c528a66018b820a3](https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore?_a=history&version=GCcea5fa610dba4e0c024727f4c528a66018b820a3) - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 8.0.18-servicing.25311.13 to 8.0.18-servicing.25317.6][1] - **dotnet-user-jwts**: [from 8.0.18-servicing.25311.13 to 8.0.18-servicing.25317.6][1] - **dotnet-user-secrets**: [from 8.0.18-servicing.25311.13 to 8.0.18-servicing.25317.6][1] - **Microsoft.AspNetCore.Analyzers**: [from 8.0.18-servicing.25311.13 to 8.0.18-servicing.25317.6][1] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.18 to 8.0.18][1] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.18-servicing.25311.13 to 8.0.18-servicing.25317.6][1] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.18 to 8.0.18][1] - **Microsoft.AspNetCore.Authorization**: [from 8.0.18 to 8.0.18][1] - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 8.0.18-servicing.25311.13 to 8.0.18-servicing.25317.6][1] - **Microsoft.AspNetCore.Components.Web**: [from 8.0.18 to 8.0.18][1] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 8.0.18-servicing.25311.13 to 8.0.18-servicing.25317.6][1] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 8.0.18-servicing.25311.13 to 8.0.18-servicing.25317.6][1] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 8.0.18-servicing.25311.13 to 8.0.18-servicing.25317.6][1] - **Microsoft.AspNetCore.TestHost**: [from 8.0.18 to 8.0.18][1] - **Microsoft.Extensions.FileProviders.Embedded**: [from 8.0.18 to 8.0.18][1] - **Microsoft.Extensions.ObjectPool**: [from 8.0.18 to 8.0.18][1] - **Microsoft.JSInterop**: [from 8.0.18 to 8.0.18][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.18-servicing.25311.13 to 8.0.18-servicing.25317.6][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC1988c37e68bc83b1a0d3d230276a1ae8f89da38b&targetVersion=GCcea5fa610dba4e0c024727f4c528a66018b820a3&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:5ae73aca-14b4-4570-17b0-08dbd53e3897)
…0.6 dependency which will... Add back the STJ pinning as DependencyModel has a 8.0.6 dependency which will break in VS tasks ---- #### AI description (iteration 1) #### PR Classification This pull request performs a dependency management update by reintroducing explicit version pinning for System.Text.Json. #### PR Summary The changes restore STJ pinning by specifying a pinned version (8.0.5) in the property file and updating all related project files to override the default System.Text.Json version. - `eng/Versions.props`: Added a new `<PinnedSystemTextJsonPackageVersion>` element set to 8.0.5. - `src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj`: Updated System.Text.Json package reference to use the pinned version via `VersionOverride`. - `src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj`: Applied the pinned version override for System.Text.Json. - `src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj`: Integrated the pinned version override for System.Text.Json. - `src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj`: Modified the System.Text.Json package reference to include the pinned version override. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
…-merge-8.0.1xx-2025-07-08-1425
This is an old variable group that is no longer in use.
Co-authored-by: marcpopMSFT <[email protected]>
…716.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25326.1 -> To Version 8.0.0-beta.25366.2
…716.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25326.1 -> To Version 8.0.0-beta.25366.2
…0250716.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.119-servicing.25353.1 -> To Version 8.0.119-servicing.25366.1
…rnings (#49533) Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: marcpopMSFT <[email protected]> Co-authored-by: Marc Paine <[email protected]>
…0250716.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.316-servicing.25353.6 -> To Version 8.0.316-servicing.25366.2
…merge/release/8.0.1xx-to-release/8.0.3xx
…merge/release/8.0.1xx-to-release/8.0.3xx
…0250804.11 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.317-servicing.25404.10 -> To Version 8.0.317-servicing.25404.11
…merge/release/8.0.3xx-to-release/8.0.4xx
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
SimonZhao888
added
the
Area-Containers
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
…merge/release/8.0.3xx-to-release/8.0.4xx
SimonZhao888
approved these changes
Aug 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I detected changes in the release/8.0.3xx branch which have not been merged yet to release/8.0.4xx. I'm a robot and am configured to help you automatically keep release/8.0.4xx up to date, so I've opened this PR.
This PR merges commits made on release/8.0.3xx by the following committers:
Instructions for merging from UI
This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.
If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.
Instructions for merging via command line
Run these commands to merge this pull request from the command line.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/8.0.3xx-to-release/8.0.4xx'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.
or if you are using SSH
Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.