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

Commit b48aad3

Browse files
committed
Updating json files to pin versions and build.cmd to pin KoreBuild and DNX
1 parent 4b80fa3 commit b48aad3

File tree

6 files changed

+62
-61
lines changed

6 files changed

+62
-61
lines changed

global.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
{
2-
"projects": ["src"]
3-
}
2+
"projects": [
3+
"src"
4+
],
5+
"sdk": {
6+
"version": "1.0.0-rc1-final"
7+
}
8+
}

samples/IISSample/project.json

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
11
{
22
"webroot": "wwwroot",
33
"version": "1.0.0-*",
4-
54
"dependencies": {
6-
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-*",
7-
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
8-
"Microsoft.AspNet.Server.WebListener": "1.0.0-*",
9-
"Microsoft.Extensions.Logging.Console": "1.0.0-*"
5+
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-final",
6+
"Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final",
7+
"Microsoft.AspNet.Server.WebListener": "1.0.0-rc1-final",
8+
"Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final"
109
},
11-
1210
"commands": {
1311
"weblistener": "Microsoft.AspNet.Server.WebListener",
1412
"web": "Microsoft.AspNet.Server.Kestrel"
1513
},
16-
1714
"frameworks": {
18-
"dnx451": { },
19-
"dnxcore50": { }
15+
"dnx451": {},
16+
"dnxcore50": {}
2017
},
21-
2218
"publishExclude": [
2319
"node_modules",
2420
"bower_components",
@@ -31,4 +27,4 @@
3127
"node_modules",
3228
"bower_components"
3329
]
34-
}
30+
}
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
{
2-
"version": "1.0.0-*",
2+
"version": "1.0.0-rc1-final",
33
"compilationOptions": {
44
"warningsAsErrors": true,
55
"keyFile": "../../tools/Key.snk"
66
},
77
"description": "ASP.NET 5 components for working with the IIS HttpPlatformHandler module.",
88
"repository": {
9-
"type": "git",
10-
"url": "git://github.com/aspnet/IISIntegration"
9+
"type": "git",
10+
"url": "git://github.com/aspnet/IISIntegration"
1111
},
1212
"dependencies": {
13-
"Microsoft.AspNet.Http": "1.0.0-*",
14-
"Microsoft.AspNet.Http.Extensions": "1.0.0-*",
13+
"Microsoft.AspNet.Http": "1.0.0-rc1-final",
14+
"Microsoft.AspNet.Http.Extensions": "1.0.0-rc1-final",
1515
"Microsoft.Extensions.SecurityHelper.Sources": {
1616
"type": "build",
17-
"version": "1.0.0-*"
17+
"version": "1.0.0-rc1-final"
1818
}
1919
},
2020
"frameworks": {
21-
"net451": { },
21+
"net451": {},
2222
"dotnet5.4": {
2323
"dependencies": {
24-
"System.Security.Principal.Windows": "4.0.0-beta-*"
24+
"System.Security.Principal.Windows": "4.0.0-beta-23516"
2525
}
2626
}
2727
}
28-
}
28+
}
Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
2-
"compilationOptions": {
3-
"warningsAsErrors": true
4-
},
5-
"commands": {
6-
"test": "xunit.runner.aspnet"
7-
},
8-
"dependencies": {
9-
"Microsoft.AspNet.Server.Testing": "1.0.0-*",
10-
"Microsoft.Extensions.Logging.Console": "1.0.0-*",
11-
"xunit.runner.aspnet": "2.0.0-aspnet-*"
12-
},
13-
"frameworks": {
14-
"dnx451": {
15-
"frameworkAssemblies": {
16-
"System.Data": "",
17-
"System.Net.Http": "",
18-
"System.Net.Http.WebRequest": "",
19-
"System.Xml": ""
20-
}
21-
}
2+
"compilationOptions": {
3+
"warningsAsErrors": true
4+
},
5+
"commands": {
6+
"test": "xunit.runner.aspnet"
7+
},
8+
"dependencies": {
9+
"Microsoft.AspNet.Server.Testing": "1.0.0-rc1-final",
10+
"Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
11+
"xunit.runner.aspnet": "2.0.0-aspnet-rc1-final"
12+
},
13+
"frameworks": {
14+
"dnx451": {
15+
"frameworkAssemblies": {
16+
"System.Data": "",
17+
"System.Net.Http": "",
18+
"System.Net.Http.WebRequest": "",
19+
"System.Xml": ""
20+
}
2221
}
22+
}
2323
}
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
{
1+
{
22
"version": "1.0.0-*",
33
"dependencies": {
4-
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-*",
5-
"Microsoft.AspNet.TestHost": "1.0.0-*",
6-
"xunit.runner.aspnet": "2.0.0-aspnet-*"
4+
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-final",
5+
"Microsoft.AspNet.TestHost": "1.0.0-rc1-final",
6+
"xunit.runner.aspnet": "2.0.0-aspnet-rc1-final"
77
},
88
"commands": {
99
"test": "xunit.runner.aspnet"
1010
},
1111
"frameworks": {
12-
"dnx451": { },
13-
"dnxcore50": { }
12+
"dnx451": {},
13+
"dnxcore50": {}
1414
}
15-
}
15+
}

test/TestSites/project.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
"webroot": "wwwroot",
33
"version": "1.0.0-*",
44
"dependencies": {
5-
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-*",
6-
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
7-
"Microsoft.AspNet.Server.WebListener": "1.0.0-*",
8-
"Microsoft.AspNet.WebUtilities": "1.0.0-*",
9-
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*",
10-
"Microsoft.Extensions.Configuration.Json": "1.0.0-*",
11-
"Microsoft.Extensions.Logging.Console": "1.0.0-*",
12-
"xunit.runner.aspnet": "2.0.0-aspnet-*"
5+
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-final",
6+
"Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final",
7+
"Microsoft.AspNet.Server.WebListener": "1.0.0-rc1-final",
8+
"Microsoft.AspNet.WebUtilities": "1.0.0-rc1-final",
9+
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-rc1-final",
10+
"Microsoft.Extensions.Configuration.Json": "1.0.0-rc1-final",
11+
"Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
12+
"xunit.runner.aspnet": "2.0.0-aspnet-rc1-final"
1313
},
1414
"frameworks": {
15-
"dnx451": { },
15+
"dnx451": {},
1616
"dnxcore50": {
1717
"dependencies": {
18-
"System.Net.Primitives": "4.0.11-beta-*",
19-
"System.Runtime": "4.0.21-beta-*"
18+
"System.Net.Primitives": "4.0.11-beta-23516",
19+
"System.Runtime": "4.0.21-beta-23516"
2020
}
2121
}
2222
},
@@ -36,4 +36,4 @@
3636
"node_modules",
3737
"bower_components"
3838
]
39-
}
39+
}

0 commit comments

Comments
 (0)