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

fix build broken by PlatformAbstractions (#409)

This commit is contained in:
Andrew Stanton-Nurse 2017-04-20 14:17:45 -07:00 committed by GitHub
parent c2eec09ba0
commit 64e9cba14d
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Microsoft.AspNetCore.Sockets.Client/ServerSentEventsTransport.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
@ -60,7 +60,10 @@ namespace Microsoft.AspNetCore.Sockets.Client
Running = Task.WhenAll(sendTask, receiveTask).ContinueWith(t =>
{
if (t.Exception != null) { _logger.LogError(t.Exception, "Transport stopped"); }
if (t.Exception != null)
{
_logger.LogError(0, t.Exception.InnerException, "Transport stopped");
}
_application.Output.TryComplete(t.IsFaulted ? t.Exception.InnerException : null);
return t;

5
test/Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest/AutobahnTests.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Server.IntegrationTesting;
using Microsoft.AspNetCore.Testing.xunit;
using Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest.Autobahn;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.PlatformAbstractions;
using Xunit.Abstractions;
namespace Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest
@ -31,7 +30,7 @@ namespace Microsoft.AspNetCore.WebSockets.Internal.ConformanceTest
var reportDir = Environment.GetEnvironmentVariable("AUTOBAHN_SUITES_REPORT_DIR");
var outDir = !string.IsNullOrEmpty(reportDir) ?
reportDir :
Path.Combine(PlatformServices.Default.Application.ApplicationBasePath, "autobahnreports");
Path.Combine(AppContext.BaseDirectory, "autobahnreports");
if (Directory.Exists(outDir))
{