Skip to content

[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx' #49375

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

Merged
merged 19 commits into from
Jun 13, 2025

Conversation

github-actions[bot]
Copy link
Contributor

I detected changes in the release/9.0.1xx branch which have not been merged yet to release/9.0.3xx. I'm a robot and am configured to help you automatically keep release/9.0.3xx up to date, so I've opened this PR.

This PR merges commits made on release/9.0.1xx by the following committers:

  • marcpopMSFT
  • v-wuzhai
  • SimonZhao888
  • dotnet-maestro[bot]
  • dtivel

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/9.0.1xx
git pull --ff-only
git checkout release/9.0.3xx
git pull --ff-only
git merge --no-ff release/9.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/9.0.1xx-to-release/9.0.3xx
or if you are using SSH
git push [email protected]:dotnet/sdk HEAD:merge/release/9.0.1xx-to-release/9.0.3xx

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/9.0.1xx-to-release/9.0.3xx'. 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.1xx-to-release/9.0.3xx origin/release/9.0.3xx
git pull https://github.com/dotnet/sdk merge/release/9.0.1xx-to-release/9.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/9.0.1xx-to-release/9.0.3xx
or if you are using SSH
git fetch
git checkout -b merge/release/9.0.1xx-to-release/9.0.3xx origin/release/9.0.3xx
git pull [email protected]:dotnet/sdk merge/release/9.0.1xx-to-release/9.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/sdk HEAD:merge/release/9.0.1xx-to-release/9.0.3xx

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.

dotnet-maestro bot and others added 18 commits May 28, 2025 02:02
…0527.2

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.10.27-servicing-25215-02 -> To Version 17.10.29-servicing-25277-02
…0528.2

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.10.27-servicing-25215-02 -> To Version 17.10.30-servicing-25278-02
…darc-release/8.0.3xx-7fcd7a06-b653-466e-a262-a7cf56a810ac
…darc-release/8.0.3xx-7fcd7a06-b653-466e-a262-a7cf56a810ac
…610.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25264.2 -> To Version 8.0.0-beta.25310.3
…0250611.3

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.412-servicing.25304.13 -> To Version 8.0.412-servicing.25311.3
@v-wuzhai
Copy link
Member

Hi @marcpopMSFT, @MiYanni

I did a quick experiment and noticed that test projects seem able to use version properties defined in Versions.props — even without directly importing it — as long as they include testAsset.props via:

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />

From what I can tell, this might be because testAsset.props indirectly brings in Versions.props, making those properties (like $(FSharpCoreXXXXX)) available to the test project.

Here's a screenshot showing a test project using a custom version property from Versions.props, and the build output confirming that it was picked up and used:

454722051-a03d5d21-a5bc-433e-ba39-e8ecd85a8393

If this behavior is reliable, we might consider centralizing more (or all) test package versions in Versions.props. That could help:

  • Reduce duplication of version strings across test projects
  • Make version updates easier and more consistent
  • Improve maintainability over time

Just a thought — it seems like a useful direction.

@MiYanni MiYanni merged commit 77d9abc into release/9.0.3xx Jun 13, 2025
30 checks passed
@MiYanni MiYanni deleted the merge/release/9.0.1xx-to-release/9.0.3xx branch June 13, 2025 16:06
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.

5 participants