Merge pull request #1229 from AArnott/fix1217

Add support for `IReadOnlySet<T>`
MessagePack-CSharp · May 17, 2021 · 7af6eea · 7af6eea
2 parents 27230c7 + 752022e
commit 7af6eea
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 6 deletions.
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.100",
+    "version": "5.0.201",
     "rollForward": "patch",
     "allowPrerelease": false
   }

diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Formatters/CollectionFormatter.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Formatters/CollectionFormatter.cs
@@ -1271,6 +1271,28 @@ protected override HashSet<T> Create(int count, MessagePackSerializerOptions opt
         }
     }
 
+#if NET5_0_OR_GREATER
+
+    public sealed class InterfaceReadOnlySetFormatter<T> : CollectionFormatterBase<T, HashSet<T>, IReadOnlySet<T>>
+    {
+        protected override void Add(HashSet<T> collection, int index, T value, MessagePackSerializerOptions options)
+        {
+            collection.Add(value);
+        }
+
+        protected override IReadOnlySet<T> Complete(HashSet<T> intermediateCollection)
+        {
+            return intermediateCollection;
+        }
+
+        protected override HashSet<T> Create(int count, MessagePackSerializerOptions options)
+        {
+            return new HashSet<T>(options.Security.GetEqualityComparer<T>());
+        }
+    }
+
+#endif
+
     public sealed class ConcurrentBagFormatter<T> : CollectionFormatterBase<T, System.Collections.Concurrent.ConcurrentBag<T>>
     {
         protected override int? GetCount(ConcurrentBag<T> sequence)

diff --git a/...gePack.UnityClient/Assets/Scripts/MessagePack/Formatters/StandardClassLibraryFormatter.cs b/...gePack.UnityClient/Assets/Scripts/MessagePack/Formatters/StandardClassLibraryFormatter.cs
@@ -636,7 +636,7 @@ public T Deserialize(ref MessagePackReader reader, MessagePackSerializerOptions
         }
     }
 
-#if NET5_0
+#if NET5_0_OR_GREATER
 
     public sealed class HalfFormatter : IMessagePackFormatter<Half>
     {

diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Resolvers/BuiltinResolver.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Resolvers/BuiltinResolver.cs
@@ -152,7 +152,7 @@ internal static class BuiltinResolverGetFormatterHelper
             { typeof(System.Numerics.Complex), ComplexFormatter.Instance },
             { typeof(System.Numerics.Complex?), new StaticNullableFormatter<System.Numerics.Complex>(ComplexFormatter.Instance) },
 
-#if NET5_0
+#if NET5_0_OR_GREATER
             { typeof(System.Half), HalfFormatter.Instance },
 #endif
         };

diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Resolvers/DynamicGenericResolver.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Resolvers/DynamicGenericResolver.cs
@@ -70,6 +70,9 @@ internal static class DynamicGenericResolverGetFormatterHelper
               { typeof(IReadOnlyList<>), typeof(InterfaceReadOnlyListFormatter<>) },
               { typeof(IReadOnlyCollection<>), typeof(InterfaceReadOnlyCollectionFormatter<>) },
               { typeof(ISet<>), typeof(InterfaceSetFormatter<>) },
+#if NET5_0_OR_GREATER
+              { typeof(IReadOnlySet<>), typeof(InterfaceReadOnlySetFormatter<>) },
+#endif
               { typeof(System.Collections.Concurrent.ConcurrentBag<>), typeof(ConcurrentBagFormatter<>) },
               { typeof(System.Collections.Concurrent.ConcurrentQueue<>), typeof(ConcurrentQueueFormatter<>) },
               { typeof(System.Collections.Concurrent.ConcurrentStack<>), typeof(ConcurrentStackFormatter<>) },

diff --git a/src/MessagePack.UnityClient/Assets/Scripts/Tests/ShareTests/FormatterTest.cs b/src/MessagePack.UnityClient/Assets/Scripts/Tests/ShareTests/FormatterTest.cs
@@ -313,7 +313,7 @@ public void UriTest_Relative()
             this.Convert(relative).ToString().Is("/me/");
         }
 
-#if NET5_0
+#if NET5_0_OR_GREATER
 
         [Fact]
         public void HalfTest()

diff --git a/src/MessagePack/net5.0/PublicAPI.Unshipped.txt b/src/MessagePack/net5.0/PublicAPI.Unshipped.txt
@@ -4,6 +4,8 @@ MessagePack.FormatterNotRegisteredException.FormatterNotRegisteredException(Syst
 MessagePack.Formatters.HalfFormatter
 MessagePack.Formatters.HalfFormatter.Deserialize(ref MessagePack.MessagePackReader reader, MessagePack.MessagePackSerializerOptions options) -> System.Half
 MessagePack.Formatters.HalfFormatter.Serialize(ref MessagePack.MessagePackWriter writer, System.Half value, MessagePack.MessagePackSerializerOptions options) -> void
+MessagePack.Formatters.InterfaceReadOnlySetFormatter<T>
+MessagePack.Formatters.InterfaceReadOnlySetFormatter<T>.InterfaceReadOnlySetFormatter() -> void
 MessagePack.MessagePackReader.MessagePackReader() -> void
 MessagePack.MessagePackSerializerOptions.SequencePool.get -> MessagePack.SequencePool
 MessagePack.MessagePackSerializerOptions.WithPool(MessagePack.SequencePool pool) -> MessagePack.MessagePackSerializerOptions

diff --git a/tests/MessagePack.Tests/DynamicObjectResolverRecordsTests.cs b/tests/MessagePack.Tests/DynamicObjectResolverRecordsTests.cs
@@ -3,7 +3,7 @@
 
 using Xunit;
 
-#if NET5_0
+#if NET5_0_OR_GREATER
 
 namespace MessagePack.Tests
 {

diff --git a/tests/MessagePack.Tests/IsExternalInit.cs b/tests/MessagePack.Tests/IsExternalInit.cs
@@ -1,7 +1,7 @@
 // Copyright (c) All contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-#if !NET5_0
+#if !NET5_0_OR_GREATER
 
 #pragma warning disable CA1812