From 0025724433aa74af66a1e94ee18e8e5999801ce5 Mon Sep 17 00:00:00 2001 From: BrennanConroy Date: Tue, 31 May 2016 11:10:40 -0700 Subject: [PATCH] Replace PlatformAbstractions with RuntimeInformation --- src/Microsoft.AspNetCore.Diagnostics/project.json | 1 - .../DeveloperExceptionPageMiddlewareTest.cs | 6 ++---- test/Microsoft.AspNetCore.Diagnostics.Tests/project.json | 1 + 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Microsoft.AspNetCore.Diagnostics/project.json b/src/Microsoft.AspNetCore.Diagnostics/project.json index 5c737da0e9..aa8bc215c2 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/project.json +++ b/src/Microsoft.AspNetCore.Diagnostics/project.json @@ -31,7 +31,6 @@ "Microsoft.Extensions.FileProviders.Physical": "1.0.0-*", "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*", "Microsoft.Extensions.Options": "1.0.0-*", - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-*", "System.Diagnostics.DiagnosticSource": "4.0.0-*" }, "frameworks": { diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs b/test/Microsoft.AspNetCore.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs index 49ac11fd3c..424750920b 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs @@ -7,6 +7,7 @@ using System.Diagnostics; using System.IO; using System.Linq; using System.Reflection; +using System.Runtime.InteropServices; using System.Runtime.Versioning; using System.Text; using System.Threading; @@ -16,7 +17,6 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.TestHost; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.FileProviders; -using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; @@ -38,9 +38,7 @@ namespace Microsoft.AspNetCore.Diagnostics "TestFiles/SourceFile.txt" }; - var OSPlatform = PlatformServices.Default.Runtime.OperatingSystemPlatform; - - if (!(OSPlatform == Platform.Linux || OSPlatform == Platform.Darwin)) + if (!(RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || RuntimeInformation.IsOSPlatform(OSPlatform.OSX))) { data.Add(@"TestFiles\SourceFile.txt"); } diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json b/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json index 01c319495a..37ac800dc8 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json +++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json @@ -14,6 +14,7 @@ } }, "dependencies": { + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-*", "dotnet-test-xunit": "1.0.0-*", "Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.AspNetCore.Diagnostics": "1.0.0-*",