Skip to content

Merge from 'release/6.0-rc1' into 'release/6.0'#35588

Merged
dougbu merged 10 commits intorelease/6.0from
dougbu/merge.from.rc1
Aug 24, 2021
Merged

Merge from 'release/6.0-rc1' into 'release/6.0'#35588
dougbu merged 10 commits intorelease/6.0from
dougbu/merge.from.rc1

Conversation

@dougbu
Copy link
Copy Markdown
Contributor

@dougbu dougbu commented Aug 21, 2021

  • bot couldn't do this automatically

dotnet-maestro Bot and others added 10 commits August 20, 2021 08:41
@dotnet-maestro
[release/6.0-rc1] Update dependencies from dotnet/runtime dotnet/efco…
3743dcc 
…re (#35513)
@github-actions @Tratcher
Set HttpSys read error log levels to debug #35490 (#35542)
dd2b7da 
Co-authored-by: Chris R <Tratcher@outlook.com>
[release/6.0-rc1] Treat reference type parameters in oblivious nullab…
781f4fb 
…ility context as optional (#35526)

* Treat parameters in oblivious nullability context as optional

* Only apply fix for reference types

* Update optionality check in API descriptor

* Update check in BindAsync and Mvc.ApiExplorer test
@github-actions @JamesNK
HTTP/3: Use new QuicStream.ReadsCompleted property in transport (#35483)
4655c3c 
Co-authored-by: James Newton-King <james@newtonking.com>
@JamesNK
HTTP/3: Fix incorrectly pooling aborted streams (#35441)
670cfd0
@MackinnonBuck @BrennanConroy
[release/6.0-rc1] Binding support for 'bool' values with InputRadioGr…
e8e2b5f 
…oup and InputSelect (#35523)

* Binding support for 'bool' values with InputRadioGroup and InputSelect (#35318)

* Update CodeCheck.ps1

Co-authored-by: Brennan <brecon@microsoft.com>
@dotnet-maestro
[release/6.0-rc1] Update dependencies from dotnet/efcore dotnet/runti…
115de74 
…me (#35558)

* Update dependencies from https://github.com/dotnet/efcore build 20210820.19

Microsoft.EntityFrameworkCore.Tools , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.Design
 From Version 6.0.0-rc.1.21420.8 -> To Version 6.0.0-rc.1.21420.19

* Update dependencies from https://github.com/dotnet/efcore build 20210820.22

Microsoft.EntityFrameworkCore.Tools , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.Design
 From Version 6.0.0-rc.1.21420.8 -> To Version 6.0.0-rc.1.21420.22

* Update dependencies from https://github.com/dotnet/efcore build 20210820.30

Microsoft.EntityFrameworkCore.Tools , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.Design
 From Version 6.0.0-rc.1.21420.8 -> To Version 6.0.0-rc.1.21420.30

* Update dependencies from https://github.com/dotnet/runtime build 20210820.15

Microsoft.NETCore.Platforms , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.Win32.SystemEvents , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.Extensions.Primitives , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.Extensions.Options , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Configuration , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging , Microsoft.Extensions.Http , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Hosting , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Ref , System.Windows.Extensions , System.Threading.Channels , System.Text.Json , System.Text.Encodings.Web , System.ServiceProcess.ServiceController , System.Drawing.Common , System.DirectoryServices.Protocols , System.Diagnostics.EventLog , System.Diagnostics.DiagnosticSource , System.IO.Pipelines , System.Security.Permissions , System.Security.Cryptography.Xml , System.Security.Cryptography.Pkcs , System.Runtime.CompilerServices.Unsafe , System.Resources.Extensions , System.Reflection.Metadata , System.Net.Http.WinHttpHandler , System.Net.Http.Json
 From Version 6.0.0-rc.1.21420.7 -> To Version 6.0.0-rc.1.21420.15

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@rafikiassumani-msft
Improve Minimal APIs support for request media types #35082 (#35230) (#…
ac45a99 
…35579)

* add support for request media types
@dotnet-maestro
[release/6.0-rc1] Update dependencies from dotnet/efcore dotnet/runti…
0b82af5 
…me (#35573)
@dougbu
Merge remote-tracking branch 'release/6.0-rc1' into 'release/6.0'
3aafbcf
@BrennanConroy
Copy link
Copy Markdown
Member

BrennanConroy commented Aug 21, 2021

Why couldn't it do it? #35556

Also, I'm guessing this PR will fail on code check because of a unshipped.txt file being updated in a release/x.x branch
https://github.com/dotnet/aspnetcore/pull/35588/files#diff-fcf0cf86c8fe3f7f872569404cd06a4be7e6f51fb364e8102fc752def6d34731R216

@dougbu
Copy link
Copy Markdown
Contributor Author

dougbu commented Aug 21, 2021

I believe the "bot" (actually a pipeline build kicked off after merges into source branches) was attempting to update #35556. It failed because versions have changed in both branches. I'll close #35556 in favour of this one.

We admins can ignore Code Check failures when necessary. This is a weird case caused by creating the RTM branch so early in the release cycle.

@dougbu dougbu mentioned this pull request Aug 21, 2021
Closed
@BrennanConroy
Copy link
Copy Markdown
Member

BrennanConroy commented Aug 21, 2021

Sounds good! Thanks for the explanation.

@dougbu
Copy link
Copy Markdown
Contributor Author

dougbu commented Aug 22, 2021 •
edited
Loading

The only failures here are the expected Code Check complaints about 4 modified PublicAPI.Unshipped.txt files and the continued problems in the optional dotnet.aspnetcore-components pipeline. That's fine prior to RTM. (API stability in RC1 would have been nice but that ship has sailed.)

/ping reviewers

PS. @SteveSandersonMS @HaoK why isn't the new pipeline named aspnetcore-components❔ We don't prefix aspnetcore in any other pipelines and, while some teams use the dotnet. prefix, more use dotnet- and still more (like us) forgo prefixes entirely.

(This was answered elsewhere and I renamed the pipeline.)

@Pilchie Pilchie added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Aug 23, 2021
@dougbu
Copy link
Copy Markdown
Contributor Author

dougbu commented Aug 24, 2021

/ping reviewers

@dougbu dougbu mentioned this pull request Aug 24, 2021
Closed
wtgodbe
wtgodbe approved these changes Aug 24, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@wtgodbe wtgodbe 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, did you make any changes other than merge conflict resolution?

@wtgodbe
Copy link
Copy Markdown
Member

wtgodbe commented Aug 24, 2021

I believe the "bot" (actually a pipeline build kicked off after merges into source branches) was attempting to update #35556. It failed because versions have changed in both branches. I'll close #35556 in favour of this one.

It doesn't fail because versions changed in both branches, it fails after somebody pushes a commit resolving merge conflicts. In those cases the bot keeps failing until the old PR is merged, then opens a catch-up PR.

@dougbu
Copy link
Copy Markdown
Contributor Author

dougbu commented Aug 24, 2021

did you make any changes other than merge conflict resolution?

No

@dougbu dougbu merged commit 057ed19 into release/6.0 Aug 24, 2021
@dougbu dougbu deleted the dougbu/merge.from.rc1 branch August 24, 2021 18:27
@ghost ghost added this to the 6.0-rc2 milestone Aug 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wtgodbe wtgodbe wtgodbe approved these changes

@BrennanConroy BrennanConroy Awaiting requested review from BrennanConroy

@halter73 halter73 Awaiting requested review from halter73

@javiercn javiercn Awaiting requested review from javiercn

@Pilchie Pilchie Awaiting requested review from Pilchie

@pranavkm pranavkm Awaiting requested review from pranavkm

@Tratcher Tratcher Awaiting requested review from Tratcher

Assignees

No one assigned

Labels

area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework

Projects

None yet

Milestone

6.0-rc2

Development

Successfully merging this pull request may close these issues.

7 participants

@dougbu @BrennanConroy @wtgodbe @Pilchie @JamesNK @MackinnonBuck @rafikiassumani-msft