From 8e57b5e3b61ec72b190461def0464b225ffa1a04 Mon Sep 17 00:00:00 2001 From: Brennan Conroy Date: Thu, 10 Dec 2020 00:19:53 +0000 Subject: [PATCH 01/14] Merged PR 11157: Run callbacks outside of locks --- .../Internal/Infrastructure/TimeoutControl.cs | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) 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); } } From 5b92756c41a80ec0f09d901b2b7472945b1527ff Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 10 Dec 2020 20:04:49 +0000 Subject: [PATCH 02/14] Merged PR 11687: Set publishing to temporarily use internal/release-publishing branch Set publishing to temporarily use internal/release-publishing branch --- eng/common/post-build/publish-using-darc.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ` From 7933df4827bd4b027ef27a77c78dfda025353b0f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 10 Dec 2020 22:52:20 +0000 Subject: [PATCH 03/14] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 11 ++++++++++- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 4 ++-- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index be79ec8ee5..86d8cb9d94 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,6 +2,11 @@ + + + + + @@ -10,5 +15,9 @@ - + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c5ea0cb17..5566504c2f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -94,8 +94,8 @@ cf258a14b70ad9069470a108f13765e0e5988f51 - https://github.com/dotnet/runtime - b02e13abab3d6f499751af2ad1ae6333fb4e633d + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 681e2c3e1e8cbece1c796f7afc3c3a9bd9759d56 https://github.com/dotnet/runtime @@ -210,8 +210,8 @@ cf258a14b70ad9069470a108f13765e0e5988f51 - https://github.com/dotnet/runtime - b02e13abab3d6f499751af2ad1ae6333fb4e633d + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 681e2c3e1e8cbece1c796f7afc3c3a9bd9759d56 https://github.com/dotnet/runtime @@ -247,8 +247,8 @@ cf258a14b70ad9069470a108f13765e0e5988f51 - https://github.com/dotnet/runtime - b02e13abab3d6f499751af2ad1ae6333fb4e633d + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 681e2c3e1e8cbece1c796f7afc3c3a9bd9759d56 https://github.com/dotnet/runtime @@ -295,16 +295,16 @@ All Runtime.$rid packages should have the same version. --> - https://github.com/dotnet/runtime - b02e13abab3d6f499751af2ad1ae6333fb4e633d + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 681e2c3e1e8cbece1c796f7afc3c3a9bd9759d56 - - https://github.com/dotnet/runtime - b02e13abab3d6f499751af2ad1ae6333fb4e633d + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 681e2c3e1e8cbece1c796f7afc3c3a9bd9759d56 - - https://github.com/dotnet/runtime - b02e13abab3d6f499751af2ad1ae6333fb4e633d + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 681e2c3e1e8cbece1c796f7afc3c3a9bd9759d56 diff --git a/eng/Versions.props b/eng/Versions.props index 5f86c4093a..fc419433a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,10 +58,10 @@ 5.0.0 - 5.0.1-servicing.20575.16 + 5.0.1-servicing.20610.7 5.0.0 5.0.1 - 5.0.1-servicing.20575.16 + 5.0.1-servicing.20610.7 5.0.0 5.0.0 5.0.0 From 6b3724c21afb71cca2bb5cd714ca769b7f88e345 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 11 Dec 2020 03:17:08 +0000 Subject: [PATCH 04/14] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 5 +++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 86d8cb9d94..13cb0b8155 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -16,8 +16,9 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5566504c2f..a7718fa412 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -95,7 +95,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 681e2c3e1e8cbece1c796f7afc3c3a9bd9759d56 + aeea2adcd2799435d315fd80d3a6007dddbc55fe https://github.com/dotnet/runtime @@ -211,7 +211,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 681e2c3e1e8cbece1c796f7afc3c3a9bd9759d56 + aeea2adcd2799435d315fd80d3a6007dddbc55fe https://github.com/dotnet/runtime @@ -248,7 +248,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 681e2c3e1e8cbece1c796f7afc3c3a9bd9759d56 + aeea2adcd2799435d315fd80d3a6007dddbc55fe https://github.com/dotnet/runtime @@ -296,15 +296,15 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 681e2c3e1e8cbece1c796f7afc3c3a9bd9759d56 + aeea2adcd2799435d315fd80d3a6007dddbc55fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 681e2c3e1e8cbece1c796f7afc3c3a9bd9759d56 + aeea2adcd2799435d315fd80d3a6007dddbc55fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 681e2c3e1e8cbece1c796f7afc3c3a9bd9759d56 + aeea2adcd2799435d315fd80d3a6007dddbc55fe diff --git a/eng/Versions.props b/eng/Versions.props index fc419433a8..45e819bcd9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,10 +58,10 @@ 5.0.0 - 5.0.1-servicing.20610.7 + 5.0.1-servicing.20610.11 5.0.0 5.0.1 - 5.0.1-servicing.20610.7 + 5.0.1-servicing.20610.11 5.0.0 5.0.0 5.0.0 From 51f7b665e6d0e61ed2c26986987c8ed955d3bcc5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 11 Dec 2020 19:04:14 +0000 Subject: [PATCH 05/14] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 11 +++++----- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 38 insertions(+), 37 deletions(-) diff --git a/NuGet.config b/NuGet.config index 13cb0b8155..bc4c9801aa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,9 +3,9 @@ - - - + + + @@ -17,8 +17,9 @@ - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e0805c568..c2f8f810b9 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 + f21c0dd677fc47e61a8353dae161a8713b64786b - - https://github.com/dotnet/efcore - 494e218127bfb7afee3c9b10a30bcd32d6cd80db + + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + f21c0dd677fc47e61a8353dae161a8713b64786b - - https://github.com/dotnet/efcore - 494e218127bfb7afee3c9b10a30bcd32d6cd80db + + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + f21c0dd677fc47e61a8353dae161a8713b64786b - - https://github.com/dotnet/efcore - 494e218127bfb7afee3c9b10a30bcd32d6cd80db + + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + f21c0dd677fc47e61a8353dae161a8713b64786b - - https://github.com/dotnet/efcore - 494e218127bfb7afee3c9b10a30bcd32d6cd80db + + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + f21c0dd677fc47e61a8353dae161a8713b64786b - - https://github.com/dotnet/efcore - 494e218127bfb7afee3c9b10a30bcd32d6cd80db + + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + f21c0dd677fc47e61a8353dae161a8713b64786b - - https://github.com/dotnet/efcore - 494e218127bfb7afee3c9b10a30bcd32d6cd80db + + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + f21c0dd677fc47e61a8353dae161a8713b64786b - - https://github.com/dotnet/efcore - 494e218127bfb7afee3c9b10a30bcd32d6cd80db + + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + f21c0dd677fc47e61a8353dae161a8713b64786b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9bb4dea7ac..563283ec7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,14 +126,14 @@ 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 From 75759a8109dfb596b0f1a066a29a799480ac7ff1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 11 Dec 2020 20:33:27 +0000 Subject: [PATCH 06/14] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 5 +++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index bc4c9801aa..8747af604d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -18,8 +18,9 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2f8f810b9..770e20df1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f21c0dd677fc47e61a8353dae161a8713b64786b + 2f4f88aa51acfed60171ec87f3d52a67f629d71a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f21c0dd677fc47e61a8353dae161a8713b64786b + 2f4f88aa51acfed60171ec87f3d52a67f629d71a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f21c0dd677fc47e61a8353dae161a8713b64786b + 2f4f88aa51acfed60171ec87f3d52a67f629d71a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f21c0dd677fc47e61a8353dae161a8713b64786b + 2f4f88aa51acfed60171ec87f3d52a67f629d71a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f21c0dd677fc47e61a8353dae161a8713b64786b + 2f4f88aa51acfed60171ec87f3d52a67f629d71a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f21c0dd677fc47e61a8353dae161a8713b64786b + 2f4f88aa51acfed60171ec87f3d52a67f629d71a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f21c0dd677fc47e61a8353dae161a8713b64786b + 2f4f88aa51acfed60171ec87f3d52a67f629d71a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f21c0dd677fc47e61a8353dae161a8713b64786b + 2f4f88aa51acfed60171ec87f3d52a67f629d71a https://github.com/dotnet/runtime From 489d2cc2013f0532046981a7b4f53401e48656f0 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 12 Dec 2020 00:02:20 +0000 Subject: [PATCH 07/14] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 4 ++++ eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 8 ++++---- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8747af604d..db3ddcbfb7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,9 @@ + + + @@ -19,6 +22,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 770e20df1e..d0cb899fc0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -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 + 728fdef7b4af7ea3be1913271d04be959dae4f0a 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://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aeea2adcd2799435d315fd80d3a6007dddbc55fe + 728fdef7b4af7ea3be1913271d04be959dae4f0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aeea2adcd2799435d315fd80d3a6007dddbc55fe + 728fdef7b4af7ea3be1913271d04be959dae4f0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aeea2adcd2799435d315fd80d3a6007dddbc55fe + 728fdef7b4af7ea3be1913271d04be959dae4f0a diff --git a/eng/Versions.props b/eng/Versions.props index c1ce27fd32..9b334b7c7f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,10 +58,10 @@ 5.0.0 - 5.0.1-servicing.20610.11 + 5.0.2-servicing.20611.9 5.0.0 - 5.0.1 - 5.0.1-servicing.20610.11 + 5.0.2 + 5.0.2-servicing.20611.9 5.0.0 5.0.0 5.0.0 @@ -120,7 +120,7 @@ 5.0.0 5.0.0 5.0.0 - 5.0.0 + 5.0.1 5.0.0 5.0.0 From 4cf2feb9dd3aa2a0bed4a1ceb9cb4617e6d73fe2 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 12 Dec 2020 01:24:14 +0000 Subject: [PATCH 08/14] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 3 ++- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index db3ddcbfb7..f5aed6af0e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -23,6 +23,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d0cb899fc0..79adbfabd1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -272,7 +272,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 728fdef7b4af7ea3be1913271d04be959dae4f0a + 0260401cbe92144b5f4e70e31765828a14885e60 https://github.com/dotnet/runtime @@ -296,15 +296,15 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 728fdef7b4af7ea3be1913271d04be959dae4f0a + 0260401cbe92144b5f4e70e31765828a14885e60 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 728fdef7b4af7ea3be1913271d04be959dae4f0a + 0260401cbe92144b5f4e70e31765828a14885e60 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 728fdef7b4af7ea3be1913271d04be959dae4f0a + 0260401cbe92144b5f4e70e31765828a14885e60 diff --git a/eng/Versions.props b/eng/Versions.props index 9b334b7c7f..15298f7acc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,10 +58,10 @@ 5.0.0 - 5.0.2-servicing.20611.9 + 5.0.2-servicing.20611.12 5.0.0 5.0.2 - 5.0.2-servicing.20611.9 + 5.0.2-servicing.20611.12 5.0.0 5.0.0 5.0.0 From 6a87a2d8627da589b96c2ddb05314270d3deebfa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 12 Dec 2020 07:06:32 +0000 Subject: [PATCH 09/14] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 3 ++- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index f5aed6af0e..fbd1d31282 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -24,6 +24,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79adbfabd1..24a6a6ed01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -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 @@ -272,7 +272,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0260401cbe92144b5f4e70e31765828a14885e60 + cb5f173b9696d9d00a544b953d95190ab3b56df2 https://github.com/dotnet/runtime @@ -296,15 +296,15 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0260401cbe92144b5f4e70e31765828a14885e60 + cb5f173b9696d9d00a544b953d95190ab3b56df2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0260401cbe92144b5f4e70e31765828a14885e60 + cb5f173b9696d9d00a544b953d95190ab3b56df2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0260401cbe92144b5f4e70e31765828a14885e60 + cb5f173b9696d9d00a544b953d95190ab3b56df2 diff --git a/eng/Versions.props b/eng/Versions.props index 15298f7acc..4db7209fb8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,10 +58,10 @@ 5.0.0 - 5.0.2-servicing.20611.12 + 5.0.2-servicing.20611.20 5.0.0 5.0.2 - 5.0.2-servicing.20611.12 + 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 From 8937f4c08f2af109dd60bf1bccca7c952f3386a8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 12 Dec 2020 09:20:58 +0000 Subject: [PATCH 10/14] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 5 +++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index fbd1d31282..8b21c1e0ec 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -24,9 +24,10 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24a6a6ed01..248a19cb39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 2f4f88aa51acfed60171ec87f3d52a67f629d71a + 1ee6b629b3437c0d45bfe3aa5703abdcc449231f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 2f4f88aa51acfed60171ec87f3d52a67f629d71a + 1ee6b629b3437c0d45bfe3aa5703abdcc449231f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 2f4f88aa51acfed60171ec87f3d52a67f629d71a + 1ee6b629b3437c0d45bfe3aa5703abdcc449231f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 2f4f88aa51acfed60171ec87f3d52a67f629d71a + 1ee6b629b3437c0d45bfe3aa5703abdcc449231f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 2f4f88aa51acfed60171ec87f3d52a67f629d71a + 1ee6b629b3437c0d45bfe3aa5703abdcc449231f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 2f4f88aa51acfed60171ec87f3d52a67f629d71a + 1ee6b629b3437c0d45bfe3aa5703abdcc449231f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 2f4f88aa51acfed60171ec87f3d52a67f629d71a + 1ee6b629b3437c0d45bfe3aa5703abdcc449231f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 2f4f88aa51acfed60171ec87f3d52a67f629d71a + 1ee6b629b3437c0d45bfe3aa5703abdcc449231f https://github.com/dotnet/runtime From 2670c128d522473e146ff9f8159bfffdfe694cd9 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Sun, 13 Dec 2020 10:03:33 -0800 Subject: [PATCH 11/14] Fixup shas/uris for runtime 5.0.1 bits --- eng/Version.Details.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 248a19cb39..1ecece8ff4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -94,8 +94,8 @@ cf258a14b70ad9069470a108f13765e0e5988f51 - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aeea2adcd2799435d315fd80d3a6007dddbc55fe + https://github.com/dotnet/runtime + b02e13abab3d6f499751af2ad1ae6333fb4e633d https://github.com/dotnet/runtime @@ -210,8 +210,8 @@ cf258a14b70ad9069470a108f13765e0e5988f51 - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aeea2adcd2799435d315fd80d3a6007dddbc55fe + https://github.com/dotnet/runtime + b02e13abab3d6f499751af2ad1ae6333fb4e633d https://github.com/dotnet/runtime @@ -247,8 +247,8 @@ cf258a14b70ad9069470a108f13765e0e5988f51 - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aeea2adcd2799435d315fd80d3a6007dddbc55fe + https://github.com/dotnet/runtime + b02e13abab3d6f499751af2ad1ae6333fb4e633d https://github.com/dotnet/runtime From 9f6be77ef24696301cf36e147d6a0aa7e5b6e66c Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 12 Jan 2021 15:24:26 -0800 Subject: [PATCH 12/14] Rebrand to v5.0.3 - also grab latest 3.1 site extension package --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4db7209fb8..6a1924cedf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 5 0 - 2 + 3 @@ -235,7 +235,7 @@ 2.1.1 2.2.0 - 3.1.10-servicing-20520-4 + 3.1.11-servicing-20569-15 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) From be0a0fe646f0ae4b4ba27f59984b0c06f82d1e39 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 12 Jan 2021 16:27:46 -0800 Subject: [PATCH 13/14] Update baselines to reflect 5.0.2 release --- eng/Baseline.Designer.props | 424 ++++++++++++++++++------------------ eng/Baseline.xml | 204 ++++++++--------- 2 files changed, 314 insertions(+), 314 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index dc602f30b9..456cfb56ce 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,28 +2,28 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - - - + + + @@ -37,108 +37,108 @@ - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - - + + - 5.0.1 + 5.0.2 - - + + - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 @@ -146,110 +146,110 @@ - 5.0.1 + 5.0.2 - + - + - + - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - - + + - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 - - - + + + - 5.0.1 + 5.0.2 - - + + - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - - + + - 5.0.1 + 5.0.2 - - + + - 5.0.1 + 5.0.2 @@ -257,86 +257,86 @@ - 5.0.1 + 5.0.2 - + - + - + - + - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - + - + - + - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - - + + - 5.0.1 + 5.0.2 - + - + - + - 5.0.1 + 5.0.2 - + - + - 5.0.1 + 5.0.2 - - + + @@ -346,8 +346,8 @@ - - + + @@ -356,8 +356,8 @@ - - + + @@ -368,14 +368,14 @@ - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 @@ -383,50 +383,50 @@ - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - + - + - + - 5.0.1 + 5.0.2 - - + + - + - - + + - 5.0.1 + 5.0.2 @@ -442,27 +442,27 @@ - 5.0.1 + 5.0.2 - - + + - - + + - 5.0.1 + 5.0.2 - - + + - 5.0.1 + 5.0.2 @@ -474,185 +474,185 @@ - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 - - + + - 5.0.1 + 5.0.2 - - + + - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 - - + + - - + + - - + + - 5.0.1 + 5.0.2 - - + + - - + + - 5.0.1 + 5.0.2 - + - + - + - + - + - 5.0.1 + 5.0.2 - + - + - + - 5.0.1 + 5.0.2 - + - + - 5.0.1 + 5.0.2 - + - + - 5.0.1 + 5.0.2 - - - - + + + + - 5.0.1 + 5.0.2 @@ -661,65 +661,65 @@ - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 @@ -735,42 +735,42 @@ - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - - - + + + - 5.0.1 + 5.0.2 - + - + - + - 5.0.1 + 5.0.2 @@ -780,73 +780,73 @@ - 5.0.1 + 5.0.2 - + - + - + - 5.0.1 + 5.0.2 - + - + - + - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 - + - + - + - 5.0.1 + 5.0.2 @@ -867,11 +867,11 @@ - 5.0.1 + 5.0.2 - 5.0.1 + 5.0.2 @@ -889,13 +889,13 @@ - 5.0.1 + 5.0.2 - + - 5.0.1 + 5.0.2 \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index f294d16181..19cbf790b6 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -1,108 +1,108 @@ - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 83aaf5f2b35b4fdd9a9c2cb0922ec6ba162ab7b7 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 12 Jan 2021 16:34:40 -0800 Subject: [PATCH 14/14] Clean up `darc-int*` feed suppressions a bit --- NuGet.config | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8b21c1e0ec..1a73a851d5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,15 +19,11 @@ - - - - - - - + + +