From 14b99f74fae9d301d5ceef7361c26a1fe1572b23 Mon Sep 17 00:00:00 2001
From: Andrew Stanton-Nurse <andrew@stanton-nurse.com>
Date: Thu, 20 Apr 2017 09:31:10 -0700
Subject: [PATCH] react to removal of PlatformAbstractions (#168)

---
 .../AutobahnTests.cs                                           | 3 +--
 .../Microsoft.AspNetCore.WebSockets.ConformanceTest/Helpers.cs | 3 +--
 .../Microsoft.AspNetCore.WebSockets.ConformanceTest.csproj     | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/AutobahnTests.cs b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/AutobahnTests.cs
index e37e1b6d20..dcba43a738 100644
--- a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/AutobahnTests.cs
+++ b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/AutobahnTests.cs
@@ -8,7 +8,6 @@ using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.xunit;
 using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.AspNetCore.WebSockets.ConformanceTest.Autobahn;
-using Microsoft.Extensions.PlatformAbstractions;
 using Xunit.Abstractions;
 
 namespace Microsoft.AspNetCore.WebSockets.ConformanceTest
@@ -30,7 +29,7 @@ namespace Microsoft.AspNetCore.WebSockets.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))
                 {
diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Helpers.cs b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Helpers.cs
index ad0f500837..37f65ca082 100644
--- a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Helpers.cs
+++ b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Helpers.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using Microsoft.Extensions.PlatformAbstractions;
 
 namespace Microsoft.AspNetCore.WebSockets.ConformanceTest
 {
@@ -8,7 +7,7 @@ namespace Microsoft.AspNetCore.WebSockets.ConformanceTest
     {
         public static string GetApplicationPath(string projectName)
         {
-            var applicationBasePath = PlatformServices.Default.Application.ApplicationBasePath;
+            var applicationBasePath = AppContext.BaseDirectory;
 
             var directoryInfo = new DirectoryInfo(applicationBasePath);
             do
diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Microsoft.AspNetCore.WebSockets.ConformanceTest.csproj b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Microsoft.AspNetCore.WebSockets.ConformanceTest.csproj
index 18d5fc8df7..350e658791 100644
--- a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Microsoft.AspNetCore.WebSockets.ConformanceTest.csproj
+++ b/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Microsoft.AspNetCore.WebSockets.ConformanceTest.csproj
@@ -11,7 +11,6 @@
     <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="System.Diagnostics.FileVersionInfo" Version="$(CoreFxVersion)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />