Fix build warnings

pranavkm · pranavkm · commit 4b226b70d7da · 2016-05-02T11:27:06.000-07:00
diff --git a/samples/MemoryCacheConcurencySample/project.json b/samples/MemoryCacheConcurencySample/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true
   },
   "dependencies": {
diff --git a/samples/MemoryCacheSample/project.json b/samples/MemoryCacheSample/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true
   },
   "dependencies": {
diff --git a/samples/ProfilingSample/project.json b/samples/ProfilingSample/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true
   },
   "dependencies": {
diff --git a/samples/RedisCacheSample/project.json b/samples/RedisCacheSample/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true
   },
   "dependencies": {
diff --git a/samples/SqlServerCacheConcurencySample/project.json b/samples/SqlServerCacheConcurencySample/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true
   },
   "dependencies": {
@@ -10,9 +10,11 @@
     "Microsoft.Extensions.Options": "1.0.0-*",
     "Microsoft.Extensions.PlatformAbstractions": "1.0.0-*"
   },
-  "content": [
-    "config.json"
-  ],
+  "publishOptions": {
+    "include": [
+      "config.json"
+    ]
+  },
   "frameworks": {
     "net451": {},
     "netcoreapp1.0": {
diff --git a/samples/SqlServerCacheSample/project.json b/samples/SqlServerCacheSample/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true
   },
   "dependencies": {
@@ -9,9 +9,11 @@
     "Microsoft.Extensions.Configuration.Json": "1.0.0-*",
     "Microsoft.Extensions.PlatformAbstractions": "1.0.0-*"
   },
-  "content": [
-    "config.json"
-  ],
+  "publishOptions": {
+    "include": [
+      "config.json"
+    ]
+  },
   "frameworks": {
     "net451": {},
     "netcoreapp1.0": {
diff --git a/src/Microsoft.Extensions.Caching.Abstractions.VSRC1/project.json b/src/Microsoft.Extensions.Caching.Abstractions.VSRC1/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk"
   },
@@ -11,8 +11,10 @@
     "net451": {}
   },
   "version": "1.0.0-rc1-final",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/aspnet/caching"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "https://github.com/aspnet/caching"
+    }
   }
 }
diff --git a/src/Microsoft.Extensions.Caching.Abstractions/project.json b/src/Microsoft.Extensions.Caching.Abstractions/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
@@ -8,11 +8,6 @@
     "xmlDoc": true
   },
   "description": "Caching abstractions for in-memory cache and distributed cache.\r\nCommonly used types:\r\nMicrosoft.Extensions.Caching.Distributed.IDistributedCache\r\nMicrosoft.Extensions.Caching.Memory.IMemoryCache",
-  "tags": [
-    "cache",
-    "memorycache",
-    "distributedcache"
-  ],
   "dependencies": {
     "Microsoft.Extensions.Primitives": "1.0.0-*"
   },
@@ -41,8 +36,15 @@
     }
   },
   "version": "1.0.0-*",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/aspnet/caching"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "https://github.com/aspnet/caching"
+    },
+    "tags": [
+      "cache",
+      "memorycache",
+      "distributedcache"
+    ]
   }
 }
diff --git a/src/Microsoft.Extensions.Caching.Memory.VSRC1/project.json b/src/Microsoft.Extensions.Caching.Memory.VSRC1/project.json
@@ -1,11 +1,13 @@
 {
   "version": "1.0.0-rc1-final",
   "description": "ASP.NET 5 in memory cache abstractions and implementation.",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/aspnet/caching"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "https://github.com/aspnet/caching"
+    }
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk"
   },
