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

Commit 101f2a7

Browse files
committed
Updating json files to pin versions and build.cmd to pin KoreBuild and DNX
1 parent b91eb5e commit 101f2a7

File tree

10 files changed

+159
-165
lines changed

10 files changed

+159
-165
lines changed

global.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
2-
"projects": [
3-
"src",
4-
"tools"
5-
]
6-
}
2+
"projects": [
3+
"src",
4+
"tools"
5+
],
6+
"sdk": {
7+
"version": "1.0.0-rc1-final"
8+
}
9+
}
Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
{
1+
{
22
"version": "1.0.0-*",
33
"dependencies": {
4-
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
4+
"Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final"
55
},
6-
76
"frameworks": {
8-
"dnx451": { },
9-
"dnxcore50": { }
7+
"dnx451": {},
8+
"dnxcore50": {}
109
},
11-
1210
"commands": {
13-
"run": "Microsoft.AspNet.Server.Kestrel",
14-
"web": "Microsoft.AspNet.Hosting"
11+
"run": "Microsoft.AspNet.Server.Kestrel",
12+
"web": "Microsoft.AspNet.Hosting"
1513
}
16-
}
14+
}

samples/SampleApp/project.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
2-
"version": "1.0.0-*",
3-
"dependencies": {
4-
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
5-
"Microsoft.Extensions.Logging.Console": "1.0.0-*"
2+
"version": "1.0.0-*",
3+
"dependencies": {
4+
"Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final",
5+
"Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final"
6+
},
7+
"frameworks": {
8+
"dnx451": {
9+
"dependencies": {
10+
"Microsoft.AspNet.Server.Kestrel.Https": "1.0.0-rc1-final"
11+
}
612
},
7-
"frameworks": {
8-
"dnx451": {
9-
"dependencies": {
10-
"Microsoft.AspNet.Server.Kestrel.Https": "1.0.0-*"
11-
}
12-
},
13-
"dnxcore50": {
14-
"dependencies": {
15-
"System.Console": "4.0.0-beta-*"
16-
}
17-
}
18-
},
19-
"commands": {
20-
"web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.Kestrel --server.urls http://localhost:5000;https://localhost:5001",
21-
"kestrel": "Microsoft.AspNet.Server.Kestrel --server.urls http://localhost:5000;https://localhost:5001",
22-
"run-socket": "Microsoft.AspNet.Server.Kestrel --server.urls http://unix:/tmp/kestrel-test.sock"
13+
"dnxcore50": {
14+
"dependencies": {
15+
"System.Console": "4.0.0-beta-23516"
16+
}
2317
}
24-
}
18+
},
19+
"commands": {
20+
"web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.Kestrel --server.urls http://localhost:5000;https://localhost:5001",
21+
"kestrel": "Microsoft.AspNet.Server.Kestrel --server.urls http://localhost:5000;https://localhost:5001",
22+
"run-socket": "Microsoft.AspNet.Server.Kestrel --server.urls http://unix:/tmp/kestrel-test.sock"
23+
}
24+
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.0.0-*",
2+
"version": "1.0.0-rc1-final",
33
"compilationOptions": {
44
"keyFile": "../../tools/Key.snk"
55
},
@@ -9,9 +9,9 @@
99
"url": "git://github.com/aspnet/kestrelhttpserver"
1010
},
1111
"dependencies": {
12-
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
12+
"Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final"
1313
},
1414
"frameworks": {
15-
"net451": { }
15+
"net451": {}
1616
}
1717
}

