Skip to content

Commit 5235f2f

Browse files
committed
Add support for 7.0 and update to 1.4.2
1 parent 41d5822 commit 5235f2f

29 files changed

+2105
-12
lines changed

NetJSON.Tests/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.4.1")]
36-
[assembly: AssemblyFileVersion("1.4.1")]
35+
[assembly: AssemblyVersion("1.4.2")]
36+
[assembly: AssemblyFileVersion("1.4.2")]

NetJSON.sln

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ Global
6060
{1308D326-02BB-45BD-8549-18F78A81F204}.NetFX-Release|Any CPU.ActiveCfg = Release|Any CPU
6161
{1308D326-02BB-45BD-8549-18F78A81F204}.NetFX-Release|Any CPU.Build.0 = Release|Any CPU
6262
{1308D326-02BB-45BD-8549-18F78A81F204}.Release|Any CPU.ActiveCfg = Release|Any CPU
63-
{1308D326-02BB-45BD-8549-18F78A81F204}.Release|Any CPU.Build.0 = Release|Any CPU
6463
{BF485716-70B1-43FB-A8CE-A4EEE1EA48FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6564
{BF485716-70B1-43FB-A8CE-A4EEE1EA48FA}.NetCore-Debug|Any CPU.ActiveCfg = Debug|Any CPU
6665
{BF485716-70B1-43FB-A8CE-A4EEE1EA48FA}.NetCore-Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -69,7 +68,6 @@ Global
6968
{BF485716-70B1-43FB-A8CE-A4EEE1EA48FA}.NetFX-Release|Any CPU.ActiveCfg = Release|Any CPU
7069
{BF485716-70B1-43FB-A8CE-A4EEE1EA48FA}.NetFX-Release|Any CPU.Build.0 = Release|Any CPU
7170
{BF485716-70B1-43FB-A8CE-A4EEE1EA48FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
72-
{BF485716-70B1-43FB-A8CE-A4EEE1EA48FA}.Release|Any CPU.Build.0 = Release|Any CPU
7371
{627AA273-E995-48FF-BFD5-583A3ACC2547}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7472
{627AA273-E995-48FF-BFD5-583A3ACC2547}.NetCore-Debug|Any CPU.ActiveCfg = Debug|Any CPU
7573
{627AA273-E995-48FF-BFD5-583A3ACC2547}.NetCore-Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -78,7 +76,6 @@ Global
7876
{627AA273-E995-48FF-BFD5-583A3ACC2547}.NetFX-Release|Any CPU.ActiveCfg = Release|Any CPU
7977
{627AA273-E995-48FF-BFD5-583A3ACC2547}.NetFX-Release|Any CPU.Build.0 = Release|Any CPU
8078
{627AA273-E995-48FF-BFD5-583A3ACC2547}.Release|Any CPU.ActiveCfg = Release|Any CPU
81-
{627AA273-E995-48FF-BFD5-583A3ACC2547}.Release|Any CPU.Build.0 = Release|Any CPU
8279
{9B1587E2-43DA-4668-92D1-C8B1D9B1228E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8380
{9B1587E2-43DA-4668-92D1-C8B1D9B1228E}.NetCore-Debug|Any CPU.ActiveCfg = Debug|Any CPU
8481
{9B1587E2-43DA-4668-92D1-C8B1D9B1228E}.NetCore-Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -87,7 +84,6 @@ Global
8784
{9B1587E2-43DA-4668-92D1-C8B1D9B1228E}.NetFX-Release|Any CPU.ActiveCfg = Release|Any CPU
8885
{9B1587E2-43DA-4668-92D1-C8B1D9B1228E}.NetFX-Release|Any CPU.Build.0 = Release|Any CPU
8986
{9B1587E2-43DA-4668-92D1-C8B1D9B1228E}.Release|Any CPU.ActiveCfg = Release|Any CPU
90-
{9B1587E2-43DA-4668-92D1-C8B1D9B1228E}.Release|Any CPU.Build.0 = Release|Any CPU
9187
{02A93376-FF15-461A-8095-176FE1E8D8D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
9288
{02A93376-FF15-461A-8095-176FE1E8D8D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
9389
{02A93376-FF15-461A-8095-176FE1E8D8D5}.NetCore-Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -118,7 +114,6 @@ Global
118114
{75DD27BC-85EC-4E5E-990C-843E153EF26B}.NetFX-Release|Any CPU.ActiveCfg = Release|Any CPU
119115
{75DD27BC-85EC-4E5E-990C-843E153EF26B}.NetFX-Release|Any CPU.Build.0 = Release|Any CPU
120116
{75DD27BC-85EC-4E5E-990C-843E153EF26B}.Release|Any CPU.ActiveCfg = Release|Any CPU
121-
{75DD27BC-85EC-4E5E-990C-843E153EF26B}.Release|Any CPU.Build.0 = Release|Any CPU
122117
{70D8E770-96B0-4565-A3CF-772D606A707E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
123118
{70D8E770-96B0-4565-A3CF-772D606A707E}.NetCore-Debug|Any CPU.ActiveCfg = Debug|Any CPU
124119
{70D8E770-96B0-4565-A3CF-772D606A707E}.NetCore-Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -129,7 +124,6 @@ Global
129124
{70D8E770-96B0-4565-A3CF-772D606A707E}.NetFX-Release|Any CPU.ActiveCfg = Release|Any CPU
130125
{70D8E770-96B0-4565-A3CF-772D606A707E}.NetFX-Release|Any CPU.Build.0 = Release|Any CPU
131126
{70D8E770-96B0-4565-A3CF-772D606A707E}.Release|Any CPU.ActiveCfg = Release|Any CPU
132-
{70D8E770-96B0-4565-A3CF-772D606A707E}.Release|Any CPU.Build.0 = Release|Any CPU
133127
{88A86D83-23B0-469E-AD09-40BBDE964009}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
134128
{88A86D83-23B0-469E-AD09-40BBDE964009}.Debug|Any CPU.Build.0 = Debug|Any CPU
135129
{88A86D83-23B0-469E-AD09-40BBDE964009}.NetCore-Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -164,7 +158,6 @@ Global
164158
{A3C27161-165E-4357-9E1C-1A6FB334CF11}.NetFX-Release|Any CPU.ActiveCfg = Release|Any CPU
165159
{A3C27161-165E-4357-9E1C-1A6FB334CF11}.NetFX-Release|Any CPU.Build.0 = Release|Any CPU
166160
{A3C27161-165E-4357-9E1C-1A6FB334CF11}.Release|Any CPU.ActiveCfg = Release|Any CPU
167-
{A3C27161-165E-4357-9E1C-1A6FB334CF11}.Release|Any CPU.Build.0 = Release|Any CPU
168161
{49CFDAC0-D244-4112-A56B-B457E02C76C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
169162
{49CFDAC0-D244-4112-A56B-B457E02C76C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
170163
{49CFDAC0-D244-4112-A56B-B457E02C76C5}.NetCore-Debug|Any CPU.ActiveCfg = Debug|Any CPU

NetJSON/NetJSON.nuspec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<id>NetJSON</id>
55
<title>NetJSON</title>
66
<tags>json json-serializer javascript JSON serializer binary</tags>
7-
<version>1.4.1</version>
7+
<version>1.4.2</version>
88
<authors>TJ Bakre</authors>
99
<description>Faster than Any Binary?</description>
1010
<releaseNotes>
@@ -34,4 +34,7 @@
3434
</group>
3535
</dependencies>
3636
</metadata>
37+
<files>
38+
<file src="*\**" target="\" exclude="obj\**\*.*;**\*.csproj"/>
39+
</files>
3740
</package>

NetJSON/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
// You can specify all the values or you can default the Build and Revision Numbers
3434
// by using the '*' as shown below:
3535
// [assembly: AssemblyVersion("1.0.*")]
36-
[assembly: AssemblyVersion("1.4.1")]
37-
[assembly: AssemblyFileVersion("1.4.1")]
36+
[assembly: AssemblyVersion("1.4.2")]
37+
[assembly: AssemblyFileVersion("1.4.2")]
3838
#if !NET_35 && !NET_STANDARD
3939
[assembly: SecurityRules(SecurityRuleSet.Level2, SkipVerificationInFullTrust = true)]
4040
#endif

NetJSON/lib/net35/NetJSON.dll

0 Bytes
Binary file not shown.

NetJSON/lib/net35/NetJSON.pdb

0 Bytes
Binary file not shown.

NetJSON/lib/net40/NetJSON.dll

0 Bytes
Binary file not shown.

NetJSON/lib/net40/NetJSON.pdb

0 Bytes
Binary file not shown.

NetJSON/lib/net462/NetJSON.dll

0 Bytes
Binary file not shown.

NetJSON/lib/net462/NetJSON.pdb

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)