diff --git a/src/Microsoft.Extensions.Caching.Memory/project.json b/src/Microsoft.Extensions.Caching.Memory/project.json
@@ -1,15 +1,17 @@
 {
   "version": "1.0.0-*",
   "description": "In-memory cache implementation of Microsoft.Extensions.Caching.Memory.IMemoryCache.",
-  "tags": [
-    "cache",
-    "memorycache"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/aspnet/caching"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "https://github.com/aspnet/caching"
+    },
+    "tags": [
+      "cache",
+      "memorycache"
+    ]
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
diff --git a/src/Microsoft.Extensions.Caching.Redis/project.json b/src/Microsoft.Extensions.Caching.Redis/project.json
@@ -1,15 +1,23 @@
 {
   "version": "1.0.0-*",
   "description": "Distributed cache implementation of Microsoft.Extensions.Caching.Distributed.IDistributedCache using Redis.",
-  "tags": [ "cache", "distributedcache", "redis" ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/aspnet/caching"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "https://github.com/aspnet/caching"
+    },
+    "tags": [
+      "cache",
+      "distributedcache",
+      "redis"
+    ]
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
-    "nowarn": [ "CS1591" ],
+    "nowarn": [
+      "CS1591"
+    ],
     "xmlDoc": true
   },
   "dependencies": {
@@ -20,7 +28,9 @@
   "frameworks": {
     "net451": {
       "frameworkAssemblies": {
-        "System.Runtime": { "type": "build" }
+        "System.Runtime": {
+          "type": "build"
+        }
       }
     }
   }
diff --git a/src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json b/src/Microsoft.Extensions.Caching.SqlConfig.Tools/project.json
@@ -6,11 +6,6 @@
     "System.Data.SqlClient": "4.1.0-*"
   },
   "description": "Command line tool to create tables and indexes in a Microsoft SQL Server database for distributed caching.",
-  "tags": [
-    "cache",
-    "distributedcache",
-    "sqlserver"
-  ],
   "frameworks": {
     "netcoreapp1.0": {
       "imports": [
@@ -25,7 +20,7 @@
       }
     }
   },
-  "compilationOptions": {
+  "buildOptions": {
     "outputName": "dotnet-sql-cache",
     "emitEntryPoint": true,
     "warningsAsErrors": true,
@@ -36,8 +31,15 @@
     "xmlDoc": true
   },
   "version": "1.0.0-*",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/aspnet/caching"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "https://github.com/aspnet/caching"
+    },
+    "tags": [
+      "cache",
+      "distributedcache",
+      "sqlserver"
+    ]
   }
 }
diff --git a/src/Microsoft.Extensions.Caching.SqlServer/project.json b/src/Microsoft.Extensions.Caching.SqlServer/project.json
@@ -4,12 +4,7 @@
     "Microsoft.Extensions.Options": "1.0.0-*"
   },
   "description": "Distributed cache implementation of Microsoft.Extensions.Caching.Distributed.IDistributedCache using Microsoft SQL Server.",
-  "tags": [
-    "cache",
-    "distributedcache",
-    "sqlserver"
-  ],
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
@@ -25,8 +20,15 @@
     }
   },
   "version": "1.0.0-*",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/aspnet/caching"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "https://github.com/aspnet/caching"
+    },
+    "tags": [
+      "cache",
+      "distributedcache",
+      "sqlserver"
+    ]
   }
 }
diff --git a/test/Microsoft.Extensions.Caching.Memory.Tests/project.json b/test/Microsoft.Extensions.Caching.Memory.Tests/project.json
@@ -1,9 +1,10 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Testing": "1.0.0-*",
     "Microsoft.Extensions.Caching.Memory": "1.0.0-*",
@@ -21,7 +22,6 @@
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*"
       }
     },
diff --git a/test/Microsoft.Extensions.Caching.SqlServer.Tests/project.json b/test/Microsoft.Extensions.Caching.SqlServer.Tests/project.json
@@ -1,9 +1,10 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Testing": "1.0.0-*",
     "Microsoft.Extensions.Caching.SqlServer": "1.0.0-*",
@@ -12,9 +13,11 @@
     "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
     "xunit": "2.1.0"
   },
-  "content": [
-    "config.json"
-  ],
+  "publishOptions": {
+    "include": [
+      "config.json"
+    ]
+  },
   "frameworks": {
     "netcoreapp1.0": {
       "imports": [
@@ -26,7 +29,6 @@
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "dotnet-test-xunit": "1.0.0-*",
         "moq.netcore": "4.4.0-beta8",
         "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "compilationOptions": {`
	`2`	`+ "buildOptions": {`
`3`	`3`	`"emitEntryPoint": true`
`4`	`4`	`},`
`5`	`5`	`"dependencies": {`