Update: All NuGet Packages

Reloaded-Project · Jul 5, 2022 · 53cd4eb · 53cd4eb
1 parent 0f90621
commit 53cd4eb
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 29 deletions.
diff --git a/...ce/Reloaded.Messaging.Compressor.ZStandard/Reloaded.Messaging.Compressor.ZStandard.csproj b/...ce/Reloaded.Messaging.Compressor.ZStandard/Reloaded.Messaging.Compressor.ZStandard.csproj
@@ -24,7 +24,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ZstdNet" Version="1.3.3" />
+    <PackageReference Include="ZstdNet" Version="1.4.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Source/Reloaded.Messaging.Serializer.MessagePack/MsgPackSerializer.cs b/Source/Reloaded.Messaging.Serializer.MessagePack/MsgPackSerializer.cs
@@ -1,50 +1,46 @@
 using MessagePack;
+using MessagePack.Resolvers;
 using Reloaded.Messaging.Interfaces;
 
 namespace Reloaded.Messaging.Serializer.MessagePack
 {
     public class MsgPackSerializer : ISerializer
     {
         /// <summary>
-        /// Uses LZ4 compression for serialization.
+        /// Any custom resolver to pass to MessagePack.
+        /// Default is <see cref="ContractlessStandardResolver.Instance"/>
         /// </summary>
-        public bool UseLZ4 { get; private set; }
+        public IFormatterResolver Resolver { get; private set; } = ContractlessStandardResolver.Instance;
 
         /// <summary>
-        /// Any custom resolver to pass to MessagePack.
-        /// Default is <see cref="MessagePack.Resolvers.ContractlessStandardResolver.Instance"/>
+        /// Options for the MessagePack serializer.
         /// </summary>
-        public IFormatterResolver Resolver { get; private set; } = global::MessagePack.Resolvers.ContractlessStandardResolver.Instance;
+        public MessagePackSerializerOptions SerializerOptions { get; private set; } = MessagePackSerializerOptions.Standard;
 
         /// <summary>
         /// Creates a new instance of the MessagePack serializer.
         /// </summary>
-        /// <param name="useLz4">Uses MessagePack's serializer with LZ4 compression.</param>
         /// <param name="resolver">
         ///     Custom resolver to pass to MessagePack, default is "Contractless Resolver"
-        ///     (<see cref="MessagePack.Resolvers.ContractlessStandardResolver.Instance"/>).
+        ///     (<see cref="ContractlessStandardResolver.Instance"/>).
         /// </param>
-        public MsgPackSerializer(bool useLz4, IFormatterResolver resolver = null)
+        public MsgPackSerializer(IFormatterResolver resolver = null)
         {
-            UseLZ4 = useLz4;
             if (resolver != null)
                 Resolver = resolver;
         }
 
-
         /// <inheritdoc />
         public TStruct Deserialize<TStruct>(byte[] serialized)
         {
-            return UseLZ4 ? LZ4MessagePackSerializer.Deserialize<TStruct>(serialized, Resolver) : 
-                            MessagePackSerializer.Deserialize<TStruct>(serialized, Resolver);
+            return MessagePackSerializer.Deserialize<TStruct>(serialized, SerializerOptions);
         }
 
 
         /// <inheritdoc />
         public byte[] Serialize<TStruct>(ref TStruct item)
         {
-            return UseLZ4 ? LZ4MessagePackSerializer.Serialize(item, Resolver) :
-                            MessagePackSerializer.Serialize(item, Resolver);
+            return MessagePackSerializer.Serialize(item, SerializerOptions);
         }
     }
 }
