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

Merge remote-tracking branch 'origin/rel/2.0.0-preview2' into dev

This commit is contained in:
Pavel Krymets 2017-06-07 14:29:28 -07:00
parent 50f1d8f9fe a9ca4aeeb2
commit c845b07b56
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
samples/ChatSample/ChatSample.csproj
View File

@ -42,6 +42,7 @@
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" /> <PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" />

2
test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs
View File

@ -198,7 +198,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
Assert.Equal("Websocket closed with error: InternalServerError.", exception.Message); Assert.Equal("Websocket closed with error: InternalServerError.", exception.Message);
} }
[Fact] [Fact(Skip="https://github.com/aspnet/SignalR/issues/526")]
public async Task ServerClosesConnectionWithErrorIfHubCannotBeCreated_LongPolling() public async Task ServerClosesConnectionWithErrorIfHubCannotBeCreated_LongPolling()
{ {
var exception = await Assert.ThrowsAsync<HttpRequestException>( var exception = await Assert.ThrowsAsync<HttpRequestException>(