Merge remote-tracking branch 'internal/internal/release/5.0' into 'release/5.0'

NuGet.config

@@ -2,6 +2,14 @@
 <configuration>
   <packageSources>
     <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-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" />
@@ -10,5 +18,16 @@
     <!-- 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" />
   </packageSources>
-  <disabledPackageSources />
+  <disabledPackageSources>
+    <add key="darc-int-dotnet-runtime-681e2c3" value="true" />
+    <add key="darc-int-dotnet-runtime-aeea2ad" value="true" />
+    <add key="darc-int-dotnet-efcore-f21c0dd" value="true" />
+    <add key="darc-int-dotnet-runtime-728fdef" value="true" />
+    <add key="darc-int-dotnet-runtime-0260401" value="true" />
+    <add key="darc-int-dotnet-efcore-2f4f88a" value="true" />
+    <add key="darc-int-dotnet-runtime-cb5f173" value="true" />
+    <!--  Begin: Package sources from dotnet-efcore -->
+    <add key="darc-int-dotnet-efcore-1ee6b62" value="true" />
+    <!--  End: Package sources from dotnet-efcore -->
+  </disabledPackageSources>
 </configuration>

eng/Version.Details.xml

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

eng/Versions.props

@@ -58,10 +58,10 @@
   <PropertyGroup Label="Automated">
     <!-- Packages from dotnet/runtime -->
     <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>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.1-servicing.20575.16</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.2-servicing.20611.20</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
     <MicrosoftWin32RegistryPackageVersion>5.0.0</MicrosoftWin32RegistryPackageVersion>
     <MicrosoftWin32SystemEventsPackageVersion>5.0.0</MicrosoftWin32SystemEventsPackageVersion>
     <MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0</MicrosoftExtensionsCachingAbstractionsPackageVersion>
@@ -100,7 +100,7 @@
     <MicrosoftExtensionsPrimitivesPackageVersion>5.0.0</MicrosoftExtensionsPrimitivesPackageVersion>
     <MicrosoftExtensionsInternalTransportPackageVersion>5.0.0-rtm.20519.4</MicrosoftExtensionsInternalTransportPackageVersion>
     <SystemComponentModelAnnotationsPackageVersion>5.0.0</SystemComponentModelAnnotationsPackageVersion>
-    <SystemDiagnosticsDiagnosticSourcePackageVersion>5.0.0</SystemDiagnosticsDiagnosticSourcePackageVersion>
+    <SystemDiagnosticsDiagnosticSourcePackageVersion>5.0.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
     <SystemDiagnosticsEventLogPackageVersion>5.0.0</SystemDiagnosticsEventLogPackageVersion>
     <SystemDirectoryServicesProtocolsPackageVersion>5.0.0</SystemDirectoryServicesProtocolsPackageVersion>
     <SystemDrawingCommonPackageVersion>5.0.0</SystemDrawingCommonPackageVersion>
@@ -120,20 +120,20 @@
     <SystemSecurityPrincipalWindowsPackageVersion>5.0.0</SystemSecurityPrincipalWindowsPackageVersion>
     <SystemServiceProcessServiceControllerPackageVersion>5.0.0</SystemServiceProcessServiceControllerPackageVersion>
     <SystemTextEncodingsWebPackageVersion>5.0.0</SystemTextEncodingsWebPackageVersion>
-    <SystemTextJsonPackageVersion>5.0.0</SystemTextJsonPackageVersion>
+    <SystemTextJsonPackageVersion>5.0.1</SystemTextJsonPackageVersion>
     <SystemThreadingChannelsPackageVersion>5.0.0</SystemThreadingChannelsPackageVersion>
     <SystemWindowsExtensionsPackageVersion>5.0.0</SystemWindowsExtensionsPackageVersion>
     <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
     <MicrosoftNETCorePlatformsPackageVersion>5.0.0</MicrosoftNETCorePlatformsPackageVersion>
     <!-- Packages from dotnet/efcore -->
-    <dotnetefPackageVersion>5.0.1</dotnetefPackageVersion>
-    <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.1</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
-    <MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.1</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
-    <MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.1</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
-    <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.1</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
-    <MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.1</MicrosoftEntityFrameworkCoreToolsPackageVersion>
-    <MicrosoftEntityFrameworkCorePackageVersion>5.0.1</MicrosoftEntityFrameworkCorePackageVersion>
-    <MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.1</MicrosoftEntityFrameworkCoreDesignPackageVersion>
+    <dotnetefPackageVersion>5.0.2</dotnetefPackageVersion>
+    <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.2</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
+    <MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.2</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
+    <MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.2</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
+    <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.2</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
+    <MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.2</MicrosoftEntityFrameworkCoreToolsPackageVersion>
+    <MicrosoftEntityFrameworkCorePackageVersion>5.0.2</MicrosoftEntityFrameworkCorePackageVersion>
+    <MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.2</MicrosoftEntityFrameworkCoreDesignPackageVersion>
     <!-- Packages from dotnet/arcade -->
     <MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20580.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>

eng/common/post-build/publish-using-darc.ps1

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

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);
             }
         }