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

Commit 6c437d1

Browse files
committed
Updating json files to pin versions and build.cmd to pin KoreBuild and DNX
1 parent 0cfa4c8 commit 6c437d1

File tree

17 files changed

+9576
-61
lines changed

17 files changed

+9576
-61
lines changed

build.cmd

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,19 @@ copy %CACHED_NUGET% .nuget\nuget.exe > nul
1616

1717
:restore
1818
IF EXIST packages\KoreBuild goto run
19-
.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
21+
) ELSE (
22+
.nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
23+
)
2024
.nuget\NuGet.exe install Sake -version 0.2 -o packages -ExcludeVersion
2125

2226
IF "%SKIP_DNX_INSTALL%"=="1" goto run
23-
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
29+
) ELSE (
30+
CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86
31+
)
2432
CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x86
2533

2634
:run
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-beta6",
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-beta6"
1010
},
1111
"frameworks": {
12-
"net45": { }
12+
"net45": {}
1313
}
14-
}
14+
}
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{
2+
"locked": true,
3+
"version": 1,
4+
"targets": {
5+
".NETFramework,Version=v4.5": {
6+
"Microsoft.Framework.NotNullAttribute.Sources/1.0.0-beta6": {
7+
"frameworkAssemblies": [
8+
"Microsoft.CSharp",
9+
"mscorlib",
10+
"System",
11+
"System.Core"
12+
],
13+
"compile": {
14+
"lib/net45/Microsoft.Framework.NotNullAttribute.Sources.dll": {}
15+
},
16+
"runtime": {
17+
"lib/net45/Microsoft.Framework.NotNullAttribute.Sources.dll": {}
18+
}
19+
}
20+
}
21+
},
22+
"libraries": {
23+
"Microsoft.Framework.NotNullAttribute.Sources/1.0.0-beta6": {
24+
"sha512": "85K5j4jXSZxErwaNUrMMaq2O5sjPsW68fnCdSK8h88MZh04Bj0QAsk4yuRZG0nZlgn7He+k1H5XIWkMSLDXFKQ==",
25+
"files": [
26+
"lib/dnx451/Microsoft.Framework.NotNullAttribute.Sources.dll",
27+
"lib/dnx451/Microsoft.Framework.NotNullAttribute.Sources.xml",
28+
"lib/dotnet/Microsoft.Framework.NotNullAttribute.Sources.dll",
29+
"lib/dotnet/Microsoft.Framework.NotNullAttribute.Sources.xml",
30+
"lib/net45/Microsoft.Framework.NotNullAttribute.Sources.dll",
31+
"lib/net45/Microsoft.Framework.NotNullAttribute.Sources.xml",
32+
"Microsoft.Framework.NotNullAttribute.Sources.1.0.0-beta6.nupkg",
33+
"Microsoft.Framework.NotNullAttribute.Sources.1.0.0-beta6.nupkg.sha512",
34+
"Microsoft.Framework.NotNullAttribute.Sources.nuspec",
35+
"shared/NotNullAttribute.cs"
36+
]
37+
}
38+
},
39+
"projectFileDependencyGroups": {
40+
"": [
41+
"Microsoft.AspNet.WebSockets.Protocol >= 1.0.0-beta6"
42+
],
43+
".NETFramework,Version=v4.5": []
44+
}
45+
}
Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,36 @@
11
{
2-
"version": "1.0.0-*",
2+
"version": "1.0.0-beta6",
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-beta6"
12+
}
1013
},
1114
"frameworks": {
12-
"net45": { },
15+
"net45": {},
1316
"dnxcore50": {
1417
"dependencies": {
15-
"System.Diagnostics.Contracts": "4.0.0-beta-*",
16-
"System.IO": "4.0.10-beta-*",
17-
"System.Linq": "4.0.0-beta-*",
18-
"System.Net.WebSockets": "4.0.0-beta-*",
19-
"System.Runtime": "4.0.20-beta-*",
20-
"System.Runtime.InteropServices": "4.0.20-beta-*",
21-
"System.Runtime.Extensions": "4.0.10-beta-*",
22-
"System.Security.Cryptography.Encryption": "4.0.0-beta-*",
23-
"System.Security.Cryptography.Hashing": "4.0.0-beta-*",
24-
"System.Security.Cryptography.Hashing.Algorithms": "4.0.0-beta-*",
25-
"System.Security.Cryptography.RandomNumberGenerator": "4.0.0-beta-*",
26-
"System.Text.Encoding.Extensions": "4.0.10-beta-*",
27-
"System.Threading": "4.0.10-beta-*",
28-
"System.Threading.Tasks": "4.0.10-beta-*",
29-
"System.Threading.Timer": "4.0.0-beta-*"
18+
"System.Diagnostics.Contracts": "4.0.0-beta-23109",
19+
"System.IO": "4.0.10-beta-23109",
20+
"System.Linq": "4.0.0-beta-23109",
21+
"System.Net.WebSockets": "4.0.0-beta-23109",
22+
"System.Runtime": "4.0.20-beta-23109",
23+
"System.Runtime.InteropServices": "4.0.20-beta-23109",
24+
"System.Runtime.Extensions": "4.0.10-beta-23109",
25+
"System.Security.Cryptography.Encryption": "4.0.0-beta-23109",
26+
"System.Security.Cryptography.Hashing": "4.0.0-beta-23109",
27+
"System.Security.Cryptography.Hashing.Algorithms": "4.0.0-beta-23109",
28+
"System.Security.Cryptography.RandomNumberGenerator": "4.0.0-beta-23109",
29+
"System.Text.Encoding.Extensions": "4.0.10-beta-23109",
30+
"System.Threading": "4.0.10-beta-23109",
31+
"System.Threading.Tasks": "4.0.10-beta-23109",
32+
"System.Threading.Timer": "4.0.0-beta-23109"
3033
}
3134
}
3235
}
33-
}
36+
}

0 commit comments

Comments
 (0)