Skip to content

Conversation

@dotnet-maestro-bot
Copy link
Contributor

I detected changes in the release/5.0-rc2 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-rc2 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-rc2
git pull --ff-only
git checkout master
git pull --ff-only
git merge --no-ff release/5.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/5.0-rc2-to-master
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/5.0-rc2-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-rc2-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-rc2-to-master master
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/5.0-rc2-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-rc2-to-master
or if you are using SSH
git checkout -b merge/release/5.0-rc2-to-master master
git pull [email protected]:dotnet-maestro-bot/AspNetCore merge/release/5.0-rc2-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-rc2-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.

John Luo and others added 5 commits September 1, 2020 09:30
Remove @using Microsoft.AspNetCore.Components.Web.Virtualization in blazorserver template.
…901.2 (dotnet#25495)

[release/5.0] Update dependencies from dotnet/efcore
- Updates:
  - Microsoft.EntityFrameworkCore.Tools: from 5.0.0-rc.1.20451.1 to 5.0.0-rc.1.20451.2
  - Microsoft.EntityFrameworkCore.SqlServer: from 5.0.0-rc.1.20451.1 to 5.0.0-rc.1.20451.2
  - dotnet-ef: from 5.0.0-rc.1.20451.1 to 5.0.0-rc.1.20451.2
  - Microsoft.EntityFrameworkCore: from 5.0.0-rc.1.20451.1 to 5.0.0-rc.1.20451.2
  - Microsoft.EntityFrameworkCore.Design: from 5.0.0-rc.1.20451.1 to 5.0.0-rc.1.20451.2
  - Microsoft.EntityFrameworkCore.Relational: from 5.0.0-rc.1.20451.1 to 5.0.0-rc.1.20451.2
  - Microsoft.EntityFrameworkCore.Sqlite: from 5.0.0-rc.1.20451.1 to 5.0.0-rc.1.20451.2
  - Microsoft.EntityFrameworkCore.InMemory: from 5.0.0-rc.1.20451.1 to 5.0.0-rc.1.20451.2
…/5.0-to-release/5.0-rc2

[automated] Merge branch 'release/5.0' => 'release/5.0-rc2'
[release/5.0-rc2] Update dependencies from dotnet/efcore
- Updates:
  - Microsoft.EntityFrameworkCore.Tools: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.12
  - Microsoft.EntityFrameworkCore.SqlServer: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.12
  - dotnet-ef: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.12
  - Microsoft.EntityFrameworkCore: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.12
  - Microsoft.EntityFrameworkCore.Design: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.12
  - Microsoft.EntityFrameworkCore.Relational: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.12
  - Microsoft.EntityFrameworkCore.Sqlite: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.12
  - Microsoft.EntityFrameworkCore.InMemory: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.12

 - Merge branch 'release/5.0-rc2' into darc-release/5.0-rc2-3ebdc2ef-d6ce-4e79-aa79-c89018409111
@dotnet-maestro-bot dotnet-maestro-bot force-pushed the merge/release/5.0-rc2-to-master branch from 683e84a to 97ed919 Compare September 2, 2020 05:24
@ghost ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Merge Forward ⏩ labels Sep 2, 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 Sep 2, 2020
@ghost
Copy link

ghost commented Sep 2, 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.

…re (dotnet#25528)

[release/5.0-rc2] Update dependencies from dotnet/runtime dotnet/efcore
- Updates:
  - System.ComponentModel.Annotations: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - System.Diagnostics.DiagnosticSource: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - System.Diagnostics.EventLog: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - System.DirectoryServices.Protocols: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Logging.Abstractions: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Logging.Configuration: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Logging.Console: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Logging.Debug: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Logging.EventLog: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Logging.EventSource: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Logging.TraceSource: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Options: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Options.ConfigurationExtensions: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Options.DataAnnotations: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Primitives: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Logging: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Internal.Transport: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Http: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Hosting.Abstractions: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Caching.Abstractions: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Caching.Memory: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Configuration: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Configuration.Abstractions: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Configuration.Binder: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Configuration.CommandLine: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Configuration.EnvironmentVariables: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Configuration.FileExtensions: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Configuration.Ini: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Configuration.UserSecrets: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Configuration.Xml: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.DependencyInjection: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.DependencyInjection.Abstractions: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.FileProviders.Abstractions: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.FileProviders.Composite: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.FileProviders.Physical: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.FileSystemGlobbing: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.HostFactoryResolver.Sources: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Hosting: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Extensions.Configuration.Json: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.NETCore.BrowserDebugHost.Transport: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Win32.Registry: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.Win32.SystemEvents: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - System.Drawing.Common: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - System.Text.Json: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - System.Threading.Channels: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - System.Windows.Extensions: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - System.Text.Encodings.Web: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - System.ServiceProcess.ServiceController: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - System.IO.Pipelines: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - System.Net.Http.Json: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - System.Net.Http.WinHttpHandler: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - System.Net.WebSockets.WebSocketProtocol: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - System.Reflection.Metadata: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - System.Resources.Extensions: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - System.Runtime.CompilerServices.Unsafe: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - System.Security.AccessControl: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - System.Security.Cryptography.Cng: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - System.Security.Cryptography.Pkcs: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - System.Security.Cryptography.Xml: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - System.Security.Permissions: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27
  - System.Security.Principal.Windows: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.2.20451.27

- Updates:
  - Microsoft.EntityFrameworkCore.Tools: from 5.0.0-rc.2.20451.12 to 5.0.0-rc.2.20452.1
  - Microsoft.EntityFrameworkCore.SqlServer: from 5.0.0-rc.2.20451.12 to 5.0.0-rc.2.20452.1
  - dotnet-ef: from 5.0.0-rc.2.20451.12 to 5.0.0-rc.2.20452.1
  - Microsoft.EntityFrameworkCore: from 5.0.0-rc.2.20451.12 to 5.0.0-rc.2.20452.1
  - Microsoft.EntityFrameworkCore.Design: from 5.0.0-rc.2.20451.12 to 5.0.0-rc.2.20452.1
  - Microsoft.EntityFrameworkCore.Relational: from 5.0.0-rc.2.20451.12 to 5.0.0-rc.2.20452.1
  - Microsoft.EntityFrameworkCore.Sqlite: from 5.0.0-rc.2.20451.12 to 5.0.0-rc.2.20452.1
  - Microsoft.EntityFrameworkCore.InMemory: from 5.0.0-rc.2.20451.12 to 5.0.0-rc.2.20452.1
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

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

@ghost ghost removed the auto-merge label Sep 2, 2020
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

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

1 similar comment
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on release/5.0-rc2 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-rc2 by the following committers:

* API review changes.

* Fixed JSObjectReferenceJsonConverter

* CR feedback

* Update JSObjectReferenceExtensions.cs
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

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

@TanayParikh TanayParikh added the blocked The work on this issue is blocked due to some dependency label Sep 2, 2020
@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/5.0-rc2, but I could not automatically push those to merge/release/5.0-rc2-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.

1 similar comment
@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/5.0-rc2, but I could not automatically push those to merge/release/5.0-rc2-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.

@TanayParikh
Copy link
Contributor

@dougbu @JunTaoLuo I'm seeing a lot of downgrades / "updates" here which are actually older than the changes in master. I'm able to identify a few of them, but there are a 150 files with potential "downgrades" here. What's the best course of action?

@dougbu
Copy link
Contributor

dougbu commented Sep 2, 2020

@TanayParikh do not take any of the automated changes in eng/Version.Details.xml or eng/Versions.props in this merge (or any merge PR going forward). We sometimes take manual version changes from downlevel branches but avoid downgrading as much as possible.

But, let the $(AspNetCoreMajorMinorVersion) changes come through.

@dougbu
Copy link
Contributor

dougbu commented Sep 2, 2020

We sometimes take manual version changes from downlevel branches but avoid downgrading as much as possible.

Should have mentioned: We also sometimes take automated upgrades during a short window while in the midst of rebranding. That's not the case here.

@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/5.0-rc2, but I could not automatically push those to merge/release/5.0-rc2-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.

5 similar comments
@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/5.0-rc2, but I could not automatically push those to merge/release/5.0-rc2-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
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/5.0-rc2, but I could not automatically push those to merge/release/5.0-rc2-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
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/5.0-rc2, but I could not automatically push those to merge/release/5.0-rc2-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
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/5.0-rc2, but I could not automatically push those to merge/release/5.0-rc2-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
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/5.0-rc2, but I could not automatically push those to merge/release/5.0-rc2-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.

@TanayParikh
Copy link
Contributor

TanayParikh commented Sep 3, 2020

@TanayParikh do not take any of the automated changes in eng/Version.Details.xml or eng/Versions.props in this merge (or any merge PR going forward).

Done.

We sometimes take manual version changes from downlevel branches but avoid downgrading as much as possible.

Reverted the downgrades I could clearly identify, though there are likely to be more in areas I'm not entirely familiar with.

cc/

Please let me know if any of your changes are being downgraded through this merge PR. I'm hesitant to merge in as-is due to how many downgrades I've already found.

@halter73
Copy link
Member

halter73 commented Sep 3, 2020

I'm hesitant to merge in as-is due to how many downgrades I've already found.

That's good instinct. The changes to KestrelServerOptionsSystemdExtensions.cs reverts #24118. How did this happen? Did bot automatically do this?

Copy link
Member

@halter73 halter73 left a comment

Choose a reason for hiding this comment

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

Blocking until we figure out why changes like those made in #24118 are being reverted.

@TanayParikh
Copy link
Contributor

How did this happen? Did bot automatically do this?

Yes.

@halter73
Copy link
Member

halter73 commented Sep 3, 2020

Take another look at f7e9d0e (#25527). It looks like you were trying to revert a merge commit. That's not something that I would expect to work well, and it seems that's what downgraded everything.

Rather than trying to revert stuff or fix this PR, I think we should just close this and let darc generate a new PR.

@TanayParikh TanayParikh closed this Sep 3, 2020
@TanayParikh
Copy link
Contributor

That's not something that I would expect to work well, and it seems that's what downgraded everything.

Rather than trying to revert stuff or fix this PR, I think we should just close this and let darc generate a new PR.

Thanks for the clarification! Closing out.

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 blocked The work on this issue is blocked due to some dependency Type: Merge Forward ⏩

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants