Merge pull request #20 from skbkontur/core-dict-fix

fix Dictionary serialization for net core 3 (issue #18 )

.travis.yml

@@ -10,4 +10,6 @@ script:
   - dotnet restore ./GroBuf.sln --verbosity m
   - dotnet build --configuration Release --framework netstandard2.0 ./GroBuf/GroBuf.csproj
   - dotnet build --configuration Release --framework netcoreapp2.1 ./GroBuf.Tests/GroBuf.Tests.csproj
+  - dotnet build --configuration Release --framework netcoreapp3.1 ./GroBuf.Tests/GroBuf.Tests.csproj
   - dotnet test --no-build --configuration Release --framework netcoreapp2.1 --filter TestCategory!=LongRunning ./GroBuf.Tests/GroBuf.Tests.csproj
+  - dotnet test --no-build --configuration Release --framework netcoreapp3.1 --filter TestCategory!=LongRunning ./GroBuf.Tests/GroBuf.Tests.csproj

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.5 - 2020.04.03
+- Fix GroBuf to work on .NET Core 3 (issue [#18](https://github.com/skbkontur/GroBuf/issues/18)).
+- Use [SourceLink](https://github.com/dotnet/sourcelink) to help ReSharper decompiler show actual code.
+
 ## v1.4 - 2018.09.14
 - Use [Nerdbank.GitVersioning](https://github.com/AArnott/Nerdbank.GitVersioning) to automate generation of assembly 
   and nuget package versions.

GroBuf.Tests/GroBuf.Tests.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>netcoreapp2.1;net45</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,4 +21,22 @@
     <ProjectReference Include="..\GroBuf\GroBuf.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Include="Files\dict0.buf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Files\dict1.buf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Files\dict2.buf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Files\dict3.buf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Files\dict4.buf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
 </Project>

GroBuf.Tests/TestDictionary.cs

@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
+
+using FluentAssertions;
 
 using GroBuf.DataMembersExtracters;
 
@@ -17,6 +20,37 @@ public void SetUp()
             serializer = new Serializer(new PropertiesExtractor());
         }
 
+        [TestCase(0)]
+        [TestCase(1)]
+        [TestCase(2)]
+        [TestCase(3)]
+        [TestCase(4)]
+        public void TestRandom(int i, bool generateFiles = false)
+        {
+            var rnd = new Random(i);
+            var count = rnd.Next(1, 100);
+            var dict = new Dictionary<string, Zzz>();
+            for (int j = 0; j < count; j++)
+                dict[$"{i}{j}{count}{rnd.Next(1000, 10000)}"] = new Zzz
+                    {
+                        Properties = new Dictionary<string, byte[]>
+                            {
+                                {rnd.Next(1000, 10000).ToString(), new byte[] {5, 4}}
+                            }
+                    };
+
+            var buf = serializer.Serialize(dict);
+
+            if (generateFiles)
+                File.WriteAllBytes($"{TestContext.CurrentContext.TestDirectory}/../../../Files/dict{i}.buf", buf);
+
+            var expectedBuf = File.ReadAllBytes($"{TestContext.CurrentContext.TestDirectory}/Files/dict{i}.buf");
+            buf.Should().BeEquivalentTo(expectedBuf);
+
+            var dict2 = serializer.Deserialize<Dictionary<string, Zzz>>(buf);
+            dict2.Should().BeEquivalentTo(dict);
+        }
+
         [Test]
         public void TestGetSize()
         {

GroBuf/SizeCounters/DictionarySizeCounterBuilder.cs

@@ -58,6 +58,8 @@ protected override void CountSizeNotEmpty(SizeCounterMethodBuilderContext contex
 
             context.LoadObj(); // stack: [size, obj]
             var entryType = Type.GetNestedType("Entry", BindingFlags.NonPublic).MakeGenericType(Type.GetGenericArguments());
+            var hashCodeType = entryType.GetField("hashCode", BindingFlags.Public | BindingFlags.Instance).FieldType;
+            var isNetCore3 = hashCodeType == typeof(uint);
             var entries = il.DeclareLocal(entryType.MakeArrayType());
             il.Ldfld(Type.GetPrivateInstanceField(PlatformHelpers.DictionaryEntriesFieldNames));
             il.Stloc(entries);
@@ -73,8 +75,16 @@ protected override void CountSizeNotEmpty(SizeCounterMethodBuilderContext contex
             il.Dup(); // stack: [size, &entries[i], &entries[i]]
             var entry = il.DeclareLocal(entryType.MakeByRefType());
             il.Stloc(entry); // entry = &entries[i]; stack: [size, entry]
-            il.Ldfld(entryType.GetField("hashCode")); // stack: [size, entry.hashCode]
-            il.Ldc_I4(0); // stack: [size, entry.hashCode, 0]
+            if (!isNetCore3)
+            {
+                il.Ldfld(entryType.GetField("hashCode")); // stack: [entry.hashCode]
+                il.Ldc_I4(0); // stack: [entry.hashCode, 0]
+            }
+            else
+            {
+                il.Ldfld(entryType.GetField("next")); // stack: [entry.next]
+                il.Ldc_I4(-1); // stack: [entry.next, -1]
+            }
             var nextLabel = il.DefineLabel("next");
             il.Blt(nextLabel, false); // if(entry.hashCode < 0) goto next; stack: [size]
 

GroBuf/Writers/DictionaryWriterBuilder.cs

@@ -70,6 +70,8 @@ protected override void WriteNotEmpty(WriterMethodBuilderContext context)
 
             context.LoadObj(); // stack: [obj]
             var entryType = Type.GetNestedType("Entry", BindingFlags.NonPublic).MakeGenericType(Type.GetGenericArguments());
+            var hashCodeType = entryType.GetField("hashCode", BindingFlags.Public | BindingFlags.Instance).FieldType;
+            var isNetCore3 = hashCodeType == typeof(uint);
             var entries = il.DeclareLocal(entryType.MakeArrayType());
             il.Ldfld(Type.GetPrivateInstanceField(PlatformHelpers.DictionaryEntriesFieldNames)); // stack: [obj.entries]
             il.Stloc(entries); // entries = obj.entries; stack: []
@@ -85,8 +87,16 @@ protected override void WriteNotEmpty(WriterMethodBuilderContext context)
             il.Dup(); // stack: [&entries[i], &entries[i]]
             var entry = il.DeclareLocal(entryType.MakeByRefType());
             il.Stloc(entry); // entry = &entries[i]; stack: [entry]
-            il.Ldfld(entryType.GetField("hashCode")); // stack: [entry.hashCode]
-            il.Ldc_I4(0); // stack: [entry.hashCode, 0]
+            if (!isNetCore3)
+            {
+                il.Ldfld(entryType.GetField("hashCode")); // stack: [entry.hashCode]
+                il.Ldc_I4(0); // stack: [entry.hashCode, 0]
+            }
+            else
+            {
+                il.Ldfld(entryType.GetField("next")); // stack: [entry.next]
+                il.Ldc_I4(-1); // stack: [entry.next, -1]
+            }
             var nextLabel = il.DefineLabel("next");
             il.Blt(nextLabel, false); // if(entry.hashCode < 0) goto next; stack: []
 

version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.4",
+  "version": "1.5",
   "assemblyVersion": {
     "precision": "build"
   },