Fix build warnings

aspnet · May 2, 2016 · a953e30 · a953e30
1 parent b494969
commit a953e30
Show file tree

Hide file tree

Showing 11 changed files with 94 additions and 72 deletions.
diff --git a/samples/SampleApp/project.json b/samples/SampleApp/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true
   },
   "dependencies": {
@@ -12,9 +12,11 @@
     "Microsoft.Extensions.Logging.Filter": "1.0.0-*",
     "Microsoft.Extensions.PlatformAbstractions": "1.0.0-*"
   },
-  "content": [
-    "logging.json"
-  ],
+  "publishOptions": {
+    "include": [
+      "logging.json"
+    ]
+  },
   "frameworks": {
     "net451": {
       "dependencies": {

diff --git a/src/Microsoft.Extensions.Logging.Abstractions/project.json b/src/Microsoft.Extensions.Logging.Abstractions/project.json
@@ -1,14 +1,16 @@
 {
   "version": "1.0.0-*",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/logging"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/logging"
+    },
+    "tags": [
+      "logging"
+    ]
   },
   "description": "Logging abstractions for Microsoft.Extensions.Logging.\r\nCommonly used types:\r\nMicrosoft.Extensions.Logging.ILogger\r\nMicrosoft.Extensions.Logging.ILoggerFactory\r\nMicrosoft.Extensions.Logging.ILogger<TCategoryName>\r\nMicrosoft.Extensions.Logging.LogLevel\r\nMicrosoft.Extensions.Logging. \r\nMicrosoft.Extensions.Logging.",
-  "tags": [
-    "logging"
-  ],
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [

diff --git a/src/Microsoft.Extensions.Logging.Console/project.json b/src/Microsoft.Extensions.Logging.Console/project.json
@@ -1,14 +1,16 @@
 {
   "version": "1.0.0-*",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/logging"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/logging"
+    },
+    "tags": [
+      "logging"
+    ]
   },
   "description": "Console logger provider implementation for Microsoft.Extensions.Logging.",
-  "tags": [
-    "logging"
-  ],
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [

diff --git a/src/Microsoft.Extensions.Logging.Debug/project.json b/src/Microsoft.Extensions.Logging.Debug/project.json
@@ -1,14 +1,16 @@
 {
   "version": "1.0.0-*",
   "description": "Debug output logger provider implementation for Microsoft.Extensions.Logging. This logger logs messages to a debugger monitor by writing messages with System.Diagnostics.Debug.WriteLine().",
-  "tags": [
-    "logging"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/logging"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/logging"
+    },
+    "tags": [
+      "logging"
+    ]
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [

diff --git a/src/Microsoft.Extensions.Logging.EventLog/project.json b/src/Microsoft.Extensions.Logging.EventLog/project.json
@@ -1,19 +1,23 @@
 {
   "version": "1.0.0-*",
   "description": "Windows Event Log logger provider implementation for Microsoft.Extensions.Logging.",
-  "tags": [
-    "eventlog",
-    "logging",
-    "windowseventlog"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/logging"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/logging"
+    },
+    "tags": [
+      "eventlog",
+      "logging",
+      "windowseventlog"
+    ]
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
-    "nowarn": [ "CS1591" ],
+    "nowarn": [
+      "CS1591"
+    ],
     "xmlDoc": true
   },
   "dependencies": {
@@ -22,7 +26,9 @@
   "frameworks": {
     "net451": {
       "frameworkAssemblies": {
-        "System.Runtime": { "type": "build" }
+        "System.Runtime": {
+          "type": "build"
+        }
       }
     }
   }

diff --git a/src/Microsoft.Extensions.Logging.Filter/project.json b/src/Microsoft.Extensions.Logging.Filter/project.json
@@ -1,21 +1,23 @@
 {
   "version": "1.0.0-*",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/logging"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/logging"
+    },
+    "tags": [
+      "logging"
+    ]
   },
   "description": "Provides a common way to filter log messages across all registered logger providers.",
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "xmlDoc": true,
     "nowarn": [
       "CS1591"
     ]
   },
-  "tags": [
-    "logging"
-  ],
   "dependencies": {
     "Microsoft.Extensions.Configuration.Abstractions": "1.0.0-*",
     "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*"

diff --git a/src/Microsoft.Extensions.Logging.Testing/project.json b/src/Microsoft.Extensions.Logging.Testing/project.json
@@ -1,21 +1,23 @@
 {
   "description": "Helpers for writing tests that use Microsoft.Extensions.Logging. Contains null implementations of the abstractions that do nothing, as well as test implementations that are observable.",
-  "tags": [
-    "logging",
-    "testing"
-  ],
   "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
       "CS1591"
     ],
     "xmlDoc": true
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/logging"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/logging"
+    },
+    "tags": [
+      "logging",
+      "testing"
+    ]
   },
   "dependencies": {
     "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*",

diff --git a/src/Microsoft.Extensions.Logging.TraceSource/project.json b/src/Microsoft.Extensions.Logging.TraceSource/project.json
@@ -1,15 +1,17 @@
 {
   "version": "1.0.0-*",
   "description": "TraceSource logger provider implementation for Microsoft.Extensions.Logging.  This logger logs messages to a trace listener by writing messages with System.Diagnostics.TraceSource.TraceEvent().",
-  "tags": [
-    "logging",
-    "tracesource"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/logging"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/logging"
+    },
+    "tags": [
+      "logging",
+      "tracesource"
+    ]
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [

diff --git a/src/Microsoft.Extensions.Logging/project.json b/src/Microsoft.Extensions.Logging/project.json
@@ -1,18 +1,20 @@
 {
   "version": "1.0.0-*",
   "description": "Logging infrastructure default implementation for Microsoft.Extensions.Logging.",
-  "tags": [
-    "logging"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/logging"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/logging"
+    },
+    "tags": [
+      "logging"
+    ]
   },
   "dependencies": {
     "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*",
     "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*"
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "define": [
       "TRACE"

diff --git a/test/Microsoft.Extensions.Logging.Test/project.json b/test/Microsoft.Extensions.Logging.Test/project.json
@@ -1,8 +1,9 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true
   },
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Testing": "1.0.0-*",
     "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
@@ -26,8 +27,7 @@
           "type": "platform"
         },
         "System.Diagnostics.Process": "4.1.0-*",
-        "moq.netcore": "4.4.0-beta8",
-        "dotnet-test-xunit": "1.0.0-*"
+        "moq.netcore": "4.4.0-beta8"
       }
     },
     "net451": {

diff --git a/test/Microsoft.Extensions.Logging.Testing.Tests/project.json b/test/Microsoft.Extensions.Logging.Testing.Tests/project.json
@@ -1,9 +1,10 @@
 {
   "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true
   },
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.Extensions.Logging.Testing": "1.0.0-*",
     "xunit": "2.1.0"
@@ -20,8 +21,7 @@
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "System.Diagnostics.Process": "4.1.0-*",
-        "dotnet-test-xunit": "1.0.0-*"
+        "System.Diagnostics.Process": "4.1.0-*"
       }
     },
     "net451": {