Skip to content
This repository has been archived by the owner on Oct 18, 2018. It is now read-only.

Commit

Permalink
Updating json files to pin versions and build.cmd to pin KoreBuild an…
Browse files Browse the repository at this point in the history
…d DNX
  • Loading branch information
pranavkm committed Jul 10, 2015
1 parent b6e55eb commit 0cfe3fb
Show file tree
Hide file tree
Showing 17 changed files with 7,681 additions and 37 deletions.
12 changes: 10 additions & 2 deletions build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.AspNet.WebSockets.Client/project.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"version": "1.0.0-*",
"version": "1.0.0-beta5",
"description": "Client for communicating over web sockets.",
"dependencies": {
"Microsoft.AspNet.WebSockets.Protocol": "1.0.0-*"
"Microsoft.AspNet.WebSockets.Protocol": "1.0.0-beta5"
},
"frameworks": {
"net45": { }
Expand Down
14 changes: 14 additions & 0 deletions src/Microsoft.AspNet.WebSockets.Client/project.lock.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"locked": true,
"version": -9996,
"targets": {
".NETFramework,Version=v4.5": {}
},
"libraries": {},
"projectFileDependencyGroups": {
"": [
"Microsoft.AspNet.WebSockets.Protocol >= 1.0.0-beta5"
],
".NETFramework,Version=v4.5": []
}
}
30 changes: 15 additions & 15 deletions src/Microsoft.AspNet.WebSockets.Protocol/project.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{
"version": "1.0.0-*",
"version": "1.0.0-beta5",
"description": "Managed web socket protocol parser.",
"frameworks": {
"net45": { },
"dnxcore50": {
"dependencies": {
"System.Diagnostics.Contracts": "4.0.0-beta-*",
"System.IO": "4.0.10-beta-*",
"System.Linq": "4.0.0-beta-*",
"System.Net.WebSockets": "4.0.0-beta-*",
"System.Runtime": "4.0.20-beta-*",
"System.Runtime.InteropServices": "4.0.20-beta-*",
"System.Runtime.Extensions": "4.0.10-beta-*",
"System.Security.Cryptography.Encryption": "4.0.0-beta-*",
"System.Security.Cryptography.Hashing": "4.0.0-beta-*",
"System.Security.Cryptography.Hashing.Algorithms": "4.0.0-beta-*",
"System.Text.Encoding.Extensions": "4.0.10-beta-*",
"System.Threading": "4.0.10-beta-*",
"System.Threading.Tasks": "4.0.10-beta-*",
"System.Threading.Timer": "4.0.0-beta-*"
"System.Diagnostics.Contracts": "4.0.0-beta-23019",
"System.IO": "4.0.10-beta-23019",
"System.Linq": "4.0.0-beta-23019",
"System.Net.WebSockets": "4.0.0-beta-23019",
"System.Runtime": "4.0.20-beta-23019",
"System.Runtime.InteropServices": "4.0.20-beta-23019",
"System.Runtime.Extensions": "4.0.10-beta-23019",
"System.Security.Cryptography.Encryption": "4.0.0-beta-23019",
"System.Security.Cryptography.Hashing": "4.0.0-beta-23019",
"System.Security.Cryptography.Hashing.Algorithms": "4.0.0-beta-23019",
"System.Text.Encoding.Extensions": "4.0.10-beta-23019",
"System.Threading": "4.0.10-beta-23019",
"System.Threading.Tasks": "4.0.10-beta-23019",
"System.Threading.Timer": "4.0.0-beta-23019"
}
}
}
Expand Down
Loading

0 comments on commit 0cfe3fb

Please sign in to comment.