Merge branch 'rel/1.0.0' into dev/jgoshi/handleDeprecatedPJ

2017-01-26 14:28:37 -08:00 · 2017-01-26 14:28:37 -08:00 · 2cc4f3f166
commit 2cc4f3f166
parent 3821d39d6c 1fe1c3af01
6 changed files with 65 additions and 3 deletions
--- a/TestAssets/TestProjects/TestAppWithExplicitIncludeGlob/Program.cs
+++ b/TestAssets/TestProjects/TestAppWithExplicitIncludeGlob/Program.cs
@ -0,0 +1,9 @@
+using System;
+
+class Program
+{
+    static void Main(string[] args)
+    {
+        Console.WriteLine("Hello World!");
+    }
+}
--- a/TestAssets/TestProjects/TestAppWithExplicitIncludeGlob/project.json
+++ b/TestAssets/TestProjects/TestAppWithExplicitIncludeGlob/project.json
@ -0,0 +1,24 @@
+{ 
+  "version": "1.0.0-*", 
+  "buildOptions": { 
+    "debugType": "portable", 
+    "emitEntryPoint": true,
+    "compile": {
+      "include": [
+        "**/*.cs"
+      ]
+    }
+  },
+  "dependencies": {}, 
+  "frameworks": { 
+    "netcoreapp1.0": { 
+      "dependencies": { 
+        "Microsoft.NETCore.App": { 
+          "type": "platform", 
+          "version": "1.0.1" 
+        } 
+      }, 
+      "imports": "dnxcore50" 
+    } 
+  } 
+}