Target the dotnet TFM (tests stay in DNX)

ite-klass · Oct 31, 2015 · e12f75e · e12f75e
1 parent 68b8835
commit e12f75e
Show file tree

Hide file tree

Showing 4 changed files with 2,696 additions and 893 deletions.
diff --git a/Serilog.sln.DotSettings b/Serilog.sln.DotSettings
@@ -29,6 +29,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002ELocal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=LocalizableElement/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleOrderBy/@EntryIndexedValue">ERROR</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NotAccessedField_002EGlobal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NotAccessedVariable/@EntryIndexedValue">ERROR</s:String>

diff --git a/src/Serilog/project.json b/src/Serilog/project.json
@@ -51,23 +51,19 @@
                 "System.Threading.Tasks": ""
             }
         },
-      "dnxcore50": {
-        "dependencies": {
-          "Microsoft.CSharp": "4.0.1-beta-23225",
-          "System.Collections": "4.0.11-beta-23225",
-          "System.Collections.Concurrent":  "4.0.11-beta-23225",
-          "System.Console": "4.0.0-beta-23225",
-          "System.Diagnostics.Process": "4.0.0-beta-23225",
-          "System.Diagnostics.TraceSource": "4.0.0-beta-23109",
-          "System.IO.FileSystem": "4.0.1-beta-23225",
-          "System.Linq": "4.0.1-beta-23225",
-          "System.Runtime": "4.0.21-beta-23409",
-          "System.Runtime.Extensions": "4.0.11-beta-23225",
-          "System.Text.RegularExpressions": "4.0.11-beta-23225",
-          "System.Threading": "4.0.11-beta-23225",
-          "System.Threading.Thread": "4.0.0-beta-23225",
-          "System.Threading.Timer": "4.0.1-beta-23225"
+        "dotnet": {
+            "compilationOptions": {
+                "define": [ "DNXCORE50" ]
+            },
+            "dependencies": {
+                "Microsoft.NETCore.Platforms": "1.0.0",
+                "Microsoft.NETCore": "5.0.0",
+                "System.Collections.Concurrent":  "4.0.11-beta-23225",
+                "System.Console": "4.0.0-beta-23225",
+                "System.Diagnostics.Process": "4.0.0-beta-23225",
+                "System.Diagnostics.TraceSource": "4.0.0-beta-23109",
+                "System.Threading.Thread": "4.0.0-beta-23225"
+            }
         }
-      }
     }
 }