Merge remote-tracking branch 'upstream/rel/1.0.0' into rel101

2017-02-25 14:30:53 -06:00 · 2017-02-25 14:30:53 -06:00 · ab887ec024
commit ab887ec024
parent aa3c38e7e1 e53429feb4
31 changed files with 1349 additions and 323 deletions
--- a/TestAssets/TestProjects/PJTestLibraryWithConfiguration/contentitem.txt
+++ b/TestAssets/TestProjects/PJTestLibraryWithConfiguration/contentitem.txt
@ -0,0 +1 @@
+Random content.
--- a/TestAssets/TestProjects/PJTestLibraryWithConfiguration/project.json
+++ b/TestAssets/TestProjects/PJTestLibraryWithConfiguration/project.json
@ -17,5 +17,13 @@
  },
  "frameworks": {
    "netstandard1.5": {}
+  },
+  "packOptions": {
+      "files": {
+          "include": ["contentitem.txt"],
+          "mappings": {
+              "dir/contentitem.txt": "contentitem.txt"
+          }
+      }
  }
 }
--- a/TestAssets/TestProjects/ProjectJsonWebTemplate/project.json
+++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/project.json
@ -97,7 +97,8 @@
      "wwwroot",
      "**/*.cshtml",
      "appsettings.json",
-      "web.config"
+      "web.config",
+      "README.md"
    ]
  },