Updating json files to pin versions and build.cmd to pin KoreBuild an…

…d DNX
aspnet · Jul 10, 2015 · 83f9259 · 83f9259
1 parent 50dfcd0
commit 83f9259
Show file tree

Hide file tree

Showing 77 changed files with 40,963 additions and 264 deletions.
diff --git a/build.cmd b/build.cmd
@@ -16,17 +16,21 @@ copy %CACHED_NUGET% .nuget\nuget.exe > nul
 
 :restore
 IF EXIST packages\KoreBuild goto run
-.nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
+IF DEFINED BUILDCMD_RELEASE (
+    .nuget\NuGet.exe install KoreBuild -version 0.2.1-%BUILDCMD_RELEASE% -ExcludeVersion -o packages -nocache -pre
+) ELSE (
+    .nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
+)
 .nuget\NuGet.exe install Sake -version 0.2 -o packages -ExcludeVersion
 
-IF "%1" == "rebuild-package" goto run
-
-IF "%SKIP_DNX_INSTALL%"=="1" (
-    REM On the CI, don't upgrade since the previous installed DNVM is already there.
-    CALL packages\KoreBuild\build\dnvm use default -runtime CLR -arch x86
+IF "%SKIP_DNX_INSTALL%"=="1" goto run
+IF DEFINED BUILDCMD_RELEASE (
+    CALL packages\KoreBuild\build\dnvm install 1.0.0-%BUILDCMD_RELEASE% -runtime CLR -arch x86 -a default
 ) ELSE (
-    CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86
+    CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86 
 )
+CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x86
 
 :run
-packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*
+CALL packages\KoreBuild\build\dnvm use default -runtime CLR -arch x86
+packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*
diff --git a/misc/DnuWrapTestSolutions/ConsoleApp1/src/ConsoleApp1/project.json b/misc/DnuWrapTestSolutions/ConsoleApp1/src/ConsoleApp1/project.json
@@ -1,7 +1,7 @@
 {
-    "version": "1.0.0-*",
+    "version": "1.0.0-beta5",
     "dependencies": {
-        "LibraryAlpha": "1.0.0-*"
+        "LibraryAlpha": "1.0.0-beta5"
     },
     "commands": { 
         "run" : "run"

diff --git a/misc/DnuWrapTestSolutions/ConsoleApp1/src/LibraryAlpha/project.json b/misc/DnuWrapTestSolutions/ConsoleApp1/src/LibraryAlpha/project.json
@@ -1,7 +1,7 @@
 {
-    "version": "1.0.0-*",
+    "version": "1.0.0-beta5",
     "dependencies": {
-        "LibraryBeta": "1.0.0-*"
+        "LibraryBeta": "1.0.0-beta5"
     },
 
     "frameworks" : {

diff --git a/misc/DnuWrapTestSolutions/ConsoleApp1/src/LibraryBeta/project.json b/misc/DnuWrapTestSolutions/ConsoleApp1/src/LibraryBeta/project.json
@@ -1,5 +1,5 @@
 {
-    "version": "1.0.0-*",
+    "version": "1.0.0-beta5",
     "dependencies": {
     },
 

diff --git a/misc/LockFileTestProjects/src/Dnx451AppReferencingNet40Lib/project.json b/misc/LockFileTestProjects/src/Dnx451AppReferencingNet40Lib/project.json
@@ -1,5 +1,5 @@
-{
-    "version": "1.0.0-*",
+{
+    "version": "1.0.0-beta5",
     "dependencies": {
         "Net40Lib": ""
     },

diff --git a/misc/LockFileTestProjects/src/Net40Lib/project.json b/misc/LockFileTestProjects/src/Net40Lib/project.json
@@ -1,5 +1,5 @@
-{
-    "version": "1.0.0-*",
+{
+    "version": "1.0.0-beta5",
     "dependencies": {
         "Newtonsoft.Json": "6.0.6"
     },

diff --git a/misc/ResourcesTestProjects/testproject/project.json b/misc/ResourcesTestProjects/testproject/project.json
@@ -1,5 +1,5 @@
-{
-    "version": "1.0.0-*",
+{
+    "version": "1.0.0-beta5",
     "dependencies": {
     },
 
@@ -10,9 +10,9 @@
         },
         "dnxcore50": {
             "dependencies": {
-                "System.Runtime": "4.0.20-beta-*",
-                "System.Reflection": "4.0.0-beta-*",
-                "System.Console": "4.0.0-beta-*"
+                "System.Runtime": "4.0.20-beta-23019",
+                "System.Reflection": "4.0.0-beta-23019",
+                "System.Console": "4.0.0-beta-23019"
             }
         }
     },

diff --git a/misc/ServicingTestProjects/ServiceableLib1/project.json b/misc/ServicingTestProjects/ServiceableLib1/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "1.0.0",
 
     "frameworks" : {

diff --git a/misc/ServicingTestProjects/UnserviceableLib1/project.json b/misc/ServicingTestProjects/UnserviceableLib1/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "1.0.0",
 
     "frameworks" : {

diff --git a/misc/ServicingTestProjects/UnserviceableLib2/project.json b/misc/ServicingTestProjects/UnserviceableLib2/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "1.0.0",
 
     "frameworks" : {

diff --git a/misc/XreTestApps/DependentProject/project.json b/misc/XreTestApps/DependentProject/project.json
@@ -8,4 +8,4 @@
         "dnx451": {},
         "dnxcore50": {}
     }
-}
+}
diff --git a/samples/HelloShared/project.json b/samples/HelloShared/project.json
@@ -1,13 +1,13 @@
 {
-    "version": "0.1-beta-*",
+    "version": "0.1-beta-beta5",
     "dependencies": { },
     "shared": "*.cs",
     "frameworks": {
         "dnx451": { },
         "dnxcore50": {
             "dependencies": {
-                "System.Linq": "4.0.0-beta-*",
-                "System.Runtime": "4.0.20-beta-*"
+                "System.Linq": "4.0.0-beta-23019",
+                "System.Runtime": "4.0.20-beta-23019"
             }
         }
     }