huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge in 'release/5.0' changes

This commit is contained in:
dotnet-bot 2021-05-12 01:59:37 +00:00
parent 8cddac6e61 bf48b47651
commit 6842f9086b
4 changed files with 314 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

416
eng/Baseline.Designer.props
View File

File diff suppressed because it is too large Load Diff

200
eng/Baseline.xml
View File

@ -4,105 +4,105 @@ This file contains a list of all the packages and their versions which were rele
Update this list when preparing for a new patch.
-->
<Baseline Version="5.0.5">
<Package Id="AspNetCoreRuntime.5.0.x64" Version="5.0.5" />
<Package Id="AspNetCoreRuntime.5.0.x86" Version="5.0.5" />
<Package Id="dotnet-sql-cache" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="5.0.5" />
<Baseline Version="5.0.6">
<Package Id="AspNetCoreRuntime.5.0.x64" Version="5.0.6" />
<Package Id="AspNetCoreRuntime.5.0.x86" Version="5.0.6" />
<Package Id="dotnet-sql-cache" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.App.Ref" Version="5.0.0" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm64" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-x64" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.osx-x64" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-arm" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-arm64" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x86" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authorization" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Components.Web" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Components" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.DataProtection" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Http.Features" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Metadata" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Owin" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Razor.Language" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.TestHost" Version="5.0.5" />
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="5.0.5" />
<Package Id="Microsoft.CodeAnalysis.Razor" Version="5.0.5" />
<Package Id="Microsoft.dotnet-openapi" Version="5.0.5" />
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="5.0.5" />
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="5.0.5" />
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.5.0" Version="5.0.5" />
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.5.0" Version="5.0.5" />
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="5.0.5" />
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="5.0.5" />
<Package Id="Microsoft.Extensions.Configuration.KeyPerFile" Version="5.0.5" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="5.0.5" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="5.0.5" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks" Version="5.0.5" />
<Package Id="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.5" />
<Package Id="Microsoft.Extensions.Identity.Core" Version="5.0.5" />
<Package Id="Microsoft.Extensions.Identity.Stores" Version="5.0.5" />
<Package Id="Microsoft.Extensions.Localization.Abstractions" Version="5.0.5" />
<Package Id="Microsoft.Extensions.Localization" Version="5.0.5" />
<Package Id="Microsoft.Extensions.Logging.AzureAppServices" Version="5.0.5" />
<Package Id="Microsoft.Extensions.ObjectPool" Version="5.0.5" />
<Package Id="Microsoft.Extensions.WebEncoders" Version="5.0.5" />
<Package Id="Microsoft.JSInterop.WebAssembly" Version="5.0.5" />
<Package Id="Microsoft.JSInterop" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm64" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-x64" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.App.Runtime.osx-x64" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-arm" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-arm64" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x86" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Authorization" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Components.Web" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Components" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.DataProtection" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Http.Features" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Metadata" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Owin" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Razor.Language" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="5.0.6" />
<Package Id="Microsoft.AspNetCore.TestHost" Version="5.0.6" />
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="5.0.6" />
<Package Id="Microsoft.CodeAnalysis.Razor" Version="5.0.6" />
<Package Id="Microsoft.dotnet-openapi" Version="5.0.6" />
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="5.0.6" />
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="5.0.6" />
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.5.0" Version="5.0.6" />
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.5.0" Version="5.0.6" />
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="5.0.6" />
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="5.0.6" />
<Package Id="Microsoft.Extensions.Configuration.KeyPerFile" Version="5.0.6" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="5.0.6" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="5.0.6" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks" Version="5.0.6" />
<Package Id="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.6" />
<Package Id="Microsoft.Extensions.Identity.Core" Version="5.0.6" />
<Package Id="Microsoft.Extensions.Identity.Stores" Version="5.0.6" />
<Package Id="Microsoft.Extensions.Localization.Abstractions" Version="5.0.6" />
<Package Id="Microsoft.Extensions.Localization" Version="5.0.6" />
<Package Id="Microsoft.Extensions.Logging.AzureAppServices" Version="5.0.6" />
<Package Id="Microsoft.Extensions.ObjectPool" Version="5.0.6" />
<Package Id="Microsoft.Extensions.WebEncoders" Version="5.0.6" />
<Package Id="Microsoft.JSInterop.WebAssembly" Version="5.0.6" />
<Package Id="Microsoft.JSInterop" Version="5.0.6" />
</Baseline>

4
eng/Versions.props
View File

@ -9,7 +9,7 @@
<AspNetCoreMajorVersion>5</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>7</AspNetCorePatchVersion>
<ValidateBaseline>false</ValidateBaseline>
<ValidateBaseline>true</ValidateBaseline>
<!--
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
-->
@ -238,7 +238,7 @@
<!-- Packages from 2.1, 2.2, and 3.1 branches used for site extension build. -->
<MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>2.2.0</MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>3.1.14-servicing-21166-8</MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>3.1.15-servicing-21215-12</MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64PackageVersion>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64PackageVersion>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86PackageVersion>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86PackageVersion>
<!-- 3rd party dependencies -->

8
global.json
View File

@ -1,19 +1,19 @@
{
"sdk": {
"version": "5.0.202"
"version": "5.0.203"
},
"tools": {
"dotnet": "5.0.202",
"dotnet": "5.0.203",
"runtimes": {
"dotnet/x64": [
"2.1.27",
"2.1.28",
"$(MicrosoftNETCoreAppInternalPackageVersion)"
],
"dotnet/x86": [
"$(MicrosoftNETCoreAppInternalPackageVersion)"
],
"aspnetcore/x64": [
"3.1.14"
"3.1.15"
]
},
"Git": "2.22.0",