Skip to content

[automated] Merge branch 'release/3.1' => 'master' #15225

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
Closed
wants to merge 182 commits into from
Closed

[automated] Merge branch 'release/3.1' => 'master' #15225

wants to merge 182 commits into from

Conversation

dotnet-maestro-bot
Copy link
Contributor

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

dougbu and others added 30 commits September 23, 2019 22:45
@dougbu
Update branding to 2.1.14
82c42d5 
- aspnet/AspNetCore-Internal#3153
@wtgodbe
Merge branch 'release/2.2' into merge/release/2.1-to-release/2.2
2ff5abb
@wtgodbe
Merge branches
ff61a43
@wtgodbe
Add icon metadata to manually generated .nuspecs
8c49f89
@wtgodbe
Merge pull request dotnet#14357 from dotnet-maestro-bot/merge/release…
3bb7be1 
…/2.1-to-release/2.2

[automated] Merge branch 'release/2.1' => 'release/2.2'
@wtgodbe
Update to GA SDK
4e72e66
@wtgodbe
Update package baseline
73ffb2d
@dougbu
Update branding to 3.0.1
c974842 
- aspnet/AspNetCore-Internal#3153
@dougbu
Disable up-to-date check of package baselines
fcad3da
@dougbu
Correct and centralize a couple of conditions
8bfb2a7 
- add `$(IgnorePackageBaselines)` property
@dougbu
Further centralize choice to opt out of servicing features for now
2d9d13a 
- no changes in known frameworks, targeting pack features, et cetera
@wtgodbe
Update to stable SDK in source build
f20a414
@wtgodbe
Use up-to-date nuget versions
86e9b45
@wtgodbe
Update MSBuild deps
ac69173
@wtgodbe
Suppress errors for removed references in Components.csproj
e233890
@dougbu
Disable building targeting pack
3c65c03 
- `$(IsServicingBuild)` disabled at the moment
@wtgodbe
Temporarily try usi a preview9 sdk
14eb9e3
@wtgodbe
Newer SDK
cad1988
@dougbu
Find or install Tar on CI
f219a38 
- work around dotnet/core-eng#7970
- install Git in repo if Tar can't be found in usual locations
- use found or installed Tar in Microsoft.AspNetCore.App.Ref project
  - copy into repo from wherever it's found
- add lots of `Write-Host` debugging

