update prelim. DNX implementation to RC1-Update1

CryptArchy · Apr 25, 2016 · 78c3b1b · 78c3b1b
1 parent 34cd6b5
commit 78c3b1b
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 38 deletions.
diff --git a/global.json b/global.json
@@ -1,5 +1,9 @@
 {
   "sdk": {
-    "version": "1.0.0-beta8"
-  }
+    "version": "1.0.0-rc1-update1"
+	},
+	"projects":[
+        "Common.Logging.Core.Dnx",
+        "Common.Logging.Dnx"
+    ]
 }
diff --git a/src/Common.Logging.Core.Dnx/project.json b/src/Common.Logging.Core.Dnx/project.json
@@ -1,20 +1,18 @@
 {
-    "version": "3.3.0-*",
-    "description": "Common.Logging.Core.Dnx",
-    "compilationOptions": {
-        "define": [ "PORTABLE" ]
-    },
-    "frameworks": {
-        "dnx451": { },
-        "dnxcore50": {
-            "dependencies": {
-                "Microsoft.CSharp": "4.0.1-beta-*",
-                "System.Collections": "4.0.11-beta-*",
-                "System.Linq": "4.0.1-beta-*",
-                "System.Runtime": "4.0.21-beta-*",
-                "System.Threading": "4.0.11-beta-*"
-            }
-        }
-    },
-    "compile": [ "../Common.Logging.Core/**/*.cs", "../CommonAssemblyInfo.cs" ]
+  "version": "3.3.0-*",
+  "description": "Common.Logging.Core.Dnx",
+  "compilationOptions": {
+    "define": [ "PORTABLE", "DOTNETCORE" ]
+  },
+  "frameworks": {
+    "dotnet": { }
+  },
+  "compile": [ "../Common.Logging.Core/**/*.cs", "../CommonAssemblyInfo.cs" ],
+  "dependencies": {
+    "Microsoft.CSharp": "4.0.0",
+    "System.Collections": "4.0.10",
+    "System.Linq": "4.0.0",
+    "System.Runtime": "4.0.20",
+    "System.Threading": "4.0.10"
+  }
 }
diff --git a/src/Common.Logging.Dnx/project.json b/src/Common.Logging.Dnx/project.json
@@ -1,16 +1,20 @@
 {
-    "version": "3.3.0-*",
-    "description": "Common.Logging.Dnx",
-    "compilationOptions": {
-        "define": [ "PORTABLE" ]
-    },
-    "dependencies": {
-        "Common.Logging.Core.DNX": "3.3.0-*"
-    },
-    "frameworks": {
-        "dnx451": { },
-        "dnxcore50": { }
-    },
-    "compile": [ "../Common.Logging.Portable/**/*.cs", "../CommonAssemblyInfo.cs" ],
-    "compileExclude": [ "../Common.Logging.Portable/Logging/Factory/ResharperAnnotation.cs" ]
+  "version": "3.3.0-*",
+  "description": "Common.Logging.Dnx",
+  "compilationOptions": {
+    "define": [ "PORTABLE", "DOTNETCORE" ]
+  },
+  "dependencies": {
+    "Common.Logging.Core.Dnx": "3.3.0-*",
+    "Microsoft.CSharp": "4.0.0",
+    "System.Collections": "4.0.10",
+    "System.Linq": "4.0.0",
+    "System.Runtime": "4.0.20",
+    "System.Threading": "4.0.10"
+  },
+  "frameworks": {
+    "dotnet": { }
+  },
+  "compile": [ "../Common.Logging.Portable/**/*.cs", "../CommonAssemblyInfo.cs" ],
+  "compileExclude": [ "../Common.Logging.Portable/Logging/Factory/ResharperAnnotation.cs" ],
 }
diff --git a/src/Common.Logging.Portable/Logging/Configuration/ArgUtils.cs b/src/Common.Logging.Portable/Logging/Configuration/ArgUtils.cs
@@ -147,7 +147,7 @@ public static T Coalesce<T>(Predicate<T> predicate, params T[] values) where T :
         public static T TryParseEnum<T>(T defaultValue, string stringValue) where T : struct
         {
             Type enumType = typeof(T);
-#if DNXCORE50
+#if DOTNETCORE
             if (!enumType.GetTypeInfo().IsEnum)
 #elif WinRT
             if (!enumType.IsEnum())

diff --git a/src/Common.Logging.Portable/Logging/Configuration/DefaultConfigurationReader.cs b/src/Common.Logging.Portable/Logging/Configuration/DefaultConfigurationReader.cs
@@ -45,7 +45,7 @@ public class DefaultConfigurationReader : IConfigurationReader
         /// </remarks>
         public object GetSection(string sectionName)
         {
-#if DNX451 || DNXCORE50     // No System.Configuration in DNX, replace with something DNX-specific?
+#if DOTNETCORE     // No System.Configuration in DotNetCore, replace with something DotNetCore-specific?
             return null;
 #else
 #if PORTABLE

diff --git a/src/Common.Logging.Portable/Logging/Simple/ExceptionFormatter.cs b/src/Common.Logging.Portable/Logging/Simple/ExceptionFormatter.cs
@@ -98,7 +98,7 @@ private static void OutputHeader(IFormatProvider formatProvider, StringBuilder s
 
         private static void OutputDetails(IFormatProvider formatProvider, StringBuilder sb, Exception exception)
         {
-#if PORTABLE && !WinRT && !DNXCORE50
+#if PORTABLE && !WinRT && !DOTNETCORE
             sb.AppendFormat(formatProvider, "Thread ID : {0}\r\n", Thread.CurrentThread.ManagedThreadId);
 #endif
 
@@ -184,7 +184,7 @@ private static void OutputProperties(IFormatProvider formatProvider, StringBuild
                 }
 
                 var enumerableValue = propertyValue as IEnumerable;
-#if WinRT || DNXCORE50
+#if WinRT || DOTNETCORE
                 var propertyTypeName = property.PropertyType.Name;
 #else
                 var propertyTypeName = property.ReflectedType.Name;