Revert "Transition to netstandard."

This reverts commit 078604f3a8.
This commit is contained in:
N. Taylor Mullen 2016-03-02 10:06:46 -08:00
parent 078604f3a8
commit 911506dc6b
7 changed files with 27 additions and 48 deletions

View File

@ -13,12 +13,8 @@
"web": "IISSample" "web": "IISSample"
}, },
"frameworks": { "frameworks": {
"dnx451": {}, "dnx451": { },
"netstandardapp1.5": { "dnxcore50": { }
"imports": [
"dnxcore50"
]
}
}, },
"publishExclude": [ "publishExclude": [
"node_modules", "node_modules",
@ -32,4 +28,4 @@
"node_modules", "node_modules",
"bower_components" "bower_components"
] ]
} }

View File

@ -8,13 +8,13 @@ namespace Microsoft.AspNetCore.IISPlatformHandler
{ {
internal class NativeMethods 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"; private const string api_ms_win_core_handle_LIB = "api-ms-win-core-handle-l1-1-0.dll";
#else #else
private const string KERNEL32 = "kernel32.dll"; private const string KERNEL32 = "kernel32.dll";
#endif #endif
#if NETSTANDARD1_3 #if DOTNET5_4
[DllImport(api_ms_win_core_handle_LIB, ExactSpelling = true, SetLastError = true)] [DllImport(api_ms_win_core_handle_LIB, ExactSpelling = true, SetLastError = true)]
#else #else
[DllImport(KERNEL32, ExactSpelling = true, SetLastError = true)] [DllImport(KERNEL32, ExactSpelling = true, SetLastError = true)]

View File

@ -3,15 +3,13 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "nowarn": [ "CS1591" ],
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"description": "ASP.NET 5 components for working with the IIS HttpPlatformHandler module.", "description": "ASP.NET 5 components for working with the IIS HttpPlatformHandler module.",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/IISIntegration" "url": "git://github.com/aspnet/IISIntegration"
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0-*", "Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0-*",
@ -25,14 +23,11 @@
} }
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": { },
"netstandard1.3": { "dotnet5.4": {
"dependencies": { "dependencies": {
"System.Security.Principal.Windows": "4.0.0-*" "System.Security.Principal.Windows": "4.0.0-*"
}, }
"imports": [
"dotnet5.4"
]
} }
} }
} }

View File

@ -1,15 +1,14 @@
{ {
"name": "dotnet-publish-iis", "name": "dotnet-publish-iis",
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true, "emitEntryPoint": true,
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "nowarn": [ "CS1591" ],
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-*", "NETStandard.Library": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils": "1.0.0-*", "Microsoft.Extensions.CommandLineUtils": "1.0.0-*",
@ -17,11 +16,9 @@
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*" "Microsoft.DotNet.Cli.Utils": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"netstandardapp1.5": { "dnxcore50": {
"imports": [
"dnxcore50"
]
} }
} }
} }

View File

@ -7,11 +7,8 @@
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
"netstandardapp1.5": { "dnxcore50": {
"imports": [ "imports": "portable-net451+win8",
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"
} }
@ -22,5 +19,5 @@
} }
} }
}, },
"testRunner": "xunit" "testRunner": "xunit"
} }

View File

@ -17,11 +17,8 @@
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
"netstandardapp1.5": { "dnxcore50": {
"imports": [ "imports": "portable-net451+win8",
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"System.Net.Primitives": "4.0.11-*", "System.Net.Primitives": "4.0.11-*",
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"
@ -29,4 +26,4 @@
}, },
"dnx451": {} "dnx451": {}
} }
} }

View File

@ -5,14 +5,11 @@
"Microsoft.NETCore.Platforms": "1.0.1-*" "Microsoft.NETCore.Platforms": "1.0.1-*"
}, },
"frameworks": { "frameworks": {
"netstandardapp1.5": { "dnxcore50": {
"imports": [ "imports": "portable-net451+win8",
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"
} }
} }
} }
} }