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

…d DNX
aspnet · Sep 3, 2015 · e84d9bd · e84d9bd
1 parent 4161106
commit e84d9bd
Show file tree

Hide file tree

Showing 17 changed files with 9,705 additions and 65 deletions.
diff --git a/build.cmd b/build.cmd
@@ -3,8 +3,6 @@ cd %~dp0
 
 SETLOCAL
 SET CACHED_NUGET=%LocalAppData%\NuGet\NuGet.exe
-SET BUILDCMD_KOREBUILD_VERSION=""
-SET BUILDCMD_DNX_VERSION=""
 
 IF EXIST %CACHED_NUGET% goto copynuget
 echo Downloading latest version of NuGet.exe...
@@ -18,21 +16,21 @@ copy %CACHED_NUGET% .nuget\nuget.exe > nul
 
 :restore
 IF EXIST packages\KoreBuild goto run
-IF %BUILDCMD_KOREBUILD_VERSION%=="" (
-	.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 -version %BUILDCMD_KOREBUILD_VERSION% -ExcludeVersion -o packages -nocache -pre
+	.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
-IF %BUILDCMD_DNX_VERSION%=="" (
-	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 install %BUILDCMD_DNX_VERSION% -runtime CLR -arch x86 -a default
+	CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86 
 )
 CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x86
 
 :run
 CALL packages\KoreBuild\build\dnvm use default -runtime CLR -arch x86
-packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*
+packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*
diff --git a/src/Microsoft.AspNet.WebSockets.Client/project.json b/src/Microsoft.AspNet.WebSockets.Client/project.json
@@ -1,14 +1,14 @@
 {
-    "version": "1.0.0-*",
+    "version": "1.0.0-beta7",
     "description": "Client for communicating over web sockets.",
     "repository": {
         "type": "git",
         "url": "git://github.com/aspnet/websockets"
     },
     "dependencies": {
-        "Microsoft.AspNet.WebSockets.Protocol": "1.0.0-*"
+        "Microsoft.AspNet.WebSockets.Protocol": "1.0.0-beta7"
     },
     "frameworks": {
-        "net45": { }
+        "net45": {}
     }
-}
+}
diff --git a/src/Microsoft.AspNet.WebSockets.Client/project.lock.json b/src/Microsoft.AspNet.WebSockets.Client/project.lock.json
@@ -0,0 +1,57 @@
+{
+  "locked": true,
+  "version": 1,
+  "targets": {
+    ".NETFramework,Version=v4.5": {
+      "Microsoft.AspNet.WebSockets.Protocol/1.0.0-beta7": {
+        "type": "project",
+        "dependencies": {
+          "Microsoft.Framework.NotNullAttribute.Sources": "1.0.0-beta7"
+        }
+      },
+      "Microsoft.Framework.NotNullAttribute.Sources/1.0.0-beta7": {
+        "type": "package",
+        "frameworkAssemblies": [
+          "Microsoft.CSharp",
+          "mscorlib",
+          "System",
+          "System.Core"
+        ],
+        "compile": {
+          "lib/net45/Microsoft.Framework.NotNullAttribute.Sources.dll": {}
+        },
+        "runtime": {
+          "lib/net45/Microsoft.Framework.NotNullAttribute.Sources.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "Microsoft.AspNet.WebSockets.Protocol/1.0.0-beta7": {
+      "type": "project",
+      "path": "../Microsoft.AspNet.WebSockets.Protocol/project.json"
+    },
+    "Microsoft.Framework.NotNullAttribute.Sources/1.0.0-beta7": {
+      "type": "package",
+      "sha512": "kQEnnd9EfkktgUUYcMPqhUbK95PO3KWR0/CP+DxfYwpQZLursg9IjExfN5QU93dju1N92cXPhu/AagkQwHYSWA==",
+      "files": [
+        "lib/dnx451/Microsoft.Framework.NotNullAttribute.Sources.dll",
+        "lib/dnx451/Microsoft.Framework.NotNullAttribute.Sources.xml",
+        "lib/dotnet/Microsoft.Framework.NotNullAttribute.Sources.dll",
+        "lib/dotnet/Microsoft.Framework.NotNullAttribute.Sources.xml",
+        "lib/net45/Microsoft.Framework.NotNullAttribute.Sources.dll",
+        "lib/net45/Microsoft.Framework.NotNullAttribute.Sources.xml",
+        "Microsoft.Framework.NotNullAttribute.Sources.1.0.0-beta7.nupkg",
+        "Microsoft.Framework.NotNullAttribute.Sources.1.0.0-beta7.nupkg.sha512",
+        "Microsoft.Framework.NotNullAttribute.Sources.nuspec",
+        "shared/NotNullAttribute.cs"
+      ]
+    }
+  },
+  "projectFileDependencyGroups": {
+    "": [
+      "Microsoft.AspNet.WebSockets.Protocol >= 1.0.0-beta7"
+    ],
+    ".NETFramework,Version=v4.5": []
+  }
+}
diff --git a/src/Microsoft.AspNet.WebSockets.Protocol/project.json b/src/Microsoft.AspNet.WebSockets.Protocol/project.json
@@ -1,30 +1,33 @@
 {
-    "version": "1.0.0-*",
+    "version": "1.0.0-beta7",
     "description": "Managed web socket protocol parser.",
     "repository": {
         "type": "git",
         "url": "git://github.com/aspnet/websockets"
     },
     "dependencies": {
-        "Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }
+        "Microsoft.Framework.NotNullAttribute.Sources": {
+            "type": "build",
+            "version": "1.0.0-beta7"
+        }
     },
     "frameworks": {
-        "net45": { },
+        "net45": {},
         "dnxcore50": {
             "dependencies": {
-                "System.Diagnostics.Contracts": "4.0.1-beta-*",
-                "System.IO": "4.0.11-beta-*",
-                "System.Linq": "4.0.1-beta-*",
-                "System.Net.WebSockets": "4.0.0-beta-*",
-                "System.Runtime": "4.0.21-beta-*",
-                "System.Runtime.InteropServices": "4.0.21-beta-*",
-                "System.Runtime.Extensions": "4.0.11-beta-*",
-                "System.Security.Cryptography.Algorithms": "4.0.0-beta-*",
-                "System.Text.Encoding.Extensions": "4.0.11-beta-*",
-                "System.Threading": "4.0.11-beta-*",
-                "System.Threading.Tasks": "4.0.11-beta-*",
-                "System.Threading.Timer": "4.0.1-beta-*"
+                "System.Diagnostics.Contracts": "4.0.1-beta-23225",
+                "System.IO": "4.0.11-beta-23225",
+                "System.Linq": "4.0.1-beta-23225",
+                "System.Net.WebSockets": "4.0.0-beta-23225",
+                "System.Runtime": "4.0.21-beta-23225",
+                "System.Runtime.InteropServices": "4.0.21-beta-23225",
+                "System.Runtime.Extensions": "4.0.11-beta-23225",
+                "System.Security.Cryptography.Algorithms": "4.0.0-beta-23225",
+                "System.Text.Encoding.Extensions": "4.0.11-beta-23225",
+                "System.Threading": "4.0.11-beta-23225",
+                "System.Threading.Tasks": "4.0.11-beta-23225",
+                "System.Threading.Timer": "4.0.1-beta-23225"
             }
         }
     }
-}
+}