From 57371e5c9c7ba535a40dd9cf4995d3c11d45ce3a Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Tue, 1 Mar 2016 13:32:58 -0800 Subject: [PATCH] Transition to netstandard. - dotnet5.X => netstandard1.y (where y = x-1). - DNXCore50 => netstandardapp1.5. - Applied the same changes to ifdefs. --- samples/SampleStartups/project.json | 11 +++++++---- .../project.json | 10 ++++++++-- .../project.json | 14 ++++++++++---- .../Startup/StartupExceptionPage.cs | 2 +- src/Microsoft.AspNetCore.Hosting/project.json | 17 ++++++++++++----- .../Deployers/ApplicationDeployer.cs | 4 ++-- .../Deployers/IISExpressDeployer.cs | 2 +- .../project.json | 15 ++++++++++----- src/Microsoft.AspNetCore.TestHost/project.json | 13 +++++++++---- .../project.json | 7 +++++-- .../project.json | 7 +++++-- 11 files changed, 70 insertions(+), 32 deletions(-) diff --git a/samples/SampleStartups/project.json b/samples/SampleStartups/project.json index ffd61f20b1..795637eced 100644 --- a/samples/SampleStartups/project.json +++ b/samples/SampleStartups/project.json @@ -6,8 +6,11 @@ }, "frameworks": { "dnx451": {}, - "dnxcore50": { - "imports": "portable-net451+win8" - } + "netstandardapp1.5": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] + } } -} +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Hosting.Abstractions/project.json b/src/Microsoft.AspNetCore.Hosting.Abstractions/project.json index 77f1671b86..df67e00412 100644 --- a/src/Microsoft.AspNetCore.Hosting.Abstractions/project.json +++ b/src/Microsoft.AspNetCore.Hosting.Abstractions/project.json @@ -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" + ] + } } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/project.json b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/project.json index e12abd3b10..af00fa6a2f 100644 --- a/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/project.json +++ b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/project.json @@ -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" + ] + } } -} +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Hosting/Startup/StartupExceptionPage.cs b/src/Microsoft.AspNetCore.Hosting/Startup/StartupExceptionPage.cs index 8750199eba..6b75a1c3b8 100644 --- a/src/Microsoft.AspNetCore.Hosting/Startup/StartupExceptionPage.cs +++ b/src/Microsoft.AspNetCore.Hosting/Startup/StartupExceptionPage.cs @@ -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); diff --git a/src/Microsoft.AspNetCore.Hosting/project.json b/src/Microsoft.AspNetCore.Hosting/project.json index a89830784b..264fc8d40d 100644 --- a/src/Microsoft.AspNetCore.Hosting/project.json +++ b/src/Microsoft.AspNetCore.Hosting/project.json @@ -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" + ] } } -} +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployer.cs b/src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployer.cs index bf1bec300d..26ba4de34c 100644 --- a/src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployer.cs @@ -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 environment, string name, string value) { #endif diff --git a/src/Microsoft.AspNetCore.Server.Testing/Deployers/IISExpressDeployer.cs b/src/Microsoft.AspNetCore.Server.Testing/Deployers/IISExpressDeployer.cs index ea7a97a054..62d1d0c5c0 100644 --- a/src/Microsoft.AspNetCore.Server.Testing/Deployers/IISExpressDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.Testing/Deployers/IISExpressDeployer.cs @@ -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 diff --git a/src/Microsoft.AspNetCore.Server.Testing/project.json b/src/Microsoft.AspNetCore.Server.Testing/project.json index 7aef426977..4fa5eb2f03 100644 --- a/src/Microsoft.AspNetCore.Server.Testing/project.json +++ b/src/Microsoft.AspNetCore.Server.Testing/project.json @@ -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" + ] } } -} +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.TestHost/project.json b/src/Microsoft.AspNetCore.TestHost/project.json index f2f13819c7..27630931b0 100644 --- a/src/Microsoft.AspNetCore.TestHost/project.json +++ b/src/Microsoft.AspNetCore.TestHost/project.json @@ -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" + ] } } -} +} \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/project.json b/test/Microsoft.AspNetCore.Hosting.Tests/project.json index ecc4271eec..6832e137a5 100644 --- a/test/Microsoft.AspNetCore.Hosting.Tests/project.json +++ b/test/Microsoft.AspNetCore.Hosting.Tests/project.json @@ -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": { diff --git a/test/Microsoft.AspNetCore.TestHost.Tests/project.json b/test/Microsoft.AspNetCore.TestHost.Tests/project.json index dd88a79bf8..6f8a110aa1 100644 --- a/test/Microsoft.AspNetCore.TestHost.Tests/project.json +++ b/test/Microsoft.AspNetCore.TestHost.Tests/project.json @@ -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": {