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

Merge pull request #29250 from dotnet/dougbu/5.0.3 

[release/5.0] Rebrand to 5.0.3
This commit is contained in:
Matt Mitchell 2021-01-13 07:17:03 -08:00 committed by GitHub
parent 50b3190579 83aaf5f2b3
commit 1dfd6ce7de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 403 additions and 378 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
NuGet.config
View File

@ -2,6 +2,14 @@
<configuration> <configuration>
<packageSources> <packageSources>
<clear /> <clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-1ee6b62" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-1ee6b629/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-cb5f173" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-cb5f173b/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" /> <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" /> <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" /> <add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
@ -10,5 +18,12 @@
<!-- Used for the SiteExtension 3.1 bits that are included in the 5.0 build --> <!-- Used for the SiteExtension 3.1 bits that are included in the 5.0 build -->
<add key="dotnet31-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" /> <add key="dotnet31-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
</packageSources> </packageSources>
<disabledPackageSources /> <disabledPackageSources>
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-1ee6b62" value="true" />
<!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-cb5f173" value="true" />
<!-- End: Package sources from dotnet-runtime -->
</disabledPackageSources>
</configuration> </configuration>

424
eng/Baseline.Designer.props
View File

File diff suppressed because it is too large Load Diff

204
eng/Baseline.xml
View File

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

78
eng/Version.Details.xml
View File

@ -9,37 +9,37 @@
--> -->
<Dependencies> <Dependencies>
<ProductDependencies> <ProductDependencies>
<Dependency Name="dotnet-ef" Version="5.0.1"> <Dependency Name="dotnet-ef" Version="5.0.2">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>494e218127bfb7afee3c9b10a30bcd32d6cd80db</Sha> <Sha>1ee6b629b3437c0d45bfe3aa5703abdcc449231f</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.1"> <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.2">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>494e218127bfb7afee3c9b10a30bcd32d6cd80db</Sha> <Sha>1ee6b629b3437c0d45bfe3aa5703abdcc449231f</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.1"> <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.2">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>494e218127bfb7afee3c9b10a30bcd32d6cd80db</Sha> <Sha>1ee6b629b3437c0d45bfe3aa5703abdcc449231f</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.1"> <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.2">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>494e218127bfb7afee3c9b10a30bcd32d6cd80db</Sha> <Sha>1ee6b629b3437c0d45bfe3aa5703abdcc449231f</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.1"> <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.2">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>494e218127bfb7afee3c9b10a30bcd32d6cd80db</Sha> <Sha>1ee6b629b3437c0d45bfe3aa5703abdcc449231f</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.1"> <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.2">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>494e218127bfb7afee3c9b10a30bcd32d6cd80db</Sha> <Sha>1ee6b629b3437c0d45bfe3aa5703abdcc449231f</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.1"> <Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.2">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>494e218127bfb7afee3c9b10a30bcd32d6cd80db</Sha> <Sha>1ee6b629b3437c0d45bfe3aa5703abdcc449231f</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="5.0.1"> <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="5.0.2">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>494e218127bfb7afee3c9b10a30bcd32d6cd80db</Sha> <Sha>1ee6b629b3437c0d45bfe3aa5703abdcc449231f</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0"> <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
@ -193,9 +193,9 @@
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha> <Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
</Dependency> </Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="5.0.0"> <Dependency Name="System.Diagnostics.DiagnosticSource" Version="5.0.1">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha> <Sha>cb5f173b9696d9d00a544b953d95190ab3b56df2</Sha>
</Dependency> </Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="5.0.0"> <Dependency Name="System.Diagnostics.EventLog" Version="5.0.0">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
@ -270,9 +270,9 @@
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha> <Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
</Dependency> </Dependency>
<Dependency Name="System.Text.Json" Version="5.0.0"> <Dependency Name="System.Text.Json" Version="5.0.1">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha> <Sha>cb5f173b9696d9d00a544b953d95190ab3b56df2</Sha>
</Dependency> </Dependency>
<Dependency Name="System.Threading.Channels" Version="5.0.0"> <Dependency Name="System.Threading.Channels" Version="5.0.0">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
@ -294,17 +294,17 @@
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
All Runtime.$rid packages should have the same version. All Runtime.$rid packages should have the same version.
--> -->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.1"> <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.2">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha> <Sha>cb5f173b9696d9d00a544b953d95190ab3b56df2</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.1-servicing.20575.16"> <Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.2-servicing.20611.20">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha> <Sha>cb5f173b9696d9d00a544b953d95190ab3b56df2</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="5.0.1-servicing.20575.16"> <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="5.0.2-servicing.20611.20">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha> <Sha>cb5f173b9696d9d00a544b953d95190ab3b56df2</Sha>
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>

30
eng/Versions.props
View File

