Changes to fixx issues to pass CI build pipeline.

2 files changed, 13 insertions, 17 deletions

diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackSerializer.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackSerializer.cs
index f3773f70..4348e4c3 100644
--- a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackSerializer.cs
+++ b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackSerializer.cs
@@ -71,13 +71,6 @@ namespace MessagePack
             fastWriter.Flush();
         }
 
-        /// <summary>
-        /// Serializes a given value with the specified buffer writer.
-        /// </summary>
-        /// <param name="writer">The buffer writer to serialize with.</param>
-        /// <param name="value">The value to serialize.</param>
-        /// <param name="options">The options. Use <c>null</c> to use default options.</param>
-        /// <exception cref="MessagePackSerializationException">Thrown when any error occurs during serialization.</exception>
         internal static void SerializeSemiGeneric<T>(ref MessagePackWriter writer, Object valueObject, MessagePackSerializerOptions options = null)
         {
             T value = (T)valueObject;
@@ -85,6 +78,13 @@ namespace MessagePack
             Serialize(ref writer, value, options);
         }
 
+        /// <summary>
+        /// Serializes a given value with the specified buffer writer.
+        /// </summary>
+        /// <param name="writer">The buffer writer to serialize with.</param>
+        /// <param name="value">The value to serialize.</param>
+        /// <param name="options">The options. Use <c>null</c> to use default options.</param>
+        /// <exception cref="MessagePackSerializationException">Thrown when any error occurs during serialization.</exception>
         public static void Serialize<T>(ref MessagePackWriter writer, T value, MessagePackSerializerOptions options = null)
         {
             options = options ?? DefaultOptions;
@@ -240,11 +240,6 @@ namespace MessagePack
         /// <exception cref="MessagePackSerializationException">Thrown when any error occurs during deserialization.</exception>
         public static T Deserialize<T>(ref MessagePackReader reader, MessagePackSerializerOptions options = null)
         {
-            return (T)DeserializeSemiGeneric<T>(ref reader, options);
-        }
-
-        internal static Object DeserializeSemiGeneric<T>(ref MessagePackReader reader, MessagePackSerializerOptions options = null)
-        {
             options = options ?? DefaultOptions;
 
             try
@@ -276,6 +271,11 @@ namespace MessagePack
             }
         }
 
+        internal static Object DeserializeSemiGeneric<T>(ref MessagePackReader reader, MessagePackSerializerOptions options = null)
+        {
+            return DeserializeSemiGeneric<T>(ref reader, options);
+        }
+
         /// <summary>
         /// Deserializes a value of a given type from a sequence of bytes.
         /// </summary>
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackSerializerOptions.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackSerializerOptions.cs
index de2bb4b8..a9a9ec51 100644
--- a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackSerializerOptions.cs
+++ b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackSerializerOptions.cs
@@ -28,11 +28,7 @@ namespace MessagePack
             "System.Management.IWbemClassObjectFreeThreaded",
         };
 
-#if DYNAMICCODEDUMPER
-        static readonly MessagePackSerializerOptions _standard = new MessagePackSerializerOptions(Resolvers.BuiltinResolver.Instance);
-
-        public static MessagePackSerializerOptions Standard => _standard;
-#else
+#if !DYNAMICCODEDUMPER
         /// <summary>
         /// Gets a good default set of options that uses the <see cref="Resolvers.StandardResolver"/> and no compression.
         /// </summary>