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

Transition to netstandard. 

- dotnet5.X => netstandard1.y (where y = x-1).
- DNXCore50 => netstandardapp1.5.
- Applied the same changes to ifdefs.
This commit is contained in:
N. Taylor Mullen 2016-03-01 13:32:58 -08:00
parent 6defb6e85b
commit 57371e5c9c
11 changed files with 70 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
samples/SampleStartups/project.json
View File

@ -6,8 +6,11 @@
},
"frameworks": {
"dnx451": {},
"dnxcore50": {
"imports": "portable-net451+win8"
}
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net451+win8"
]
}
}
}
}

10
src/Microsoft.AspNetCore.Hosting.Abstractions/project.json
View File

@ -3,7 +3,9 @@
"compilationOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ],
"nowarn": [
"CS1591"
],
"xmlDoc": true
},
"description": "ASP.NET 5 Hosting abstractions.",
@ -20,6 +22,10 @@
},
"frameworks": {
"net451": {},
"dotnet5.4": {}
"netstandard1.3": {
"imports": [
"dotnet5.4"
]
}
}
}

14
src/Microsoft.AspNetCore.Hosting.Server.Abstractions/project.json
View File

@ -3,7 +3,9 @@
"compilationOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ],
"nowarn": [
"CS1591"
],
"xmlDoc": true
},
"description": "ASP.NET 5 Hosting server abstractions.",
@ -16,7 +18,11 @@
"Microsoft.Extensions.Configuration.Abstractions": "1.0.0-*"
},
"frameworks": {
"net451": { },
"dotnet5.4": { }
"net451": {},
"netstandard1.3": {
"imports": [
"dotnet5.4"
]
}
}
}
}

2
src/Microsoft.AspNetCore.Hosting/Startup/StartupExceptionPage.cs
View File

@ -233,7 +233,7 @@ namespace Microsoft.AspNetCore.Hosting.Startup
private static string GenerateFooterEncoded(IRuntimeEnvironment environment)
{
var runtimeType = HtmlEncodeAndReplaceLineBreaks(environment.RuntimeType);
#if DNXCORE50 || DOTNET5_4
#if NETSTANDARDAPP1_5 || NETSTANDARD1_3
var systemRuntimeAssembly = typeof(System.ComponentModel.DefaultValueAttribute).GetTypeInfo().Assembly;
var assemblyVersion = new AssemblyName(systemRuntimeAssembly.FullName).Version.ToString();
var clrVersion = HtmlEncodeAndReplaceLineBreaks(assemblyVersion);

17
src/Microsoft.AspNetCore.Hosting/project.json
View File

@ -8,7 +8,9 @@
"compilationOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ],
"nowarn": [
"CS1591"
],
"xmlDoc": true
},
"dependencies": {
@ -34,16 +36,21 @@
"frameworks": {
"net451": {
"frameworkAssemblies": {
"System.Runtime": { "type": "build" }
"System.Runtime": {
"type": "build"
}
}
},
"dotnet5.4": {
"netstandard1.3": {
"dependencies": {
"System.Console": "4.0.0-*",
"System.Diagnostics.StackTrace": "4.0.1-*",
"System.Reflection.Extensions": "4.0.1-*"
},
"imports": "portable-net45+win8"
"imports": [
"dotnet5.4",
"portable-net45+win8"
]
}
}
}
}

4
src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployer.cs
View File

@ -161,7 +161,7 @@ namespace Microsoft.AspNetCore.Server.Testing
var environment =
#if NET451
startInfo.EnvironmentVariables;
#elif DNXCORE50
#elif NETSTANDARDAPP1_5
startInfo.Environment;
#endif
@ -176,7 +176,7 @@ namespace Microsoft.AspNetCore.Server.Testing
#if NET451
protected void SetEnvironmentVariable(System.Collections.Specialized.StringDictionary environment, string name, string value)
{
#elif DNXCORE50
#elif NETSTANDARDAPP1_5
protected void SetEnvironmentVariable(System.Collections.Generic.IDictionary<string, string> environment, string name, string value)
{
#endif

2
src/Microsoft.AspNetCore.Server.Testing/Deployers/IISExpressDeployer.cs
View File

@ -97,7 +97,7 @@ namespace Microsoft.AspNetCore.Server.Testing
#if NET451
SetEnvironmentVariable(startInfo.EnvironmentVariables, "PATH", startInfo.EnvironmentVariables["PATH"]);
SetEnvironmentVariable(startInfo.EnvironmentVariables, "DNX_APPBASE", DeploymentParameters.ApplicationPath);
#elif DOTNET5_4
#elif NETSTANDARD1_3
SetEnvironmentVariable(startInfo.Environment, "PATH", startInfo.Environment["PATH"]);
SetEnvironmentVariable(startInfo.Environment, "DNX_APPBASE", DeploymentParameters.ApplicationPath);
#endif

15
src/Microsoft.AspNetCore.Server.Testing/project.json
View File

@ -3,7 +3,9 @@
"compilationOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ],
"nowarn": [
"CS1591"
],
"xmlDoc": true
},
"description": "ASP.NET 5 helpers to deploy applications to IIS Express, IIS, WebListener and Kestrel for testing.",
@ -23,10 +25,10 @@
"Microsoft.Web.Administration": "7.0.0"
},
"frameworkAssemblies": {
"System.Net.Http": "",
"System.Net.Http": ""
}
},
"dnxcore50": {
"netstandardapp1.5": {
"dependencies": {
"System.Diagnostics.Process": "4.1.0-*",
"System.IO.FileSystem": "4.0.1-*",
@ -37,7 +39,10 @@
"System.Threading": "4.0.11-*",
"System.Threading.Thread": "4.0.0-*"
},
"imports": "portable-net45+win8"
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
}
}
}

13
src/Microsoft.AspNetCore.TestHost/project.json
View File

@ -3,7 +3,9 @@
"compilationOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ],
"nowarn": [
"CS1591"
],
"xmlDoc": true
},
"description": "ASP.NET 5 web server for writing and running tests.",
@ -20,12 +22,15 @@
"System.Net.Http": ""
}
},
"dotnet5.4": {
"netstandard1.3": {
"dependencies": {
"System.Diagnostics.Contracts": "4.0.1-*",
"System.Net.Http": "4.0.1-*"
},
"imports": "portable-net45+win8"
"imports": [
"dotnet5.4",
"portable-net45+win8"
]
}
}
}
}

7
test/Microsoft.AspNetCore.Hosting.Tests/project.json
View File

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

7
test/Microsoft.AspNetCore.TestHost.Tests/project.json
View File

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