src/Microsoft.AspNet.Server.Kestrel/project.json

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
11
{
2-
"version": "1.0.0-*",
2+
"version": "1.0.0-rc1-final",
33
"description": "ASP.NET 5 cross platform development web server.",
44
"repository": {
55
"type": "git",
66
"url": "git://github.com/aspnet/kestrelhttpserver"
77
},
88
"dependencies": {
9-
"Microsoft.AspNet.Hosting": "1.0.0-*",
10-
"Microsoft.Extensions.Logging.Abstractions": "1.0.0-*",
11-
"System.Numerics.Vectors": "4.1.1-beta-*",
9+
"Microsoft.AspNet.Hosting": "1.0.0-rc1-final",
10+
"Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc1-final",
11+
"System.Numerics.Vectors": "4.1.1-beta-23516",
1212
"Microsoft.StandardsPolice": {
1313
"version": "1.0.0-*",
1414
"type": "build"
1515
},
1616
"Microsoft.AspNet.Internal.libuv-Darwin": {
17-
"version": "1.0.0-*",
17+
"version": "1.0.0-rc1-final",
1818
"type": "build"
1919
},
2020
"Microsoft.AspNet.Internal.libuv-Windows": {
21-
"version": "1.0.0-*",
21+
"version": "1.0.0-rc1-final",
2222
"type": "build"
2323
}
2424
},
2525
"frameworks": {
26-
"dnx451": { },
27-
"net451": { },
26+
"dnx451": {},
27+
"net451": {},
2828
"dnxcore50": {
2929
"dependencies": {
30-
"System.Collections": "4.0.11-beta-*",
31-
"System.Diagnostics.Debug": "4.0.11-beta-*",
32-
"System.Diagnostics.TraceSource": "4.0.0-beta-*",
33-
"System.Diagnostics.Tracing": "4.0.21-beta-*",
34-
"System.Globalization": "4.0.11-beta-*",
35-
"System.IO": "4.0.11-beta-*",
36-
"System.Linq": "4.0.1-beta-*",
37-
"System.Net.Primitives": "4.0.11-beta-*",
38-
"System.Runtime.Extensions": "4.0.11-beta-*",
39-
"System.Runtime.InteropServices": "4.0.21-beta-*",
40-
"System.Text.Encoding": "4.0.11-beta-*",
41-
"System.Threading": "4.0.11-beta-*",
42-
"System.Threading.Tasks": "4.0.11-beta-*",
43-
"System.Threading.Thread": "4.0.0-beta-*",
44-
"System.Threading.ThreadPool": "4.0.10-beta-*",
45-
"System.Threading.Timer": "4.0.1-beta-*"
30+
"System.Collections": "4.0.11-beta-23516",
31+
"System.Diagnostics.Debug": "4.0.11-beta-23516",
32+
"System.Diagnostics.TraceSource": "4.0.0-beta-23516",
33+
"System.Diagnostics.Tracing": "4.0.21-beta-23516",
34+
"System.Globalization": "4.0.11-beta-23516",
35+
"System.IO": "4.0.11-beta-23516",
36+
"System.Linq": "4.0.1-beta-23516",
37+
"System.Net.Primitives": "4.0.11-beta-23516",
38+
"System.Runtime.Extensions": "4.0.11-beta-23516",
39+
"System.Runtime.InteropServices": "4.0.21-beta-23516",
40+
"System.Text.Encoding": "4.0.11-beta-23516",
41+
"System.Threading": "4.0.11-beta-23516",
42+
"System.Threading.Tasks": "4.0.11-beta-23516",
43+
"System.Threading.Thread": "4.0.0-beta-23516",
44+
"System.Threading.ThreadPool": "4.0.10-beta-23516",
45+
"System.Threading.Timer": "4.0.1-beta-23516"
4646
}
4747
},
4848
"dotnet5.4": {
4949
"dependencies": {
50-
"System.Collections": "4.0.11-beta-*",
51-
"System.Diagnostics.Debug": "4.0.11-beta-*",
52-
"System.Diagnostics.TraceSource": "4.0.0-beta-*",
53-
"System.Diagnostics.Tracing": "4.0.21-beta-*",
54-
"System.Globalization": "4.0.11-beta-*",
55-
"System.IO": "4.0.11-beta-*",
56-
"System.Linq": "4.0.1-beta-*",
57-
"System.Net.Primitives": "4.0.11-beta-*",
58-
"System.Runtime.Extensions": "4.0.11-beta-*",
59-
"System.Runtime.InteropServices": "4.0.21-beta-*",
60-
"System.Text.Encoding": "4.0.11-beta-*",
61-
"System.Threading": "4.0.11-beta-*",
62-
"System.Threading.Tasks": "4.0.11-beta-*",
63-
"System.Threading.Thread": "4.0.0-beta-*",
64-
"System.Threading.ThreadPool": "4.0.10-beta-*",
65-
"System.Threading.Timer": "4.0.1-beta-*"
50+
"System.Collections": "4.0.11-beta-23516",
51+
"System.Diagnostics.Debug": "4.0.11-beta-23516",
52+
"System.Diagnostics.TraceSource": "4.0.0-beta-23516",
53+
"System.Diagnostics.Tracing": "4.0.21-beta-23516",
54+
"System.Globalization": "4.0.11-beta-23516",
55+
"System.IO": "4.0.11-beta-23516",
56+
"System.Linq": "4.0.1-beta-23516",
57+
"System.Net.Primitives": "4.0.11-beta-23516",
58+
"System.Runtime.Extensions": "4.0.11-beta-23516",
59+
"System.Runtime.InteropServices": "4.0.21-beta-23516",
60+
"System.Text.Encoding": "4.0.11-beta-23516",
61+
"System.Threading": "4.0.11-beta-23516",
62+
"System.Threading.Tasks": "4.0.11-beta-23516",
63+
"System.Threading.Thread": "4.0.0-beta-23516",
64+
"System.Threading.ThreadPool": "4.0.10-beta-23516",
65+
"System.Threading.Timer": "4.0.1-beta-23516"
6666
}
6767
}
6868
},
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
{
1+
{
22
"version": "1.0.0-*",
33
"dependencies": {
4-
"Microsoft.AspNet.Http.Abstractions": "1.0.0-*",
5-
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
6-
"System.Net.Http": "4.0.1-beta-*",
7-
"xunit.runner.aspnet": "2.0.0-aspnet-*"
4+
"Microsoft.AspNet.Http.Abstractions": "1.0.0-rc1-final",
5+
"Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final",
6+
"System.Net.Http": "4.0.1-beta-23516",
7+
"xunit.runner.aspnet": "2.0.0-aspnet-rc1-final"
88
},
99
"frameworks": {
10-
"dnx451": { },
11-
"dnxcore50": { }
10+
"dnx451": {},
11+
"dnxcore50": {}
1212
},
1313
"compilationOptions": {
1414
"allowUnsafe": true
1515
},
1616
"commands": {
1717
"test": "xunit.runner.aspnet -parallel none"
1818
}
19-
}
19+
}
Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
{
2-
"version": "1.0.0-*",
3-
"dependencies": {
4-
"xunit.runner.aspnet": "2.0.0-aspnet-*",
5-
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
6-
"Microsoft.AspNet.Testing": "1.0.0-*"
2+
"version": "1.0.0-*",
3+
"dependencies": {
4+
"xunit.runner.aspnet": "2.0.0-aspnet-rc1-final",
5+
"Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final",
6+
"Microsoft.AspNet.Testing": "1.0.0-rc1-final"
7+
},
8+
"frameworks": {
9+
"dnx451": {
10+
"dependencies": {
11+
"System.Net.Http": "4.0.1-beta-23516",
12+
"Microsoft.AspNet.Server.Kestrel.Https": "1.0.0-rc1-final"
13+
}
714
},
8-
"frameworks": {
9-
"dnx451": {
10-
"dependencies": {
11-
"System.Net.Http": "4.0.1-beta-*",
12-
"Microsoft.AspNet.Server.Kestrel.Https": "1.0.0-*"
13-
}
14-
},
15-
"dnxcore50": {
16-
"dependencies": {
17-
"System.Diagnostics.TraceSource": "4.0.0-beta-*",
18-
"System.IO": "4.0.11-beta-*",
19-
"System.Net.Sockets": "4.0.10-beta-*",
20-
"System.Runtime.Handles": "4.0.1-beta-*"
21-
}
22-
}
23-
},
24-
"compilationOptions": {
25-
"allowUnsafe": true,
26-
"keyFile": "../../tools/Key.snk"
27-
},
28-
"commands": {
29-
"run": "Microsoft.AspNet.Server.KestrelTests",
30-
"test": "xunit.runner.aspnet -parallel none"
15+
"dnxcore50": {
16+
"dependencies": {
17+
"System.Diagnostics.TraceSource": "4.0.0-beta-23516",
18+
"System.IO": "4.0.11-beta-23516",
19+
"System.Net.Sockets": "4.1.0-beta-23516",
20+
"System.Runtime.Handles": "4.0.1-beta-23516"
21+
}
3122
}
32-
}
23+
},
24+
"compilationOptions": {
25+
"allowUnsafe": true,
26+
"keyFile": "../../tools/Key.snk"
27+
},
28+
"commands": {
29+
"run": "Microsoft.AspNet.Server.KestrelTests",
30+
"test": "xunit.runner.aspnet -parallel none"
31+
}
32+
}
Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,25 @@
11
{
2-
"version": "1.0.0-*",
3-
4-
"dependencies": {
5-
"Microsoft.Dnx.Compilation.CSharp.Abstractions": "1.0.0-*",
6-
"Microsoft.AspNet.Http.Features": "1.0.0-*",
7-
"Microsoft.AspNet.Hosting": "1.0.0-*"
2+
"version": "1.0.0-*",
3+
"dependencies": {
4+
"Microsoft.Dnx.Compilation.CSharp.Abstractions": "1.0.0-rc1-final",
5+
"Microsoft.AspNet.Http.Features": "1.0.0-rc1-final",
6+
"Microsoft.AspNet.Hosting": "1.0.0-rc1-final"
7+
},
8+
"commands": {
9+
"run": "Microsoft.AspNet.Server.Kestrel.GeneratedCode"
10+
},
11+
"frameworks": {
12+
"dnx451": {
13+
"frameworkAssemblies": {
14+
"System.Runtime": "",
15+
"System.Text.Encoding": "",
16+
"System.Threading.Tasks": ""
17+
}
818
},
9-
10-
"commands": {
11-
"run": "Microsoft.AspNet.Server.Kestrel.GeneratedCode"
12-
},
13-
14-
"frameworks": {
15-
"dnx451": {
16-
"frameworkAssemblies": {
17-
"System.Runtime": "",
18-
"System.Text.Encoding": "",
19-
"System.Threading.Tasks": ""
20-
}
21-
},
22-
"dnxcore50": {
23-
"dependencies": {
24-
"System.Console": "4.0.0-beta-*"
25-
}
26-
}
19+
"dnxcore50": {
20+
"dependencies": {
21+
"System.Console": "4.0.0-beta-23516"
22+
}
2723
}
28-
}
24+
}
25+
}

0 commit comments

Comments
 (0)