Skip to content

Commit 11005eb

Browse files
kevin-montrosekevin-montrose
committed
2.13.0-beta1
1 parent 0937635 commit 11005eb

File tree

7 files changed

+188
-191
lines changed

7 files changed

+188
-191
lines changed

‎Benchmark/project.json

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
1-
{
2-
"version": "1.0.0",
3-
"description": "Benchmark Console Application",
4-
"authors": [ "Kevin Montrose" ],
5-
"tags": [ "" ],
6-
"projectUrl": "",
7-
"licenseUrl": "",
8-
"commands": {
9-
"Benchmark": "Benchmark"
10-
},
11-
"dependencies": {
12-
"Sigil": "4.5.1-*",
13-
"Jil": { "target": "project" },
14-
"Newtonsoft.Json": "7.0.1",
15-
"SimpleSpeedTester":"1.1.1"
16-
},
17-
"frameworks": {
18-
"dnx451": {
19-
"frameworkAssemblies": {
20-
"System.Runtime.Serialization": "4.0.0.0",
21-
"System.Xml": "4.0.0.0"
22-
},
23-
"dependencies": {
24-
"ServiceStack.Text": "3.9.67",
25-
"protobuf-net": "2.1.0-alpha-1"
26-
}
1+
{
2+
"version": "1.0.0",
3+
"description": "Benchmark Console Application",
4+
"authors": [ "Kevin Montrose" ],
5+
"tags": [ "" ],
6+
"projectUrl": "",
7+
"licenseUrl": "",
8+
"commands": {
9+
"Benchmark": "Benchmark"
2710
},
28-
"net45": {
29-
"frameworkAssemblies": {
30-
"System.Runtime.Serialization": "4.0.0.0",
31-
"System.Xml": "4.0.0.0"
32-
},
33-
"dependencies": {
34-
"ServiceStack.Text": "3.9.67",
35-
"protobuf-net": "2.1.0-alpha-1"
36-
}
11+
"dependencies": {
12+
"Sigil": "4.5.1",
13+
"Jil": { "target": "project" },
14+
"Newtonsoft.Json": "7.0.1",
15+
"SimpleSpeedTester": "1.1.1"
3716
},
38-
"dotnet5.4": {
39-
"compilationOptions": { "define": [ "COREFX", "COREFXTODO", "NO_SERVICESTACK" ] },
40-
"dependencies": {
41-
"System.Runtime.Serialization.Primitives": "4.1.0-*",
42-
"protobuf-net": "2.1.0-alpha-1"
43-
}
44-
},
45-
"dnxcore50": {
46-
"compilationOptions": { "define": [ "COREFX", "COREFXTODO", "NO_SERVICESTACK" ] },
47-
"dependencies": {
48-
"System.Runtime.Serialization.Primitives": "4.1.0-*",
49-
"protobuf-net": "2.1.0-alpha-1"
50-
}
51-
},
52-
}
17+
"frameworks": {
18+
"dnx451": {
19+
"frameworkAssemblies": {
20+
"System.Runtime.Serialization": "4.0.0.0",
21+
"System.Xml": "4.0.0.0"
22+
},
23+
"dependencies": {
24+
"ServiceStack.Text": "3.9.67",
25+
"protobuf-net": "2.1.0-alpha-1"
26+
}
27+
},
28+
"net45": {
29+
"frameworkAssemblies": {
30+
"System.Runtime.Serialization": "4.0.0.0",
31+
"System.Xml": "4.0.0.0"
32+
},
33+
"dependencies": {
34+
"ServiceStack.Text": "3.9.67",
35+
"protobuf-net": "2.1.0-alpha-1"
36+
}
37+
},
38+
"dotnet5.4": {
39+
"compilationOptions": { "define": [ "COREFX", "COREFXTODO", "NO_SERVICESTACK" ] },
40+
"dependencies": {
41+
"System.Runtime.Serialization.Primitives": "4.1.0-*",
42+
"protobuf-net": "2.1.0-alpha-1"
43+
}
44+
},
45+
"dnxcore50": {
46+
"compilationOptions": { "define": [ "COREFX", "COREFXTODO", "NO_SERVICESTACK" ] },
47+
"dependencies": {
48+
"System.Runtime.Serialization.Primitives": "4.1.0-*",
49+
"protobuf-net": "2.1.0-alpha-1"
50+
}
51+
},
52+
}
5353
}

‎Experiments/project.json

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
{
2-
"version": "1.0.0-*",
3-
"description": "Experiments Console Application",
4-
"authors": [ "Kevin Montrose" ],
5-
"tags": [ "" ],
6-
"projectUrl": "",
7-
"licenseUrl": "",
8-
"commands": {
9-
"Experiments": "Experiments"
10-
},
1+
{
2+
"version": "1.0.0-*",
3+
"description": "Experiments Console Application",
4+
"authors": [ "Kevin Montrose" ],
5+
"tags": [ "" ],
6+
"projectUrl": "",
7+
"licenseUrl": "",
8+
"commands": {
9+
"Experiments": "Experiments"
10+
},
1111

12-
"dependencies": {
13-
"Jil": { "target": "project" },
14-
"Sigil": "4.5.1-*"
15-
},
16-
"frameworks": {
17-
"net45": {
18-
"frameworkAssemblies": {
19-
"System.Runtime.Serialization": "4.0.0.0"
20-
}
12+
"dependencies": {
13+
"Jil": { "target": "project" },
14+
"Sigil": "4.5.1"
2115
},
22-
"dotnet5.4": {
23-
"dependencies": {
24-
"System.Runtime.Serialization.Primitives":"4.1.0-*",
25-
"System.Collections.Concurrent": "4.0.11-*"
26-
}
16+
"frameworks": {
17+
"net45": {
18+
"frameworkAssemblies": {
19+
"System.Runtime.Serialization": "4.0.0.0"
20+
}
21+
},
22+
"dotnet5.4": {
23+
"dependencies": {
24+
"System.Runtime.Serialization.Primitives": "4.1.0-*",
25+
"System.Collections.Concurrent": "4.0.11-*"
26+
}
27+
}
2728
}
28-
}
2929
}

‎Jil.StrongName/project.json

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
1-
{
2-
"version": "2.12.2-beta1",
3-
"description": "A fast JSON serializer and deserializer.",
4-
"authors": [ "Kevin Montrose" ],
5-
"owners": [ "kmontrose" ],
6-
"tags": [ "json" ],
7-
"releaseNotes": "Core CLR support",
8-
"projectUrl": "https://github.com/kevin-montrose/Jil",
9-
"licenseUrl": "https://github.com/kevin-montrose/Jil/blob/master/LICENSE",
10-
"copyright": "Copyright (c) 2013 - 2015 Kevin Montrose",
11-
"compile": [
12-
"../Jil/**/*.cs"
13-
],
14-
"compilationOptions": {
15-
"keyFile": "Properties/Jil.StrongName.snk",
16-
"allowUnsafe": true,
17-
"define": [ "STRONG_NAME" ]
18-
},
19-
"dependencies": {
20-
"Sigil": "4.5.1-*"
21-
},
22-
"frameworks": {
23-
"net45": {
24-
"frameworkAssemblies": {
25-
"System.Runtime.Serialization": "4.0.0.0"
26-
}
1+
{
2+
"version": "2.13.0-beta1",
3+
"description": "A fast JSON serializer and deserializer.",
4+
"authors": [ "Kevin Montrose" ],
5+
"owners": [ "kmontrose" ],
6+
"tags": [ "json" ],
7+
"releaseNotes": "Core CLR support",
8+
"projectUrl": "https://github.com/kevin-montrose/Jil",
9+
"licenseUrl": "https://github.com/kevin-montrose/Jil/blob/master/LICENSE",
10+
"copyright": "Copyright (c) 2013 - 2015 Kevin Montrose",
11+
"compile": [
12+
"../Jil/**/*.cs"
13+
],
14+
"compilationOptions": {
15+
"keyFile": "Properties/Jil.StrongName.snk",
16+
"allowUnsafe": true,
17+
"define": [ "STRONG_NAME" ]
2718
},
28-
"dotnet5.2": {
29-
"compilationOptions": { "define": [ "COREFX", "COREFXTODO" ] },
30-
"dependencies": {
31-
"System.Runtime.Serialization.Primitives": "4.1.0-*",
32-
"System.Collections.NonGeneric": "4.0.1-*"
33-
}
19+
"dependencies": {
20+
"Sigil": "4.5.1"
3421
},
35-
"dotnet5.4": {
36-
"compilationOptions": { "define": [ "COREFX", "COREFXTODO" ] },
37-
"dependencies": {
38-
"System.Runtime.Serialization.Primitives": "4.1.0-*",
39-
"System.Collections.NonGeneric": "4.0.1-*"
40-
}
41-
}
42-
},
43-
"dev-notes": "see main project.json"
22+
"frameworks": {
23+
"net45": {
24+
"frameworkAssemblies": {
25+
"System.Runtime.Serialization": "4.0.0.0"
26+
}
27+
},
28+
"dotnet5.2": {
29+
"compilationOptions": { "define": [ "COREFX", "COREFXTODO" ] },
30+
"dependencies": {
31+
"System.Runtime.Serialization.Primitives": "4.1.0-*",
32+
"System.Collections.NonGeneric": "4.0.1-*"
33+
}
34+
},
35+
"dotnet5.4": {
36+
"compilationOptions": { "define": [ "COREFX", "COREFXTODO" ] },
37+
"dependencies": {
38+
"System.Runtime.Serialization.Primitives": "4.1.0-*",
39+
"System.Collections.NonGeneric": "4.0.1-*"
40+
}
41+
}
42+
},
43+
"dev-notes": "see main project.json"
4444
}

‎Jil/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// The following GUID is for the ID of the typelib if this project is exposed to COM
1313
[assembly: Guid("a4bd090c-cd3e-4f8e-af53-a947b0a87316")]
1414

15-
[assembly: AssemblyVersion("2.12.1")]
16-
[assembly: AssemblyFileVersion("2.12.1")]
15+
[assembly: AssemblyVersion("2.13.0")]
16+
[assembly: AssemblyFileVersion("2.13.0")]
1717

1818
#if !STRONG_NAME
1919
[assembly: InternalsVisibleTo("JilTests")]

‎Jil/project.json

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
{
2-
"version": "2.12.2-beta1",
3-
"description": "A fast JSON serializer and deserializer.",
4-
"authors": [ "Kevin Montrose" ],
5-
"owners": [ "kmontrose" ],
6-
"tags": [ "json" ],
7-
"releaseNotes": "Core CLR support",
8-
"projectUrl": "https://github.com/kevin-montrose/Jil",
9-
"licenseUrl": "https://github.com/kevin-montrose/Jil/blob/master/LICENSE",
10-
"copyright": "Copyright (c) 2013 - 2015 Kevin Montrose",
11-
"compilationOptions": {
12-
"allowUnsafe": true
13-
},
14-
"dependencies": {
15-
"Sigil": "4.5.1-*"
16-
},
17-
"frameworks": {
18-
"net45": {
19-
"frameworkAssemblies": {
20-
"System.Runtime.Serialization": "4.0.0.0"
21-
}
1+
{
2+
"version": "2.13.0-beta1",
3+
"description": "A fast JSON serializer and deserializer.",
4+
"authors": [ "Kevin Montrose" ],
5+
"owners": [ "kmontrose" ],
6+
"tags": [ "json" ],
7+
"releaseNotes": "Core CLR support",
8+
"projectUrl": "https://github.com/kevin-montrose/Jil",
9+
"licenseUrl": "https://github.com/kevin-montrose/Jil/blob/master/LICENSE",
10+
"copyright": "Copyright (c) 2013 - 2015 Kevin Montrose",
11+
"compilationOptions": {
12+
"allowUnsafe": true
2213
},
23-
"dotnet5.2": {
24-
"compilationOptions": { "define": [ "COREFX", "COREFXTODO" ] },
25-
"dependencies": {
26-
"System.Runtime.Serialization.Primitives": "4.1.0-*",
27-
"System.Collections.NonGeneric": "4.0.1-*"
28-
}
14+
"dependencies": {
15+
"Sigil": "4.5.1"
2916
},
30-
"dotnet5.4": {
31-
"compilationOptions": { "define": [ "COREFX", "COREFXTODO" ] },
32-
"dependencies": {
33-
"System.Runtime.Serialization.Primitives": "4.1.0-*",
34-
"System.Collections.NonGeneric": "4.0.1-*"
35-
}
36-
}
37-
},
38-
"dev-notes": [
39-
"why is there an identical 5.4 build? because Sigil has a 5.2 vs 5.4; 5.4 uses compiled regex - and we want that"
40-
]
17+
"frameworks": {
18+
"net45": {
19+
"frameworkAssemblies": {
20+
"System.Runtime.Serialization": "4.0.0.0"
21+
}
22+
},
23+
"dotnet5.2": {
24+
"compilationOptions": { "define": [ "COREFX", "COREFXTODO" ] },
25+
"dependencies": {
26+
"System.Runtime.Serialization.Primitives": "4.1.0-*",
27+
"System.Collections.NonGeneric": "4.0.1-*"
28+
}
29+
},
30+
"dotnet5.4": {
31+
"compilationOptions": { "define": [ "COREFX", "COREFXTODO" ] },
32+
"dependencies": {
33+
"System.Runtime.Serialization.Primitives": "4.1.0-*",
34+
"System.Collections.NonGeneric": "4.0.1-*"
35+
}
36+
}
37+
},
38+
"dev-notes": [
39+
"why is there an identical 5.4 build? because Sigil has a 5.2 vs 5.4; 5.4 uses compiled regex - and we want that"
40+
]
4141
}

0 commit comments

Comments
 (0)