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

Commit e84d9bd

Browse files
pranavkmpranavkm
committed
Updating json files to pin versions and build.cmd to pin KoreBuild and DNX
1 parent 4161106 commit e84d9bd

File tree

17 files changed

+9705
-65
lines changed

17 files changed

+9705
-65
lines changed

‎build.cmd

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ cd %~dp0
33

44
SETLOCAL
55
SET CACHED_NUGET=%LocalAppData%\NuGet\NuGet.exe
6-
SET BUILDCMD_KOREBUILD_VERSION=""
7-
SET BUILDCMD_DNX_VERSION=""
86

97
IF EXIST %CACHED_NUGET% goto copynuget
108
echo Downloading latest version of NuGet.exe...
@@ -18,21 +16,21 @@ copy %CACHED_NUGET% .nuget\nuget.exe > nul
1816

1917
:restore
2018
IF EXIST packages\KoreBuild goto run
21-
IF %BUILDCMD_KOREBUILD_VERSION%=="" (
22-
.nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
19+
IF DEFINED BUILDCMD_RELEASE (
20+
.nuget\NuGet.exe install KoreBuild -version 0.2.1-%BUILDCMD_RELEASE% -ExcludeVersion -o packages -nocache -pre
2321
) ELSE (
24-
.nuget\NuGet.exe install KoreBuild -version %BUILDCMD_KOREBUILD_VERSION% -ExcludeVersion -o packages -nocache -pre
22+
.nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
2523
)
2624
.nuget\NuGet.exe install Sake -version 0.2 -o packages -ExcludeVersion
2725

2826
IF "%SKIP_DNX_INSTALL%"=="1" goto run
29-
IF %BUILDCMD_DNX_VERSION%=="" (
30-
CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86
27+
IF DEFINED BUILDCMD_RELEASE (
28+
CALL packages\KoreBuild\build\dnvm install 1.0.0-%BUILDCMD_RELEASE% -runtime CLR -arch x86 -a default
3129
) ELSE (
32-
CALL packages\KoreBuild\build\dnvm install %BUILDCMD_DNX_VERSION% -runtime CLR -arch x86 -a default
30+
CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86
3331
)
3432
CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x86
3533

3634
:run
3735
CALL packages\KoreBuild\build\dnvm use default -runtime CLR -arch x86
38-
packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*
36+
packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*

‎src/Microsoft.AspNet.WebSockets.Client/project.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"version": "1.0.0-*",
2+
"version": "1.0.0-beta7",
33
"description": "Client for communicating over web sockets.",
44
"repository": {
55
"type": "git",
66
"url": "git://github.com/aspnet/websockets"
77
},
88
"dependencies": {
9-
"Microsoft.AspNet.WebSockets.Protocol": "1.0.0-*"
9+
"Microsoft.AspNet.WebSockets.Protocol": "1.0.0-beta7"
1010
},
1111
"frameworks": {
12-
"net45": { }
12+
"net45": {}
1313
}
14-
}
14+
}

