Merge remote-tracking branch 'origin/release' into dev

2016-05-11 08:45:43 -07:00 · 2016-05-11 08:45:43 -07:00 · 5bf2ab600b
parent dc68e3b021 912971120f
commit 5bf2ab600b
2 changed files with 2 additions and 1 deletions
--- a/makefile.shade
+++ b/makefile.shade
@ -2,6 +2,7 @@
 var VERSION='0.1'
 var FULL_VERSION='0.1'
 var AUTHORS='Microsoft Open Technologies, Inc.'
+-BuildQuality = "preview1";

 use-standard-lifecycle
 k-standard-goals
--- a/test/TestApps/Dependency/project.json
+++ b/test/TestApps/Dependency/project.json
@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-*",
+  "version": "1.0.0",
  "dependencies": {
    "NETStandard.Library": "1.5.0-*"
  },