diff --git a/...eloaded.Messaging.Serializer.MessagePack/Reloaded.Messaging.Serializer.MessagePack.csproj b/...eloaded.Messaging.Serializer.MessagePack/Reloaded.Messaging.Serializer.MessagePack.csproj
@@ -26,7 +26,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MessagePack" Version="1.9.11" />
+    <PackageReference Include="MessagePack" Version="2.4.35" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Source/Reloaded.Messaging.Serializer.NewtonsoftJson/NewtonsoftJsonSerializer.cs b/Source/Reloaded.Messaging.Serializer.NewtonsoftJson/NewtonsoftJsonSerializer.cs
@@ -6,6 +6,9 @@
 
 namespace Reloaded.Messaging.Serializer.NewtonsoftJson
 {
+    /// <summary>
+    /// 
+    /// </summary>
     public class NewtonsoftJsonSerializer : ISerializer
     {
         /// <summary>

diff --git a/...d.Messaging.Serializer.ReloadedMemory/Reloaded.Messaging.Serializer.ReloadedMemory.csproj b/...d.Messaging.Serializer.ReloadedMemory/Reloaded.Messaging.Serializer.ReloadedMemory.csproj
@@ -24,7 +24,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Reloaded.Memory" Version="1.4.1" />
+    <PackageReference Include="Reloaded.Memory" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...d.Messaging.Serializer.SystemTextJson/Reloaded.Messaging.Serializer.SystemTextJson.csproj b/...d.Messaging.Serializer.SystemTextJson/Reloaded.Messaging.Serializer.SystemTextJson.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Condition="'$(TargetFramework)' == 'netstandard2.0'" Version="5.0.2" />
+    <PackageReference Include="System.Text.Json" Condition="'$(TargetFramework)' == 'netstandard2.0'" Version="6.0.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Source/Reloaded.Messaging.Tests/Reloaded.Messaging.Tests.csproj b/Source/Reloaded.Messaging.Tests/Reloaded.Messaging.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;NET472</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;NET472;net5.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -17,9 +17,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Source/Reloaded.Messaging.Tests/Struct/StringMessage.cs b/Source/Reloaded.Messaging.Tests/Struct/StringMessage.cs
@@ -8,7 +8,7 @@ namespace Reloaded.Messaging.Tests.Struct
     public struct StringMessage : IMessage<MessageType>
     {
         public MessageType GetMessageType() => MessageType.String;
-        public ISerializer GetSerializer()  => new MsgPackSerializer(true);
+        public ISerializer GetSerializer()  => new MsgPackSerializer();
         public ICompressor GetCompressor()  => null;
 
         public string Text { get; set; }

diff --git a/Source/Reloaded.Messaging.Tests/Struct/Vector3.cs b/Source/Reloaded.Messaging.Tests/Struct/Vector3.cs
@@ -7,7 +7,7 @@ namespace Reloaded.Messaging.Tests.Struct
     public struct Vector3 : IMessage<MessageType>
     {
         public MessageType GetMessageType() => MessageType.Vector3;
-        public ISerializer GetSerializer() => new MsgPackSerializer(true);
+        public ISerializer GetSerializer() => new MsgPackSerializer();
         public ICompressor GetCompressor() => null;
 
         public float X { get; set; }

diff --git a/Source/Reloaded.Messaging.Tests/Tests/Serialization/StringPassTest.cs b/Source/Reloaded.Messaging.Tests/Tests/Serialization/StringPassTest.cs
@@ -36,7 +36,7 @@ public void Dispose()
         [Fact(Timeout = 1000)]
         public void MsgPackPassString()
         {
-            Overrides.SerializerOverride[typeof(StringMessage)] = new MsgPackSerializer(false);
+            Overrides.SerializerOverride[typeof(StringMessage)] = new MsgPackSerializer();
             Overrides.CompressorOverride[typeof(StringMessage)] = null;
             PassString();
         }

diff --git a/Source/Reloaded.Messaging.Tests/Tests/Serialization/VectorPassTest.cs b/Source/Reloaded.Messaging.Tests/Tests/Serialization/VectorPassTest.cs
@@ -34,7 +34,7 @@ public void Dispose()
         [Fact(Timeout = 1000)]
         public void MsgPackPassVector3()
         {
-            Overrides.SerializerOverride[typeof(Vector3)] = new MsgPackSerializer(false);
+            Overrides.SerializerOverride[typeof(Vector3)] = new MsgPackSerializer();
             Overrides.CompressorOverride.Remove(typeof(Vector3));
             PassVector3();
         }

diff --git a/Source/Reloaded.Messaging/Reloaded.Messaging.csproj b/Source/Reloaded.Messaging/Reloaded.Messaging.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;netcoreapp3.1;net5.0</TargetFrameworks>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <Authors>Sewer56</Authors>
     <Company />
@@ -23,8 +23,8 @@
 
   <ItemGroup>
     <PackageReference Include="LiteNetLib" Version="1.0.0-rc.3" />
-    <PackageReference Include="System.Memory" Version="4.5.3" Condition="! $(DefineConstants.Contains('USE_NATIVE_SPAN_API'))" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" Condition="! $(DefineConstants.Contains('USE_NATIVE_UNSAFE'))" />
+    <PackageReference Include="System.Memory" Version="4.5.5" Condition="! $(DefineConstants.Contains('USE_NATIVE_SPAN_API'))"  />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" Condition="! $(DefineConstants.Contains('USE_NATIVE_UNSAFE'))" />
   </ItemGroup>
 
   <ItemGroup>