‎src/Microsoft.AspNet.WebSockets.Client/project.lock.json

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
{
2+
"locked": true,
3+
"version": 1,
4+
"targets": {
5+
".NETFramework,Version=v4.5": {
6+
"Microsoft.AspNet.WebSockets.Protocol/1.0.0-beta7": {
7+
"type": "project",
8+
"dependencies": {
9+
"Microsoft.Framework.NotNullAttribute.Sources": "1.0.0-beta7"
10+
}
11+
},
12+
"Microsoft.Framework.NotNullAttribute.Sources/1.0.0-beta7": {
13+
"type": "package",
14+
"frameworkAssemblies": [
15+
"Microsoft.CSharp",
16+
"mscorlib",
17+
"System",
18+
"System.Core"
19+
],
20+
"compile": {
21+
"lib/net45/Microsoft.Framework.NotNullAttribute.Sources.dll": {}
22+
},
23+
"runtime": {
24+
"lib/net45/Microsoft.Framework.NotNullAttribute.Sources.dll": {}
25+
}
26+
}
27+
}
28+
},
29+
"libraries": {
30+
"Microsoft.AspNet.WebSockets.Protocol/1.0.0-beta7": {
31+
"type": "project",
32+
"path": "../Microsoft.AspNet.WebSockets.Protocol/project.json"
33+
},
34+
"Microsoft.Framework.NotNullAttribute.Sources/1.0.0-beta7": {
35+
"type": "package",
36+
"sha512": "kQEnnd9EfkktgUUYcMPqhUbK95PO3KWR0/CP+DxfYwpQZLursg9IjExfN5QU93dju1N92cXPhu/AagkQwHYSWA==",
37+
"files": [
38+
"lib/dnx451/Microsoft.Framework.NotNullAttribute.Sources.dll",
39+
"lib/dnx451/Microsoft.Framework.NotNullAttribute.Sources.xml",
40+
"lib/dotnet/Microsoft.Framework.NotNullAttribute.Sources.dll",
41+
"lib/dotnet/Microsoft.Framework.NotNullAttribute.Sources.xml",
42+
"lib/net45/Microsoft.Framework.NotNullAttribute.Sources.dll",
43+
"lib/net45/Microsoft.Framework.NotNullAttribute.Sources.xml",
44+
"Microsoft.Framework.NotNullAttribute.Sources.1.0.0-beta7.nupkg",
45+
"Microsoft.Framework.NotNullAttribute.Sources.1.0.0-beta7.nupkg.sha512",
46+
"Microsoft.Framework.NotNullAttribute.Sources.nuspec",
47+
"shared/NotNullAttribute.cs"
48+
]
49+
}
50+
},
51+
"projectFileDependencyGroups": {
52+
"": [
53+
"Microsoft.AspNet.WebSockets.Protocol >= 1.0.0-beta7"
54+
],
55+
".NETFramework,Version=v4.5": []
56+
}
57+
}

‎src/Microsoft.AspNet.WebSockets.Protocol/project.json

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,33 @@
11
{
2-
"version": "1.0.0-*",
2+
"version": "1.0.0-beta7",
33
"description": "Managed web socket protocol parser.",
44
"repository": {
55
"type": "git",
66
"url": "git://github.com/aspnet/websockets"
77
},
88
"dependencies": {
9-
"Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }
9+
"Microsoft.Framework.NotNullAttribute.Sources": {
10+
"type": "build",
11+
"version": "1.0.0-beta7"
12+
}
1013
},
1114
"frameworks": {
12-
"net45": { },
15+
"net45": {},
1316
"dnxcore50": {
1417
"dependencies": {
15-
"System.Diagnostics.Contracts": "4.0.1-beta-*",
16-
"System.IO": "4.0.11-beta-*",
17-
"System.Linq": "4.0.1-beta-*",
18-
"System.Net.WebSockets": "4.0.0-beta-*",
19-
"System.Runtime": "4.0.21-beta-*",
20-
"System.Runtime.InteropServices": "4.0.21-beta-*",
21-
"System.Runtime.Extensions": "4.0.11-beta-*",
22-
"System.Security.Cryptography.Algorithms": "4.0.0-beta-*",
23-
"System.Text.Encoding.Extensions": "4.0.11-beta-*",
24-
"System.Threading": "4.0.11-beta-*",
25-
"System.Threading.Tasks": "4.0.11-beta-*",
26-
"System.Threading.Timer": "4.0.1-beta-*"
18+
"System.Diagnostics.Contracts": "4.0.1-beta-23225",
19+
"System.IO": "4.0.11-beta-23225",
20+
"System.Linq": "4.0.1-beta-23225",
21+
"System.Net.WebSockets": "4.0.0-beta-23225",
22+
"System.Runtime": "4.0.21-beta-23225",
23+
"System.Runtime.InteropServices": "4.0.21-beta-23225",
24+
"System.Runtime.Extensions": "4.0.11-beta-23225",
25+
"System.Security.Cryptography.Algorithms": "4.0.0-beta-23225",
26+
"System.Text.Encoding.Extensions": "4.0.11-beta-23225",
27+
"System.Threading": "4.0.11-beta-23225",
28+
"System.Threading.Tasks": "4.0.11-beta-23225",
29+
"System.Threading.Timer": "4.0.1-beta-23225"
2730
}
2831
}
2932
}
30-
}
33+
}

0 commit comments

Comments
 (0)