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:36:28 -08:00
parent abc2abb51b
commit be3c20cab4
21 changed files with 137 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
samples/DatabaseErrorPageSample/project.json
View File

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

8
samples/DeveloperExceptionPageSample/project.json
View File

@ -12,7 +12,11 @@
"web": "DeveloperExceptionPageSample" "web": "DeveloperExceptionPageSample"
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "dnx451": {},
"dnxcore50": { } "netstandardapp1.5": {
"imports": [
"dnxcore50"
]
}
} }
} }

6
samples/ElmPageSample/project.json
View File

@ -14,6 +14,10 @@
}, },
"frameworks": { "frameworks": {
"dnx451": {}, "dnx451": {},
"dnxcore50": {} "netstandardapp1.5": {
"imports": [
"dnxcore50"
]
}
} }
} }

8
samples/ExceptionHandlerSample/project.json
View File

@ -14,7 +14,11 @@
"web": "ExceptionHandlerSample" "web": "ExceptionHandlerSample"
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "dnx451": {},
"dnxcore50": { } "netstandardapp1.5": {
"imports": [
"dnxcore50"
]
}
} }
} }

8
samples/MiddlewareAnalysisSample/project.json
View File

@ -15,7 +15,11 @@
"web": "MiddlewareAnalysisSample" "web": "MiddlewareAnalysisSample"
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "dnx451": {},
"dnxcore50": { } "netstandardapp1.5": {
"imports": [
"dnxcore50"
]
}
} }
} }

6
samples/RuntimeInfoPageSample/project.json
View File

@ -14,6 +14,10 @@
}, },
"frameworks": { "frameworks": {
"dnx451": {}, "dnx451": {},
"dnxcore50": {} "netstandardapp1.5": {
"imports": [
"dnxcore50"
]
}
} }
} }

12
samples/StatusCodePagesSample/project.json
View File

@ -13,7 +13,9 @@
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },
"commands": { "web": "StatusCodePagesSample" }, "commands": {
"web": "StatusCodePagesSample"
},
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
"Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
@ -21,7 +23,11 @@
"Microsoft.NETCore.Platforms": "1.0.1-*" "Microsoft.NETCore.Platforms": "1.0.1-*"
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "dnx451": {},
"dnxcore50": { } "netstandardapp1.5": {
"imports": [
"dnxcore50"
]
}
} }
} }

6
samples/WelcomePageSample/project.json
View File

@ -13,6 +13,10 @@
}, },
"frameworks": { "frameworks": {
"dnx451": {}, "dnx451": {},
"dnxcore50": {} "netstandardapp1.5": {
"imports": [
"dnxcore50"
]
}
} }
} }

11
src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json
View File

@ -8,15 +8,20 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.4": { "netstandard1.3": {
"dependencies": { "dependencies": {
"System.Resources.ResourceManager": "4.0.1-*" "System.Resources.ResourceManager": "4.0.1-*"
} },
"imports": [
"dotnet5.4"
]
} }
} }
} }

11
src/Microsoft.AspNetCore.Diagnostics.Elm/project.json
View File

