Merge branch 'release' into dev

aspnet · May 2, 2016 · f65c3db · f65c3db
2 parents 453e482 + 05602d3
commit f65c3db
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/samples/AntiforgerySample/project.json b/samples/AntiforgerySample/project.json
@@ -10,7 +10,7 @@
     "Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
     "Newtonsoft.Json": "8.0.3"
   },
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true
   },
   "frameworks": {
@@ -27,10 +27,12 @@
       }
     }
   },
-  "content": [
-    "wwwroot",
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "wwwroot",
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",

diff --git a/src/Microsoft.AspNetCore.Antiforgery/project.json b/src/Microsoft.AspNetCore.Antiforgery/project.json
@@ -1,21 +1,23 @@
 {
   "description": "An antiforgery system for ASP.NET Core designed to generate and validate tokens to prevent Cross-Site Request Forgery attacks.",
-  "tags": [
-    "aspnetcore",
-    "antiforgery"
-  ],
   "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
       "CS1591"
     ],
     "xmlDoc": true
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/antiforgery"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/antiforgery"
+    },
+    "tags": [
+      "aspnetcore",
+      "antiforgery"
+    ]
   },
   "dependencies": {
     "Microsoft.AspNetCore.DataProtection": "1.0.0-*",

diff --git a/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/project.json
@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "AntiforgerySample": "1.0.0-*",
     "Microsoft.AspNetCore.TestHost": "1.0.0-*",
@@ -15,7 +16,6 @@
         },
         "moq.netcore": "4.4.0-beta8",
         "System.Net.Http": "4.0.1-*",
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*"
       },
       "imports": [

diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/project.json b/test/Microsoft.AspNetCore.Antiforgery.Test/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.Antiforgery": "1.0.0-*",
     "Microsoft.AspNetCore.Http": "1.0.0-*",
@@ -22,7 +23,6 @@
           "type": "platform"
         },
         "moq.netcore": "4.4.0-beta8",
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       },