Skip to content

Commit 8926589

Browse files
YveesYvees
committed
0.7.0.5
1 parent f8798cb commit 8926589

6 files changed

Lines changed: 61 additions & 15 deletions

File tree

‎src/SystemCommonLibrary.AspNetCore/SystemCommonLibrary.AspNetCore.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<PropertyGroup>
44
<TargetFramework>net7.0</TargetFramework>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
6-
<Version>0.7.0.4</Version>
6+
<Version>0.7.0.5</Version>
77
<Copyright>clawit.com</Copyright>
88
<PackageLicenseUrl></PackageLicenseUrl>
99
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
10-
<AssemblyVersion>0.7.0.4</AssemblyVersion>
11-
<FileVersion>0.7.0.4</FileVersion>
10+
<AssemblyVersion>0.7.0.5</AssemblyVersion>
11+
<FileVersion>0.7.0.5</FileVersion>
1212
<Authors>clawit.com</Authors>
1313
<Company>clawit.com</Company>
1414
</PropertyGroup>

‎src/SystemCommonLibrary.Data/SystemCommonLibrary.Data.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
77
<Copyright>clawit.com</Copyright>
8-
<Version>0.7.0.4</Version>
9-
<AssemblyVersion>0.7.0.4</AssemblyVersion>
8+
<Version>0.7.0.5</Version>
9+
<AssemblyVersion>0.7.0.5</AssemblyVersion>
1010
<Authors>clawit.com</Authors>
1111
<Company>clawit.com</Company>
12-
<FileVersion>0.7.0.4</FileVersion>
12+
<FileVersion>0.7.0.5</FileVersion>
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Dapper" Version="2.1.21" />
16+
<PackageReference Include="Dapper" Version="2.1.24" />
1717
<PackageReference Include="MongoDB.Driver" Version="2.22.0" />
1818
<PackageReference Include="MySql.Data" Version="8.2.0" />
19-
<PackageReference Include="Npgsql" Version="7.0.6" />
19+
<PackageReference Include="Npgsql" Version="8.0.0" />
2020
<PackageReference Include="StackExchange.Redis" Version="2.7.4" />
2121
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
2222
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />

‎src/SystemCommonLibrary/Serialization/BitSerializer.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,18 @@ public static byte[] Serialize(object param)
318318
{
319319
datas.AddRange(Encoding.UTF8.GetBytes(((decimal)param).ToString()));
320320
}
321+
else if (param is ushort)
322+
{
323+
datas.AddRange(BitConverter.GetBytes((ushort)param));
324+
}
325+
else if (param is uint)
326+
{
327+
datas.AddRange(BitConverter.GetBytes((uint)param));
328+
}
329+
else if (param is ulong)
330+
{
331+
datas.AddRange(BitConverter.GetBytes((ulong)param));
332+
}
321333
else if (param is DateTime)
322334
{
323335
datas.AddRange(Encoding.UTF8.GetBytes(((DateTime)param).Ticks.ToString()));
@@ -454,6 +466,18 @@ public static object Deserialize(Type type, byte[] datas, ref int offset)
454466
var sData = Encoding.UTF8.GetString(data);
455467
obj = decimal.Parse(sData); ;
456468
}
469+
else if (type == typeof(ushort))
470+
{
471+
obj = (BitConverter.ToUInt16(data, 0));
472+
}
473+
else if (type == typeof(uint))
474+
{
475+
obj = (BitConverter.ToUInt32(data, 0));
476+
}
477+
else if (type == typeof(ulong))
478+
{
479+
obj = (BitConverter.ToUInt64(data, 0));
480+
}
457481
else if (type == typeof(DateTime))
458482
{
459483
var sData = Encoding.UTF8.GetString(data);

‎src/SystemCommonLibrary/SystemCommonLibrary.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<TargetFramework>net7.0</TargetFramework>
55

66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
7-
<Version>0.7.0.4</Version>
8-
<AssemblyVersion>0.7.0.4</AssemblyVersion>
9-
<FileVersion>0.7.0.4</FileVersion>
7+
<Version>0.7.0.5</Version>
8+
<AssemblyVersion>0.7.0.5</AssemblyVersion>
9+
<FileVersion>0.7.0.5</FileVersion>
1010
<Copyright>clawit.com</Copyright>
1111
<PackageLicenseUrl></PackageLicenseUrl>
1212
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
@@ -15,7 +15,7 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
18+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
1919
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
2020
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
2121
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />

‎src/UnitTest/BitSerializerTest.cs‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using Org.BouncyCastle.Utilities;
21
using System;
32
using System.Collections.Generic;
43
using System.Drawing;
@@ -82,6 +81,13 @@ public class ClassSize
8281
public Size Dim1 { get; set; }
8382
}
8483

84+
public class ClassUInt
85+
{
86+
public ushort Dim1 { get; set; }
87+
public uint Dim2 { get; set; }
88+
public ulong Dim3 { get; set; }
89+
}
90+
8591
public class ClassParent
8692
{
8793
public ClassBase Dim0 { get; set; }
@@ -231,5 +237,21 @@ public void DeserializeSize()
231237
Assert.Equal(src.Dim1.Height, dest.Dim1.Height);
232238
Assert.Equal(src.Dim1.Width, dest.Dim1.Width);
233239
}
240+
241+
[Fact]
242+
public void DeserializeColor()
243+
{
244+
var src = new ClassUInt()
245+
{
246+
Dim1 = 1,
247+
Dim2 = 2,
248+
Dim3 = 3
249+
};
250+
var bytes = BitSerializer.Serialize(src);
251+
var dest = BitSerializer.Deserialize<ClassUInt>(bytes);
252+
Assert.Equal(src.Dim1, dest.Dim1);
253+
Assert.Equal(src.Dim2, dest.Dim2);
254+
Assert.Equal(src.Dim3, dest.Dim3);
255+
}
234256
}
235257
}

‎src/UnitTest/UnitTest.csproj‎

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

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
11-
<PackageReference Include="xunit" Version="2.6.1" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
11+
<PackageReference Include="xunit" Version="2.6.2" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>

0 commit comments

Comments
 (0)