huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge commit '67acc3d331454956fc06d6de2218a625e3e596f8' into internal-merge-5.0-2021-06-08-1100

This commit is contained in:
Sean Reeser 2021-06-08 11:01:08 -07:00
parent 57d5a46492 67acc3d331
commit 456ee1622c
4 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
NuGet.config
View File

@ -4,12 +4,10 @@
<clear /> <clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-efcore --> <!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-42e8143" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-42e81439/nuget/v3/index.json" /> <add key="darc-int-dotnet-efcore-f8a6198" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-f8a6198d/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-efcore --> <!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-478b2f8-2" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-478b2f8c-2/nuget/v3/index.json" /> <add key="darc-int-dotnet-runtime-556582d-2" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-556582d9-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-478b2f8-1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-478b2f8c-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-478b2f8" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-478b2f8c/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <!--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-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@ -24,12 +22,10 @@
<clear /> <clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-478b2f8" value="true" /> <add key="darc-int-dotnet-runtime-556582d-2" value="true" />
<add key="darc-int-dotnet-runtime-478b2f8-1" value="true" />
<add key="darc-int-dotnet-runtime-478b2f8-2" value="true" />
<!-- End: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-efcore --> <!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-42e8143" value="true" /> <add key="darc-int-dotnet-efcore-f8a6198" value="true" />
<!-- End: Package sources from dotnet-efcore --> <!-- End: Package sources from dotnet-efcore -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources> </disabledPackageSources>

44
eng/Version.Details.xml
View File

@ -9,37 +9,37 @@
--> -->
<Dependencies> <Dependencies>
<ProductDependencies> <ProductDependencies>
<Dependency Name="dotnet-ef" Version="5.0.6"> <Dependency Name="dotnet-ef" Version="5.0.7">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://github.com/dotnet/efcore</Uri>
<Sha>42e81439158d5884dab24326c84ed95cd4baaa21</Sha> <Sha>f8a6198dad41e8ed584da6ff711837f3288f8a8d</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.6"> <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.7">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://github.com/dotnet/efcore</Uri>
<Sha>42e81439158d5884dab24326c84ed95cd4baaa21</Sha> <Sha>f8a6198dad41e8ed584da6ff711837f3288f8a8d</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.6"> <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.7">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://github.com/dotnet/efcore</Uri>
<Sha>42e81439158d5884dab24326c84ed95cd4baaa21</Sha> <Sha>f8a6198dad41e8ed584da6ff711837f3288f8a8d</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.6"> <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.7">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://github.com/dotnet/efcore</Uri>
<Sha>42e81439158d5884dab24326c84ed95cd4baaa21</Sha> <Sha>f8a6198dad41e8ed584da6ff711837f3288f8a8d</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.6"> <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.7">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://github.com/dotnet/efcore</Uri>
<Sha>42e81439158d5884dab24326c84ed95cd4baaa21</Sha> <Sha>f8a6198dad41e8ed584da6ff711837f3288f8a8d</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.6"> <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.7">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://github.com/dotnet/efcore</Uri>
<Sha>42e81439158d5884dab24326c84ed95cd4baaa21</Sha> <Sha>f8a6198dad41e8ed584da6ff711837f3288f8a8d</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.6"> <Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.7">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://github.com/dotnet/efcore</Uri>
<Sha>42e81439158d5884dab24326c84ed95cd4baaa21</Sha> <Sha>f8a6198dad41e8ed584da6ff711837f3288f8a8d</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="5.0.6"> <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="5.0.7">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://github.com/dotnet/efcore</Uri>
<Sha>42e81439158d5884dab24326c84ed95cd4baaa21</Sha> <Sha>f8a6198dad41e8ed584da6ff711837f3288f8a8d</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0"> <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0">
<Uri>https://github.com/dotnet/runtime</Uri> <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. 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. All Runtime.$rid packages should have the same version.
--> -->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.6"> <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>478b2f8c0e480665f6c52c95cd57830784dc9560</Sha> <Sha>556582d964cc21b82a88d7154e915076f6f9008e</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.6-servicing.21220.11"> <Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.7-servicing.21255.8">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>478b2f8c0e480665f6c52c95cd57830784dc9560</Sha> <Sha>556582d964cc21b82a88d7154e915076f6f9008e</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="5.0.6-servicing.21220.11"> <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="5.0.7-servicing.21255.8">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>478b2f8c0e480665f6c52c95cd57830784dc9560</Sha> <Sha>556582d964cc21b82a88d7154e915076f6f9008e</Sha>
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>

22
eng/Versions.props
View File