@ -4,7 +4,9 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"repository": { "repository": {
@ -17,10 +19,13 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.4": { "netstandard1.3": {
"dependencies": { "dependencies": {
"System.Threading": "4.0.11-*" "System.Threading": "4.0.11-*"
} },
"imports": [
"dotnet5.4"
]
} }
}, },
"compileExclude": [ "compileExclude": [

8
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLogger.cs
View File

@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Utilities;
using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Storage;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using System; using System;
#if DOTNET5_4 #if NETSTANDARD1_3
using System.Threading; using System.Threading;
#else #else
using System.Runtime.Remoting.Messaging; using System.Runtime.Remoting.Messaging;
@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
{ {
public class DataStoreErrorLogger : ILogger public class DataStoreErrorLogger : ILogger
{ {
#if DOTNET5_4 #if NETSTANDARD1_3
private readonly AsyncLocal<DataStoreErrorLog> _log = new AsyncLocal<DataStoreErrorLog>(); private readonly AsyncLocal<DataStoreErrorLog> _log = new AsyncLocal<DataStoreErrorLog>();
#else #else
private const string ContextName = "__DataStoreErrorLog"; private const string ContextName = "__DataStoreErrorLog";
@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
{ {
get get
{ {
#if DOTNET5_4 #if NETSTANDARD1_3
return _log.Value; return _log.Value;
#else #else
return (DataStoreErrorLog)CallContext.LogicalGetData(ContextName); return (DataStoreErrorLog)CallContext.LogicalGetData(ContextName);
@ -41,7 +41,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
// it will not be available to code outside of the current async context. // it will not be available to code outside of the current async context.
// We create it ahead of time so that any cloning just clones the reference // We create it ahead of time so that any cloning just clones the reference
// to the object that will hold any errors. // to the object that will hold any errors.
#if DOTNET5_4 #if NETSTANDARD1_3
_log.Value = new DataStoreErrorLog(); _log.Value = new DataStoreErrorLog();
#else #else
CallContext.LogicalSetData(ContextName, new DataStoreErrorLog()); CallContext.LogicalSetData(ContextName, new DataStoreErrorLog());

2
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs
View File

@ -67,7 +67,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
try try
{ {
#if !DOTNET5_4 #if !NETSTANDARD1_3
// TODO This probably isn't the correct place for this workaround, it // TODO This probably isn't the correct place for this workaround, it
// needs to be called before anything is written to CallContext // needs to be called before anything is written to CallContext
// http://msdn.microsoft.com/en-us/library/dn458353(v=vs.110).aspx // http://msdn.microsoft.com/en-us/library/dn458353(v=vs.110).aspx

11
src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json
View File

@ -8,7 +8,9 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"dependencies": { "dependencies": {
@ -25,11 +27,14 @@
"System.Threading.Tasks": "" "System.Threading.Tasks": ""
} }
}, },
"dotnet5.4": { "netstandard1.3": {
"dependencies": { "dependencies": {
"System.Threading": "4.0.11-*" "System.Threading": "4.0.11-*"
}, },
"imports": "portable-net451+win8" "imports": [
"dotnet5.4",
"portable-net451+win8"
]
} }
} }
} }

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

@ -4,7 +4,9 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"repository": { "repository": {
@ -22,11 +24,14 @@
"System.Diagnostics.DiagnosticSource": "4.0.0-*" "System.Diagnostics.DiagnosticSource": "4.0.0-*"
}, },
"frameworks": { "frameworks": {
"net451": { }, "net451": {},
"dotnet5.4": { "netstandard1.3": {
"dependencies": { "dependencies": {
"System.Reflection.Extensions": "4.0.1-*" "System.Reflection.Extensions": "4.0.1-*"
} },
"imports": [
"dotnet5.4"
]
} }
}, },
"compileExclude": [ "compileExclude": [

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

@ -4,7 +4,9 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"repository": { "repository": {
@ -16,9 +18,12 @@
"Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*", "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*",
"System.Diagnostics.DiagnosticSource": "4.0.0-*" "System.Diagnostics.DiagnosticSource": "4.0.0-*"
}, },
"frameworks": { "frameworks": {
"net451": { }, "net451": {},
"dotnet5.4": { } "netstandard1.3": {
"imports": [
"dotnet5.4"
]
}
} }
} }

9
src/PageGenerator/project.json
View File

@ -15,10 +15,13 @@
}, },
"frameworks": { "frameworks": {
"dnx451": {}, "dnx451": {},
"dnxcore50": { "netstandardapp1.5": {
"dependencies": { "dependencies": {
"System.Console": "4.0.0-*", "System.Console": "4.0.0-*"
} },
"imports": [
"dnxcore50"
]
} }
}, },
"commands": { "commands": {

7
test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json
View File

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

7
test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json
View File

@ -15,12 +15,15 @@
], ],
"testRunner": "xunit", "testRunner": "xunit",
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"dependencies": { "dependencies": {
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"
}, },
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
}, },
"net451": { "net451": {
"frameworkAssemblies": { "frameworkAssemblies": {

7
test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json
View File

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

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

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

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

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