diff --git a/NuGet.config b/NuGet.config index be79ec8ee5..8b21c1e0ec 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,6 +2,14 @@ + + + + + + + + @@ -10,5 +18,16 @@ - + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41cfd741de..1ecece8ff4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - - https://github.com/dotnet/efcore - 494e218127bfb7afee3c9b10a30bcd32d6cd80db + + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 1ee6b629b3437c0d45bfe3aa5703abdcc449231f - - https://github.com/dotnet/efcore - 494e218127bfb7afee3c9b10a30bcd32d6cd80db + + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 1ee6b629b3437c0d45bfe3aa5703abdcc449231f - - https://github.com/dotnet/efcore - 494e218127bfb7afee3c9b10a30bcd32d6cd80db + + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 1ee6b629b3437c0d45bfe3aa5703abdcc449231f - - https://github.com/dotnet/efcore - 494e218127bfb7afee3c9b10a30bcd32d6cd80db + + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 1ee6b629b3437c0d45bfe3aa5703abdcc449231f - - https://github.com/dotnet/efcore - 494e218127bfb7afee3c9b10a30bcd32d6cd80db + + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 1ee6b629b3437c0d45bfe3aa5703abdcc449231f - - https://github.com/dotnet/efcore - 494e218127bfb7afee3c9b10a30bcd32d6cd80db + + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 1ee6b629b3437c0d45bfe3aa5703abdcc449231f - - https://github.com/dotnet/efcore - 494e218127bfb7afee3c9b10a30bcd32d6cd80db + + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 1ee6b629b3437c0d45bfe3aa5703abdcc449231f - - https://github.com/dotnet/efcore - 494e218127bfb7afee3c9b10a30bcd32d6cd80db + + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 1ee6b629b3437c0d45bfe3aa5703abdcc449231f https://github.com/dotnet/runtime @@ -193,9 +193,9 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - - https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + cb5f173b9696d9d00a544b953d95190ab3b56df2 https://github.com/dotnet/runtime @@ -270,9 +270,9 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - - https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + cb5f173b9696d9d00a544b953d95190ab3b56df2 https://github.com/dotnet/runtime @@ -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. --> - - https://github.com/dotnet/runtime - b02e13abab3d6f499751af2ad1ae6333fb4e633d + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + cb5f173b9696d9d00a544b953d95190ab3b56df2 - - https://github.com/dotnet/runtime - b02e13abab3d6f499751af2ad1ae6333fb4e633d + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + cb5f173b9696d9d00a544b953d95190ab3b56df2 - - https://github.com/dotnet/runtime - b02e13abab3d6f499751af2ad1ae6333fb4e633d + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + cb5f173b9696d9d00a544b953d95190ab3b56df2 diff --git a/eng/Versions.props b/eng/Versions.props index a00f5ccadc..4db7209fb8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,10 +58,10 @@ 5.0.0 - 5.0.1-servicing.20575.16 + 5.0.2-servicing.20611.20 5.0.0 - 5.0.1 - 5.0.1-servicing.20575.16 + 5.0.2 + 5.0.2-servicing.20611.20 5.0.0 5.0.0 5.0.0 @@ -100,7 +100,7 @@ 5.0.0 5.0.0-rtm.20519.4 5.0.0 - 5.0.0 + 5.0.1 5.0.0 5.0.0 5.0.0 @@ -120,20 +120,20 @@ 5.0.0 5.0.0 5.0.0 - 5.0.0 + 5.0.1 5.0.0 5.0.0 5.0.0 - 5.0.1 - 5.0.1 - 5.0.1 - 5.0.1 - 5.0.1 - 5.0.1 - 5.0.1 - 5.0.1 + 5.0.2 + 5.0.2 + 5.0.2 + 5.0.2 + 5.0.2 + 5.0.2 + 5.0.2 + 5.0.2 5.0.0-beta.20580.4 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 650b13b089..386357bed9 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/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 ` 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); } }