@ -59,10 +59,10 @@
<PropertyGroup Label="Automated"> <PropertyGroup Label="Automated">
<!-- Packages from dotnet/runtime --> <!-- Packages from dotnet/runtime -->
<MicrosoftExtensionsDependencyModelPackageVersion>5.0.0</MicrosoftExtensionsDependencyModelPackageVersion> <MicrosoftExtensionsDependencyModelPackageVersion>5.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>5.0.6-servicing.21220.11</MicrosoftNETCoreAppInternalPackageVersion> <MicrosoftNETCoreAppInternalPackageVersion>5.0.7-servicing.21255.8</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>5.0.0</MicrosoftNETCoreAppRefPackageVersion> <MicrosoftNETCoreAppRefPackageVersion>5.0.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.6</MicrosoftNETCoreAppRuntimewinx64PackageVersion> <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.6-servicing.21220.11</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion> <MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.7-servicing.21255.8</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
<MicrosoftWin32RegistryPackageVersion>5.0.0</MicrosoftWin32RegistryPackageVersion> <MicrosoftWin32RegistryPackageVersion>5.0.0</MicrosoftWin32RegistryPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>5.0.0</MicrosoftWin32SystemEventsPackageVersion> <MicrosoftWin32SystemEventsPackageVersion>5.0.0</MicrosoftWin32SystemEventsPackageVersion>
<MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0</MicrosoftExtensionsCachingAbstractionsPackageVersion> <MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0</MicrosoftExtensionsCachingAbstractionsPackageVersion>
@ -127,14 +127,14 @@
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 --> <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsPackageVersion>5.0.2</MicrosoftNETCorePlatformsPackageVersion> <MicrosoftNETCorePlatformsPackageVersion>5.0.2</MicrosoftNETCorePlatformsPackageVersion>
<!-- Packages from dotnet/efcore --> <!-- Packages from dotnet/efcore -->
<dotnetefPackageVersion>5.0.6</dotnetefPackageVersion> <dotnetefPackageVersion>5.0.7</dotnetefPackageVersion>
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.6</MicrosoftEntityFrameworkCoreInMemoryPackageVersion> <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.7</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.6</MicrosoftEntityFrameworkCoreRelationalPackageVersion> <MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.7</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.6</MicrosoftEntityFrameworkCoreSqlitePackageVersion> <MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.7</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.6</MicrosoftEntityFrameworkCoreSqlServerPackageVersion> <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.7</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.6</MicrosoftEntityFrameworkCoreToolsPackageVersion> <MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.7</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>5.0.6</MicrosoftEntityFrameworkCorePackageVersion> <MicrosoftEntityFrameworkCorePackageVersion>5.0.7</MicrosoftEntityFrameworkCorePackageVersion>
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.6</MicrosoftEntityFrameworkCoreDesignPackageVersion> <MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.7</MicrosoftEntityFrameworkCoreDesignPackageVersion>
<!-- Packages from dotnet/arcade --> <!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21160.3</MicrosoftDotNetBuildTasksInstallersPackageVersion> <MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21160.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup> </PropertyGroup>

20
src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp
View File

@ -91,14 +91,6 @@ REQUEST_NOTIFICATION_STATUS IN_PROCESS_HANDLER::ServerShutdownMessage() const
VOID VOID
IN_PROCESS_HANDLER::NotifyDisconnect() IN_PROCESS_HANDLER::NotifyDisconnect()
{ {
::RaiseEvent<ANCMEvents::ANCM_INPROC_REQUEST_DISCONNECT>(m_pW3Context, nullptr);
if (m_pApplication->QueryBlockCallbacksIntoManaged() ||
m_fManagedRequestComplete)
{
return;
}
// NotifyDisconnect can be called before the m_pManagedHttpContext is set, // NotifyDisconnect can be called before the m_pManagedHttpContext is set,
// so save that in a bool. // so save that in a bool.
// Don't lock when calling m_pDisconnect to avoid the potential deadlock between this // 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; void* pManagedHttpContext = nullptr;
{ {
SRWExclusiveLock lock(m_srwDisconnectLock); SRWExclusiveLock lock(m_srwDisconnectLock);
if (m_pApplication->QueryBlockCallbacksIntoManaged() ||
m_fManagedRequestComplete)
{
return;
}
::RaiseEvent<ANCMEvents::ANCM_INPROC_REQUEST_DISCONNECT>(m_pW3Context, nullptr);
pManagedHttpContext = m_pManagedHttpContext; pManagedHttpContext = m_pManagedHttpContext;
m_disconnectFired = true; m_disconnectFired = true;
} }
@ -121,8 +122,11 @@ IN_PROCESS_HANDLER::IndicateManagedRequestComplete(
VOID VOID
) )
{ {
{
SRWExclusiveLock lock(m_srwDisconnectLock);
m_fManagedRequestComplete = TRUE; m_fManagedRequestComplete = TRUE;
m_pManagedHttpContext = nullptr; m_pManagedHttpContext = nullptr;
}
::RaiseEvent<ANCMEvents::ANCM_INPROC_MANAGED_REQUEST_COMPLETION>(m_pW3Context, nullptr); ::RaiseEvent<ANCMEvents::ANCM_INPROC_MANAGED_REQUEST_COMPLETION>(m_pW3Context, nullptr);
} }