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

Replace PlatformAbstractions with RuntimeInformation

This commit is contained in:
BrennanConroy 2016-05-31 11:10:40 -07:00
parent 99d9ed9c2f
commit 0025724433
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Microsoft.AspNetCore.Diagnostics/project.json
View File

@ -31,7 +31,6 @@
"Microsoft.Extensions.FileProviders.Physical": "1.0.0-*", "Microsoft.Extensions.FileProviders.Physical": "1.0.0-*",
"Microsoft.Extensions.Logging.Abstractions": "1.0.0-*", "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*",
"Microsoft.Extensions.Options": "1.0.0-*", "Microsoft.Extensions.Options": "1.0.0-*",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-*",
"System.Diagnostics.DiagnosticSource": "4.0.0-*" "System.Diagnostics.DiagnosticSource": "4.0.0-*"
}, },
"frameworks": { "frameworks": {

6
test/Microsoft.AspNetCore.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs
View File

@ -7,6 +7,7 @@ using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices;
using System.Runtime.Versioning; using System.Runtime.Versioning;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
@ -16,7 +17,6 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.TestHost; using Microsoft.AspNetCore.TestHost;
using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing;
using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.PlatformAbstractions;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
@ -38,9 +38,7 @@ namespace Microsoft.AspNetCore.Diagnostics
"TestFiles/SourceFile.txt" "TestFiles/SourceFile.txt"
}; };
var OSPlatform = PlatformServices.Default.Runtime.OperatingSystemPlatform; if (!(RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || RuntimeInformation.IsOSPlatform(OSPlatform.OSX)))
if (!(OSPlatform == Platform.Linux || OSPlatform == Platform.Darwin))
{ {
data.Add(@"TestFiles\SourceFile.txt"); data.Add(@"TestFiles\SourceFile.txt");
} }

1
test/Microsoft.AspNetCore.Diagnostics.Tests/project.json
View File

@ -14,6 +14,7 @@
} }
}, },
"dependencies": { "dependencies": {
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-*",
"dotnet-test-xunit": "1.0.0-*", "dotnet-test-xunit": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "Microsoft.AspNetCore.Diagnostics": "1.0.0-*",