diff --git a/wsnet2-dotnet/WSNet2.Client/WSNet2.Client.csproj b/wsnet2-dotnet/WSNet2.Client/WSNet2.Client.csproj index 479a3af6..a1476428 100644 --- a/wsnet2-dotnet/WSNet2.Client/WSNet2.Client.csproj +++ b/wsnet2-dotnet/WSNet2.Client/WSNet2.Client.csproj @@ -2,11 +2,11 @@ Exe - net6.0 + net8.0 - + diff --git a/wsnet2-dotnet/WSNet2.Core.Test/QueryTests.cs b/wsnet2-dotnet/WSNet2.Core.Test/QueryTests.cs index c2545162..c47ac8f1 100644 --- a/wsnet2-dotnet/WSNet2.Core.Test/QueryTests.cs +++ b/wsnet2-dotnet/WSNet2.Core.Test/QueryTests.cs @@ -104,8 +104,8 @@ public void TestOr() query.Or(); var expect = new object[] { new object[] { } }; Assert.AreEqual( - MessagePackSerializer.Serialize(expect), - MessagePackSerializer.Serialize(query.condsList)); + MessagePackSerializer.SerializeToJson(expect), + MessagePackSerializer.SerializeToJson(query.condsList)); // ()*(A+B) = (A+B) query.Or( @@ -121,14 +121,14 @@ public void TestOr() }, }; Assert.AreEqual( - MessagePackSerializer.Serialize(expect), - MessagePackSerializer.Serialize(query.condsList)); + MessagePackSerializer.SerializeToJson(expect), + MessagePackSerializer.SerializeToJson(query.condsList)); // (A+B)*() = (A+B) query.Or(new Query()); Assert.AreEqual( - MessagePackSerializer.Serialize(expect), - MessagePackSerializer.Serialize(query.condsList)); + MessagePackSerializer.SerializeToJson(expect), + MessagePackSerializer.SerializeToJson(query.condsList)); // (A+B)*((C+D)+(E)) = (AC+AD+AE+BC+BD+BE) var q2 = new Query().Or( @@ -164,8 +164,8 @@ public void TestOr() }; query.Or(new Query()); Assert.AreEqual( - MessagePackSerializer.Serialize(expect), - MessagePackSerializer.Serialize(query.condsList)); + MessagePackSerializer.SerializeToJson(expect), + MessagePackSerializer.SerializeToJson(query.condsList)); } [Test] @@ -196,8 +196,8 @@ public void TestInt() }; Assert.AreEqual( - MessagePackSerializer.Serialize(expect), - MessagePackSerializer.Serialize(query.condsList)); + MessagePackSerializer.SerializeToJson(expect), + MessagePackSerializer.SerializeToJson(query.condsList)); } [Test] @@ -218,8 +218,8 @@ public void TestString() }; Assert.AreEqual( - MessagePackSerializer.Serialize(expect), - MessagePackSerializer.Serialize(query.condsList)); + MessagePackSerializer.SerializeToJson(expect), + MessagePackSerializer.SerializeToJson(query.condsList)); } [Test] @@ -239,8 +239,8 @@ public void TestContain() }; Assert.AreEqual( - MessagePackSerializer.Serialize(expect), - MessagePackSerializer.Serialize(query.condsList)); + MessagePackSerializer.SerializeToJson(expect), + MessagePackSerializer.SerializeToJson(query.condsList)); } [Test] @@ -278,8 +278,8 @@ public void TestSample() }; Assert.AreEqual( - MessagePackSerializer.Serialize(expect), - MessagePackSerializer.Serialize(query.condsList)); + MessagePackSerializer.SerializeToJson(expect), + MessagePackSerializer.SerializeToJson(query.condsList)); query.Equal("k3", 100); query.Or( @@ -345,8 +345,8 @@ public void TestSample() }; Assert.AreEqual( - MessagePackSerializer.Serialize(expect), - MessagePackSerializer.Serialize(query.condsList)); + MessagePackSerializer.SerializeToJson(expect), + MessagePackSerializer.SerializeToJson(query.condsList)); } [Test] diff --git a/wsnet2-dotnet/WSNet2.Core.Test/WSNet2.Core.Test.csproj b/wsnet2-dotnet/WSNet2.Core.Test/WSNet2.Core.Test.csproj index 2e2d3b3c..ebc8473b 100644 --- a/wsnet2-dotnet/WSNet2.Core.Test/WSNet2.Core.Test.csproj +++ b/wsnet2-dotnet/WSNet2.Core.Test/WSNet2.Core.Test.csproj @@ -1,15 +1,15 @@ - net6.0 + net8.0 false - - - - + + + + diff --git a/wsnet2-dotnet/WSNet2.Sample/WSNet2.Sample.csproj b/wsnet2-dotnet/WSNet2.Sample/WSNet2.Sample.csproj index b55140ee..53e7d446 100644 --- a/wsnet2-dotnet/WSNet2.Sample/WSNet2.Sample.csproj +++ b/wsnet2-dotnet/WSNet2.Sample/WSNet2.Sample.csproj @@ -2,15 +2,15 @@ Exe - net6.0 + net8.0 - + - - + + diff --git a/wsnet2-unity/Assets/WSNet2/Scripts/Core/WSNet2Serializer.cs b/wsnet2-unity/Assets/WSNet2/Scripts/Core/WSNet2Serializer.cs index f9b06ce4..01a2b513 100644 --- a/wsnet2-unity/Assets/WSNet2/Scripts/Core/WSNet2Serializer.cs +++ b/wsnet2-unity/Assets/WSNet2/Scripts/Core/WSNet2Serializer.cs @@ -165,10 +165,6 @@ public WSNet2SerializerException(string message) : base(message) public WSNet2SerializerException(string message, Exception innerException) : base(message, innerException) { } - - protected WSNet2SerializerException(SerializationInfo info, StreamingContext context) : base(info, context) - { - } } }