Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dotnet更新 #92

Merged
merged 1 commit into from
Jan 8, 2025
+29 −33
Merged

dotnet更新 #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions wsnet2-dotnet/WSNet2.Client/WSNet2.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MessagePack" Version="2.1.115" />
<PackageReference Include="MessagePack" Version="3.1.0" />
<Compile Include="../../wsnet2-unity/Assets/WSNet2/Scripts/Core/**/*.cs" />
</ItemGroup>

Expand Down
36 changes: 18 additions & 18 deletions wsnet2-dotnet/WSNet2.Core.Test/QueryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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(
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -196,8 +196,8 @@ public void TestInt()
};

Assert.AreEqual(
MessagePackSerializer.Serialize(expect),
MessagePackSerializer.Serialize(query.condsList));
MessagePackSerializer.SerializeToJson(expect),
MessagePackSerializer.SerializeToJson(query.condsList));
}

[Test]
Expand All @@ -218,8 +218,8 @@ public void TestString()
};

Assert.AreEqual(
MessagePackSerializer.Serialize(expect),
MessagePackSerializer.Serialize(query.condsList));
MessagePackSerializer.SerializeToJson(expect),
MessagePackSerializer.SerializeToJson(query.condsList));
}

[Test]
Expand All @@ -239,8 +239,8 @@ public void TestContain()
};

Assert.AreEqual(
MessagePackSerializer.Serialize(expect),
MessagePackSerializer.Serialize(query.condsList));
MessagePackSerializer.SerializeToJson(expect),
MessagePackSerializer.SerializeToJson(query.condsList));
}

[Test]
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -345,8 +345,8 @@ public void TestSample()
};

Assert.AreEqual(
MessagePackSerializer.Serialize(expect),
MessagePackSerializer.Serialize(query.condsList));
MessagePackSerializer.SerializeToJson(expect),
MessagePackSerializer.SerializeToJson(query.condsList));
}

[Test]
Expand Down
10 changes: 5 additions & 5 deletions wsnet2-dotnet/WSNet2.Core.Test/WSNet2.Core.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MessagePack" Version="2.1.152" />
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="MessagePack" Version="3.1.0" />
<PackageReference Include="nunit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<Compile Include="../../wsnet2-unity/Assets/WSNet2/Scripts/Core/**/*.cs" />
</ItemGroup>

Expand Down
8 changes: 4 additions & 4 deletions wsnet2-dotnet/WSNet2.Sample/WSNet2.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MessagePack" Version="2.1.115" />
<PackageReference Include="MessagePack" Version="3.1.0" />
<Compile Include="../../wsnet2-unity/Assets/WSNet2/Scripts/Core/**/*.cs" />
<Compile Include="../../wsnet2-unity/Assets/Sample/Logic/**/*.cs" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
<PackageReference Include="ZLogger" Version="1.6.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
<PackageReference Include="ZLogger" Version="1.7.1" />
</ItemGroup>

</Project>
4 changes: 0 additions & 4 deletions wsnet2-unity/Assets/WSNet2/Scripts/Core/WSNet2Serializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
}
}

}
Loading