-
Notifications
You must be signed in to change notification settings - Fork 1.2k
[automated] Merge branch 'release/10.0.1xx' => 'main' #50868
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
…iate between CSWinRT 2 and 3
Co-authored-by: Daniel Plaisted <[email protected]>
Co-authored-by: Daniel Plaisted <[email protected]>
… with FrameworkReference (#50872)
@jjonescz Uhhh, we're getting failures on the CSC only tests for the run file feature. |
…250916.1 On relative base path root Microsoft.Testing.Platform From Version 1.9.0-preview.25464.1 -> To Version 1.9.0-preview.25466.1 MSTest From Version 3.11.0-preview.25464.1 -> To Version 3.11.0-preview.25466.1
Looks like the runtime version used by the sdk (and in tests) is RC2 but the "bundled" version is RC1. This mismatch is causing the CSC optimization to never trigger (and hence the relevant tests are failing). I see some changes to this logic, e.g., in src/Tasks/sdk-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs, probably that's related. |
In BundledVersions.props of the built sdk I see <KnownFrameworkReference Include="Microsoft.NETCore.App" TargetFramework="net10.0" RuntimeFrameworkName="Microsoft.NETCore.App" DefaultRuntimeFrameworkVersion="10.0.0-rc.2.25427.104" LatestRuntimeFrameworkVersion="10.0.0-rc.1.25420.111" TargetingPackName="Microsoft.NETCore.App.Ref" TargetingPackVersion="10.0.0-rc.1.25420.111" RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**" RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64;linux-s390x;linux-loongarch64;linux-bionic-arm;linux-bionic-arm64;linux-bionic-x64;linux-bionic-x86;linux-ppc64le;freebsd-x64;freebsd-arm64;linux-riscv64;linux-musl-riscv64;linux-musl-loongarch64;android-arm64;android-x64" /> i.e., DefaultRuntimeFrameworkVersion is RC2 and LatestRuntimeFrameworkVersion is RC1. That seems unexpected. |
…ask for filtering items by compatible RuntimeIdentifier (#50875) Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: baronfel <[email protected]> Co-authored-by: --get <[email protected]>
…#50890) Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: baronfel <[email protected]> Co-authored-by: Jan Jones <[email protected]>
Co-authored-by: Wes Sleeman <[email protected]>
…of ToString for assembly references (#50891) Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: baronfel <[email protected]>
…mentation (#50887) Co-authored-by: Copilot <[email protected]>
…se/10.0.1xx-to-main
Just to clarify: this doesn't seem like an issue with run-file (the run-file tests only uncovered it), so I'm not investigating further here atm. |
@dsplaisted looks like you changed something in that area recently ^ |
I detected changes in the release/10.0.1xx branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.
This PR merges commits made on release/10.0.1xx 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/10.0.1xx-to-main'. 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.