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

…d DNX
aspnet · May 12, 2015 · 0a43101 · 0a43101
1 parent 1cda9bf
commit 0a43101
Show file tree

Hide file tree

Showing 18 changed files with 15,366 additions and 38 deletions.
diff --git a/NuGet.Config b/NuGet.Config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
+    <clear />
     <add key="NuGet" value="https://nuget.org/api/v2/" />
     <add key="AspNetMaster" value="https://www.myget.org/F/aspnetmaster/api/v2" />
   </packageSources>

diff --git a/build.cmd b/build.cmd
@@ -16,11 +16,19 @@ 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 "%SKIP_DNX_INSTALL%"=="1" goto run
-CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86
+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 install default -runtime CoreCLR -arch x86
 
 :run

diff --git a/src/Microsoft.AspNet.Testing/project.json b/src/Microsoft.AspNet.Testing/project.json
@@ -1,7 +1,7 @@
 {
-    "version": "1.0.0-*",
+    "version": "1.0.0-beta4",
     "dependencies": {
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
+        "xunit.runner.aspnet": "2.0.0-aspnet-beta4"
     },
     "frameworks": {
         "dnx451": {
@@ -13,12 +13,12 @@
         },
         "dnxcore50": {
             "dependencies": {
-                "System.Runtime": "4.0.20-beta-*",
-                "System.Runtime.InteropServices": "4.0.20-beta-*",
-                "System.Globalization": "4.0.10-beta-*",
-                "System.Threading.Tasks": "4.0.10-beta-*",
-                "System.Reflection": "4.0.10-beta-*",
-                "System.Threading.Thread": "4.0.0-beta-*"
+                "System.Runtime": "4.0.20-beta-22816",
+                "System.Runtime.InteropServices": "4.0.20-beta-22816",
+                "System.Globalization": "4.0.10-beta-22816",
+                "System.Threading.Tasks": "4.0.10-beta-22816",
+                "System.Reflection": "4.0.10-beta-22816",
+                "System.Threading.Thread": "4.0.0-beta-22816"
             }
         }
     }