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

Merge branch 'release/2.2' => 'master' (#9313)

This commit is contained in:
Doug Bunting 2019-04-12 14:53:52 -07:00 committed by GitHub
parent b1ca2c1155 3b180691e1
commit 6df7aa4da0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eng/PatchConfig.props
View File

@ -41,6 +41,9 @@ Later on, this will be checked using this condition:
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.5' "> <PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.5' ">
<PackagesInPatch> <PackagesInPatch>
Microsoft.AspNetCore.AspNetCoreModule;
Microsoft.AspNetCore.AspNetCoreModuleV2;
java:signalr;
</PackagesInPatch> </PackagesInPatch>
</PropertyGroup> </PropertyGroup>

3
src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.cpp
View File

@ -104,7 +104,7 @@ AddConfigSection(
if (aspNetCoreNode == NULL) if (aspNetCoreNode == NULL)
{ {
RETURN_IF_FAILED(hr = pXMLDoc->createElement(section, &element)); RETURN_IF_FAILED(hr = pXMLDoc->createElement(section, &element));
RETURN_IF_FAILED(hr = element->setAttribute(name, CComVariant(aspNetCore))); RETURN_IF_FAILED(hr = element->setAttribute(name, CComVariant(aspNetCore)));
RETURN_IF_FAILED(hr = element->setAttribute(overrideMode, CComVariant(allow))); RETURN_IF_FAILED(hr = element->setAttribute(overrideMode, CComVariant(allow)));
@ -130,7 +130,6 @@ RemoveConfigSection(
IXMLDOMNode* webServerNode; IXMLDOMNode* webServerNode;
IXMLDOMNode* aspNetCoreNode; IXMLDOMNode* aspNetCoreNode;
IXMLDOMNode* tempNode; IXMLDOMNode* tempNode;
IXMLDOMElement* element;
STRU customActionData; STRU customActionData;
CComBSTR selectLanguage = SysAllocString(L"SelectionLanguage"); CComBSTR selectLanguage = SysAllocString(L"SelectionLanguage");

2
src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionAdapterTests.cs
View File

@ -146,6 +146,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
var serviceContext = new TestServiceContext(LoggerFactory); var serviceContext = new TestServiceContext(LoggerFactory);
TestApplicationErrorLogger.ThrowOnUngracefulShutdown = false;
var stopTask = Task.CompletedTask; var stopTask = Task.CompletedTask;
await using (var server = new TestServer(requestDelegate, serviceContext, listenOptions)) await using (var server = new TestServer(requestDelegate, serviceContext, listenOptions))
using (var shutdownCts = new CancellationTokenSource(TestConstants.DefaultTimeout)) using (var shutdownCts = new CancellationTokenSource(TestConstants.DefaultTimeout))