Skip to content

Commit 3cd5534

Browse files
maximmaxim
authored andcommitted
Changes to fixx issues to pass CI build pipeline.
1 parent 8ef5aec commit 3cd5534

File tree

2 files changed

+13
-17
lines changed

2 files changed

+13
-17
lines changed

src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackSerializer.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,20 @@ public static void Serialize<T>(IBufferWriter<byte> writer, T value, MessagePack
7171
fastWriter.Flush();
7272
}
7373

74-
/// <summary>
75-
/// Serializes a given value with the specified buffer writer.
76-
/// </summary>
77-
/// <param name="writer">The buffer writer to serialize with.</param>
78-
/// <param name="value">The value to serialize.</param>
79-
/// <param name="options">The options. Use <c>null</c> to use default options.</param>
80-
/// <exception cref="MessagePackSerializationException">Thrown when any error occurs during serialization.</exception>
8174
internal static void SerializeSemiGeneric<T>(ref MessagePackWriter writer, Object valueObject, MessagePackSerializerOptions options = null)
8275
{
8376
T value = (T)valueObject;
8477

8578
Serialize(ref writer, value, options);
8679
}
8780

81+
/// <summary>
82+
/// Serializes a given value with the specified buffer writer.
83+
/// </summary>
84+
/// <param name="writer">The buffer writer to serialize with.</param>
85+
/// <param name="value">The value to serialize.</param>
86+
/// <param name="options">The options. Use <c>null</c> to use default options.</param>
87+
/// <exception cref="MessagePackSerializationException">Thrown when any error occurs during serialization.</exception>
8888
public static void Serialize<T>(ref MessagePackWriter writer, T value, MessagePackSerializerOptions options = null)
8989
{
9090
options = options ?? DefaultOptions;
@@ -239,11 +239,6 @@ public static T Deserialize<T>(in ReadOnlySequence<byte> byteSequence, MessagePa
239239
/// <returns>The deserialized value.</returns>
240240
/// <exception cref="MessagePackSerializationException">Thrown when any error occurs during deserialization.</exception>
241241
public static T Deserialize<T>(ref MessagePackReader reader, MessagePackSerializerOptions options = null)
242-
{
243-
return (T)DeserializeSemiGeneric<T>(ref reader, options);
244-
}
245-
246-
internal static Object DeserializeSemiGeneric<T>(ref MessagePackReader reader, MessagePackSerializerOptions options = null)
247242
{
248243
options = options ?? DefaultOptions;
249244

@@ -276,6 +271,11 @@ internal static Object DeserializeSemiGeneric<T>(ref MessagePackReader reader, M
276271
}
277272
}
278273

274+
internal static Object DeserializeSemiGeneric<T>(ref MessagePackReader reader, MessagePackSerializerOptions options = null)
275+
{
276+
return DeserializeSemiGeneric<T>(ref reader, options);
277+
}
278+
279279
/// <summary>
280280
/// Deserializes a value of a given type from a sequence of bytes.
281281
/// </summary>

src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackSerializerOptions.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,7 @@ public class MessagePackSerializerOptions
2828
"System.Management.IWbemClassObjectFreeThreaded",
2929
};
3030

31-
#if DYNAMICCODEDUMPER
32-
static readonly MessagePackSerializerOptions _standard = new MessagePackSerializerOptions(Resolvers.BuiltinResolver.Instance);
33-
34-
public static MessagePackSerializerOptions Standard => _standard;
35-
#else
31+
#if !DYNAMICCODEDUMPER
3632
/// <summary>
3733
/// Gets a good default set of options that uses the <see cref="Resolvers.StandardResolver"/> and no compression.
3834
/// </summary>

0 commit comments

Comments
 (0)