Merge rel/1.0.1 into dev

2016-10-31 08:31:31 -07:00 · 2016-10-31 08:31:31 -07:00 · 50887581df
parent b7f3ea4451 04f9863293
commit 50887581df
2 changed files with 0 additions and 8 deletions
--- a/NuGetPackageVerifier.json
+++ b/NuGetPackageVerifier.json
@ -1,7 +0,0 @@
-{
-    "Default": { // Rules to run for packages not listed in any other set.
-        "rules": [
-            "DefaultCompositeRule"
-        ]
-    }
-}
--- a/src/Microsoft.AspNetCore/project.json
+++ b/src/Microsoft.AspNetCore/project.json
@ -7,7 +7,6 @@
    "Microsoft.AspNetCore.Routing": "1.1.0-*",
    "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0-*",
    "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*",
-    "Microsoft.AspNetCore.StaticFiles": "1.1.0-*",
    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0-*",
    "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0-*",
    "Microsoft.Extensions.Configuration.Json": "1.1.0-*",