From 821b46fb611dae9cd643851194f6052b8115b34c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 5 May 2021 21:30:34 +0000 Subject: [PATCH 1/7] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 12 ++++++------ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 014238cb75..3d76381bb5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,12 +4,12 @@ + + - - - + @@ -24,12 +24,12 @@ - - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 234ca9bc2d..7dd594788a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -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 - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 6701b31940a3bfff08b08c46f4333d9fbbf791c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 6701b31940a3bfff08b08c46f4333d9fbbf791c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 6701b31940a3bfff08b08c46f4333d9fbbf791c9 diff --git a/eng/Versions.props b/eng/Versions.props index 227cc65414..a33cb3da4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -59,10 +59,10 @@ 5.0.0 - 5.0.6-servicing.21220.11 + 5.0.7-servicing.21255.4 5.0.0 - 5.0.6 - 5.0.6-servicing.21220.11 + 5.0.7 + 5.0.7-servicing.21255.4 5.0.0 5.0.0 5.0.0 From 356776891c16114d6dea31603e2972ff6e20cfac Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 12 May 2021 16:41:45 +0000 Subject: [PATCH 2/7] Merged PR 14745: Call RaiseEvent later For 5.0 --- .../inprocesshandler.cpp | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp index 0328adec4e..9aedd1eb5b 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp @@ -91,14 +91,6 @@ REQUEST_NOTIFICATION_STATUS IN_PROCESS_HANDLER::ServerShutdownMessage() const VOID IN_PROCESS_HANDLER::NotifyDisconnect() { - ::RaiseEvent(m_pW3Context, nullptr); - - if (m_pApplication->QueryBlockCallbacksIntoManaged() || - m_fManagedRequestComplete) - { - return; - } - // NotifyDisconnect can be called before the m_pManagedHttpContext is set, // so save that in a bool. // Don't lock when calling m_pDisconnect to avoid the potential deadlock between this @@ -106,6 +98,15 @@ IN_PROCESS_HANDLER::NotifyDisconnect() void* pManagedHttpContext = nullptr; { SRWExclusiveLock lock(m_srwDisconnectLock); + + if (m_pApplication->QueryBlockCallbacksIntoManaged() || + m_fManagedRequestComplete) + { + return; + } + + ::RaiseEvent(m_pW3Context, nullptr); + pManagedHttpContext = m_pManagedHttpContext; m_disconnectFired = true; } @@ -121,8 +122,11 @@ IN_PROCESS_HANDLER::IndicateManagedRequestComplete( VOID ) { - m_fManagedRequestComplete = TRUE; - m_pManagedHttpContext = nullptr; + { + SRWExclusiveLock lock(m_srwDisconnectLock); + m_fManagedRequestComplete = TRUE; + m_pManagedHttpContext = nullptr; + } ::RaiseEvent(m_pW3Context, nullptr); } From 35b0a3d35a418f05a01a6aa0decfe077dcd85d65 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 13 May 2021 18:27:30 +0000 Subject: [PATCH 3/7] Merged PR 14945: [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:d7d10d70-26ab-4663-2902-08d89c6af29b) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: d7d10d70-26ab-4663-2902-08d89c6af29b - **Build**: 20210505.8 - **Date Produced**: 5/5/2021 10:27 PM - **Commit**: 556582d964cc21b82a88d7154e915076f6f9008e - **Branch**: refs/heads/internal/release/5.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NETCore.App.Internal**: [from 5.0.7-servicing.21255.4 to 5.0.7-servicing.21255.8][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 5.0.7 to 5.0.7][1] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 5.0.7-servicing.21255.4 to 5.0.7-servicing.21255.8][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC6701b31&targetVersion=GC556582d&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:d7d10d70-26ab-4663-2902-08d89c6af29b) --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3d76381bb5..3e168f020d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,12 +4,9 @@ - - - - + @@ -24,12 +21,9 @@ - + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7dd594788a..0e21db0ef8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -296,15 +296,15 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6701b31940a3bfff08b08c46f4333d9fbbf791c9 + 556582d964cc21b82a88d7154e915076f6f9008e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6701b31940a3bfff08b08c46f4333d9fbbf791c9 + 556582d964cc21b82a88d7154e915076f6f9008e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6701b31940a3bfff08b08c46f4333d9fbbf791c9 + 556582d964cc21b82a88d7154e915076f6f9008e diff --git a/eng/Versions.props b/eng/Versions.props index e79e75a82c..97389a1985 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -59,10 +59,10 @@ 5.0.0 - 5.0.7-servicing.21255.4 + 5.0.7-servicing.21255.8 5.0.0 5.0.7 - 5.0.7-servicing.21255.4 + 5.0.7-servicing.21255.8 5.0.0 5.0.0 5.0.0 From 67acc3d331454956fc06d6de2218a625e3e596f8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 13 May 2021 20:39:30 +0000 Subject: [PATCH 4/7] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 2 ++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3e168f020d..dd82c96ac2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + @@ -24,6 +25,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e21db0ef8..ca4ee8f3ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://github.com/dotnet/efcore - 42e81439158d5884dab24326c84ed95cd4baaa21 + f8a6198dad41e8ed584da6ff711837f3288f8a8d - + https://github.com/dotnet/efcore - 42e81439158d5884dab24326c84ed95cd4baaa21 + f8a6198dad41e8ed584da6ff711837f3288f8a8d - + https://github.com/dotnet/efcore - 42e81439158d5884dab24326c84ed95cd4baaa21 + f8a6198dad41e8ed584da6ff711837f3288f8a8d - + https://github.com/dotnet/efcore - 42e81439158d5884dab24326c84ed95cd4baaa21 + f8a6198dad41e8ed584da6ff711837f3288f8a8d - + https://github.com/dotnet/efcore - 42e81439158d5884dab24326c84ed95cd4baaa21 + f8a6198dad41e8ed584da6ff711837f3288f8a8d - + https://github.com/dotnet/efcore - 42e81439158d5884dab24326c84ed95cd4baaa21 + f8a6198dad41e8ed584da6ff711837f3288f8a8d - + https://github.com/dotnet/efcore - 42e81439158d5884dab24326c84ed95cd4baaa21 + f8a6198dad41e8ed584da6ff711837f3288f8a8d - + https://github.com/dotnet/efcore - 42e81439158d5884dab24326c84ed95cd4baaa21 + f8a6198dad41e8ed584da6ff711837f3288f8a8d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 97389a1985..15201c05e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,14 +127,14 @@ 5.0.2 - 5.0.6 - 5.0.6 - 5.0.6 - 5.0.6 - 5.0.6 - 5.0.6 - 5.0.6 - 5.0.6 + 5.0.7 + 5.0.7 + 5.0.7 + 5.0.7 + 5.0.7 + 5.0.7 + 5.0.7 + 5.0.7 5.0.0-beta.21160.3 From 99adca0efd6e638ad41a267265f742739c9bcfe7 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 8 Jun 2021 13:31:48 -0700 Subject: [PATCH 5/7] [release/5.0] Bump SDK and runtimes --- global.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/global.json b/global.json index 1b6aca209f..8dd41ed5f4 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "5.0.203" + "version": "5.0.204" }, "tools": { - "dotnet": "5.0.203", + "dotnet": "5.0.204", "runtimes": { "dotnet/x64": [ "2.1.28", @@ -13,7 +13,7 @@ "$(MicrosoftNETCoreAppInternalPackageVersion)" ], "aspnetcore/x64": [ - "3.1.15" + "3.1.16" ] }, "Git": "2.22.0", From 47d31ac2774fd4607d59367498f5230ae24f6563 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 8 Jun 2021 13:43:58 -0700 Subject: [PATCH 6/7] [release/5.0] Bump SiteExtension.3.1 version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index dec3877ec2..b5f4307b0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -238,7 +238,7 @@ 2.1.1 2.2.0 - 3.1.15-servicing-21215-12 + 3.1.16-servicing-21263-5 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) From 4834c8a6f9814bb76397339390520b685d0ddeac Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 8 Jun 2021 13:53:58 -0700 Subject: [PATCH 7/7] [release/5.0] Update package baselines - also re-enable baseline validation --- eng/Baseline.Designer.props | 416 ++++++++++++++++++------------------ eng/Baseline.xml | 200 ++++++++--------- eng/Versions.props | 2 +- 3 files changed, 309 insertions(+), 309 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 87a2693fee..f7d0554e84 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,28 +2,28 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - - - + + + @@ -37,108 +37,108 @@ - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - - + + - 5.0.6 + 5.0.7 - - + + - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 @@ -146,110 +146,110 @@ - 5.0.6 + 5.0.7 - + - + - + - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - - + + - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 - - - + + + - 5.0.6 + 5.0.7 - - + + - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - - + + - 5.0.6 + 5.0.7 - - + + - 5.0.6 + 5.0.7 @@ -257,86 +257,86 @@ - 5.0.6 + 5.0.7 - + - + - + - + - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - + - + - + - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - - + + - 5.0.6 + 5.0.7 - + - + - + - 5.0.6 + 5.0.7 - + - + - 5.0.6 + 5.0.7 - - + + @@ -346,8 +346,8 @@ - - + + @@ -356,8 +356,8 @@ - - + + @@ -368,14 +368,14 @@ - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 @@ -383,50 +383,50 @@ - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - + - + - + - 5.0.6 + 5.0.7 - + - + - + - 5.0.6 + 5.0.7 @@ -442,27 +442,27 @@ - 5.0.6 + 5.0.7 - - + + - - + + - 5.0.6 + 5.0.7 - - + + - 5.0.6 + 5.0.7 @@ -474,185 +474,185 @@ - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 - - + + - 5.0.6 + 5.0.7 - - + + - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 - - + + - - + + - - + + - 5.0.6 + 5.0.7 - - + + - - + + - 5.0.6 + 5.0.7 - + - + - + - 5.0.6 + 5.0.7 - + - + - + - 5.0.6 + 5.0.7 - + - + - 5.0.6 + 5.0.7 - + - + - 5.0.6 + 5.0.7 - - - - + + + + - 5.0.6 + 5.0.7 @@ -661,65 +661,65 @@ - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 @@ -735,42 +735,42 @@ - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - - - + + + - 5.0.6 + 5.0.7 - + - + - + - 5.0.6 + 5.0.7 @@ -780,73 +780,73 @@ - 5.0.6 + 5.0.7 - + - + - + - 5.0.6 + 5.0.7 - + - + - + - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - + - + - + - 5.0.6 + 5.0.7 @@ -867,11 +867,11 @@ - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 @@ -889,13 +889,13 @@ - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 0a3fdf2861..78cda625dc 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,105 +4,105 @@ This file contains a list of all the packages and their versions which were rele Update this list when preparing for a new patch. --> - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Versions.props b/eng/Versions.props index b5f4307b0f..d9cb8fd2e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 5 0 8 - false + true