diff --git a/samples/IISSample/project.json b/samples/IISSample/project.json index 2d07f326ae..a79ae4e78a 100644 --- a/samples/IISSample/project.json +++ b/samples/IISSample/project.json @@ -13,8 +13,12 @@ "web": "IISSample" }, "frameworks": { - "dnx451": { }, - "dnxcore50": { } + "dnx451": {}, + "netstandardapp1.5": { + "imports": [ + "dnxcore50" + ] + } }, "publishExclude": [ "node_modules", @@ -28,4 +32,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 f7fd88619a..75cad39af5 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 DOTNET5_4 +#if NETSTANDARD1_3 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 DOTNET5_4 +#if NETSTANDARD1_3 [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 a27b4093e4..b731fddd01 100644 --- a/src/Microsoft.AspNetCore.IISPlatformHandler/project.json +++ b/src/Microsoft.AspNetCore.IISPlatformHandler/project.json @@ -3,13 +3,15 @@ "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-*", @@ -23,11 +25,14 @@ } }, "frameworks": { - "net451": { }, - "dotnet5.4": { + "net451": {}, + "netstandard1.3": { "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 8c70943541..e481e3699c 100644 --- a/src/dotnet-publish-iis/project.json +++ b/src/dotnet-publish-iis/project.json @@ -1,14 +1,15 @@ -{ +{ "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-*", @@ -16,9 +17,11 @@ "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*" }, - "frameworks": { - "dnxcore50": { + "netstandardapp1.5": { + "imports": [ + "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 59b8bbc423..6577478d1b 100644 --- a/test/Microsoft.AspNetCore.IISPlatformHandler.Tests/project.json +++ b/test/Microsoft.AspNetCore.IISPlatformHandler.Tests/project.json @@ -7,8 +7,11 @@ "xunit": "2.1.0" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "dotnet-test-xunit": "1.0.0-dev-*" } @@ -19,5 +22,5 @@ } } }, - "testRunner": "xunit" + "testRunner": "xunit" } \ No newline at end of file diff --git a/test/TestSites/project.json b/test/TestSites/project.json index c3b35340a7..c39459058f 100644 --- a/test/TestSites/project.json +++ b/test/TestSites/project.json @@ -17,8 +17,11 @@ "xunit": "2.1.0" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "System.Net.Primitives": "4.0.11-*", "dotnet-test-xunit": "1.0.0-dev-*" @@ -26,4 +29,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 388f7dc7bd..6f48b6691d 100644 --- a/test/dotnet-publish-iis.Tests/project.json +++ b/test/dotnet-publish-iis.Tests/project.json @@ -5,11 +5,14 @@ "Microsoft.NETCore.Platforms": "1.0.1-*" }, "frameworks": { - "dnxcore50": { - "imports": "portable-net451+win8", + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], "dependencies": { "dotnet-test-xunit": "1.0.0-dev-*" } } } -} +} \ No newline at end of file