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"
},
"frameworks": {
"dnx451": {},
"netstandardapp1.5": {
"imports": [
"dnxcore50"
]
}
"dnx451": { },
"dnxcore50": { }
},
"publishExclude": [
"node_modules",
@ -32,4 +28,4 @@
"node_modules",
"bower_components"
]
}
}

View File

@ -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)]

View File

@ -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"
]
}
}
}
}
}

View File

@ -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": {
}
}
}
}

View File

@ -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"
}

View File

@ -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": {}
}
}
}

View File

@ -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-*"
}
}
}
}
}