升级net5

.github/workflows/dotnetcore.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@master
       with:
-        dotnet-version: 3.1.302
+        dotnet-version: 5.0.100
     - name: dotnet info
       run: dotnet --info
     - name: dotnet restore

README.md

@@ -8,9 +8,10 @@
 2. 掌握BCD编码、Hex编码；
 3. 掌握各种位移、异或；
 4. 掌握常用反射；
-5. 掌握快速ctrl+c、ctrl+v；
-6. 掌握Span\<T\>的基本用法
-7. 掌握以上装逼技能，就可以开始搬砖了。
+5. 掌握JObject的用法；
+6. 掌握快速ctrl+c、ctrl+v；
+7. 掌握Span\<T\>的基本用法；
+8. 掌握以上装逼技能，就可以开始搬砖了。
 
 ## JT809数据结构解析
 
@@ -300,23 +301,23 @@ public class JT809_2019_Config : JT809GlobalConfigBase
 
 ``` ini
 
-BenchmarkDotNet=v0.12.1, OS=Windows 10.0.18363.836 (1909/November2018Update/19H2)
+BenchmarkDotNet=v0.12.1, OS=Windows 10.0.19041.630 (2004/?/20H1)
 Intel Core i7-8700K CPU 3.70GHz (Coffee Lake), 1 CPU, 12 logical and 6 physical cores
-.NET Core SDK=3.1.300
-  [Host]     : .NET Core 3.1.4 (CoreCLR 4.700.20.20201, CoreFX 4.700.20.22101), X64 RyuJIT
-  Job-WFPAJY : .NET Core 3.1.4 (CoreCLR 4.700.20.20201, CoreFX 4.700.20.22101), X64 RyuJIT
+.NET Core SDK=5.0.100
+  [Host]     : .NET Core 5.0.0 (CoreCLR 5.0.20.51904, CoreFX 5.0.20.51904), X64 RyuJIT
+  Job-VIMLSX : .NET Core 5.0.0 (CoreCLR 5.0.20.51904, CoreFX 5.0.20.51904), X64 RyuJIT
 
-Platform=AnyCpu  Server=False  Toolchain=.NET Core 3.1  
+Platform=AnyCpu  Server=False  Toolchain=.NET Core 5.0  
 
 ```
-|                                  Method |      N |         Mean |       Error |      StdDev |      Gen 0 | Gen 1 | Gen 2 |  Allocated |
-|---------------------------------------- |------- |-------------:|------------:|------------:|-----------:|------:|------:|-----------:|
-| **JT809_0x9400_0x9401_Package_Deserialize** |    **100** |     **494.2 μs** |     **5.09 μs** |     **4.76 μs** |    **16.6016** |     **-** |     **-** |  **103.13 KB** |
-|   JT809_0x9400_0x9401_Package_Serialize |    100 |     220.0 μs |     2.24 μs |     2.09 μs |    14.6484 |     - |     - |   90.63 KB |
-| **JT809_0x9400_0x9401_Package_Deserialize** |  **10000** |  **49,835.5 μs** |   **456.53 μs** |   **404.71 μs** |  **1636.3636** |     **-** |     **-** | **10312.5 KB** |
-|   JT809_0x9400_0x9401_Package_Serialize |  10000 |  21,843.2 μs |   161.08 μs |   142.80 μs |  1468.7500 |     - |     - |  9062.5 KB |
-| **JT809_0x9400_0x9401_Package_Deserialize** | **100000** | **486,411.6 μs** | **5,499.89 μs** | **5,144.60 μs** | **16000.0000** |     **-** |     **-** |  **103125 KB** |
-|   JT809_0x9400_0x9401_Package_Serialize | 100000 | 218,839.3 μs | 1,665.04 μs | 1,476.02 μs | 14666.6667 |     - |     - |   90625 KB |
+|                                  Method |      N |         Mean |       Error |       StdDev |      Gen 0 | Gen 1 | Gen 2 |    Allocated |
+|---------------------------------------- |------- |-------------:|------------:|-------------:|-----------:|------:|------:|-------------:|
+| **JT809_0x9400_0x9401_Package_Deserialize** |    **100** |     **466.5 μs** |     **2.08 μs** |      **1.85 μs** |    **16.6016** |     **-** |     **-** |    **103.13 KB** |
+|   JT809_0x9400_0x9401_Package_Serialize |    100 |     202.8 μs |     3.98 μs |      4.09 μs |    14.6484 |     - |     - |     90.63 KB |
+| **JT809_0x9400_0x9401_Package_Deserialize** |  **10000** |  **46,739.4 μs** |   **230.36 μs** |    **179.85 μs** |  **1636.3636** |     **-** |     **-** |  **10312.53 KB** |
+|   JT809_0x9400_0x9401_Package_Serialize |  10000 |  19,994.5 μs |   155.11 μs |    129.53 μs |  1468.7500 |     - |     - |   9062.51 KB |
+| **JT809_0x9400_0x9401_Package_Deserialize** | **100000** | **479,053.9 μs** | **9,378.79 μs** | **11,518.00 μs** | **16000.0000** |     **-** |     **-** | **103125.28 KB** |
+|   JT809_0x9400_0x9401_Package_Serialize | 100000 | 205,928.8 μs | 2,074.26 μs |  1,940.26 μs | 14000.0000 |     - |     - |  90625.28 KB |
 
 ## JT809协议消息对照表
 