@ -8,7 +8,7 @@
<PropertyGroup Label="Version settings"> <PropertyGroup Label="Version settings">
<AspNetCoreMajorVersion>5</AspNetCoreMajorVersion> <AspNetCoreMajorVersion>5</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion> <AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>2</AspNetCorePatchVersion> <AspNetCorePatchVersion>3</AspNetCorePatchVersion>
<!-- <!--
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
--> -->
@ -58,10 +58,10 @@
<PropertyGroup Label="Automated"> <PropertyGroup Label="Automated">
<!-- Packages from dotnet/runtime --> <!-- Packages from dotnet/runtime -->
<MicrosoftExtensionsDependencyModelPackageVersion>5.0.0</MicrosoftExtensionsDependencyModelPackageVersion> <MicrosoftExtensionsDependencyModelPackageVersion>5.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>5.0.1-servicing.20575.16</MicrosoftNETCoreAppInternalPackageVersion> <MicrosoftNETCoreAppInternalPackageVersion>5.0.2-servicing.20611.20</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>5.0.0</MicrosoftNETCoreAppRefPackageVersion> <MicrosoftNETCoreAppRefPackageVersion>5.0.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion> <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.1-servicing.20575.16</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion> <MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.2-servicing.20611.20</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
<MicrosoftWin32RegistryPackageVersion>5.0.0</MicrosoftWin32RegistryPackageVersion> <MicrosoftWin32RegistryPackageVersion>5.0.0</MicrosoftWin32RegistryPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>5.0.0</MicrosoftWin32SystemEventsPackageVersion> <MicrosoftWin32SystemEventsPackageVersion>5.0.0</MicrosoftWin32SystemEventsPackageVersion>
<MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0</MicrosoftExtensionsCachingAbstractionsPackageVersion> <MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0</MicrosoftExtensionsCachingAbstractionsPackageVersion>
@ -100,7 +100,7 @@
<MicrosoftExtensionsPrimitivesPackageVersion>5.0.0</MicrosoftExtensionsPrimitivesPackageVersion> <MicrosoftExtensionsPrimitivesPackageVersion>5.0.0</MicrosoftExtensionsPrimitivesPackageVersion>
<MicrosoftExtensionsInternalTransportPackageVersion>5.0.0-rtm.20519.4</MicrosoftExtensionsInternalTransportPackageVersion> <MicrosoftExtensionsInternalTransportPackageVersion>5.0.0-rtm.20519.4</MicrosoftExtensionsInternalTransportPackageVersion>
<SystemComponentModelAnnotationsPackageVersion>5.0.0</SystemComponentModelAnnotationsPackageVersion> <SystemComponentModelAnnotationsPackageVersion>5.0.0</SystemComponentModelAnnotationsPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>5.0.0</SystemDiagnosticsDiagnosticSourcePackageVersion> <SystemDiagnosticsDiagnosticSourcePackageVersion>5.0.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemDiagnosticsEventLogPackageVersion>5.0.0</SystemDiagnosticsEventLogPackageVersion> <SystemDiagnosticsEventLogPackageVersion>5.0.0</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesProtocolsPackageVersion>5.0.0</SystemDirectoryServicesProtocolsPackageVersion> <SystemDirectoryServicesProtocolsPackageVersion>5.0.0</SystemDirectoryServicesProtocolsPackageVersion>
<SystemDrawingCommonPackageVersion>5.0.0</SystemDrawingCommonPackageVersion> <SystemDrawingCommonPackageVersion>5.0.0</SystemDrawingCommonPackageVersion>
@ -120,20 +120,20 @@
<SystemSecurityPrincipalWindowsPackageVersion>5.0.0</SystemSecurityPrincipalWindowsPackageVersion> <SystemSecurityPrincipalWindowsPackageVersion>5.0.0</SystemSecurityPrincipalWindowsPackageVersion>
<SystemServiceProcessServiceControllerPackageVersion>5.0.0</SystemServiceProcessServiceControllerPackageVersion> <SystemServiceProcessServiceControllerPackageVersion>5.0.0</SystemServiceProcessServiceControllerPackageVersion>
<SystemTextEncodingsWebPackageVersion>5.0.0</SystemTextEncodingsWebPackageVersion> <SystemTextEncodingsWebPackageVersion>5.0.0</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>5.0.0</SystemTextJsonPackageVersion> <SystemTextJsonPackageVersion>5.0.1</SystemTextJsonPackageVersion>
<SystemThreadingChannelsPackageVersion>5.0.0</SystemThreadingChannelsPackageVersion> <SystemThreadingChannelsPackageVersion>5.0.0</SystemThreadingChannelsPackageVersion>
<SystemWindowsExtensionsPackageVersion>5.0.0</SystemWindowsExtensionsPackageVersion> <SystemWindowsExtensionsPackageVersion>5.0.0</SystemWindowsExtensionsPackageVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 --> <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsPackageVersion>5.0.0</MicrosoftNETCorePlatformsPackageVersion> <MicrosoftNETCorePlatformsPackageVersion>5.0.0</MicrosoftNETCorePlatformsPackageVersion>
<!-- Packages from dotnet/efcore --> <!-- Packages from dotnet/efcore -->
<dotnetefPackageVersion>5.0.1</dotnetefPackageVersion> <dotnetefPackageVersion>5.0.2</dotnetefPackageVersion>
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.1</MicrosoftEntityFrameworkCoreInMemoryPackageVersion> <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.2</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.1</MicrosoftEntityFrameworkCoreRelationalPackageVersion> <MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.2</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.1</MicrosoftEntityFrameworkCoreSqlitePackageVersion> <MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.2</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.1</MicrosoftEntityFrameworkCoreSqlServerPackageVersion> <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.2</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.1</MicrosoftEntityFrameworkCoreToolsPackageVersion> <MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.2</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>5.0.1</MicrosoftEntityFrameworkCorePackageVersion> <MicrosoftEntityFrameworkCorePackageVersion>5.0.2</MicrosoftEntityFrameworkCorePackageVersion>
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.1</MicrosoftEntityFrameworkCoreDesignPackageVersion> <MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.2</MicrosoftEntityFrameworkCoreDesignPackageVersion>
<!-- Packages from dotnet/arcade --> <!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20580.4</MicrosoftDotNetBuildTasksInstallersPackageVersion> <MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20580.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup> </PropertyGroup>
@ -235,7 +235,7 @@
<!-- Packages from 2.1, 2.2, and 3.1 branches used for site extension build. --> <!-- Packages from 2.1, 2.2, and 3.1 branches used for site extension build. -->
<MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion> <MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>2.2.0</MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion> <MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>2.2.0</MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>3.1.10-servicing-20520-4</MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion> <MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>3.1.11-servicing-20569-15</MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64PackageVersion>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64PackageVersion> <MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64PackageVersion>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64PackageVersion>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86PackageVersion>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86PackageVersion> <MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86PackageVersion>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86PackageVersion>
<!-- 3rd party dependencies --> <!-- 3rd party dependencies -->

