Merge remote-tracking branch 'upstream/v1.x'

MessagePack-CSharp · Feb 10, 2020 · 895178f · 895178f
2 parents 17760a4 + 6cbd819
commit 895178f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackSecurity.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackSecurity.cs
@@ -146,9 +146,9 @@ public IEqualityComparer GetEqualityComparer()
         protected virtual IEqualityComparer<T> GetHashCollisionResistantEqualityComparer<T>()
         {
             IEqualityComparer<T> result = null;
-            if (typeof(T).IsEnum)
+            if (typeof(T).GetTypeInfo().IsEnum)
             {
-                Type underlyingType = typeof(T).GetEnumUnderlyingType();
+                Type underlyingType = typeof(T).GetTypeInfo().GetEnumUnderlyingType();
                 result =
                     underlyingType == typeof(sbyte) ? CollisionResistantHasher<T>.Instance :
                     underlyingType == typeof(byte) ? CollisionResistantHasher<T>.Instance :

diff --git a/version.json b/version.json
@@ -3,6 +3,7 @@
   "version": "2.1",
   "publicReleaseRefSpec": [
     "^refs/heads/master$",
+    "^refs/heads/v1\\.x$",
     "^refs/heads/v\\d+(?:.\\d+)?$"
   ]
 }