Skip to content

Conversation

@github-actions
Copy link
Contributor

I detected changes in the release/9.0 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/9.0 by the following committers:

  • captainsafia
  • dotnet-maestro[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.

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
git pull --ff-only
git checkout main
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/aspnetcore HEAD:merge/release/9.0-to-main
or if you are using SSH
git push [email protected]:dotnet/aspnetcore HEAD:merge/release/9.0-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/9.0-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

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

dotnet-maestro bot and others added 2 commits September 13, 2024 18:45
[release/9.0] Update dependencies from dotnet/runtime


 - Fix linker warnings
…mplementation (#57852)

* Fix handling of [Produces] without type on controller

* Recursively map sub-schemas to reference cache

* Rely on MaxDepth behavior in STJ

* Improve nested type test
@ghost ghost added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Sep 16, 2024
@wtgodbe
Copy link
Member

wtgodbe commented Sep 16, 2024

@captainsafia do the changes look right?

@captainsafia
Copy link
Member

@captainsafia do the changes look right?

Yep -- this looks good!

@wtgodbe wtgodbe merged commit ff7e42e into main Sep 17, 2024
@wtgodbe wtgodbe deleted the merge/release/9.0-to-main branch September 17, 2024 16:51
@dotnet-policy-service dotnet-policy-service bot added this to the 10.0-preview1 milestone Sep 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants