[automated] Merge branch 'release/3.1' => 'master' #22743

dotnet-maestro-bot · 2020-06-09T23:24:59Z

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

@wtgodbe

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.

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

# 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/3.1-to-master

or if you are using SSH

git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/3.1-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/3.1-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/3.1-to-master master
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/3.1-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/3.1-to-master

or if you are using SSH

git checkout -b merge/release/3.1-to-master master
git pull [email protected]:dotnet-maestro-bot/AspNetCore merge/release/3.1-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/3.1-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.

…g/internal/dotnet-aspnetcore-tooling This pull request updates the following dependencies [marker]: <> (Begin:7bf32a0c-3505-43af-42b0-08d79559e63d) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - **Subscription**: 7bf32a0c-3505-43af-42b0-08d79559e63d - **Build**: 20200520.4 - **Date Produced**: 5/20/2020 7:15 PM - **Commit**: 7b992cb8b4ec55b2b3888db28d7ab105eeaaa5f7 - **Branch**: refs/heads/internal/release/3.1 - **Updates**: - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: from 3.1.4 to 3.1.5 - **Microsoft.AspNetCore.Razor.Language**: from 3.1.4 to 3.1.5 - **Microsoft.CodeAnalysis.Razor**: from 3.1.4 to 3.1.5 - **Microsoft.NET.Sdk.Razor**: from 3.1.4 to 3.1.5 [marker]: <> (End:7bf32a0c-3505-43af-42b0-08d79559e63d)

…g/internal/dotnet-aspnetcore-tooling This pull request updates the following dependencies [marker]: <> (Begin:7bf32a0c-3505-43af-42b0-08d79559e63d) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - **Subscription**: 7bf32a0c-3505-43af-42b0-08d79559e63d - **Build**: 20200520.13 - **Date Produced**: 5/21/2020 3:42 AM - **Commit**: 0e01666509ce785750e66cb5e2d2da219867c4fb - **Branch**: refs/heads/internal/release/3.1 - **Updates**: - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: from 3.1.5 to 3.1.5 - **Microsoft.AspNetCore.Razor.Language**: from 3.1.5 to 3.1.5 - **Microsoft.CodeAnalysis.Razor**: from 3.1.5 to 3.1.5 - **Microsoft.NET.Sdk.Razor**: from 3.1.5 to 3.1.5 [marker]: <> (End:7bf32a0c-3505-43af-42b0-08d79559e63d)

…g/internal/dotnet-efcore This pull request updates the following dependencies [marker]: <> (Begin:e908e90a-0c22-4c54-b254-08d79557a113) ## From https://github.com/dotnet/efcore - **Subscription**: e908e90a-0c22-4c54-b254-08d79557a113 - **Build**: 20200520.1 - **Date Produced**: 5/20/2020 5:36 PM - **Commit**: 85b57af827aa71b77d673e813e046d081c8027ed - **Branch**: refs/heads/internal/release/3.1 - **Updates**: - **Microsoft.EntityFrameworkCore.Tools**: from 3.1.4 to 3.1.5 - **Microsoft.EntityFrameworkCore.InMemory**: from 3.1.4 to 3.1.5 - **Microsoft.EntityFrameworkCore**: from 3.1.4 to 3.1.5 - **Microsoft.EntityFrameworkCore.Relational**: from 3.1.4 to 3.1.5 - **Microsoft.EntityFrameworkCore.Sqlite**: from 3.1.4 to 3.1.5 - **dotnet-ef**: from 3.1.4 to 3.1.5 - **Microsoft.EntityFrameworkCore.SqlServer**: from 3.1.4 to 3.1.5 [marker]: <> (End:e908e90a-0c22-4c54-b254-08d79557a113)

Update branding to 3.1.6

ghost

Auto-approving branch merge.

ghost · 2020-06-09T23:25:07Z

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 · 2020-06-09T23:30:50Z

This pull request has been updated.

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

dotnet-maestro-bot · 2020-06-09T23:43:25Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.1, but I could not automatically push those to merge/release/3.1-to-master to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

dotnet-maestro-bot · 2020-06-09T23:44:16Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.1, but I could not automatically push those to merge/release/3.1-to-master to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

dotnet-maestro-bot · 2020-06-09T23:44:35Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.1, but I could not automatically push those to merge/release/3.1-to-master to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

dotnet-maestro-bot · 2020-06-10T16:38:44Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.1, but I could not automatically push those to merge/release/3.1-to-master to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

dotnet-maestro-bot · 2020-06-10T17:06:10Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.1, but I could not automatically push those to merge/release/3.1-to-master to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

dotnet-maestro-bot · 2020-06-10T17:06:25Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.1, but I could not automatically push those to merge/release/3.1-to-master to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

dotnet-bot and others added 8 commits May 21, 2020 03:33

Remove darc-int feeds

8e3da95

Update branding to 3.1.6

626bf3d

Update baseline

efdd24a

Update baseline

f610ec4

Merge pull request dotnet#22731 from dotnet/wtgodbe/316

24b9e84

Update branding to 3.1.6

dotnet-maestro-bot requested a review from dougbu as a code owner June 9, 2020 23:24

ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Merge Forward ⏩ labels Jun 9, 2020

ghost approved these changes Jun 9, 2020

View reviewed changes

ghost added the auto-merge label Jun 9, 2020

Enable control flow guard for IIS dlls (dotnet#22609)

b19d9d9

dotnet-maestro-bot requested review from Tratcher, halter73 and jkotalik as code owners June 9, 2020 23:30

ghost removed the auto-merge label Jun 9, 2020

wtgodbe added 2 commits June 9, 2020 16:34

Merge branch 'master' into merge/release/3.1-to-master

97b336c

Fix stuff

fa8e387

wtgodbe merged commit 237dff2 into dotnet:master Jun 10, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[automated] Merge branch 'release/3.1' => 'master' #22743

[automated] Merge branch 'release/3.1' => 'master' #22743

Uh oh!

dotnet-maestro-bot commented Jun 9, 2020

Uh oh!

ghost left a comment

Uh oh!

ghost commented Jun 9, 2020

Uh oh!

dotnet-maestro-bot commented Jun 9, 2020

Uh oh!

dotnet-maestro-bot commented Jun 9, 2020

Uh oh!

dotnet-maestro-bot commented Jun 9, 2020

Uh oh!

dotnet-maestro-bot commented Jun 9, 2020

Uh oh!

dotnet-maestro-bot commented Jun 10, 2020

Uh oh!

dotnet-maestro-bot commented Jun 10, 2020

Uh oh!

dotnet-maestro-bot commented Jun 10, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

[automated] Merge branch 'release/3.1' => 'master' #22743

[automated] Merge branch 'release/3.1' => 'master' #22743

Uh oh!

Conversation

dotnet-maestro-bot commented Jun 9, 2020

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

Uh oh!

ghost left a comment

Choose a reason for hiding this comment

Uh oh!

ghost commented Jun 9, 2020

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.

Uh oh!

dotnet-maestro-bot commented Jun 9, 2020

Uh oh!

dotnet-maestro-bot commented Jun 9, 2020

Uh oh!

dotnet-maestro-bot commented Jun 9, 2020

Uh oh!

dotnet-maestro-bot commented Jun 9, 2020

Uh oh!

dotnet-maestro-bot commented Jun 10, 2020

Uh oh!

dotnet-maestro-bot commented Jun 10, 2020

Uh oh!

dotnet-maestro-bot commented Jun 10, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

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.