Skip to content
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

[automated] Merge branch 'release/5.0' => 'master' #26767

Merged

Conversation

dotnet-maestro-bot
Copy link
Contributor

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

  • halter73
  • dotnet-maestro[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/5.0
git pull --ff-only
git checkout master
git pull --ff-only
git merge --no-ff release/5.0

# 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-to-master
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/5.0-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-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-to-master master
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/5.0-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-to-master
or if you are using SSH
git checkout -b merge/release/5.0-to-master master
git pull [email protected]:dotnet-maestro-bot/AspNetCore merge/release/5.0-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-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 and others added 3 commits October 9, 2020 22:22
@dotnet-maestro-bot dotnet-maestro-bot force-pushed the merge/release/5.0-to-master branch from dd002ce to ff6d198 Compare October 10, 2020 03:41
@ghost ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Merge Forward ⏩ labels Oct 10, 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 Oct 10, 2020
@ghost
Copy link

ghost commented Oct 10, 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.

…1010.7 (dotnet#26792)

[release/5.0] Update dependencies from dotnet/runtime
@ghost ghost removed the auto-merge label Oct 11, 2020
…6797)

* !!! Correct condition controlling `public` API analysis !!!
-  dotnet#26785 demonstrated analyzers were inoperable

* Remove unused `public` API files

* Update `public` API files
- three Components files were missing `#nullable enable`
- `nullable` annotations missing or out-of-date elsewhere

* Ignore `public` API files completely during source build
- do not warn about unused files

* Update more `public` API files
dotnet-maestro bot and others added 3 commits October 12, 2020 12:54
…012.2 (dotnet#26816)

Microsoft.EntityFrameworkCore.Tools , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer
 From Version 5.0.0-rtm.20509.3 -> To Version 5.0.0

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
- remove `$(DisableServicingFeatures)` property; `$(IsServicingBuild)` works now
@halter73 halter73 force-pushed the merge/release/5.0-to-master branch from 1b59ce2 to 16543d4 Compare October 13, 2020 00:23
Copy link
Member

@dougbu dougbu left a comment

Choose a reason for hiding this comment

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

Looks good but you or @TanayParikh will need to open this branch and use VS to add the new members to the API baseline files.

Or, @Pilchie should we remove the baseline files from 'master' until much later in the release❔

@Pilchie
Copy link
Member

Pilchie commented Oct 13, 2020

I’d prefer to keep them through the release so that we are more aware of when API surface area changes, though we should move the 5.0 APIs to the “Shipped” files.

@halter73 halter73 force-pushed the merge/release/5.0-to-master branch from e81582d to 461bdcc Compare October 13, 2020 01:54
@dougbu
Copy link
Member

dougbu commented Oct 13, 2020

though we should move the 5.0 APIs to the “Shipped” files.

Soon 😺

@halter73
Copy link
Member

I'm working through applying the analyzer suggestions using VS, but it's unbelievably slow. I'm going to try it on my office workstation to see if that helps but I'm not very hopeful. Is there any way to mass apply suggestions for "RS0036" analyzer suggestions without VS?

@dougbu
Copy link
Member

dougbu commented Oct 13, 2020

Is there any way to mass apply suggestions for "RS0036" analyzer suggestions without VS?

Personally, I open the smallest containing *.slnf file for projects w/ errors and build. Then I navigate to one of the errors and use the fixer's entire solution option.

@halter73 halter73 force-pushed the merge/release/5.0-to-master branch from 461bdcc to c074c85 Compare October 13, 2020 04:06
@halter73 halter73 force-pushed the merge/release/5.0-to-master branch from c074c85 to 41246b0 Compare October 13, 2020 04:12
@Pilchie
Copy link
Member

Pilchie commented Oct 13, 2020

A commandline way of applying the fixes is a feature request, but I don't think it exists yet, right @mavasani ?

@mavasani
Copy link

A commandline way of applying the fixes is a feature request, but I don't think it exists yet, right @mavasani ?

That is correct, it has still not been implemented. Tagging @mikadumont @vatsalyaagrawal

@mikadumont
Copy link

A commandline way of applying the fixes

I went ahead and created an issue to be tracked here dotnet/roslyn#48561

@runfoapp runfoapp bot mentioned this pull request Oct 13, 2020
@TanayParikh
Copy link
Contributor

@dotnet/aspnet-build updated with the additional public api annotations, and now passing CI. Any objections in merging?

@dougbu
Copy link
Member

dougbu commented Oct 13, 2020

@TanayParikh no objection from me. I'm surprised the public API is so different from what's in release/5.0 but everything seems to be working.

@Pilchie
Copy link
Member

Pilchie commented Oct 13, 2020

Tagging @pranavkm to take a look. Looks like a lot of these changes are to go from null-oblivious to null-annotated. Is that expected? Did we do more nullable work in master? Did a new arcade change a setting here or something?

@pranavkm
Copy link
Contributor

We made changes to use nullable on generic type parameters late in 5.0. The changes make sense.

@TanayParikh
Copy link
Contributor

Thanks all, merging.

@TanayParikh TanayParikh merged commit d0978cd into dotnet:master Oct 14, 2020
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.

8 participants