Merge branch 'release' into dev

aspnet · Nov 2, 2015 · af0d2e5 · af0d2e5
2 parents 037196d + e934f5e
commit af0d2e5
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 11 deletions.
diff --git a/src/Microsoft.AspNet.Html.Abstractions/project.json b/src/Microsoft.AspNet.Html.Abstractions/project.json
@@ -6,7 +6,8 @@
     "url": "git://github.com/aspnet/httpabstractions"
   },
   "compilationOptions": {
-    "warningsAsErrors": true
+    "warningsAsErrors": true,
+    "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
     "System.Text.Encodings.Web": "4.0.0-beta-*"

diff --git a/src/Microsoft.AspNet.Http.Abstractions/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Http.Abstractions/Properties/AssemblyInfo.cs
@@ -6,5 +6,5 @@
 using System.Runtime.CompilerServices;
 
 [assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: InternalsVisibleTo("Microsoft.AspNet.Http.Abstractions.Tests")]
+[assembly: InternalsVisibleTo("Microsoft.AspNet.Http.Abstractions.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: NeutralResourcesLanguage("en-us")]
diff --git a/src/Microsoft.AspNet.Http.Abstractions/project.json b/src/Microsoft.AspNet.Http.Abstractions/project.json
@@ -6,7 +6,8 @@
     "url": "git://github.com/aspnet/httpabstractions"
   },
   "compilationOptions": {
-    "warningsAsErrors": true
+    "warningsAsErrors": true,
+    "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
     "Microsoft.AspNet.Http.Features": "1.0.0-*",

diff --git a/src/Microsoft.AspNet.Http.Extensions/project.json b/src/Microsoft.AspNet.Http.Extensions/project.json
@@ -6,7 +6,8 @@
     "url": "git://github.com/aspnet/httpabstractions"
   },
   "compilationOptions": {
-    "warningsAsErrors": true
+    "warningsAsErrors": true,
+    "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
     "Microsoft.AspNet.Http.Abstractions": "1.0.0-*",

diff --git a/src/Microsoft.AspNet.Http.Features/project.json b/src/Microsoft.AspNet.Http.Features/project.json
@@ -6,7 +6,8 @@
     "url": "git://github.com/aspnet/httpabstractions"
   },
   "compilationOptions": {
-    "warningsAsErrors": true
+    "warningsAsErrors": true,
+    "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
     "Microsoft.Extensions.Primitives": "1.0.0-*"

diff --git a/src/Microsoft.AspNet.Http/project.json b/src/Microsoft.AspNet.Http/project.json
@@ -7,7 +7,8 @@
   },
   "compilationOptions": {
     "warningsAsErrors": true,
-    "allowUnsafe": true
+    "allowUnsafe": true,
+    "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
     "Microsoft.AspNet.Http.Abstractions": "1.0.0-*",

diff --git a/src/Microsoft.AspNet.Owin/project.json b/src/Microsoft.AspNet.Owin/project.json
@@ -6,7 +6,8 @@
     "url": "git://github.com/aspnet/httpabstractions"
   },
   "compilationOptions": {
-    "warningsAsErrors": true
+    "warningsAsErrors": true,
+    "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
     "Microsoft.AspNet.Http": "1.0.0-*"

diff --git a/src/Microsoft.AspNet.WebUtilities/project.json b/src/Microsoft.AspNet.WebUtilities/project.json
@@ -6,7 +6,8 @@
     "url": "git://github.com/aspnet/httpabstractions"
   },
   "compilationOptions": {
-    "warningsAsErrors": true
+    "warningsAsErrors": true,
+    "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
     "Microsoft.Extensions.Primitives": "1.0.0-*",

diff --git a/src/Microsoft.Extensions.BufferedHtmlContent.Sources/project.json b/src/Microsoft.Extensions.BufferedHtmlContent.Sources/project.json
@@ -1,5 +1,9 @@
 {
   "version": "1.0.0-*",
+  "compilationOptions": {
+    "warningsAsErrors": true,
+    "keyFile": "../../tools/Key.snk"
+  },
   "shared": "*.cs",
   "dependencies": {},
   "frameworks": {

diff --git a/src/Microsoft.Extensions.WebEncoders/project.json b/src/Microsoft.Extensions.WebEncoders/project.json
@@ -7,7 +7,8 @@
   },
   "compilationOptions": {
     "warningsAsErrors": true,
-    "allowUnsafe": true
+    "allowUnsafe": true,
+    "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
     "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*",

diff --git a/src/Microsoft.Net.Http.Headers/project.json b/src/Microsoft.Net.Http.Headers/project.json
@@ -6,7 +6,8 @@
     "url": "git://github.com/aspnet/httpabstractions"
   },
   "compilationOptions": {
-    "warningsAsErrors": true
+    "warningsAsErrors": true,
+    "keyFile": "../../tools/Key.snk"
   },
   "frameworks": {
     "net451": {},

diff --git a/test/Microsoft.AspNet.Http.Abstractions.Tests/project.json b/test/Microsoft.AspNet.Http.Abstractions.Tests/project.json
@@ -1,4 +1,8 @@
 {
+  "compilationOptions": {
+    "warningsAsErrors": true,
+    "keyFile": "../../tools/Key.snk"
+  },
   "dependencies": {
     "Microsoft.AspNet.Http": "1.0.0-*",
     "Microsoft.AspNet.Testing": "1.0.0-*",

diff --git a/test/Microsoft.Extensions.WebEncoders.Tests/project.json b/test/Microsoft.Extensions.WebEncoders.Tests/project.json
@@ -9,7 +9,9 @@
     "test": "xunit.runner.aspnet"
   },
   "compilationOptions": {
-    "allowUnsafe": true
+    "allowUnsafe": true,
+    "warningsAsErrors": true,
+    "keyFile": "../../tools/Key.snk"
   },
   "frameworks": {
     "dnx451": { },

diff --git a/tools/Key.snk b/tools/Key.snk