Skip to content

[automated] Merge branch 'release/3.1' => 'main' #32597

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 16 commits into from
May 14, 2021
Merged

[automated] Merge branch 'release/3.1' => 'main' #32597

merged 16 commits into from
May 14, 2021

Conversation

dotnet-maestro-bot
Copy link
Contributor

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

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

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-bot and others added 15 commits April 7, 2021 16:48
@dotnet-bot
Merge in 'release/3.1' changes
639a606
@dotnet-bot
Merge in 'release/3.1' changes
41531ab
@dotnet-bot
Merge in 'release/3.1' changes
51f863a
@dotnet-bot
Merge in 'release/3.1' changes
65f78c0
@dotnet-bot
Merge in 'release/3.1' changes
fc284ae
@dotnet-bot
Merge in 'release/3.1' changes
1deebca
@dotnet-bot
Merge in 'release/3.1' changes
4c00455
@dotnet-bot
Merge in 'release/3.1' changes
c6516ad
@dotnet-bot @wtgodbe
Merged PR 14006: [internal/release/3.1] Update dependencies from dnce…
e4704f7 
…ng/internal/dotnet-efcore

This pull request updates the following dependencies

[marker]: <> (Begin:e908e90a-0c22-4c54-b254-08d79557a113)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- **Subscription**: e908e90a-0c22-4c54-b254-08d79557a113
- **Build**: 20210407.7
- **Date Produced**: 4/7/2021 8:05 PM
- **Commit**: 316acfe22bc6d3834e135dc6b8053dc9f560ffc2
- **Branch**: refs/heads/internal/release/3.1

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.EntityFrameworkCore.Tools**: [from 3.1.14 to 3.1.15][1]
  - **Microsoft.EntityFrameworkCore.SqlServer**: [from 3.1.14 to 3.1.15][1]
  - **dotnet-ef**: [from 3.1.14 to 3.1.15][1]
  - **Microsoft.EntityFrameworkCore**: [from 3.1.14 to 3.1.15][1]
  - **Microsoft.EntityFrameworkCore.InMemory**: [from 3.1.14 to 3.1.15][1]
  - **Microsoft.EntityFrameworkCore.Relational**: [from 3.1.14 to 3.1.15][1]
  - **Microsoft.EntityFrameworkCore.Sqlite**: [from 3.1.14 to 3.1.15][1]
  - **Microsoft.Extensions.Logging**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.AspNetCore.Analyzer.Testing**: [from 3.1.14-servicing.21165.9 to 3.1.15-servicing.21207.1][2]
  - **Microsoft.AspNetCore.BenchmarkRunner.Sources**: [from 3.1.14-servicing.21165.9 to 3.1.15-servicing.21207.1][2]
  - **Microsoft.Extensions.ActivatorUtilities.Sources**: [from 3.1.14-servicing.21165.9 to 3.1.15-servicing.21207.1][2]
  - **Microsoft.Extensions.Caching.Abstractions**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Caching.Memory**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Caching.SqlServer**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Caching.StackExchangeRedis**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.CommandLineUtils.Sources**: [from 3.1.14-servicing.21165.9 to 3.1.15-servicing.21207.1][2]
  - **Microsoft.Extensions.Configuration.Abstractions**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Configuration.AzureKeyVault**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Configuration.Binder**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Configuration.CommandLine**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Configuration.EnvironmentVariables**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Configuration.FileExtensions**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Configuration.Ini**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Configuration.Json**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Configuration.KeyPerFile**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Configuration.UserSecrets**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Configuration.Xml**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Configuration**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.DependencyInjection.Abstractions**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.DependencyInjection**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.DiagnosticAdapter**: [fr...
@dotnet-bot @wtgodbe
Merged PR 14041: [internal/release/3.1] Update dependencies from dnce…
c5665ed 
…ng/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**: 20210407.8
- **Date Produced**: 4/7/2021 10:59 PM
- **Commit**: fd6e7516ef0f4d858b5fa2737791f1e208010a15
- **Branch**: refs/heads/internal/release/3.1

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.AspNetCore.Razor.Language**: [from 3.1.14 to 3.1.15][1]
  - **Microsoft.CodeAnalysis.Razor**: [from 3.1.14 to 3.1.15][1]
  - **Microsoft.NET.Sdk.Razor**: [from 3.1.14 to 3.1.15][1]
  - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: [from 3.1.14 to 3.1.15][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling/branches?baseVersion=GCaec2954&targetVersion=GCfd6e751&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:7bf32a0c-3505-43af-42b0-08d79559e63d)
@dotnet-bot @wtgodbe
Merged PR 14341: [internal/release/3.1] Update dependencies from dnce…
b467b1f 
…ng/internal/dotnet-efcore

This pull request updates the following dependencies

[marker]: <> (Begin:e908e90a-0c22-4c54-b254-08d79557a113)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- **Subscription**: e908e90a-0c22-4c54-b254-08d79557a113
- **Build**: 20210414.7
- **Date Produced**: 4/15/2021 2:53 AM
- **Commit**: f27020308547a24d2b78fad34307d1a4d502f355
- **Branch**: refs/heads/internal/release/3.1

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.EntityFrameworkCore.Tools**: [from 3.1.15 to 3.1.15][1]
  - **Microsoft.EntityFrameworkCore.SqlServer**: [from 3.1.15 to 3.1.15][1]
  - **dotnet-ef**: [from 3.1.15 to 3.1.15][1]
  - **Microsoft.EntityFrameworkCore**: [from 3.1.15 to 3.1.15][1]
  - **Microsoft.EntityFrameworkCore.InMemory**: [from 3.1.15 to 3.1.15][1]
  - **Microsoft.EntityFrameworkCore.Relational**: [from 3.1.15 to 3.1.15][1]
  - **Microsoft.EntityFrameworkCore.Sqlite**: [from 3.1.15 to 3.1.15][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GC390084d&targetVersion=GCf270203&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:e908e90a-0c22-4c54-b254-08d79557a113)

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.Extensions.Logging**: from 3.1.15 to 3.1.15 (parent: Microsoft.EntityFrameworkCore)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.14 to 3.1.15 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.AspNetCore.Analyzer.Testing**: from 3.1.15-servicing.21207.1 to 3.1.15-servicing.21214.5 (parent: Microsoft.EntityFrameworkCore)
  - **Microsoft.AspNetCore.BenchmarkRunner.Sources**: from 3.1.15-servicing.21207.1 to 3.1.15-servicing.21214.5 (parent: Microsoft.EntityFrameworkCore)
  - **Microsoft.Extensions.ActivatorUtilities.Sources**: from 3.1.15-servicing.21207.1 to 3.1.15-servicing.21214.5 (parent: Microsoft.EntityFrameworkCore)
  - **Microsoft.Extensions.Caching.Abstractions**: from 3.1.15 to 3.1.15 (parent: Microsoft.EntityFrameworkCore)
  - **Microsoft.Extensions.Caching.Memory**: from 3.1.15 to 3.1.15 (parent: Microsoft.EntityFrameworkCore)
  - **Microsoft.Extensions.Caching.SqlServer**: from 3.1.15 to 3.1.15 (parent: Microsoft.EntityFrameworkCore)
  - **Microsoft.Extensions.Caching.StackExchangeRedis**: from 3.1.15 to 3.1.15 (parent: Microsoft.EntityFrameworkCore)
  - **Microsoft.Extensions.CommandLineUtils.Sources**: from 3.1.15-servicing.21207.1 to 3.1.15-servicing.21214.5 (parent: Microsoft.EntityFrameworkCore)
  - **Microsoft.Extensions.Configuration.Abstractions...
@dotnet-bot
[internal/release/3.1] Update dependencies from dnceng/internal/dotne…
8ca3954 
…t-aspnetcore-tooling

 - Fix tests

 - Fixup nuget config

 - Merge remote-tracking branch 'origin/internal/release/3.1' into darc-internal/release/3.1-abb7ce07-c2cf-48b4-83cf-58ca4dbabd3d
@wtgodbe
Merge commit '8ca3954ca335343ce6dd1d14d8d1c6c3369710b7' into wtgodbe/…
b71cfb5 
…3116Merge
@wtgodbe
Internal->public code merge, update baseline & SDK
68e6e22
@wtgodbe
Merge pull request dotnet#32583 from dotnet/wtgodbe/3116Merge
dbdec83 
[release/3.1] code-merge, baseline/SDK update
@dotnet-maestro-bot dotnet-maestro-bot requested review from dougbu and a team as code owners May 11, 2021 22:04
@dotnet-maestro-bot dotnet-maestro-bot force-pushed the merge/release/3.1-to-main branch from 0176905 to dbdec83 Compare May 11, 2021 22:04
@ghost ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Merge Forward ⏩ labels May 11, 2021
ghost
ghost approved these changes May 11, 2021
View reviewed changes
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 tell-mode Indicates a PR which is being merged during tell-mode community-contribution Indicates that the PR has been added by a community member labels May 11, 2021
@jkotalik jkotalik merged commit 8674585 into dotnet:main May 14, 2021
@ghost ghost added this to the 6.0-preview5 milestone May 14, 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
Reviewers

@dougbu dougbu Awaiting requested review from dougbu

Assignees
No one assigned
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework tell-mode Indicates a PR which is being merged during tell-mode Type: Merge Forward ⏩
Projects
None yet
Milestone
6.0-preview5
Development

Successfully merging this pull request may close these issues.
6 participants
@dotnet-maestro-bot @jkotalik @mkArtakMSFT @dotnet-bot @wtgodbe @captainsafia