Update packages and SpanWriter (#428)

jamescourtney · Feb 25, 2024 · 8c8510b · 8c8510b
1 parent 21695cc
commit 8c8510b
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 40 deletions.
diff --git a/src/Benchmarks/Benchmark/Benchmark.csproj b/src/Benchmarks/Benchmark/Benchmark.csproj
@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
-    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.10" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
+    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.12" />
     <PackageReference Include="MessagePack" Version="2.5.140" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="protobuf-net" Version="3.2.30" />

diff --git a/src/Benchmarks/BenchmarkOld/BenchmarkOld.csproj b/src/Benchmarks/BenchmarkOld/BenchmarkOld.csproj
@@ -16,8 +16,8 @@
     </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
-    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.10" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
+    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.12" />
     <PackageReference Include="MessagePack" Version="2.5.140" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="protobuf-net" Version="3.2.30" />

diff --git a/src/Benchmarks/ExperimentalBenchmarkOld/ExperimentalBenchmarkOld.csproj b/src/Benchmarks/ExperimentalBenchmarkOld/ExperimentalBenchmarkOld.csproj
@@ -12,8 +12,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
-        <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.10" />
+        <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
+        <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.12" />
         <PackageReference Include="FlatSharp.Compiler" Version="7.4.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/FlatSharp.Runtime/GeneratedSerializerWrapper.cs b/src/FlatSharp.Runtime/GeneratedSerializerWrapper.cs
@@ -192,7 +192,7 @@ item is IFlatBufferDeserializedObject deserializedObj &&
                 Debug.Assert(!sharedStringWriter.IsDirty);
             }
 
-            writer.InvokeWrite(this.innerSerializer, destination, item, serializationContext);
+            this.innerSerializer.Write(writer, destination, item, serializationContext);
 
             if (sharedStringWriter?.IsDirty == true)
             {

diff --git a/src/FlatSharp.Runtime/IO/ISpanWriter.cs b/src/FlatSharp.Runtime/IO/ISpanWriter.cs
@@ -78,21 +78,6 @@ public interface ISpanWriter
     /// </summary>
     int GetStringBytes(Span<byte> destination, string value, Encoding encoding);
 
-    /// <summary>
-    /// Invokes the <see cref="IGeneratedSerializer{T}.Write{TSpanWriter}(TSpanWriter, Span{byte}, T, SerializationContext)"/>
-    /// method using the type information for this serializer.
-    /// </summary>
-    /// <remarks>
-    /// IGeneratedSerializer is a generic interface that accepts a SpanWriter. However, with precise type information,
-    /// it is possible for SpanWriter instances to avoid vtable indirection when wrapped in a struct or passed as a struct. This
-    /// hook allows SpanWriter implementations to invoke the generated serializer in an efficient way.
-    /// </remarks>
-    void InvokeWrite<TItemType>(
-        IGeneratedSerializer<TItemType> serializer,
-        Span<byte> destination,
-        TItemType item,
-        SerializationContext context);
-
     /// <summary>
     /// Invokes the <see cref="ISharedStringWriter.FlushWrites{TSpanWriter}(TSpanWriter, Span{byte}, SerializationContext)"/> method.
     /// </summary>

diff --git a/src/FlatSharp.Runtime/IO/SpanWriter.cs b/src/FlatSharp.Runtime/IO/SpanWriter.cs
@@ -112,15 +112,6 @@ public int GetStringBytes(Span<byte> destination, string value, Encoding encodin
         return bytesWritten;
     }
 
-    public void InvokeWrite<TItemType>(IGeneratedSerializer<TItemType> serializer, Span<byte> destination, TItemType item, SerializationContext context)
-    {
-        serializer.Write(
-            this,
-            destination,
-            item,
-            context);
-    }
-
     public void FlushSharedStrings(ISharedStringWriter writer, Span<byte> destination, SerializationContext context)
     {
         writer.FlushWrites(this, destination, context);

diff --git a/src/FlatSharp/FlatSharp.csproj b/src/FlatSharp/FlatSharp.csproj
@@ -50,9 +50,7 @@
     <ItemGroup>
         <ProjectReference Include="..\FlatSharp.Runtime\FlatSharp.Runtime.csproj" />
     </ItemGroup>
-    <ItemGroup>
-        <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
-    </ItemGroup>
+
     <ItemGroup>
         <Compile Update="TypeModel\ScalarTypeModels.cs">
             <DesignTime>True</DesignTime>

diff --git a/src/Tests/FlatSharpCompilerTests/FlatSharpCompilerTests.csproj b/src/Tests/FlatSharpCompilerTests/FlatSharpCompilerTests.csproj
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Grpc.Core" Version="2.46.6" />
-    <PackageReference Include="Grpc.Core.Api" Version="2.59.0" />
+    <PackageReference Include="Grpc.Core.Api" Version="2.61.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
 
@@ -25,11 +25,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Update="Microsoft.TestPlatform.ObjectModel" Version="17.8.0" />
-    <PackageReference Update="xunit" Version="2.6.2" />
-    <PackageReference Update="xunit.runner.utility" Version="2.6.2" />
-    <PackageReference Update="xunit.runner.visualstudio" Version="2.5.4">
+    <PackageReference Update="xunit" Version="2.7.0" />
+    <PackageReference Update="xunit.runner.utility" Version="2.7.0" />
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>