Skip to content

[manual] Merge release/9.0-staging into release/9.0 - #130652

Merged
svick merged 17 commits into
dotnet:release/9.0from
mrek-msft:release/9.0-staging-merge
Jul 16, 2026
Merged

[manual] Merge release/9.0-staging into release/9.0#130652
svick merged 17 commits into
dotnet:release/9.0from
mrek-msft:release/9.0-staging-merge

Conversation

@mrek-msft

Copy link
Copy Markdown
Member

Merge commit must be used for merging. SQUASHing is prohibited for this servicing merge.

github-actionsBotand others added 15 commits June 15, 2026 19:09
…agile reference. (dotnet#129430)
Backport of dotnet#112387 to release/9.0-staging
/cc @AaronRobinsonMSFT@jkoritzinskyClosesdotnet#129421
## Customer Impact
- [ ] Customer reported
- [x] Found internally
This is flaky test issue that is impacting the 9.0 branch. It was fixed
in 10, but missed 11.
## Regression
- [ ] Yes
- [x] No
Flaky test.
## Testing
This fix has been in 10 and 11 with no further issues.
## Risk
Zero as it has no impact to the product.
Co-authored-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
…otnet#129208)
This pull request updates the following dependencies
[marker]: <> (Begin:e06e39ae-771e-498d-7895-08dcbc301dc2)
## From https://github.com/dotnet/runtime-assets
- **Subscription**:
[e06e39ae-771e-498d-7895-08dcbc301dc2](https://maestro.dot.net/subscriptions?search=e06e39ae-771e-498d-7895-08dcbc301dc2)
- **Build**:
[20260609.6](https://dev.azure.com/dnceng/internal/_build/results?buildId=2995913)
([317964](https://maestro.dot.net/channel/3883/github:dotnet:runtime-assets/build/317964))
- **Date Produced**: June 9, 2026 2:32:15 PM UTC
- **Commit**:
[372cc24c11585411a5a6a8f22b47572812b5f988](dotnet/runtime-assets@372cc24)
- **Branch**:
[release/9.0](https://github.com/dotnet/runtime-assets/tree/release/9.0)
[DependencyUpdate]: <> (Begin)
- **Dependency Updates**:
- From [9.0.0-beta.26302.4 to 9.0.0-beta.26309.6][1]
- Microsoft.DotNet.CilStrip.Sources
- System.ComponentModel.TypeConverter.TestData
- System.Data.Common.TestData
- System.Drawing.Common.TestData
- System.Formats.Tar.TestData
- System.IO.Compression.TestData
- System.IO.Packaging.TestData
- System.Net.TestData
- System.Private.Runtime.UnicodeData
- System.Runtime.Numerics.TestData
- System.Runtime.TimeZoneData
- System.Security.Cryptography.X509Certificates.TestData
- System.Text.RegularExpressions.TestData
- System.Windows.Extensions.TestData
[1]:
dotnet/runtime-assets@8705fbc...372cc24
[DependencyUpdate]: <> (End)
[marker]: <> (End:e06e39ae-771e-498d-7895-08dcbc301dc2)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…t#129407)
This pull request updates the following dependencies
[marker]: <> (Begin:077f423f-1332-4108-a2ea-08dcc66548e6)
## From https://github.com/dotnet/xharness
- **Subscription**:
[077f423f-1332-4108-a2ea-08dcc66548e6](https://maestro.dot.net/subscriptions?search=077f423f-1332-4108-a2ea-08dcc66548e6)
- **Build**:
[20260619.2](https://dev.azure.com/dnceng/internal/_build/results?buildId=3003827)
([319386](https://maestro.dot.net/channel/2/github:dotnet:xharness/build/319386))
- **Date Produced**: June 19, 2026 9:42:47 AM UTC
- **Commit**:
[a0534aec8f776d258392f0266cbdb9cc97e1dd98](dotnet/xharness@a0534ae)
- **Branch**: [main](https://github.com/dotnet/xharness/tree/main)
[DependencyUpdate]: <> (Begin)
- **Dependency Updates**:
- From [11.0.0-prerelease.26301.2 to 11.0.0-prerelease.26319.2][2]
- Microsoft.DotNet.XHarness.CLI
- Microsoft.DotNet.XHarness.TestRunners.Common
- Microsoft.DotNet.XHarness.TestRunners.Xunit
[2]: dotnet/xharness@fa7fbeb...a0534ae
[DependencyUpdate]: <> (End)
[marker]: <> (End:077f423f-1332-4108-a2ea-08dcc66548e6)
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Petr Onderka <petronderka@microsoft.com>
)
This pull request updates the following dependencies
[marker]: <> (Begin:5e3f9b88-faad-436c-a580-ac009d20bb33)
## From https://github.com/dotnet/icu
- **Subscription**:
[5e3f9b88-faad-436c-a580-ac009d20bb33](https://maestro.dot.net/subscriptions?search=5e3f9b88-faad-436c-a580-ac009d20bb33)
- **Build**:
[20260613.3](https://dev.azure.com/dnceng/internal/_build/results?buildId=2999712)
([318602](https://maestro.dot.net/channel/3883/github:dotnet:icu/build/318602))
- **Date Produced**: June 13, 2026 7:45:19 PM UTC
- **Commit**:
[4cc4a8d63499da9296ddf830bdbfb74eda4aa551](dotnet/icu@4cc4a8d)
- **Branch**:
[dotnet/release/9.0](https://github.com/dotnet/icu/tree/dotnet/release/9.0)
[DependencyUpdate]: <> (Begin)
- **Dependency Updates**:
- From [9.0.0-rtm.26278.1 to 9.0.0-rtm.26313.3][1]
- Microsoft.NETCore.Runtime.ICU.Transport
[1]: dotnet/icu@1ef686b...4cc4a8d
[DependencyUpdate]: <> (End)
[marker]: <> (End:5e3f9b88-faad-436c-a580-ac009d20bb33)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Petr Onderka <petronderka@microsoft.com>
…29453)
This pull request updates the following dependencies
[marker]: <> (Begin:b609d3b5-ab6f-473c-9ce1-f266baef16fc)
## From https://github.com/dotnet/cecil
- **Subscription**:
[b609d3b5-ab6f-473c-9ce1-f266baef16fc](https://maestro.dot.net/subscriptions?search=b609d3b5-ab6f-473c-9ce1-f266baef16fc)
- **Build**:
[20260614.1](https://dev.azure.com/dnceng/internal/_build/results?buildId=3000387)
([318665](https://maestro.dot.net/channel/3883/github:dotnet:cecil/build/318665))
- **Date Produced**: June 15, 2026 5:37:14 AM UTC
- **Commit**:
[41de496d32c25dc8c99957eed6b7d14385bc1511](dotnet/cecil@41de496)
- **Branch**:
[release/9.0](https://github.com/dotnet/cecil/tree/release/9.0)
[DependencyUpdate]: <> (Begin)
- **Dependency Updates**:
- From [0.11.5-alpha.26307.3 to 0.11.5-alpha.26314.1][1]
- Microsoft.SourceBuild.Intermediate.cecil
- Microsoft.DotNet.Cecil
[1]: dotnet/cecil@5eaa92e...41de496
[DependencyUpdate]: <> (End)
[marker]: <> (End:b609d3b5-ab6f-473c-9ce1-f266baef16fc)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…sets (dotnet#129620)
This pull request updates the following dependencies
[marker]: <> (Begin:3b2e34b4-9c9e-4da6-a358-02c0b764a22e)
## From https://github.com/dotnet/source-build-assets
- **Subscription**:
[3b2e34b4-9c9e-4da6-a358-02c0b764a22e](https://maestro.dot.net/subscriptions?search=3b2e34b4-9c9e-4da6-a358-02c0b764a22e)
- **Build**:
[20260609.1](https://dev.azure.com/dnceng/internal/_build/results?buildId=2995959)
([317972](https://maestro.dot.net/channel/5175/github:dotnet:source-build-assets/build/317972))
- **Date Produced**: June 9, 2026 3:05:34 PM UTC
- **Commit**:
[8af4d7484999046095bf7670641b25f2dbb158f0](dotnet/source-build-assets@8af4d74)
- **Branch**:
[release/9.0](https://github.com/dotnet/source-build-assets/tree/release/9.0)
[DependencyUpdate]: <> (Begin)
- **Dependency Updates**:
- From [9.0.0-alpha.1.26208.6 to 9.0.0-alpha.1.26309.1][1]
- Microsoft.SourceBuild.Intermediate.source-build-assets
[1]:
dotnet/source-build-assets@8e19a1b...8af4d74
[DependencyUpdate]: <> (End)
[marker]: <> (End:3b2e34b4-9c9e-4da6-a358-02c0b764a22e)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Backport of dotnet#115036 to release/9.0-staging
/cc @dhartglassMSFT@kunalspathak
## Customer Impact
- [ ] Customer reported
- [x] Found internally
This is a testcode only change, to address the test failure discovered
in dotnet#129437
## Regression
- [ ] Yes
- [x] No
## Testing
N/A, testcode-only fix.
## Risk
[Low] This fixes a test which was working on both .NET 10 and .NET 11.
**IMPORTANT**: If this backport is for a servicing release, please
verify that:
- For .NET 8 and .NET 9: The PR target branch is `release/X.0-staging`,
not `release/X.0`.
- For .NET 10+: The PR target branch is `release/X.0` (no `-staging`
suffix).
## Package authoring no longer needed in .NET 9
**IMPORTANT**: Starting with .NET 9, you no longer need to edit a NuGet
package's csproj to enable building and bump the version.
Keep in mind that we still need package authoring in .NET 8 and older
versions.
Co-authored-by: Kunal Pathak <Kunal.Pathak@microsoft.com>
…et#129441)
I detected changes in the release/9.0 branch which have not been merged
yet to release/9.0-staging. I'm a robot and am configured to help you
automatically keep release/9.0-staging up to date, so I've opened this
PR.
This PR merges commits made on release/9.0 by the following committers:
* svick
* steveisok
## 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.
<img alt="merge button instructions"
src="https://i.imgur.com/GepcNJV.png" width="300" />
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.
``` sh
git fetch
git checkout release/9.0
git pull --ff-only
git checkout release/9.0-staging
git pull --ff-only
git merge --no-ff release/9.0
# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/runtime HEAD:merge/release/9.0-to-release/9.0-staging
```
<details>
<summary>or if you are using SSH</summary>
```
git push git@github.com:dotnet/runtime HEAD:merge/release/9.0-to-release/9.0-staging
```
</details>
After PR checks are complete push the branch
```
git push
```
## Instructions for resolving conflicts
:warning: If there are merge conflicts, you will need to resolve them
manually before merging. You can do this [using GitHub][resolve-github]
or using the [command line][resolve-cli].
[resolve-github]:
https://help.github.com/articles/resolving-a-merge-conflict-on-github/
[resolve-cli]:
https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/
## Instructions for updating this pull request
Contributors to this repo have permission update this pull request by
pushing to the branch 'merge/release/9.0-to-release/9.0-staging'. 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.
```
git fetch
git checkout -b merge/release/9.0-to-release/9.0-staging origin/release/9.0-staging
git pull https://github.com/dotnet/runtime merge/release/9.0-to-release/9.0-staging
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/runtime HEAD:merge/release/9.0-to-release/9.0-staging
```
<details>
<summary>or if you are using SSH</summary>
```
git fetch
git checkout -b merge/release/9.0-to-release/9.0-staging origin/release/9.0-staging
git pull git@github.com:dotnet/runtime merge/release/9.0-to-release/9.0-staging
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/runtime HEAD:merge/release/9.0-to-release/9.0-staging
```
</details>
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.
…t#130235)
This pull request updates the following dependencies
[marker]: <> (Begin:077f423f-1332-4108-a2ea-08dcc66548e6)
## From https://github.com/dotnet/xharness
- **Subscription**:
[077f423f-1332-4108-a2ea-08dcc66548e6](https://maestro.dot.net/subscriptions?search=077f423f-1332-4108-a2ea-08dcc66548e6)
- **Build**:
[20260703.1](https://dev.azure.com/dnceng/internal/_build/results?buildId=3013828)
([321324](https://maestro.dot.net/channel/2/github:dotnet:xharness/build/321324))
- **Date Produced**: July 3, 2026 10:12:38 AM UTC
- **Commit**:
[4da0015e9dd1ed7d3992db7d1eb6878a5ee11ab2](dotnet/xharness@4da0015)
- **Branch**: [main](https://github.com/dotnet/xharness/tree/main)
[DependencyUpdate]: <> (Begin)
- **Dependency Updates**:
- From [11.0.0-prerelease.26319.2 to 11.0.0-prerelease.26353.1][1]
- Microsoft.DotNet.XHarness.CLI
- Microsoft.DotNet.XHarness.TestRunners.Common
- Microsoft.DotNet.XHarness.TestRunners.Xunit
[1]: dotnet/xharness@a0534ae...4da0015
[DependencyUpdate]: <> (End)
[marker]: <> (End:077f423f-1332-4108-a2ea-08dcc66548e6)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
)
This pull request updates the following dependencies
[marker]: <> (Begin:5e3f9b88-faad-436c-a580-ac009d20bb33)
## From https://github.com/dotnet/icu
- **Subscription**:
[5e3f9b88-faad-436c-a580-ac009d20bb33](https://maestro.dot.net/subscriptions?search=5e3f9b88-faad-436c-a580-ac009d20bb33)
- **Build**:
[20260706.1](https://dev.azure.com/dnceng/internal/_build/results?buildId=3016029)
([321642](https://maestro.dot.net/channel/3883/github:dotnet:icu/build/321642))
- **Date Produced**: July 7, 2026 4:35:11 AM UTC
- **Commit**:
[86a9e8cc2bf5eef6fd6c944c2a656e59f8ad0387](dotnet/icu@86a9e8c)
- **Branch**:
[dotnet/release/9.0](https://github.com/dotnet/icu/tree/dotnet/release/9.0)
[DependencyUpdate]: <> (Begin)
- **Dependency Updates**:
- From [9.0.0-rtm.26313.3 to 9.0.0-rtm.26356.1][2]
- Microsoft.NETCore.Runtime.ICU.Transport
[2]: dotnet/icu@4cc4a8d...86a9e8c
[DependencyUpdate]: <> (End)
[marker]: <> (End:5e3f9b88-faad-436c-a580-ac009d20bb33)
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…otnet#130063)
This pull request updates the following dependencies
[marker]: <> (Begin:e06e39ae-771e-498d-7895-08dcbc301dc2)
## From https://github.com/dotnet/runtime-assets
- **Subscription**:
[e06e39ae-771e-498d-7895-08dcbc301dc2](https://maestro.dot.net/subscriptions?search=e06e39ae-771e-498d-7895-08dcbc301dc2)
- **Build**:
[20260630.2](https://dev.azure.com/dnceng/internal/_build/results?buildId=3011546)
([320868](https://maestro.dot.net/channel/3883/github:dotnet:runtime-assets/build/320868))
- **Date Produced**: June 30, 2026 10:41:44 AM UTC
- **Commit**:
[0255c0815603742a138342c524929c078ecf5cf4](dotnet/runtime-assets@0255c08)
- **Branch**:
[release/9.0](https://github.com/dotnet/runtime-assets/tree/release/9.0)
[DependencyUpdate]: <> (Begin)
- **Dependency Updates**:
- From [9.0.0-beta.26309.6 to 9.0.0-beta.26330.2][1]
- Microsoft.DotNet.CilStrip.Sources
- System.ComponentModel.TypeConverter.TestData
- System.Data.Common.TestData
- System.Drawing.Common.TestData
- System.Formats.Tar.TestData
- System.IO.Compression.TestData
- System.IO.Packaging.TestData
- System.Net.TestData
- System.Private.Runtime.UnicodeData
- System.Runtime.Numerics.TestData
- System.Runtime.TimeZoneData
- System.Security.Cryptography.X509Certificates.TestData
- System.Text.RegularExpressions.TestData
- System.Windows.Extensions.TestData
[1]:
dotnet/runtime-assets@372cc24...0255c08
[DependencyUpdate]: <> (End)
[marker]: <> (End:e06e39ae-771e-498d-7895-08dcbc301dc2)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
)
This pull request updates the following dependencies
[marker]: <> (Begin:5e3f9b88-faad-436c-a580-ac009d20bb33)
## From https://github.com/dotnet/icu
- **Subscription**:
[5e3f9b88-faad-436c-a580-ac009d20bb33](https://maestro.dot.net/subscriptions?search=5e3f9b88-faad-436c-a580-ac009d20bb33)
- **Build**:
[20260708.1](https://dev.azure.com/dnceng/internal/_build/results?buildId=3017450)
([321975](https://maestro.dot.net/channel/3883/github:dotnet:icu/build/321975))
- **Date Produced**: July 8, 2026 3:42:49 PM UTC
- **Commit**:
[be3dd61370b56cf0e0fadfb486cc3eafb82f910c](dotnet/icu@be3dd61)
- **Branch**:
[dotnet/release/9.0](https://github.com/dotnet/icu/tree/dotnet/release/9.0)
[DependencyUpdate]: <> (Begin)
- **Dependency Updates**:
- From [9.0.0-rtm.26356.1 to 9.0.0-rtm.26358.1][1]
- Microsoft.NETCore.Runtime.ICU.Transport
[1]: dotnet/icu@86a9e8c...be3dd61
[DependencyUpdate]: <> (End)
[marker]: <> (End:5e3f9b88-faad-436c-a580-ac009d20bb33)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…30195)
This pull request updates the following dependencies
[marker]: <> (Begin:b609d3b5-ab6f-473c-9ce1-f266baef16fc)
## From https://github.com/dotnet/cecil
- **Subscription**:
[b609d3b5-ab6f-473c-9ce1-f266baef16fc](https://maestro.dot.net/subscriptions?search=b609d3b5-ab6f-473c-9ce1-f266baef16fc)
- **Build**:
[20260703.2](https://dev.azure.com/dnceng/internal/_build/results?buildId=3013996)
([321363](https://maestro.dot.net/channel/3883/github:dotnet:cecil/build/321363))
- **Date Produced**: July 3, 2026 3:14:47 PM UTC
- **Commit**:
[d98c55d1363411ee1a0ff0c76c6e5d798e8147ec](dotnet/cecil@d98c55d)
- **Branch**:
[release/9.0](https://github.com/dotnet/cecil/tree/release/9.0)
[DependencyUpdate]: <> (Begin)
- **Dependency Updates**:
- From [0.11.5-alpha.26314.1 to 0.11.5-alpha.26353.2][1]
- Microsoft.SourceBuild.Intermediate.cecil
- Microsoft.DotNet.Cecil
[1]: dotnet/cecil@41de496...d98c55d
[DependencyUpdate]: <> (End)
[marker]: <> (End:b609d3b5-ab6f-473c-9ce1-f266baef16fc)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
## Summary
- Disable `iOS.Device.Aot.Test` and
`iOS.Device.ExportManagedSymbols.Test` on this servicing branch.
- The tests only run on physical iOS devices and no longer provide
useful CI signal.
- The servicing test infrastructure will not be updated for newer macOS
versions.
Related to dotnet#119665.
## Testing
Not run locally because these tests require physical iOS device
infrastructure. CI will validate the change.
> [!NOTE]
> This PR description was generated by GitHub Copilot.
…otnet#130355)
# Description
Backport of dotnet#130173. Updates MsQuic from 2.4.18 to the latest supported
2.5 release (2.5.9) by bumping
`MicrosoftNativeQuicMsQuicSchannelVersion` in `eng/Versions.props`.
main PR dotnet#130173
# Customer Impact
The MsQuic 2.4 branch is being phased out and will no longer receive
servicing/security updates. Staying on 2.4.18 leaves QUIC/HTTP3
consumers on an unsupported native dependency, missing bug and security
fixes shipped in the actively supported 2.5 branch.
# Regression
No. This is a native dependency version update, not a regression fix.
# Testing
Standard CI (System.Net.Quic and HTTP/3 test suites) against the updated
MsQuic package.
# Risk
Low. Single version-property change consuming an already-shipping,
actively-supported MsQuic 2.5.x package. 2.5 is the currently supported
servicing branch for MsQuic.
> [!NOTE]
> This PR was generated with the assistance of GitHub Copilot.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@mrek-msft
mrek-msft requested review from a team and CopilotJuly 13, 2026 23:49
@mrek-msftmrek-msft added NO-SQUASH The PR should not be squashed Servicing-approved Approved for servicing release labels Jul 13, 2026
@github-actionsgithub-actionsBot added the area-codeflow for labeling automated codeflow label Jul 13, 2026

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Servicing merge from release/9.0-staging into release/9.0, bringing in a set of test fixes/adjustments and dependency version updates that are expected as part of maintaining the release branch.

Changes:

  • Adjust SVE gather/scatter JIT test templates to validate computed base pointers (via Debug.Assert) and to treat address inputs as element indices.
  • Fix COM CrossApartmentQueryInterface_NoDeadlock test lifetime by waiting for completion before releasing the agile reference.
  • Disable two iOS device functional tests for CI and update several dependency/tool versions (runtime-assets, XHarness, Cecil, ICU transport, MsQuic).

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 9 comments.

Show a summary per file
FileDescription
src/tests/JIT/HardwareIntrinsics/Arm/Shared/SveScatterVectorBases.templateChanges how address vectors are expanded into pointers and adds validation asserts.
src/tests/JIT/HardwareIntrinsics/Arm/Shared/SveGatherVectorVectorBases.templateAdds validation asserts while expanding gather base pointers.
src/tests/JIT/HardwareIntrinsics/Arm/Shared/SveGatherVectorFirstFaultingVectorBases.templateAdds validation asserts for first-faulting gather base pointers (including FFR path).
src/tests/Interop/COM/ComWrappers/API/Program.csMoves WaitOne() to ensure test completes before releasing COM resources.
src/tests/FunctionalTests/iOS/Device/ExportManagedSymbols/iOS.Device.ExportManagedSymbols.Test.csprojMarks the test to be ignored in CI for servicing infrastructure constraints.
src/tests/FunctionalTests/iOS/Device/AOT/iOS.Device.Aot.Test.csprojMarks the test to be ignored in CI for servicing infrastructure constraints.
eng/Versions.propsUpdates versions for runtime-assets test data, XHarness, Cecil, ICU transport, and MsQuic.
eng/Version.Details.xmlUpdates dependency versions and SHAs to match servicing updates.
.config/dotnet-tools.jsonUpdates the pinned xharness CLI tool version.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

alinpahontu2912and others added 2 commits July 15, 2026 13:21
Backport of dotnet#130342 to .NET 9.
Fixesdotnet#129227
## Customer Impact
The new tar symlink resolution is not working properly on some
platforms.
- [ ] Customer reported
- [x] Found internally
Corrects a length mismatch that made the Tar traversal guard crash with
ArgumentOutOfRangeException (subtracting a symlink-resolved path
length from a logical path). Without it, extraction to any symlinked
destination (macOS /var , /tmp ) is broken.
## Regression
- [x] Yes
- [ ] No
## Testing
Reenabled failing CI tests.
## Risk
Low.
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…et#130345)
I detected changes in the release/9.0 branch which have not been merged
yet to release/9.0-staging. I'm a robot and am configured to help you
automatically keep release/9.0-staging up to date, so I've opened this
PR.
This PR merges commits made on release/9.0 by the following committers:
* dotnet-bot
## 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.
<img alt="merge button instructions"
src="https://i.imgur.com/GepcNJV.png" width="300" />
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.
``` sh
git fetch
git checkout release/9.0
git pull --ff-only
git checkout release/9.0-staging
git pull --ff-only
git merge --no-ff release/9.0
# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/runtime HEAD:merge/release/9.0-to-release/9.0-staging
```
<details>
<summary>or if you are using SSH</summary>
```
git push git@github.com:dotnet/runtime HEAD:merge/release/9.0-to-release/9.0-staging
```
</details>
After PR checks are complete push the branch
```
git push
```
## Instructions for resolving conflicts
:warning: If there are merge conflicts, you will need to resolve them
manually before merging. You can do this [using GitHub][resolve-github]
or using the [command line][resolve-cli].
[resolve-github]:
https://help.github.com/articles/resolving-a-merge-conflict-on-github/
[resolve-cli]:
https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/
## Instructions for updating this pull request
Contributors to this repo have permission update this pull request by
pushing to the branch 'merge/release/9.0-to-release/9.0-staging'. 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.
```
git fetch
git checkout -b merge/release/9.0-to-release/9.0-staging origin/release/9.0-staging
git pull https://github.com/dotnet/runtime merge/release/9.0-to-release/9.0-staging
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/runtime HEAD:merge/release/9.0-to-release/9.0-staging
```
<details>
<summary>or if you are using SSH</summary>
```
git fetch
git checkout -b merge/release/9.0-to-release/9.0-staging origin/release/9.0-staging
git pull git@github.com:dotnet/runtime merge/release/9.0-to-release/9.0-staging
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/runtime HEAD:merge/release/9.0-to-release/9.0-staging
```
</details>
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.
CopilotAI review requested due to automatic review settings July 15, 2026 20:18
This was referenced Aug 13, 2026
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Aug 16, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-codeflowfor labeling automated codeflowNO-SQUASHThe PR should not be squashedServicing-approvedApproved for servicing release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

@mrek-msft@svick@akoeplinger@vitek-karas@ManickaP@alinpahontu2912