Skip to content

[automated] Merge branch 'release/5.0-preview5' => 'master' #21806

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

Merged

Conversation

dotnet-maestro-bot
Copy link
Contributor

I detected changes in the release/5.0-preview5 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-preview5 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-preview5
git pull --ff-only
git checkout master
git pull --ff-only
git merge --no-ff release/5.0-preview5

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

* Do not ship SiteExtension in previews
  - We've generally avoided shipping the SiteExtension in preview releases.
* fb
@ghost ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Merge Forward ⏩ labels May 14, 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 auto-merge labels May 14, 2020
…ling (dotnet#21710)

* Update dependencies from https://github.com/dotnet/aspnetcore-tooling build 20200511.4

- Microsoft.AspNetCore.Mvc.Razor.Extensions: 5.0.0-preview.5.20258.1 -> 5.0.0-preview.5.20261.4
- Microsoft.AspNetCore.Razor.Language: 5.0.0-preview.5.20258.1 -> 5.0.0-preview.5.20261.4
- Microsoft.CodeAnalysis.Razor: 5.0.0-preview.5.20258.1 -> 5.0.0-preview.5.20261.4
- Microsoft.NET.Sdk.Razor: 5.0.0-preview.5.20258.1 -> 5.0.0-preview.5.20261.4

Dependency coherency updates

- Microsoft.Extensions.Caching.Abstractions: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Caching.Memory: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.Abstractions: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.Binder: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.CommandLine: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.EnvironmentVariables: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.FileExtensions: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.Ini: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.Json: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.UserSecrets: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.Xml: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.DependencyInjection.Abstractions: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.DependencyInjection: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.FileProviders.Abstractions: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.FileProviders.Composite: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.FileProviders.Physical: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.FileSystemGlobbing: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Hosting.Abstractions: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Hosting: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Http: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.Abstractions: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.Configuration: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.Console: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.Debug: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.EventSource: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.EventLog: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.TraceSource: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Options.ConfigurationExtensions: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Options.DataAnnotations: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Options: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Primitives: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Internal.Transport: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Win32.Registry: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Win32.SystemEvents: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- System.ComponentModel.Annotations: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- System.Diagnostics.EventLog: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- System.Drawing.Common: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- System.IO.Pipelines: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- System.Net.Http.WinHttpHandler: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- System.Net.WebSockets.WebSocketProtocol: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- System.Reflection.Metadata: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- System.Runtime.CompilerServices.Unsafe: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- System.Security.Cryptography.Cng: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- System.Security.Cryptography.Pkcs: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- System.Security.Cryptography.Xml: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- System.Security.Permissions: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- System.Security.Principal.Windows: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- System.ServiceProcess.ServiceController: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- System.Text.Encodings.Web: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- System.Text.Json: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- System.Threading.Channels: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- System.Windows.Extensions: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.DependencyModel: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.NETCore.App.Ref: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.NETCore.App.Runtime.win-x64: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.NETCore.App.Internal: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.NETCore.Platforms: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Net.Compilers.Toolset: 3.7.0-1.20254.1 -> 3.7.0-2.20259.1 (parent: Microsoft.AspNetCore.Razor.Language)

* Try BuildPool.Windows.10.Amd64.VS2019.Pre queues

- do not merge into 'master' branch

* Update RuntimeExtensionsReferenceDirectory with new tfm

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Doug Bunting <[email protected]>
Co-authored-by: John Luo <[email protected]>
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

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

@ghost ghost removed the auto-merge label May 14, 2020
@jkotalik jkotalik merged commit d99e7fe into dotnet:master May 14, 2020
@amcasey amcasey added the area-hosting Includes Hosting label Jun 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-hosting Includes Hosting 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