diff --git a/samples/IISSample/project.json b/samples/IISSample/project.json index a79ae4e78a..2d07f326ae 100644 --- a/samples/IISSample/project.json +++ b/samples/IISSample/project.json @@ -13,12 +13,8 @@ "web": "IISSample" }, "frameworks": { - "dnx451": {}, - "netstandardapp1.5": { - "imports": [ - "dnxcore50" - ] - } + "dnx451": { }, + "dnxcore50": { } }, "publishExclude": [ "node_modules", @@ -32,4 +28,4 @@ "node_modules", "bower_components" ] -} \ No newline at end of file +} diff --git a/src/Microsoft.AspNetCore.IISPlatformHandler/NativeMethods.cs b/src/Microsoft.AspNetCore.IISPlatformHandler/NativeMethods.cs index 75cad39af5..f7fd88619a 100644 --- a/src/Microsoft.AspNetCore.IISPlatformHandler/NativeMethods.cs +++ b/src/Microsoft.AspNetCore.IISPlatformHandler/NativeMethods.cs @@ -8,13 +8,13 @@ namespace Microsoft.AspNetCore.IISPlatformHandler { internal class NativeMethods { -#if NETSTANDARD1_3 +#if DOTNET5_4 private const string api_ms_win_core_handle_LIB = "api-ms-win-core-handle-l1-1-0.dll"; #else private const string KERNEL32 = "kernel32.dll"; #endif -#if NETSTANDARD1_3 +#if DOTNET5_4 [DllImport(api_ms_win_core_handle_LIB, ExactSpelling = true, SetLastError = true)] #else [DllImport(KERNEL32, ExactSpelling = true, SetLastError = true)] diff --git a/src/Microsoft.AspNetCore.IISPlatformHandler/project.json b/src/Microsoft.AspNetCore.IISPlatformHandler/project.json index b731fddd01..a27b4093e4 100644 --- a/src/Microsoft.AspNetCore.IISPlatformHandler/project.json +++ b/src/Microsoft.AspNetCore.IISPlatformHandler/project.json @@ -3,15 +3,13 @@ "compilationOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", - "nowarn": [ - "CS1591" - ], + "nowarn": [ "CS1591" ], "xmlDoc": true }, "description": "ASP.NET 5 components for working with the IIS HttpPlatformHandler module.", "repository": { - "type": "git", - "url": "git://github.com/aspnet/IISIntegration" + "type": "git", + "url": "git://github.com/aspnet/IISIntegration" }, "dependencies": { "Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0-*", @@ -25,14 +23,11 @@ } }, "frameworks": { - "net451": {}, - "netstandard1.3": { + "net451": { }, + "dotnet5.4": { "dependencies": { "System.Security.Principal.Windows": "4.0.0-*" - }, - "imports": [ - "dotnet5.4" - ] + } } } -} \ No newline at end of file +} diff --git a/src/dotnet-publish-iis/project.json b/src/dotnet-publish-iis/project.json index e481e3699c..8c70943541 100644 --- a/src/dotnet-publish-iis/project.json +++ b/src/dotnet-publish-iis/project.json @@ -1,15 +1,14 @@ -{ +{ "name": "dotnet-publish-iis", "version": "1.0.0-*", "compilationOptions": { "emitEntryPoint": true, "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", - "nowarn": [ - "CS1591" - ], + "nowarn": [ "CS1591" ], "xmlDoc": true }, + "dependencies": { "NETStandard.Library": "1.0.0-*", "Microsoft.Extensions.CommandLineUtils": "1.0.0-*", @@ -17,11 +16,9 @@ "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*" }, + "frameworks": { - "netstandardapp1.5": { - "imports": [ - "dnxcore50" - ] + "dnxcore50": { } } -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNetCore.IISPlatformHandler.Tests/project.json b/test/Microsoft.AspNetCore.IISPlatformHandler.Tests/project.json index 6577478d1b..59b8bbc423 100644 --- a/test/Microsoft.AspNetCore.IISPlatformHandler.Tests/project.json +++ b/test/Microsoft.AspNetCore.IISPlatformHandler.Tests/project.json @@ -7,11 +7,8 @@ "xunit": "2.1.0" }, "frameworks": { - "netstandardapp1.5": { - "imports": [ - "dnxcore50", - "portable-net451+win8" - ], + "dnxcore50": { + "imports": "portable-net451+win8", "dependencies": { "dotnet-test-xunit": "1.0.0-dev-*" } @@ -22,5 +19,5 @@ } } }, - "testRunner": "xunit" + "testRunner": "xunit" } \ No newline at end of file diff --git a/test/TestSites/project.json b/test/TestSites/project.json index c39459058f..c3b35340a7 100644 --- a/test/TestSites/project.json +++ b/test/TestSites/project.json @@ -17,11 +17,8 @@ "xunit": "2.1.0" }, "frameworks": { - "netstandardapp1.5": { - "imports": [ - "dnxcore50", - "portable-net451+win8" - ], + "dnxcore50": { + "imports": "portable-net451+win8", "dependencies": { "System.Net.Primitives": "4.0.11-*", "dotnet-test-xunit": "1.0.0-dev-*" @@ -29,4 +26,4 @@ }, "dnx451": {} } -} \ No newline at end of file +} diff --git a/test/dotnet-publish-iis.Tests/project.json b/test/dotnet-publish-iis.Tests/project.json index 6f48b6691d..388f7dc7bd 100644 --- a/test/dotnet-publish-iis.Tests/project.json +++ b/test/dotnet-publish-iis.Tests/project.json @@ -5,14 +5,11 @@ "Microsoft.NETCore.Platforms": "1.0.1-*" }, "frameworks": { - "netstandardapp1.5": { - "imports": [ - "dnxcore50", - "portable-net451+win8" - ], + "dnxcore50": { + "imports": "portable-net451+win8", "dependencies": { "dotnet-test-xunit": "1.0.0-dev-*" } } } -} \ No newline at end of file +}