Skip to content

Conversation

github-actions[bot]
Copy link
Contributor

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:

  • joeloff

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.

merge button instructions

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.

git fetch
git checkout release/10.0.1xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/10.0.1xx

# 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/sdk HEAD:merge/release/10.0.1xx-to-main
or if you are using SSH
git push [email protected]:dotnet/sdk HEAD:merge/release/10.0.1xx-to-main

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or 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/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.

git fetch
git checkout -b merge/release/10.0.1xx-to-main origin/main
git pull https://github.com/dotnet/sdk merge/release/10.0.1xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/10.0.1xx-to-main
or if you are using SSH
git fetch
git checkout -b merge/release/10.0.1xx-to-main origin/main
git pull [email protected]:dotnet/sdk merge/release/10.0.1xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/sdk HEAD:merge/release/10.0.1xx-to-main

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.

Sergio0694 and others added 30 commits August 8, 2025 12:42
Co-authored-by: Daniel Plaisted <[email protected]>
@github-actions github-actions bot requested a review from a team as a code owner September 16, 2025 22:29
@github-actions github-actions bot requested a review from vijayrkn as a code owner September 16, 2025 23:00
@MiYanni
Copy link
Member

MiYanni commented Sep 16, 2025

@jjonescz Uhhh, we're getting failures on the CSC only tests for the run file feature.

dotnet-maestro bot and others added 2 commits September 17, 2025 02:02
…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
@jjonescz
Copy link
Member

jjonescz commented Sep 17, 2025

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.

@jjonescz
Copy link
Member

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.

@jjonescz
Copy link
Member

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.

@akoeplinger
Copy link
Member

@dsplaisted looks like you changed something in that area recently ^

@MiYanni MiYanni merged commit 3ca6812 into main Sep 19, 2025
27 checks passed
@MiYanni MiYanni deleted the merge/release/10.0.1xx-to-main branch September 19, 2025 21:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.