src/JT809.Protocol.Benchmark/JT809.Protocol.Benchmark.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/JT809.Protocol.Benchmark/JT809SerializerContext.cs

@@ -87,7 +87,7 @@ namespace JT809.Protocol.Benchmark
     {
         public JT809SerializerContextConfig()
         {
-            Add(Job.Default.WithGcServer(false).With(CsProjCoreToolchain.NetCoreApp31).With(Platform.AnyCpu));
+            AddJob(Job.Default.WithGcServer(false).WithToolchain(CsProjCoreToolchain.NetCoreApp50).WithPlatform(Platform.AnyCpu));
         }
     }
 }

src/JT809.Protocol.Test/JT809.Protocol.Test.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -11,11 +11,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JT808" Version="2.2.10" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.6" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="JT808" Version="2.3.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

src/JT809.Protocol/Extensions/JT809HexExtensions.cs

@@ -8,79 +8,12 @@ namespace JT809.Protocol.Extensions
 {
     /// <summary>
     /// 
-    /// ref:"www.codeproject.com/tips/447938/high-performance-csharp-byte-array-to-hex-string-t"
     /// </summary>
     public static  partial class JT809BinaryExtensions
     {
-        static readonly int[] toHexTable = new int[] {
-            3145776, 3211312, 3276848, 3342384, 3407920, 3473456, 3538992, 3604528, 3670064, 3735600,
-            4259888, 4325424, 4390960, 4456496, 4522032, 4587568, 3145777, 3211313, 3276849, 3342385,
-            3407921, 3473457, 3538993, 3604529, 3670065, 3735601, 4259889, 4325425, 4390961, 4456497,
-            4522033, 4587569, 3145778, 3211314, 3276850, 3342386, 3407922, 3473458, 3538994, 3604530,
-            3670066, 3735602, 4259890, 4325426, 4390962, 4456498, 4522034, 4587570, 3145779, 3211315,
-            3276851, 3342387, 3407923, 3473459, 3538995, 3604531, 3670067, 3735603, 4259891, 4325427,
-            4390963, 4456499, 4522035, 4587571, 3145780, 3211316, 3276852, 3342388, 3407924, 3473460,
-            3538996, 3604532, 3670068, 3735604, 4259892, 4325428, 4390964, 4456500, 4522036, 4587572,
-            3145781, 3211317, 3276853, 3342389, 3407925, 3473461, 3538997, 3604533, 3670069, 3735605,
-            4259893, 4325429, 4390965, 4456501, 4522037, 4587573, 3145782, 3211318, 3276854, 3342390,
-            3407926, 3473462, 3538998, 3604534, 3670070, 3735606, 4259894, 4325430, 4390966, 4456502,
-            4522038, 4587574, 3145783, 3211319, 3276855, 3342391, 3407927, 3473463, 3538999, 3604535,
-            3670071, 3735607, 4259895, 4325431, 4390967, 4456503, 4522039, 4587575, 3145784, 3211320,
-            3276856, 3342392, 3407928, 3473464, 3539000, 3604536, 3670072, 3735608, 4259896, 4325432,
-            4390968, 4456504, 4522040, 4587576, 3145785, 3211321, 3276857, 3342393, 3407929, 3473465,
-            3539001, 3604537, 3670073, 3735609, 4259897, 4325433, 4390969, 4456505, 4522041, 4587577,
-            3145793, 3211329, 3276865, 3342401, 3407937, 3473473, 3539009, 3604545, 3670081, 3735617,
-            4259905, 4325441, 4390977, 4456513, 4522049, 4587585, 3145794, 3211330, 3276866, 3342402,
-            3407938, 3473474, 3539010, 3604546, 3670082, 3735618, 4259906, 4325442, 4390978, 4456514,
-            4522050, 4587586, 3145795, 3211331, 3276867, 3342403, 3407939, 3473475, 3539011, 3604547,
-            3670083, 3735619, 4259907, 4325443, 4390979, 4456515, 4522051, 4587587, 3145796, 3211332,
-            3276868, 3342404, 3407940, 3473476, 3539012, 3604548, 3670084, 3735620, 4259908, 4325444,
-            4390980, 4456516, 4522052, 4587588, 3145797, 3211333, 3276869, 3342405, 3407941, 3473477,
-            3539013, 3604549, 3670085, 3735621, 4259909, 4325445, 4390981, 4456517, 4522053, 4587589,
-            3145798, 3211334, 3276870, 3342406, 3407942, 3473478, 3539014, 3604550, 3670086, 3735622,
-            4259910, 4325446, 4390982, 4456518, 4522054, 4587590
-        };
-
-        /// <summary>
-        ///  values for '\0' to 'f' where 255 indicates invalid input character
-        /// starting from '\0' and not from '0' costs 48 bytes
-        /// but results 0 subtructions and less if conditions
-        /// </summary>
-        static readonly byte[] fromHexTable = new byte[] {
-            255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-            255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-            255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-            255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-            255, 255, 255, 255, 255, 255, 255, 255, 0, 1,
-            2, 3, 4, 5, 6, 7, 8, 9, 255, 255,
-            255, 255, 255, 255, 255, 10, 11, 12, 13, 14,
-            15, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-            255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-            255, 255, 255, 255, 255, 255, 255, 10, 11, 12,
-            13, 14, 15
-        };
-
-        /// <summary>
-        ///  same as above but valid values are multiplied by 16
-        /// </summary>
-        static readonly byte[] fromHexTable16 = new byte[] {
-            255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-            255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-            255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-            255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-            255, 255, 255, 255, 255, 255, 255, 255, 0, 16,
-            32, 48, 64, 80, 96, 112, 128, 144, 255, 255,
-            255, 255, 255, 255, 255, 160, 176, 192, 208, 224,
-            240, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-            255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-            255, 255, 255, 255, 255, 255, 255, 160, 176, 192,
-            208, 224, 240
-        };
-
-        public static string ToHexString(this byte[] source)
+        public static string ToHexString(this byte[] source,string separator="")
         {
-            //return string.Join(separator, source.Select(s => s.ToString("X2")));
-            return ToHexString(source, false);
+            return string.Join(separator, source.Select(s => s.ToString("X2")));
         }
 
         public static int WriteHexStringLittle(byte[] bytes, int offset, string data, int len)
@@ -181,135 +114,5 @@ namespace JT809.Protocol.Extensions
         {
             return System.Convert.ToString(value, 2).PadLeft(8, '0').AsSpan();
         }
-        public unsafe static string ReadHexStringLittle(ReadOnlySpan<byte> read, ref int offset, int len)
-        {
-            ReadOnlySpan<byte> source = read.Slice(offset, len);
-            offset += len;
-            // freeze toHexTable position in memory
-            fixed (int* hexRef = toHexTable)
-            // freeze source position in memory
-            fixed (byte* sourceRef = source)
-            {
-                // take first parsing position of source - allow inline pointer positioning
-                byte* s = sourceRef;
-                // calculate result length
-                int resultLen = (source.Length << 1);
-                // initialize result string with any character expect '\0'
-                string result = new string(' ', resultLen);
-                // take the first character address of result
-                fixed (char* resultRef = result)
-                {
-                    // pairs of characters explain the endianess of toHexTable
-                    // move on by pairs of characters (2 x 2 bytes) - allow inline pointer positioning
-                    int* pair = (int*)resultRef;
-                    // more to go
-                    while (*pair != 0)
-                        // set the value of the current pair and move to next pair and source byte
-                        *pair++ = hexRef[*s++];
-                    return result;
-                }
-            }
-        }
-
-        /// <summary>
-        /// hexIndicator: use prefix ("0x") or not
-        /// </summary>
-        /// <param name="source"></param>
-        /// <param name="hexIndicator"></param>
-        /// <returns></returns>
-        public unsafe static string ToHexString(byte[] source, bool hexIndicator)
-        {
-            // freeze toHexTable position in memory
-            fixed (int* hexRef = toHexTable)
-            // freeze source position in memory
-            fixed (byte* sourceRef = source)
-            {
-                // take first parsing position of source - allow inline pointer positioning
-                byte* s = sourceRef;
-                // calculate result length
-                int resultLen = (source.Length << 1);
-                // use prefix ("Ox")
-                if (hexIndicator)
-                    // adapt result length
-                    resultLen += 2;
-                // initialize result string with any character expect '\0'
-                string result = new string(' ', resultLen);
-                // take the first character address of result
-                fixed (char* resultRef = result)
-                {
-                    // pairs of characters explain the endianess of toHexTable
-                    // move on by pairs of characters (2 x 2 bytes) - allow inline pointer positioning
-                    int* pair = (int*)resultRef;
-                    // use prefix ("Ox") ?
-                    if (hexIndicator)
-                        // set first pair value
-                        *pair++ = 7864368;
-                    // more to go
-                    while (*pair != 0)
-                        // set the value of the current pair and move to next pair and source byte
-                        *pair++ = hexRef[*s++];
-                    return result;
-                }
-            }
-        }
-
-        public unsafe static byte[] FromHexString(this string source)
-        {
-            // return an empty array in case of null or empty source
-            if (string.IsNullOrEmpty(source))
-                return new byte[0]; // you may change it to return null
-            if (source.Length % 2 == 1) // source length must be even
-                throw new ArgumentException();
-            int
-                index = 0, // start position for parsing source
-                len = source.Length >> 1; // initial length of result
-            // take the first character address of source
-            fixed (char* sourceRef = source)
-            {
-                if (*(int*)sourceRef == 7864368) // source starts with "0x"
-                {
-                    if (source.Length == 2) // source must not be just a "0x")
-                        throw new ArgumentException();
-                    index += 2; // start position (bypass "0x")
-                    len -= 1; // result length (exclude "0x")
-                }
-                byte add = 0; // keeps a fromHexTable value
-                byte[] result = new byte[len]; // initialization of result for known length
-                // freeze fromHexTable16 position in memory
-                fixed (byte* hiRef = fromHexTable16)
-                // freeze fromHexTable position in memory
-                fixed (byte* lowRef = fromHexTable)
-                // take the first byte address of result
-                fixed (byte* resultRef = result)
-                {
-                    // take first parsing position of source - allow inremental memory position
-                    char* s = (char*)&sourceRef[index];
-                    // take first byte position of result - allow incremental memory position
-                    byte* r = resultRef;
-                    // source has more characters to parse
-                    while (*s != 0)
-                    {
-                        // check for non valid characters in pairs
-                        // you may split it if you don't like its readbility
-                        if (
-                            // check for character > 'f'
-                            *s > 102 ||
-                            // assign source value to current result position and increment source position
-                            // and check if is a valid character
-                            (*r = hiRef[*s++]) == 255 ||
-                            // check for character > 'f'
-                            *s > 102 ||
-                            // assign source value to "add" parameter and increment source position
-                            // and check if is a valid character
-                            (add = lowRef[*s++]) == 255
-                            )
-                            throw new ArgumentException();
-                        // set final value of current result byte and move pointer to next byte
-                        *r++ += add;
-                    }
-                    return result;
-                }
-            }
-        }
     }
 }

