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

Merge branch 'release/2.2'

This commit is contained in:
Nate McMaster 2018-11-30 11:15:26 -08:00
parent c06a06d16b 7dc01b6928
commit def3dc0f2b
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eng/PatchConfig.props
View File

@ -8,6 +8,7 @@
Microsoft.AspNetCore.Server.IIS; Microsoft.AspNetCore.Server.IIS;
Microsoft.AspNetCore.Server.IISIntegration; Microsoft.AspNetCore.Server.IISIntegration;
Microsoft.AspNetCore.Server.IntegrationTesting.IIS; Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets;
</PackagesInPatch> </PackagesInPatch>
</PropertyGroup> </PropertyGroup>

2
eng/targets/Packaging.targets
View File

@ -9,7 +9,7 @@
<!-- Temporary: this target is used to gather version information to pass to submodule builds. This can be removed after we finish merging submodules. --> <!-- Temporary: this target is used to gather version information to pass to submodule builds. This can be removed after we finish merging submodules. -->
<Target Name="GetBaselineArtifactInfo" <Target Name="GetBaselineArtifactInfo"
Condition="'$(IsPackableInNonServicingBuild)' == 'true' AND '$(IsSubfolderBuild)' != 'true' " Condition="'$(IsPackableInNonServicingBuild)' == 'true' AND '$(IsSubfolderBuild)' != 'true' AND '$(IsPackable)' != 'true' "
Returns="@(ArtifactInfo)" Returns="@(ArtifactInfo)"
BeforeTargets="GetArtifactInfo"> BeforeTargets="GetArtifactInfo">

2
src/SignalR/clients/ts/signalr/tests/HubConnection.test.ts
View File

@ -273,7 +273,7 @@ describe("HubConnection", () => {
}); });
}); });
it.only("start completes if connection closes and handshake not received yet", async () => { it("start completes if connection closes and handshake not received yet", async () => {
await VerifyLogger.run(async (logger) => { await VerifyLogger.run(async (logger) => {
const mockProtocol = new TestProtocol(TransferFormat.Text); const mockProtocol = new TestProtocol(TransferFormat.Text);