2
eng/common/post-build/publish-using-darc.ps1
View File

@ -54,7 +54,7 @@ try {
--id $buildId ` --id $buildId `
--publishing-infra-version $PublishingInfraVersion ` --publishing-infra-version $PublishingInfraVersion `
--default-channels ` --default-channels `
--source-branch master ` --source-branch internal/release-publishing `
--azdev-pat $AzdoToken ` --azdev-pat $AzdoToken `
--bar-uri $MaestroApiEndPoint ` --bar-uri $MaestroApiEndPoint `
--password $MaestroToken ` --password $MaestroToken `

26
src/Servers/Kestrel/Core/src/Internal/Infrastructure/TimeoutControl.cs
View File

@ -89,6 +89,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure
return; return;
} }
var timeout = false;
lock (_readTimingLock) lock (_readTimingLock)
{ {
if (!_readTimingEnabled) if (!_readTimingEnabled)
@ -105,10 +107,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure
var elapsedSeconds = (double)_readTimingElapsedTicks / TimeSpan.TicksPerSecond; var elapsedSeconds = (double)_readTimingElapsedTicks / TimeSpan.TicksPerSecond;
var rate = _readTimingBytesRead / elapsedSeconds; var rate = _readTimingBytesRead / elapsedSeconds;
if (rate < _minReadRate.BytesPerSecond && !Debugger.IsAttached) timeout = rate < _minReadRate.BytesPerSecond && !Debugger.IsAttached;
{
_timeoutHandler.OnTimeout(TimeoutReason.ReadDataRate);
}
} }
// PauseTimingReads() cannot just set _timingReads to false. It needs to go through at least one tick // PauseTimingReads() cannot just set _timingReads to false. It needs to go through at least one tick
@ -120,10 +119,18 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure
_readTimingPauseRequested = false; _readTimingPauseRequested = false;
} }
} }
if (timeout)
{
// Run callbacks outside of the lock
_timeoutHandler.OnTimeout(TimeoutReason.ReadDataRate);
}
} }
private void CheckForWriteDataRateTimeout(long timestamp) private void CheckForWriteDataRateTimeout(long timestamp)
{ {
var timeout = false;
lock (_writeTimingLock) lock (_writeTimingLock)
{ {
// Assume overly long tick intervals are the result of server resource starvation. // Assume overly long tick intervals are the result of server resource starvation.
@ -135,10 +142,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure
_writeTimingTimeoutTimestamp += extraTimeForTick; _writeTimingTimeoutTimestamp += extraTimeForTick;
} }
if (_concurrentAwaitingWrites > 0 && timestamp > _writeTimingTimeoutTimestamp && !Debugger.IsAttached) timeout = _concurrentAwaitingWrites > 0 && timestamp > _writeTimingTimeoutTimestamp && !Debugger.IsAttached;
{ }
_timeoutHandler.OnTimeout(TimeoutReason.WriteDataRate);
} if (timeout)
{
// Run callbacks outside of the lock
_timeoutHandler.OnTimeout(TimeoutReason.WriteDataRate);
} }
} }