Merge rel/1.0.0 into feature/msbuild.

2016-07-18 14:44:06 -05:00 · 2016-07-18 14:44:06 -05:00 · d2db776d87
commit d2db776d87
parent cebf828acb 9c6bcb9a83
34 changed files with 204 additions and 631 deletions
--- a/Documentation/specs/runtime-configuration-file.md
+++ b/Documentation/specs/runtime-configuration-file.md
@ -36,7 +36,7 @@ The files are both JSON files stored in UTF-8 encoding. Below are sample files.
        "framework": {
            "name": "Microsoft.DotNetCore",
            "version": "1.0.1"
-        }
+        },
        
        "applyPatches": false
    }