diff options
| -rw-r--r-- | NuGet.config | 22 | ||||
| -rw-r--r-- | eng/Version.Details.xml | 322 | ||||
| -rw-r--r-- | eng/Versions.props | 31 | ||||
| -rw-r--r-- | src/Servers/Kestrel/Core/src/Internal/Infrastructure/TimeoutControl.cs | 26 |
4 files changed, 213 insertions, 188 deletions
diff --git a/NuGet.config b/NuGet.config index b81c06525c..0e69282196 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,13 +4,19 @@ <clear /> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!-- Begin: Package sources from dotnet-aspnetcore-tooling --> - <add key="darc-pub-dotnet-aspnetcore-tooling-2dda073" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-tooling-2dda073c/nuget/v3/index.json" /> + <add key="darc-int-dotnet-aspnetcore-tooling-cd25a65" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-cd25a65e/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-aspnetcore-tooling --> + <!-- Begin: Package sources from dotnet-corefx --> + <add key="darc-int-dotnet-corefx-59d2f36" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-59d2f36e/nuget/v3/index.json" /> + <!-- End: Package sources from dotnet-corefx --> + <!-- Begin: Package sources from dotnet-core-setup --> + <add key="darc-int-dotnet-core-setup-f5eceb8" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-f5eceb81/nuget/v3/index.json" /> + <!-- End: Package sources from dotnet-core-setup --> <!-- Begin: Package sources from dotnet-efcore --> - <add key="darc-pub-dotnet-efcore-5003c12" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-efcore-5003c120/nuget/v3/index.json" /> + <add key="darc-int-dotnet-efcore-b64867f" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-b64867f6/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-efcore --> <!-- Begin: Package sources from dotnet-extensions --> - <add key="darc-pub-dotnet-extensions-2f22488" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-extensions-2f22488e/nuget/v3/index.json" /> + <add key="darc-int-dotnet-extensions-77d62c5" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-77d62c57/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-extensions --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" /> @@ -19,5 +25,13 @@ <add key="dotnet3.1-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" /> <add key="nuget.org" value="https://api.nuget.org/v3/index.json" /> </packageSources> - <disabledPackageSources /> + <disabledPackageSources> + <add key="darc-int-dotnet-extensions-77d62c5" value="true" /> + <add key="darc-int-dotnet-efcore-b64867f" value="true" /> + <add key="darc-int-dotnet-core-setup-f5eceb8" value="true" /> + <add key="darc-int-dotnet-corefx-59d2f36" value="true" /> + <!-- Begin: Package sources from dotnet-aspnetcore-tooling --> + <add key="darc-int-dotnet-aspnetcore-tooling-cd25a65" value="true" /> + <!-- End: Package sources from dotnet-aspnetcore-tooling --> + </disabledPackageSources> </configuration> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69b22d4551..5c90168d3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,276 +18,276 @@ <Sha>620cea9ccf0359993e803c900059932966399584</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="3.1.11"> - <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri> - <Sha>2dda073cee874e290dc8558e4bea0786965aa9d8</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling</Uri> + <Sha>cd25a65e47d2740ebe460fb4c465a66298e42145</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.11"> - <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri> - <Sha>2dda073cee874e290dc8558e4bea0786965aa9d8</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling</Uri> + <Sha>cd25a65e47d2740ebe460fb4c465a66298e42145</Sha> </Dependency> <Dependency Name="Microsoft.CodeAnalysis.Razor" Version="3.1.11"> - <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri> - <Sha>2dda073cee874e290dc8558e4bea0786965aa9d8</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling</Uri> + <Sha>cd25a65e47d2740ebe460fb4c465a66298e42145</Sha> </Dependency> <Dependency Name="Microsoft.NET.Sdk.Razor" Version="3.1.11"> - <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri> - <Sha>2dda073cee874e290dc8558e4bea0786965aa9d8</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling</Uri> + <Sha>cd25a65e47d2740ebe460fb4c465a66298e42145</Sha> </Dependency> <Dependency Name="dotnet-ef" Version="3.1.11"> - <Uri>https://github.com/dotnet/efcore</Uri> - <Sha>5003c1203717ef98011beb670cbd1f36fbfa3d7f</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> + <Sha>b64867f633c6b4688a97750724728ec914e26d3e</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.11"> - <Uri>https://github.com/dotnet/efcore</Uri> - <Sha>5003c1203717ef98011beb670cbd1f36fbfa3d7f</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> + <Sha>b64867f633c6b4688a97750724728ec914e26d3e</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="3.1.11"> - <Uri>https://github.com/dotnet/efcore</Uri> - <Sha>5003c1203717ef98011beb670cbd1f36fbfa3d7f</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> + <Sha>b64867f633c6b4688a97750724728ec914e26d3e</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.11"> - <Uri>https://github.com/dotnet/efcore</Uri> - <Sha>5003c1203717ef98011beb670cbd1f36fbfa3d7f</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> + <Sha>b64867f633c6b4688a97750724728ec914e26d3e</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.11"> - <Uri>https://github.com/dotnet/efcore</Uri> - <Sha>5003c1203717ef98011beb670cbd1f36fbfa3d7f</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> + <Sha>b64867f633c6b4688a97750724728ec914e26d3e</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="3.1.11"> - <Uri>https://github.com/dotnet/efcore</Uri> - <Sha>5003c1203717ef98011beb670cbd1f36fbfa3d7f</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> + <Sha>b64867f633c6b4688a97750724728ec914e26d3e</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore" Version="3.1.11"> - <Uri>https://github.com/dotnet/efcore</Uri> - <Sha>5003c1203717ef98011beb670cbd1f36fbfa3d7f</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> + <Sha>b64867f633c6b4688a97750724728ec914e26d3e</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.Analyzer.Testing" Version="3.1.11-servicing.20560.5" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Dependency Name="Microsoft.AspNetCore.Analyzer.Testing" Version="3.1.11-servicing.20567.16" CoherentParentDependency="Microsoft.EntityFrameworkCore"> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.11-servicing.20560.5" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.11-servicing.20567.16" CoherentParentDependency="Microsoft.EntityFrameworkCore"> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> - <Dependency Name="Microsoft.Extensions.ActivatorUtilities.Sources" Version="3.1.11-servicing.20560.5" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Dependency Name="Microsoft.Extensions.ActivatorUtilities.Sources" Version="3.1.11-servicing.20567.16" CoherentParentDependency="Microsoft.EntityFrameworkCore"> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> - <Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.1.11-servicing.20560.5" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.1.11-servicing.20567.16" CoherentParentDependency="Microsoft.EntityFrameworkCore"> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Configuration.KeyPerFile" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Configuration" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.DiagnosticAdapter" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> - <Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.11-servicing.20560.5" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.11-servicing.20567.16" CoherentParentDependency="Microsoft.EntityFrameworkCore"> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Hosting" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> - <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="3.1.11-servicing.20560.5" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="3.1.11-servicing.20567.16" CoherentParentDependency="Microsoft.EntityFrameworkCore"> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Http" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Localization.Abstractions" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Localization" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Logging.AzureAppServices" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Logging.Console" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> - <Dependency Name="Microsoft.Extensions.Logging.Testing" Version="3.1.11-servicing.20560.5" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Dependency Name="Microsoft.Extensions.Logging.Testing" Version="3.1.11-servicing.20567.16" CoherentParentDependency="Microsoft.EntityFrameworkCore"> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Logging" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.ObjectPool" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Options" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> - <Dependency Name="Microsoft.Extensions.ParameterDefaultValue.Sources" Version="3.1.11-servicing.20560.5" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Dependency Name="Microsoft.Extensions.ParameterDefaultValue.Sources" Version="3.1.11-servicing.20567.16" CoherentParentDependency="Microsoft.EntityFrameworkCore"> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Primitives" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> - <Dependency Name="Microsoft.Extensions.TypeNameHelper.Sources" Version="3.1.11-servicing.20560.5" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Dependency Name="Microsoft.Extensions.TypeNameHelper.Sources" Version="3.1.11-servicing.20567.16" CoherentParentDependency="Microsoft.EntityFrameworkCore"> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> - <Dependency Name="Microsoft.Extensions.ValueStopwatch.Sources" Version="3.1.11-servicing.20560.5" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Dependency Name="Microsoft.Extensions.ValueStopwatch.Sources" Version="3.1.11-servicing.20567.16" CoherentParentDependency="Microsoft.EntityFrameworkCore"> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.WebEncoders" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.JSInterop" Version="3.1.11" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri> @@ -317,9 +317,9 @@ <Uri>https://github.com/dotnet/corefx</Uri> <Sha>1b5b5f0bf030bf7250c3258c140fa9e4214325c8</Sha> </Dependency> - <Dependency Name="System.IO.Pipelines" Version="4.7.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64"> - <Uri>https://github.com/dotnet/corefx</Uri> - <Sha>3009a1fc20d9cb47d117399040d31c23f7b23e02</Sha> + <Dependency Name="System.IO.Pipelines" Version="4.7.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64"> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri> + <Sha>59d2f36ec02c494eec50940c7993257a807f9531</Sha> </Dependency> <Dependency Name="System.Net.Http.WinHttpHandler" Version="4.7.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri> @@ -390,17 +390,17 @@ 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. --> - <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.10" CoherentParentDependency="Microsoft.Extensions.Logging"> - <Uri>https://github.com/dotnet/core-setup</Uri> - <Sha>1721e3943939f9af7d5effa702bb7e9b99e254f1</Sha> + <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.11" CoherentParentDependency="Microsoft.Extensions.Logging"> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri> + <Sha>f5eceb810586ea6138aadcef9e2bba115015ab99</Sha> </Dependency> <Dependency Name="NETStandard.Library.Ref" Version="2.1.0" Pinned="true"> <Uri>https://github.com/dotnet/core-setup</Uri> <Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.10-servicing.20519.3" CoherentParentDependency="Microsoft.Extensions.Logging"> - <Uri>https://github.com/dotnet/core-setup</Uri> - <Sha>1721e3943939f9af7d5effa702bb7e9b99e254f1</Sha> + <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.11-servicing.20566.6" CoherentParentDependency="Microsoft.Extensions.Logging"> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri> + <Sha>f5eceb810586ea6138aadcef9e2bba115015ab99</Sha> </Dependency> <!-- Keep these dependencies at the bottom of ProductDependencies, else they will be picked as the parent for CoherentParentDependencies --> <Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.0" Pinned="true"> @@ -414,9 +414,9 @@ <Uri>https://github.com/dotnet/corefx</Uri> <Sha>d6302a72f8eafa326d7572a02acf8f3021ebb9e8</Sha> </Dependency> - <Dependency Name="Internal.AspNetCore.Analyzers" Version="3.1.11-servicing.20560.5" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Dependency Name="Internal.AspNetCore.Analyzers" Version="3.1.11-servicing.20567.16" CoherentParentDependency="Microsoft.EntityFrameworkCore"> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.20569.8"> <Uri>https://github.com/dotnet/arcade</Uri> @@ -430,9 +430,9 @@ <Uri>https://github.com/dotnet/arcade</Uri> <Sha>c8e0cc19e7406ab0e2b2998b9c7a9249ef801b19</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.11-servicing.20560.5" CoherentParentDependency="Microsoft.EntityFrameworkCore"> - <Uri>https://github.com/dotnet/extensions</Uri> - <Sha>2f22488e2e3bb9b2721273949e2362ca13e84d6e</Sha> + <Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.11-servicing.20567.16" CoherentParentDependency="Microsoft.EntityFrameworkCore"> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> + <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.4.1-beta4-20127-10" CoherentParentDependency="Microsoft.Extensions.Logging"> <Uri>https://github.com/dotnet/roslyn</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index a6942b90a5..f7daa93be2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ <MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion> <!-- Packages from dotnet/core-setup --> <MicrosoftExtensionsDependencyModelPackageVersion>3.1.6</MicrosoftExtensionsDependencyModelPackageVersion> - <MicrosoftNETCoreAppInternalPackageVersion>3.1.10-servicing.20519.3</MicrosoftNETCoreAppInternalPackageVersion> + <MicrosoftNETCoreAppInternalPackageVersion>3.1.11-servicing.20566.6</MicrosoftNETCoreAppInternalPackageVersion> <MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion> - <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.10</MicrosoftNETCoreAppRuntimewinx64PackageVersion> + <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.11</MicrosoftNETCoreAppRuntimewinx64PackageVersion> <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion> <!-- Packages from dotnet/corefx --> <MicrosoftBclAsyncInterfacesPackageVersion>1.1.1</MicrosoftBclAsyncInterfacesPackageVersion> @@ -79,7 +79,7 @@ <SystemComponentModelAnnotationsPackageVersion>4.7.0</SystemComponentModelAnnotationsPackageVersion> <SystemDiagnosticsEventLogPackageVersion>4.7.0</SystemDiagnosticsEventLogPackageVersion> <SystemDrawingCommonPackageVersion>4.7.1</SystemDrawingCommonPackageVersion> - <SystemIOPipelinesPackageVersion>4.7.3</SystemIOPipelinesPackageVersion> + <SystemIOPipelinesPackageVersion>4.7.4</SystemIOPipelinesPackageVersion> <SystemNetHttpWinHttpHandlerPackageVersion>4.7.2</SystemNetHttpWinHttpHandlerPackageVersion> <SystemNetWebSocketsWebSocketProtocolPackageVersion>4.7.1</SystemNetWebSocketsWebSocketProtocolPackageVersion> <SystemReflectionMetadataPackageVersion>1.8.1</SystemReflectionMetadataPackageVersion> @@ -100,16 +100,16 @@ <!-- Packages from aspnet/Blazor --> <MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>3.2.0</MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion> <!-- Packages from aspnet/Extensions --> - <InternalAspNetCoreAnalyzersPackageVersion>3.1.11-servicing.20560.5</InternalAspNetCoreAnalyzersPackageVersion> - <MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.1.11-servicing.20560.5</MicrosoftAspNetCoreAnalyzerTestingPackageVersion> - <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.11-servicing.20560.5</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion> - <MicrosoftAspNetCoreTestingPackageVersion>3.1.11-servicing.20560.5</MicrosoftAspNetCoreTestingPackageVersion> - <MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>3.1.11-servicing.20560.5</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion> + <InternalAspNetCoreAnalyzersPackageVersion>3.1.11-servicing.20567.16</InternalAspNetCoreAnalyzersPackageVersion> + <MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.1.11-servicing.20567.16</MicrosoftAspNetCoreAnalyzerTestingPackageVersion> + <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.11-servicing.20567.16</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion> + <MicrosoftAspNetCoreTestingPackageVersion>3.1.11-servicing.20567.16</MicrosoftAspNetCoreTestingPackageVersion> + <MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>3.1.11-servicing.20567.16</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion> <MicrosoftExtensionsCachingAbstractionsPackageVersion>3.1.11</MicrosoftExtensionsCachingAbstractionsPackageVersion> <MicrosoftExtensionsCachingMemoryPackageVersion>3.1.11</MicrosoftExtensionsCachingMemoryPackageVersion> <MicrosoftExtensionsCachingSqlServerPackageVersion>3.1.11</MicrosoftExtensionsCachingSqlServerPackageVersion> <MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>3.1.11</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion> - <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.11-servicing.20560.5</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion> + <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.11-servicing.20567.16</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion> <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>3.1.11</MicrosoftExtensionsConfigurationAbstractionsPackageVersion> <MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>3.1.11</MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion> <MicrosoftExtensionsConfigurationBinderPackageVersion>3.1.11</MicrosoftExtensionsConfigurationBinderPackageVersion> @@ -132,10 +132,10 @@ <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>3.1.11</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion> <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.1.11</MicrosoftExtensionsFileProvidersPhysicalPackageVersion> <MicrosoftExtensionsFileSystemGlobbingPackageVersion>3.1.11</MicrosoftExtensionsFileSystemGlobbingPackageVersion> - <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.11-servicing.20560.5</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion> + <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.11-servicing.20567.16</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion> <MicrosoftExtensionsHostingAbstractionsPackageVersion>3.1.11</MicrosoftExtensionsHostingAbstractionsPackageVersion> <MicrosoftExtensionsHostingPackageVersion>3.1.11</MicrosoftExtensionsHostingPackageVersion> - <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.1.11-servicing.20560.5</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion> + <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.1.11-servicing.20567.16</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion> <MicrosoftExtensionsHttpPackageVersion>3.1.11</MicrosoftExtensionsHttpPackageVersion> <MicrosoftExtensionsLocalizationAbstractionsPackageVersion>3.1.11</MicrosoftExtensionsLocalizationAbstractionsPackageVersion> <MicrosoftExtensionsLocalizationPackageVersion>3.1.11</MicrosoftExtensionsLocalizationPackageVersion> @@ -147,16 +147,16 @@ <MicrosoftExtensionsLoggingEventSourcePackageVersion>3.1.11</MicrosoftExtensionsLoggingEventSourcePackageVersion> <MicrosoftExtensionsLoggingEventLogPackageVersion>3.1.11</MicrosoftExtensionsLoggingEventLogPackageVersion> <MicrosoftExtensionsLoggingPackageVersion>3.1.11</MicrosoftExtensionsLoggingPackageVersion> - <MicrosoftExtensionsLoggingTestingPackageVersion>3.1.11-servicing.20560.5</MicrosoftExtensionsLoggingTestingPackageVersion> + <MicrosoftExtensionsLoggingTestingPackageVersion>3.1.11-servicing.20567.16</MicrosoftExtensionsLoggingTestingPackageVersion> <MicrosoftExtensionsLoggingTraceSourcePackageVersion>3.1.11</MicrosoftExtensionsLoggingTraceSourcePackageVersion> <MicrosoftExtensionsObjectPoolPackageVersion>3.1.11</MicrosoftExtensionsObjectPoolPackageVersion> <MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>3.1.11</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion> <MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>3.1.11</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion> <MicrosoftExtensionsOptionsPackageVersion>3.1.11</MicrosoftExtensionsOptionsPackageVersion> - <MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>3.1.11-servicing.20560.5</MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion> + <MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>3.1.11-servicing.20567.16</MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion> <MicrosoftExtensionsPrimitivesPackageVersion>3.1.11</MicrosoftExtensionsPrimitivesPackageVersion> - <MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>3.1.11-servicing.20560.5</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion> - <MicrosoftExtensionsValueStopwatchSourcesPackageVersion>3.1.11-servicing.20560.5</MicrosoftExtensionsValueStopwatchSourcesPackageVersion> + <MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>3.1.11-servicing.20567.16</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion> + <MicrosoftExtensionsValueStopwatchSourcesPackageVersion>3.1.11-servicing.20567.16</MicrosoftExtensionsValueStopwatchSourcesPackageVersion> <MicrosoftExtensionsWebEncodersPackageVersion>3.1.11</MicrosoftExtensionsWebEncodersPackageVersion> <MicrosoftInternalExtensionsRefsPackageVersion>3.1.8-servicing.20420.4</MicrosoftInternalExtensionsRefsPackageVersion> <MicrosoftJSInteropPackageVersion>3.1.11</MicrosoftJSInteropPackageVersion> @@ -218,6 +218,7 @@ <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>3.0.0</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion> <MicrosoftDataODataPackageVersion>5.8.4</MicrosoftDataODataPackageVersion> <MicrosoftDataServicesClientPackageVersion>5.8.4</MicrosoftDataServicesClientPackageVersion> + <MicrosoftDotNetSignCheckVersion>1.0.0-beta.20569.8</MicrosoftDotNetSignCheckVersion> <MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>3.19.8</MicrosoftIdentityModelClientsActiveDirectoryPackageVersion> <MicrosoftIdentityModelLoggingPackageVersion>5.5.0</MicrosoftIdentityModelLoggingPackageVersion> <MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>5.5.0</MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion> diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/TimeoutControl.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/TimeoutControl.cs index 1d9cef950a..79f74e376d 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/TimeoutControl.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/TimeoutControl.cs @@ -89,6 +89,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure return; } + var timeout = false; + lock (_readTimingLock) { if (!_readTimingEnabled) @@ -105,10 +107,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure var elapsedSeconds = (double)_readTimingElapsedTicks / TimeSpan.TicksPerSecond; var rate = _readTimingBytesRead / elapsedSeconds; - if (rate < _minReadRate.BytesPerSecond && !Debugger.IsAttached) - { - _timeoutHandler.OnTimeout(TimeoutReason.ReadDataRate); - } + timeout = rate < _minReadRate.BytesPerSecond && !Debugger.IsAttached; } // 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; } } + + if (timeout) + { + // Run callbacks outside of the lock + _timeoutHandler.OnTimeout(TimeoutReason.ReadDataRate); + } } private void CheckForWriteDataRateTimeout(long timestamp) { + var timeout = false; + lock (_writeTimingLock) { // 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; } - if (_concurrentAwaitingWrites > 0 && timestamp > _writeTimingTimeoutTimestamp && !Debugger.IsAttached) - { - _timeoutHandler.OnTimeout(TimeoutReason.WriteDataRate); - } + timeout = _concurrentAwaitingWrites > 0 && timestamp > _writeTimingTimeoutTimestamp && !Debugger.IsAttached; + } + + if (timeout) + { + // Run callbacks outside of the lock + _timeoutHandler.OnTimeout(TimeoutReason.WriteDataRate); } } |