nit: clean up / comment on VS Code warnings about build.ps1
@dougbu
Create missing directory and simplify workaround slightly
fd34e14
@dougbu
Update branding to 3.0.1 (dotnet#14404)
6a50b16 
- includes workarounds that should be removed or improved ASAP
  e.g. dotnet@f219a38 and dotnet@fd34e14
@wtgodbe
Revert to GA SDK
fa21e53
@wtgodbe
Merge pull request dotnet#14535 from aspnet/Baseline30
db40877 
Update package baseline
@jkotalik @analogrelay
Update check for 413 in IIS (dotnet#14589)
029a4c0
@jkotalik @analogrelay
[release/2.2] Backport memory leak fix from 3.0 (dotnet#13840)
59bdc34
@dotnet-maestro
Update dependencies from https://github.com/aspnet/EntityFrameworkCore …
668475c 
…build 20191002.1

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview1.19502.1
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview1.19502.1
- dotnet-ef - 3.1.0-preview1.19502.1
- Microsoft.EntityFrameworkCore - 3.1.0-preview1.19502.1
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview1.19502.1
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview1.19502.1
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview1.19502.1

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Bcl.AsyncInterfaces - 1.1.0-preview1.19501.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19501.15 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.CSharp - 4.7.0-preview1.19501.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.Registry - 4.7.0-preview1.19501.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.SystemEvents - 4.7.0-preview1.19501.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 4.7.0-preview1.19501.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 4.7.0-preview1.19501.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Drawing.Common - 4.7.0-preview1.19501.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 4.7.0-preview1.19501.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.Http.WinHttpHandler - 4.7.0-preview1.19501.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.WebSockets.WebSocketProtocol - 4.7.0-preview1.19501.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 1.8.0-preview1.19501.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 4.7.0-preview1.19501.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 4.7.0-preview1.19501.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Pkcs - 4.7.0-preview1.19501.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 4.7.0-preview1.19501.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Permissions - 4.7.0-preview1.19501.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Principal.Windows - 4.7.0-preview1.19501.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 4.7.0-preview1.19501.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 4.7.0-preview1.19501.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 4.7.0-preview1.19501.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Threading.Channels - 4.7.0-preview1.19501.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Windows.Extensions - 4.7.0-preview1.19501.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 3.1.0-preview1.19501.15 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.1.0-preview1.19501.15 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-preview1.19501.15 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.1.0-preview1.19501.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Internal.AspNetCore.Analyzers - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.1.0-preview1.19501.6 (parent: Microsoft.EntityFrameworkCore)
@dougbu
Merge branch 'release/3.0' into merge/release/2.2-to-release/3.0
8a54461
@dotnet-maestro
Update dependencies from https://github.com/aspnet/EntityFrameworkCore …
90790ca 
…build 20191002.2

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview1.19502.2
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview1.19502.2
- dotnet-ef - 3.1.0-preview1.19502.2
- Microsoft.EntityFrameworkCore - 3.1.0-preview1.19502.2
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview1.19502.2
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview1.19502.2
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview1.19502.2

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Bcl.AsyncInterfaces - 1.1.0-preview1.19501.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19501.24 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.CSharp - 4.7.0-preview1.19501.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.Registry - 4.7.0-preview1.19501.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.SystemEvents - 4.7.0-preview1.19501.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 4.7.0-preview1.19501.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 4.7.0-preview1.19501.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Drawing.Common - 4.7.0-preview1.19501.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 4.7.0-preview1.19501.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.Http.WinHttpHandler - 4.7.0-preview1.19501.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.WebSockets.WebSocketProtocol - 4.7.0-preview1.19501.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 1.8.0-preview1.19501.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 4.7.0-preview1.19501.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 4.7.0-preview1.19501.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Pkcs - 4.7.0-preview1.19501.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 4.7.0-preview1.19501.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Permissions - 4.7.0-preview1.19501.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Principal.Windows - 4.7.0-preview1.19501.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 4.7.0-preview1.19501.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 4.7.0-preview1.19501.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 4.7.0-preview1.19501.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Threading.Channels - 4.7.0-preview1.19501.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Windows.Extensions - 4.7.0-preview1.19501.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 3.1.0-preview1.19501.24 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.1.0-preview1.19501.24 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-preview1.19501.24 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.1.0-preview1.19501.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Internal.AspNetCore.Analyzers - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.1.0-preview1.19502.1 (parent: Microsoft.EntityFrameworkCore)
@dougbu
Merge branch 'release/2.2' => 'release/3.0' (dotnet#14652)
a3fd923
@pranavkm
Retarget Ignitor to netcoreapp3.0 (dotnet#14668)
b9d0e61
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on release/3.1 by the following committers:

@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on release/3.1 by the following committers:

@pranavkm
Reduce the number of members on ModelMetadataIdentity (dotnet#15280)
8c77190 
* Reduce the number of members on ModelMetadataIdentity

ModelMetadataIdentity is a discriminated union. We recently introduced an additional member on this type,
but are concerned about the performance implication of doing this. This change uses a discriminated field
to reset the member count to 3.0.
@pranavkm
Fix some issues with Ignitor (dotnet#15276)
9f9fbd0 
* Avoid null ref when FormatException is not set
* Handle errors when the client is canceled but an operation is in progress
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

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

dotnet-maestro bot and others added 3 commits October 24, 2019 00:07
@dotnet-maestro
[release/3.1] Update dependencies from 3 repositories (dotnet#15218)
c82a95e 
* Update dependencies from https://github.com/dotnet/arcade build 20191017.3

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19517.3
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19517.3
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19517.3

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.2

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.2
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.2
- dotnet-ef - 3.1.0-preview2.19521.2
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.2
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.2
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.2
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.2

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.4

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.4
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.4
- dotnet-ef - 3.1.0-preview2.19521.4
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.4
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.4
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.4
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.4

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.5

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.5
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.5
- dotnet-ef - 3.1.0-preview2.19521.5
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.5
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.5
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.5
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.5

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.7

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.7
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.7
- dotnet-ef - 3.1.0-preview2.19521.7
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.7
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.7
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.7
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.7

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.8

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.8
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.8
- dotnet-ef - 3.1.0-preview2.19521.8
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.8
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.8
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.8
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.8

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.9

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.9
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.9
- dotnet-ef - 3.1.0-preview2.19521.9
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.9
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.9
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.9
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.9

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.11

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.11
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.11
- dotnet-ef - 3.1.0-preview2.19521.11
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.11
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.11
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.11
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.11

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.12

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.12
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.12
- dotnet-ef - 3.1.0-preview2.19521.12
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.12
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.12
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.12
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.12

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.13

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.13
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.13
- dotnet-ef - 3.1.0-preview2.19521.13
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.13
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.13
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.13
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.13

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191022.1

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19522.1
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19522.1
- dotnet-ef - 3.1.0-preview2.19522.1
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19522.1
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19522.1
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19522.1
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19522.1

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191022.3

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19522.3
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19522.3
- dotnet-ef - 3.1.0-preview2.19522.3
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19522.3
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19522.3
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19522.3
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19522.3

* Remove duplicate icon url

* Remove more duplicate icon elements

* Remove more package icons

* Remove packageIcon

* Update dependencies from https://github.com/aspnet/Blazor build 20191023.1

- Microsoft.AspNetCore.Blazor.Mono - 3.1.0-preview2.19523.1

* Undo bad deletion of eng/common file
@dotnet-maestro
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling …
3e8f7fd 
…build 20191023.2

- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.1.0-preview2.19523.2
- Microsoft.AspNetCore.Razor.Language - 3.1.0-preview2.19523.2
- Microsoft.CodeAnalysis.Razor - 3.1.0-preview2.19523.2
- Microsoft.NET.Sdk.Razor - 3.1.0-preview2.19523.2
@dotnet-maestro
Update dependencies from https://github.com/aspnet/EntityFrameworkCore …
4296415 
…build 20191023.7

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19523.7
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19523.7
- dotnet-ef - 3.1.0-preview2.19523.7
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19523.7
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19523.7
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19523.7
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19523.7
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on release/3.1 by the following committers:

@hermanho @javiercn
[ApiAuth] Fix subscription callbacks when unsubscribe (dotnet#15194)
5776542 
re-assigned the callback array to itself after running splice on it when a client unsubscribed from notifications.
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on release/3.1 by the following committers:

@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on release/3.1 by the following committers:

@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on release/3.1 by the following committers:

@javiercn
Copy link
Member

I've tried to update this, but I can't. It's failing with the following message

! [remote rejected]       merge/release/3.1-to-master -> merge/release/3.1-to-master (refusing to allow an integration to create or update .github/workflows/labeler.yml)
error: failed to push some refs to 'https://github.com/dotnet-maestro-bot/AspNetCore.git'
C:\work\AspNetCore3 [merge/release/3.1-to-master]> git push https://github.com/dotnet-maestro-bot/AspNetCore.git merge/release/3.1-to-master
Enumerating objects: 432, done.
Counting objects: 100% (432/432), done.
Delta compression using up to 8 threads
Compressing objects: 100% (101/101), done.
Writing objects: 100% (148/148), 17.45 KiB | 940.00 KiB/s, done.
Total 148 (delta 107), reused 71 (delta 45)
remote: Resolving deltas: 100% (107/107), completed with 106 local objects.
To https://github.com/dotnet-maestro-bot/AspNetCore.git
 ! [remote rejected]       merge/release/3.1-to-master -> merge/release/3.1-to-master (refusing to allow an integration to create or update .github/workflows/labeler.yml)
error: failed to push some refs to 'https://github.com/dotnet-maestro-bot/AspNetCore.git'

davidfowl
davidfowl reviewed Oct 24, 2019
View reviewed changes
src/Components/Ignitor/src/CancellableOperation.cs
{
var operation = (CancellableOperation<TResult>)self!;

if (cancellationToken.IsCancellationRequested)
Copy link
Member

Choose a reason for hiding this comment

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

All this work to use the object passed in and it still makes a closure here 😄

Copy link
Contributor

Choose a reason for hiding this comment

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

Commenting on a merge PR really helps nobody 🥇

davidfowl
davidfowl reviewed Oct 24, 2019
View reviewed changes
src/Components/Ignitor/src/CancellableOperation.cs
namespace Ignitor
{
internal class CancellableOperation<TResult>
{
public CancellableOperation(TimeSpan? timeout)
public CancellableOperation(TimeSpan? timeout, CancellationToken cancellationToken)
{
Timeout = timeout;

Completion = new TaskCompletionSource<TResult>(TaskContinuationOptions.RunContinuationsAsynchronously);
Completion.Task.ContinueWith(
Copy link
Member

Choose a reason for hiding this comment

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

Why are we using ContinueWith?

@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on release/3.1 by the following committers:

javiercn and others added 2 commits October 24, 2019 18:59
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

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

@pranavkm
Copy link
Contributor

Code changes were merged as part of #15355. I'll close this and let the bot do it's thing.

@pranavkm pranavkm closed this Oct 24, 2019
@dougbu
Copy link
Contributor

dougbu commented Oct 25, 2019

@mkArtakMSFT looks like we have a repro for the external report of problems pushing into this repo:

I've tried to update this, but I can't. It's failing with the following message

! [remote rejected]       merge/release/3.1-to-master -> merge/release/3.1-to-master (refusing to allow an integration to create or update .github/workflows/labeler.yml)
error: failed to push some refs to 'https://github.com/dotnet-maestro-bot/AspNetCore.git'

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidfowl davidfowl davidfowl left review comments

@pranavkm pranavkm pranavkm left review comments

@BrennanConroy BrennanConroy BrennanConroy requested changes

@analogrelay analogrelay Awaiting requested review from analogrelay

@dougbu dougbu Awaiting requested review from dougbu

@halter73 halter73 Awaiting requested review from halter73

@jkotalik jkotalik Awaiting requested review from jkotalik

@mikaelm12 mikaelm12 Awaiting requested review from mikaelm12

@SteveSandersonMS SteveSandersonMS Awaiting requested review from SteveSandersonMS

@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 blocked The work on this issue is blocked due to some dependency
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.