src/JT809.Protocol/JT809.Protocol.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net5.0;</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Copyright>Copyright 2018.</Copyright>
     <Authors>SmallChi</Authors>
@@ -14,20 +14,17 @@
     <PackageProjectUrl>https://github.com/SmallChi/JT809</PackageProjectUrl>
     <license>https://github.com/SmallChi/JT809/blob/master/LICENSE</license>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <Version>2.1.4-preview5</Version>
+    <Version>2.2.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <DocumentationFile>JT809.Protocol.xml</DocumentationFile>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>JT809.Protocol.xml</DocumentationFile>
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NoWarn>1701;1702;1591</NoWarn>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DocumentationFile></DocumentationFile>
-    <NoWarn>1701;1702;1591</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -111,9 +108,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.6" />
-    <PackageReference Include="System.Text.Json" Version="4.7.2" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
+    <PackageReference Include="System.Text.Json" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>

src/JT809.Protocol/JT809.Protocol.xml

@@ -127,19 +127,6 @@
         <member name="T:JT809.Protocol.Extensions.JT809BinaryExtensions">
             <summary>
             
-            ref:"www.codeproject.com/tips/447938/high-performance-csharp-byte-array-to-hex-string-t"
-            </summary>
-        </member>
-        <member name="F:JT809.Protocol.Extensions.JT809BinaryExtensions.fromHexTable">
-            <summary>
-             values for '\0' to 'f' where 255 indicates invalid input character
-            starting from '\0' and not from '0' costs 48 bytes
-            but results 0 subtructions and less if conditions
-            </summary>
-        </member>
-        <member name="F:JT809.Protocol.Extensions.JT809BinaryExtensions.fromHexTable16">
-            <summary>
-             same as above but valid values are multiplied by 16
             </summary>
         </member>
         <member name="M:JT809.Protocol.Extensions.JT809BinaryExtensions.ToHexBytes(System.String)">
@@ -150,14 +137,6 @@
             <param name="separator"></param>
             <returns></returns>
         </member>
-        <member name="M:JT809.Protocol.Extensions.JT809BinaryExtensions.ToHexString(System.Byte[],System.Boolean)">
-            <summary>
-            hexIndicator: use prefix ("0x") or not
-            </summary>
-            <param name="source"></param>
-            <param name="hexIndicator"></param>
-            <returns></returns>
-        </member>
         <member name="T:JT809.Protocol.Extensions.JT809MessagePackFormatterResolverExtensions">
             <summary>