Skip to content

Commit 43eb146

Browse files
inada-sinada-s
authored
dotnet更新 (#92)
- .NET 8 (LTS) - ライブラリ更新 - テスト修正 - msgpackのバイナリ比較だと差がでるケースがあったのでjsonで比較 - Exceptionの旧形式の不要メソッド削除
2 parents c292844 + 36f7f7c commit 43eb146

5 files changed

Lines changed: 29 additions & 33 deletions

File tree

‎wsnet2-dotnet/WSNet2.Client/WSNet2.Client.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="MessagePack" Version="2.1.115" />
9+
<PackageReference Include="MessagePack" Version="3.1.0" />
1010
<Compile Include="../../wsnet2-unity/Assets/WSNet2/Scripts/Core/**/*.cs" />
1111
</ItemGroup>
1212

‎wsnet2-dotnet/WSNet2.Core.Test/QueryTests.cs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ public void TestOr()
104104
query.Or();
105105
var expect = new object[] { new object[] { } };
106106
Assert.AreEqual(
107-
MessagePackSerializer.Serialize(expect),
108-
MessagePackSerializer.Serialize(query.condsList));
107+
MessagePackSerializer.SerializeToJson(expect),
108+
MessagePackSerializer.SerializeToJson(query.condsList));
109109

110110
// ()*(A+B) = (A+B)
111111
query.Or(
@@ -121,14 +121,14 @@ public void TestOr()
121121
},
122122
};
123123
Assert.AreEqual(
124-
MessagePackSerializer.Serialize(expect),
125-
MessagePackSerializer.Serialize(query.condsList));
124+
MessagePackSerializer.SerializeToJson(expect),
125+
MessagePackSerializer.SerializeToJson(query.condsList));
126126

127127
// (A+B)*() = (A+B)
128128
query.Or(new Query());
129129
Assert.AreEqual(
130-
MessagePackSerializer.Serialize(expect),
131-
MessagePackSerializer.Serialize(query.condsList));
130+
MessagePackSerializer.SerializeToJson(expect),
131+
MessagePackSerializer.SerializeToJson(query.condsList));
132132

133133
// (A+B)*((C+D)+(E)) = (AC+AD+AE+BC+BD+BE)
134134
var q2 = new Query().Or(
@@ -164,8 +164,8 @@ public void TestOr()
164164
};
165165
query.Or(new Query());
166166
Assert.AreEqual(
167-
MessagePackSerializer.Serialize(expect),
168-
MessagePackSerializer.Serialize(query.condsList));
167+
MessagePackSerializer.SerializeToJson(expect),
168+
MessagePackSerializer.SerializeToJson(query.condsList));
169169
}
170170

171171
[Test]
@@ -196,8 +196,8 @@ public void TestInt()
196196
};
197197

198198
Assert.AreEqual(
199-
MessagePackSerializer.Serialize(expect),
200-
MessagePackSerializer.Serialize(query.condsList));
199+
MessagePackSerializer.SerializeToJson(expect),
200+
MessagePackSerializer.SerializeToJson(query.condsList));
201201
}
202202

203203
[Test]
@@ -218,8 +218,8 @@ public void TestString()
218218
};
219219

220220
Assert.AreEqual(
221-
MessagePackSerializer.Serialize(expect),
222-
MessagePackSerializer.Serialize(query.condsList));
221+
MessagePackSerializer.SerializeToJson(expect),
222+
MessagePackSerializer.SerializeToJson(query.condsList));
223223
}
224224

225225
[Test]
@@ -239,8 +239,8 @@ public void TestContain()
239239
};
240240

241241
Assert.AreEqual(
242-
MessagePackSerializer.Serialize(expect),
243-
MessagePackSerializer.Serialize(query.condsList));
242+
MessagePackSerializer.SerializeToJson(expect),
243+
MessagePackSerializer.SerializeToJson(query.condsList));
244244
}
245245

246246
[Test]
@@ -278,8 +278,8 @@ public void TestSample()
278278
};
279279

280280
Assert.AreEqual(
281-
MessagePackSerializer.Serialize(expect),
282-
MessagePackSerializer.Serialize(query.condsList));
281+
MessagePackSerializer.SerializeToJson(expect),
282+
MessagePackSerializer.SerializeToJson(query.condsList));
283283

284284
query.Equal("k3", 100);
285285
query.Or(
@@ -345,8 +345,8 @@ public void TestSample()
345345
};
346346

347347
Assert.AreEqual(
348-
MessagePackSerializer.Serialize(expect),
349-
MessagePackSerializer.Serialize(query.condsList));
348+
MessagePackSerializer.SerializeToJson(expect),
349+
MessagePackSerializer.SerializeToJson(query.condsList));
350350
}
351351

352352
[Test]

‎wsnet2-dotnet/WSNet2.Core.Test/WSNet2.Core.Test.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="MessagePack" Version="2.1.152" />
10-
<PackageReference Include="nunit" Version="3.12.0" />
11-
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
9+
<PackageReference Include="MessagePack" Version="3.1.0" />
10+
<PackageReference Include="nunit" Version="3.14.0" />
11+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1313
<Compile Include="../../wsnet2-unity/Assets/WSNet2/Scripts/Core/**/*.cs" />
1414
</ItemGroup>
1515

‎wsnet2-dotnet/WSNet2.Sample/WSNet2.Sample.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="MessagePack" Version="2.1.115" />
9+
<PackageReference Include="MessagePack" Version="3.1.0" />
1010
<Compile Include="../../wsnet2-unity/Assets/WSNet2/Scripts/Core/**/*.cs" />
1111
<Compile Include="../../wsnet2-unity/Assets/Sample/Logic/**/*.cs" />
12-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
13-
<PackageReference Include="ZLogger" Version="1.6.1" />
12+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
13+
<PackageReference Include="ZLogger" Version="1.7.1" />
1414
</ItemGroup>
1515

1616
</Project>

‎wsnet2-unity/Assets/WSNet2/Scripts/Core/WSNet2Serializer.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,6 @@ public WSNet2SerializerException(string message) : base(message)
165165
public WSNet2SerializerException(string message, Exception innerException) : base(message, innerException)
166166
{
167167
}
168-
169-
protected WSNet2SerializerException(SerializationInfo info, StreamingContext context) : base(info, context)
170-
{
171-
}
172168
}
173169

174170
}

0 commit comments

Comments
 (0)