Skip to content

Conversation

@dotnet-maestro-bot
Copy link
Contributor

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

This PR merges commits made on release/6.0-rc2 by the following committers:

  • github-actions[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/6.0-rc2
git pull --ff-only
git checkout release/6.0
git pull --ff-only
git merge --no-ff release/6.0-rc2

# 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-maestro-bot/AspNetCore HEAD:merge/release/6.0-rc2-to-release/6.0
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/6.0-rc2-to-release/6.0

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/6.0-rc2-to-release/6.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/6.0-rc2-to-release/6.0 release/6.0
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/6.0-rc2-to-release/6.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/6.0-rc2-to-release/6.0
or if you are using SSH
git checkout -b merge/release/6.0-rc2-to-release/6.0 release/6.0
git pull [email protected]:dotnet-maestro-bot/AspNetCore merge/release/6.0-rc2-to-release/6.0
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/6.0-rc2-to-release/6.0

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

@dotnet-maestro-bot dotnet-maestro-bot requested a review from a team as a code owner September 16, 2021 22:01
@ghost ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Merge Forward ⏩ labels Sep 16, 2021
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Auto-approving branch merge.

@ghost ghost added the community-contribution Indicates that the PR has been added by a community member label Sep 16, 2021
github-actions bot and others added 2 commits September 16, 2021 15:55
…tnet#36590)

* Add support for BindAsync without ParameterInfo

* Update src/Shared/ParameterBindingMethodCache.cs

Co-authored-by: David Fowler <[email protected]>

* Apply suggestions from code review

* named tuple

Co-authored-by: Brennan <[email protected]>
Co-authored-by: David Fowler <[email protected]>
…rse (dotnet#36588)

* Fixup OpenAPI displayed param type when using TryParse

* nullable

Co-authored-by: Brennan <[email protected]>
[release/6.0-rc2] Update dependencies from dotnet/runtime


 - Update CreateFrameworkListFile to account for new analyzer path format introduced with dotnet/sdk#20355
@dougbu
Copy link
Contributor

dougbu commented Sep 17, 2021

I'm confused. Where are the package version changes coming from❔ Don't we want RTM packages from dotnet/runtime in this branch (if they're available -- @Anipik ❔).

@BrennanConroy
Copy link
Member

Where are the package version changes coming from

From the RC2 branch.

Don't we want RTM packages from dotnet/runtime in this branch (if they're available

I don't think there has been an RTM dependency update to the 6.0 branch yet so isn't this expected

@dougbu
Copy link
Contributor

dougbu commented Sep 17, 2021

Don't we want RTM packages from dotnet/runtime in this branch (if they're available

I don't think there has been an RTM dependency update to the 6.0 branch yet so isn't this expected

I think there was one but hopefully nothing introducing RC1 / RC2 incompatibilities. We need to get a clean build to be sure but keep hitting infrastructure issues. Second try is almost ready for another attempt ☹️

In case someone else is up to hit the buttons in AzDO, I'm enabling an auto-merge here.

@dougbu dougbu enabled auto-merge September 17, 2021 04:46
@dougbu dougbu merged commit d278d65 into dotnet:release/6.0 Sep 17, 2021
@ghost ghost added this to the 6.0.0 milestone Sep 17, 2021
@mkArtakMSFT mkArtakMSFT removed the community-contribution Indicates that the PR has been added by a community member label Feb 15, 2022
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 Type: Merge Forward ⏩

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants