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

…d DNX
aspnet · Sep 2, 2015 · d572201 · d572201
1 parent 15eb44c
commit d572201
Show file tree

Hide file tree

Showing 94 changed files with 60,943 additions and 472 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
@@ -3,10 +3,10 @@
     "dependencies": {
         "LibraryAlpha": "1.0.0-*"
     },
-    "commands": { 
-        "run" : "run"
+    "commands": {
+        "run": "run"
     },
-    "frameworks" : {
-        "dnx451" : { }
+    "frameworks": {
+        "dnx451": {}
     }
-}
+}
diff --git a/misc/DnuWrapTestSolutions/ConsoleApp1/src/LibraryAlpha/project.json b/misc/DnuWrapTestSolutions/ConsoleApp1/src/LibraryAlpha/project.json
@@ -3,11 +3,9 @@
     "dependencies": {
         "LibraryBeta": "1.0.0-*"
     },
-
-    "frameworks" : {
-        "dnx451" : { 
-            "dependencies": {
-            }
+    "frameworks": {
+        "dnx451": {
+            "dependencies": {}
         }
     }
-}
+}
diff --git a/misc/DnuWrapTestSolutions/ConsoleApp1/src/LibraryBeta/project.json b/misc/DnuWrapTestSolutions/ConsoleApp1/src/LibraryBeta/project.json
@@ -1,8 +1,5 @@
 {
     "version": "1.0.0-*",
-    "dependencies": {
-    },
-
-    "frameworks" : {
-    }
-}
+    "dependencies": {},
+    "frameworks": {}
+}
diff --git a/misc/LockFileTestProjects/src/Dnx451AppReferencingNet40Lib/project.json b/misc/LockFileTestProjects/src/Dnx451AppReferencingNet40Lib/project.json
@@ -1,12 +1,12 @@
-{
+{
     "version": "1.0.0-*",
     "dependencies": {
         "Net40Lib": ""
     },
     "commands": {
         "run": "run"
     },
-    "frameworks" : {
-        "dnx451" : { }
+    "frameworks": {
+        "dnx451": {}
     }
-}
+}
diff --git a/misc/LockFileTestProjects/src/Net40Lib/project.json b/misc/LockFileTestProjects/src/Net40Lib/project.json
@@ -1,10 +1,9 @@
-{
+{
     "version": "1.0.0-*",
     "dependencies": {
         "Newtonsoft.Json": "6.0.6"
     },
-
-    "frameworks" : {
-        "net40": { }
+    "frameworks": {
+        "net40": {}
     }
-}
+}
diff --git a/misc/ResourcesTestProjects/testproject/project.json b/misc/ResourcesTestProjects/testproject/project.json
@@ -1,18 +1,15 @@
 {
     "version": "1.0.0-*",
-    "dependencies": {
-    },
-
+    "dependencies": {},
     "frameworks": {
         "dnx451": {
-            "dependencies": {
-            }
+            "dependencies": {}
         },
         "dnxcore50": {
             "dependencies": {
-                "System.Runtime": "4.0.21-beta-*",
-                "System.Reflection": "4.0.0",
-                "System.Console": "4.0.0-beta-*"
+                "System.Runtime": "4.0.21-beta-23225",
+                "System.Reflection": "4.1.0-beta-23225",
+                "System.Console": "4.0.0-beta-23225"
             }
         }
     },
@@ -24,4 +21,4 @@
         "../someresources/*.resx",
         "../someresources/*.txt"
     ]
-}
+}
diff --git a/misc/ServicingTestProjects/ServiceableLib1/project.json b/misc/ServicingTestProjects/ServiceableLib1/project.json
@@ -1,7 +1,6 @@
-{
+{
     "version": "1.0.0",
-
-    "frameworks" : {
-        "dnx451" : {}
+    "frameworks": {
+        "dnx451": {}
     }
-}
+}
diff --git a/misc/ServicingTestProjects/UnserviceableLib1/project.json b/misc/ServicingTestProjects/UnserviceableLib1/project.json
@@ -1,7 +1,6 @@
-{
+{
     "version": "1.0.0",
-
-    "frameworks" : {
-        "dnx451" : {}
+    "frameworks": {
+        "dnx451": {}
     }
-}
+}
diff --git a/misc/ServicingTestProjects/UnserviceableLib2/project.json b/misc/ServicingTestProjects/UnserviceableLib2/project.json
@@ -1,7 +1,6 @@
-{
+{
     "version": "1.0.0",
-
-    "frameworks" : {
-        "dnx451" : {}
+    "frameworks": {
+        "dnx451": {}
     }
-}
+}
diff --git a/misc/XreTestApps/AllTheDnxes/project.json b/misc/XreTestApps/AllTheDnxes/project.json
@@ -1,9 +1,8 @@
 {
-    "dependencies": {
-    },
+    "dependencies": {},
     "frameworks": {
         "dnx46": {},
         "dnx452": {},
         "dnx451": {}
     }
-}
+}
diff --git a/misc/XreTestApps/BareApp/project.json b/misc/XreTestApps/BareApp/project.json
@@ -3,4 +3,4 @@
         "dnx451": {},
         "dnxcore50": {}
     }
-}
+}
diff --git a/misc/XreTestApps/CommandsProject/project.json b/misc/XreTestApps/CommandsProject/project.json
@@ -6,8 +6,8 @@
         "dnx451": {},
         "dnxcore50": {
             "dependencies": {
-                "System.Console": "4.0.0-beta-22816"
+                "System.Console": "4.0.0-beta-23225"
             }
         }
     }
-}
+}
diff --git a/misc/XreTestApps/Dnx451/project.json b/misc/XreTestApps/Dnx451/project.json
@@ -1,7 +1,6 @@
 {
-    "dependencies": {
-    },
+    "dependencies": {},
     "frameworks": {
         "dnx451": {}
     }
-}
+}
diff --git a/misc/XreTestApps/Dnx452/project.json b/misc/XreTestApps/Dnx452/project.json
@@ -1,8 +1,7 @@
 {
-    "dependencies": {
-    },
+    "dependencies": {},
     "frameworks": {
         "dnx451": {},
         "dnx452": {}
     }
-}
+}
diff --git a/misc/XreTestApps/Dnx46/project.json b/misc/XreTestApps/Dnx46/project.json
@@ -1,8 +1,7 @@
 {
-    "dependencies": {
-    },
+    "dependencies": {},
     "frameworks": {
         "dnx46": {},
         "dnx451": {}
     }
-}
+}
diff --git a/misc/XreTestApps/FrameworkReferences/project.json b/misc/XreTestApps/FrameworkReferences/project.json
@@ -6,4 +6,4 @@
             }
         }
     }
-}
+}
diff --git a/misc/XreTestApps/NoDependencies/project.json b/misc/XreTestApps/NoDependencies/project.json
@@ -5,4 +5,4 @@
     "frameworks": {
         "dnx451": {}
     }
-}
+}
diff --git a/misc/XreTestApps/SharedLibrary1/project.json b/misc/XreTestApps/SharedLibrary1/project.json
@@ -6,4 +6,4 @@
         "dnx451": {},
         "dnxcore50": {}
     }
-}
+}
diff --git a/misc/XreTestApps/SharedLibrary2/project.json b/misc/XreTestApps/SharedLibrary2/project.json
@@ -6,4 +6,4 @@
         "dnx451": {},
         "dnxcore50": {}
     }
-}
+}
diff --git a/misc/XreTestApps/SharedLibrary3/project.json b/misc/XreTestApps/SharedLibrary3/project.json
@@ -6,4 +6,4 @@
         "dnx451": {},
         "dnxcore50": {}
     }
-}
+}
diff --git a/misc/XreTestApps/SharedSource/project.json b/misc/XreTestApps/SharedSource/project.json
@@ -3,4 +3,4 @@
     "frameworks": {
         "dnx451": {}
     }
-}
+}
diff --git a/misc/XreTestApps/UnresolvedDependency/project.json b/misc/XreTestApps/UnresolvedDependency/project.json
@@ -9,4 +9,4 @@
             }
         }
     }
-}
+}
diff --git a/misc/XreTestApps/UsesSharedSource/project.json b/misc/XreTestApps/UsesSharedSource/project.json
@@ -5,4 +5,4 @@
     "frameworks": {
         "dnx451": {}
     }
-}
+}
diff --git a/samples/HelloShared/project.json b/samples/HelloShared/project.json
@@ -1,14 +1,14 @@
 {
     "version": "0.1-beta-*",
-    "dependencies": { },
+    "dependencies": {},
     "shared": "*.cs",
     "frameworks": {
-        "dnx451": { },
+        "dnx451": {},
         "dnxcore50": {
             "dependencies": {
-                "System.Linq": "4.0.1-beta-*",
-                "System.Runtime": "4.0.21-beta-*"
+                "System.Linq": "4.0.1-beta-23225",
+                "System.Runtime": "4.0.21-beta-23225"
             }
         }
     }
-}
+}