Skip to content

[automated] Merge branch 'release/5.0-preview8' => 'master' #24258

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

dotnet-maestro-bot
Copy link
Contributor

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

This PR merges commits made on release/5.0-preview8 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.

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/5.0-preview8
git pull --ff-only
git checkout master
git pull --ff-only
git merge --no-ff release/5.0-preview8

# 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/5.0-preview8-to-master
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/AspNetCore HEAD:merge/release/5.0-preview8-to-master

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

git checkout -b merge/release/5.0-preview8-to-master master
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/5.0-preview8-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/5.0-preview8-to-master
or if you are using SSH
git checkout -b merge/release/5.0-preview8-to-master master
git pull git@github.com:dotnet-maestro-bot/AspNetCore merge/release/5.0-preview8-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/AspNetCore HEAD:merge/release/5.0-preview8-to-master

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 force-pushed the merge/release/5.0-preview8-to-master branch from 10ff1d6 to 697b397 Compare July 23, 2020 22:03
@ghost ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Merge Forward ⏩ labels Jul 23, 2020
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 auto-merge label Jul 23, 2020
@ghost
Copy link

ghost commented Jul 23, 2020

Hello @msftbot[bot]!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

Do note that I've been instructed to only help merge pull requests of this repository that have been opened for at least 60 minutes. No worries though, I will be back when the time is right! 😉

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on release/5.0-preview8 by the following committers:

@dotnet-maestro-bot dotnet-maestro-bot requested a review from a team as a code owner July 23, 2020 23:40
@ghost ghost removed the auto-merge label Jul 23, 2020
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on release/5.0-preview8 by the following committers:

javiercn and others added 2 commits July 24, 2020 08:42
* Wires up CSS isolation on the build.
* Transforms the css files during build.
* Bundles all scopes css into a single file and exposes it on _framework/scoped.styles.cs
* Packs pre-processed files as static web assets.
* Add support for binding record types

* PR feedback

* PR changes

* Changes per PR comments

* Changes per PR comments

* Update src/Mvc/Mvc.Core/src/Resources.resx

* Apply suggestions from code review

* Add some more tests

* Undo blazor.server.js changes

* Fixup test
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on release/5.0-preview8 by the following committers:

@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on release/5.0-preview8 by the following committers:

@TanayParikh TanayParikh merged commit 3ea1fc7 into dotnet:master Jul 24, 2020
@dougbu
Copy link
Contributor

dougbu commented Jul 24, 2020

@TanayParikh this merge will probably break all builds of aspnetcore until someone adds the new symbols in the PublicAPI.Unshipped.txt files. Please take point on fixing that up unless @pranavkm has beaten you to it. I'm available to help if my emailed instructions are insufficient.

The good news is rolling and official builds that include both #24188 and this PR haven't started yet.

It's possible things will work despite the out-of-date API baselines. That would be a problem from my PR and I'm checking locally…

@dougbu
Copy link
Contributor

dougbu commented Jul 24, 2020

Nope, the expected errors are showing up e.g.

ModelBinding\Metadata\ModelMetadataKind.cs(29,9): error RS0016: Symbol 'Constructor' is not part of the declared API. [C:\dd\dnx\aspnetcore\src\Mvc\Mvc.Abstractions\src\Microsoft.AspNetCore.Mvc.Abstractions.csproj]

dougbu pushed a commit to dougbu/razor-compiler that referenced this pull request Nov 17, 2021
…rge/release/5.0-preview8-to-master

[automated] Merge branch 'release/5.0-preview8' => 'master'

Commit migrated from dotnet/aspnetcore@3ea1fc7aac9d
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.

6 participants