diff --git a/nuget/MessagePack.AspNetCoreMvcFormatter.nuspec b/nuget/MessagePack.AspNetCoreMvcFormatter.nuspec index 247d78b2..3ee16d15 100644 --- a/nuget/MessagePack.AspNetCoreMvcFormatter.nuspec +++ b/nuget/MessagePack.AspNetCoreMvcFormatter.nuspec @@ -2,7 +2,7 @@ MessagePack.AspNetCoreMvcFormatter - 1.6.1.1 + 1.6.1.2 ASP.NET Core MVC Input/Output MessagePack formatter neuecc neuecc @@ -13,7 +13,7 @@ MsgPack, MessagePack, Serialization, Formatter, Serializer, aspnetcore, aspnetcoremvc - + diff --git a/nuget/MessagePack.ImmutableCollection.nuspec b/nuget/MessagePack.ImmutableCollection.nuspec index 1f0de681..51dc6d35 100644 --- a/nuget/MessagePack.ImmutableCollection.nuspec +++ b/nuget/MessagePack.ImmutableCollection.nuspec @@ -2,7 +2,7 @@ MessagePack.ImmutableCollection - 1.6.1.1 + 1.6.1.2 MessagePack for C# Extension Support for ImmutableCollection neuecc neuecc @@ -17,15 +17,15 @@ - + - + - + diff --git a/nuget/MessagePack.ReactiveProperty.nuspec b/nuget/MessagePack.ReactiveProperty.nuspec index cab1ff97..4da636f4 100644 --- a/nuget/MessagePack.ReactiveProperty.nuspec +++ b/nuget/MessagePack.ReactiveProperty.nuspec @@ -2,7 +2,7 @@ MessagePack.ReactiveProperty - 1.6.1.1 + 1.6.1.2 MessagePack for C# Extension Support for ReactiveProperty neuecc neuecc @@ -17,15 +17,15 @@ - + - + - + diff --git a/nuget/MessagePack.UnityShims.nuspec b/nuget/MessagePack.UnityShims.nuspec index a7342d6d..be80b33d 100644 --- a/nuget/MessagePack.UnityShims.nuspec +++ b/nuget/MessagePack.UnityShims.nuspec @@ -2,7 +2,7 @@ MessagePack.UnityShims - 1.6.1.1 + 1.6.1.2 MessagePack for C# Extension Support for Unity(add pseudo Vector type and fast Vectory[] extension formatter) neuecc neuecc @@ -17,13 +17,13 @@ - + - + - + diff --git a/nuget/MessagePack.nuspec b/nuget/MessagePack.nuspec index e114c015..d01cd91d 100644 --- a/nuget/MessagePack.nuspec +++ b/nuget/MessagePack.nuspec @@ -2,7 +2,7 @@ MessagePack - 1.6.1.1 + 1.6.1.2 MessagePack for C# neuecc neuecc diff --git a/nuget/push.bat b/nuget/push.bat index 56c15edb..bfa23b40 100644 --- a/nuget/push.bat +++ b/nuget/push.bat @@ -1,6 +1,6 @@ -nuget push MessagePack.1.6.1.1.nupkg -Source https://www.nuget.org/api/v2/package -nuget push MessagePack.ImmutableCollection.1.6.1.1.nupkg -Source https://www.nuget.org/api/v2/package -nuget push MessagePack.ReactiveProperty.1.6.1.1.nupkg -Source https://www.nuget.org/api/v2/package -nuget push MessagePack.UnityShims.1.6.1.1.nupkg -Source https://www.nuget.org/api/v2/package -nuget push MessagePack.AspNetCoreMvcFormatter.1.6.1.1.nupkg -Source https://www.nuget.org/api/v2/package -REM nuget push MessagePackAnalyzer.1.6.1.1.nupkg -Source https://www.nuget.org/api/v2/package \ No newline at end of file +nuget push MessagePack.1.6.1.2.nupkg -Source https://www.nuget.org/api/v2/package +nuget push MessagePack.ImmutableCollection.1.6.1.2.nupkg -Source https://www.nuget.org/api/v2/package +nuget push MessagePack.ReactiveProperty.1.6.1.2.nupkg -Source https://www.nuget.org/api/v2/package +nuget push MessagePack.UnityShims.1.6.1.2.nupkg -Source https://www.nuget.org/api/v2/package +nuget push MessagePack.AspNetCoreMvcFormatter.1.6.1.2.nupkg -Source https://www.nuget.org/api/v2/package +REM nuget push MessagePackAnalyzer.1.6.1.2.nupkg -Source https://www.nuget.org/api/v2/package \ No newline at end of file diff --git a/src/MessagePack.AspNetCoreMvcFormatter/_AssemblyInfo.cs b/src/MessagePack.AspNetCoreMvcFormatter/_AssemblyInfo.cs index e0bf0267..5ce20416 100644 --- a/src/MessagePack.AspNetCoreMvcFormatter/_AssemblyInfo.cs +++ b/src/MessagePack.AspNetCoreMvcFormatter/_AssemblyInfo.cs @@ -11,5 +11,5 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] [assembly: Guid("7c1f59ed-3929-4cbb-8aca-b13139fbca3a")] -[assembly: AssemblyVersion("1.6.1.1")] -[assembly: AssemblyFileVersion("1.6.1.1")] +[assembly: AssemblyVersion("1.6.1.2")] +[assembly: AssemblyFileVersion("1.6.1.2")] diff --git a/src/MessagePack.ImmutableCollection/_AssemblyInfo.cs b/src/MessagePack.ImmutableCollection/_AssemblyInfo.cs index bef71262..09efeb0d 100644 --- a/src/MessagePack.ImmutableCollection/_AssemblyInfo.cs +++ b/src/MessagePack.ImmutableCollection/_AssemblyInfo.cs @@ -11,5 +11,5 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] [assembly: Guid("fe5a979e-24c6-47dd-919f-81df6fb2e160")] -[assembly: AssemblyVersion("1.6.1.1")] -[assembly: AssemblyFileVersion("1.6.1.1")] +[assembly: AssemblyVersion("1.6.1.2")] +[assembly: AssemblyFileVersion("1.6.1.2")] diff --git a/src/MessagePack.ReactiveProperty/_AssemblyInfo.cs b/src/MessagePack.ReactiveProperty/_AssemblyInfo.cs index 84b7e709..91313659 100644 --- a/src/MessagePack.ReactiveProperty/_AssemblyInfo.cs +++ b/src/MessagePack.ReactiveProperty/_AssemblyInfo.cs @@ -11,5 +11,5 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] [assembly: Guid("16b0640a-c86d-4f21-bf2f-45efc728ae96")] -[assembly: AssemblyVersion("1.6.1.1")] -[assembly: AssemblyFileVersion("1.6.1.1")] +[assembly: AssemblyVersion("1.6.1.2")] +[assembly: AssemblyFileVersion("1.6.1.2")] diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Shims/Reflection.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Shims/Reflection.cs index 90b0def7..0cf2d612 100644 --- a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Shims/Reflection.cs +++ b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Shims/Reflection.cs @@ -68,6 +68,14 @@ namespace System.Reflection } } + public bool IsArray + { + get + { + return type.IsArray; + } + } + public bool IsValueType { get diff --git a/src/MessagePack.UnityClient/MessagePack.UnityClient.csproj b/src/MessagePack.UnityClient/MessagePack.UnityClient.csproj index 84b7dd04..0dfe7149 100644 --- a/src/MessagePack.UnityClient/MessagePack.UnityClient.csproj +++ b/src/MessagePack.UnityClient/MessagePack.UnityClient.csproj @@ -13,12 +13,12 @@ .NETFramework v3.5 Unity Subset v3.5 - Assets\smcs.rsp + Game:1 StandaloneWindows64:19 2017.1.0f1 - 4 + 4 pdbonly @@ -122,6 +122,7 @@ TupleFormatter.tt + True True @@ -134,7 +135,9 @@ + + @@ -176,6 +179,7 @@ + diff --git a/src/MessagePack.UnityShims/_AssemblyInfo.cs b/src/MessagePack.UnityShims/_AssemblyInfo.cs index 7f9758b4..ef79caf6 100644 --- a/src/MessagePack.UnityShims/_AssemblyInfo.cs +++ b/src/MessagePack.UnityShims/_AssemblyInfo.cs @@ -11,5 +11,5 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] [assembly: Guid("4b074f49-f7cb-4885-9a58-cc75a7d64b62")] -[assembly: AssemblyVersion("1.6.1.1")] -[assembly: AssemblyFileVersion("1.6.1.1")] +[assembly: AssemblyVersion("1.6.1.2")] +[assembly: AssemblyFileVersion("1.6.1.2")] diff --git a/src/MessagePack/Resolvers/DynamicObjectResolver.cs b/src/MessagePack/Resolvers/DynamicObjectResolver.cs index b657183a..11e48558 100644 --- a/src/MessagePack/Resolvers/DynamicObjectResolver.cs +++ b/src/MessagePack/Resolvers/DynamicObjectResolver.cs @@ -1635,11 +1635,11 @@ typeof(int), typeof(int) }); { if (IsProperty) { - return (MessagePackFormatterAttribute)PropertyInfo.GetCustomAttribute(typeof(MessagePackFormatterAttribute), true); + return (MessagePackFormatterAttribute)PropertyInfo.GetCustomAttribute(true); } else { - return (MessagePackFormatterAttribute)FieldInfo.GetCustomAttribute(typeof(MessagePackFormatterAttribute), true); + return (MessagePackFormatterAttribute)FieldInfo.GetCustomAttribute(true); } } diff --git a/src/MessagePack/_AssemblyInfo.cs b/src/MessagePack/_AssemblyInfo.cs index 605a91f0..61f570d3 100644 --- a/src/MessagePack/_AssemblyInfo.cs +++ b/src/MessagePack/_AssemblyInfo.cs @@ -12,8 +12,8 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] [assembly: Guid("b23e464e-0ac2-47c9-9520-ea98cbb99575")] -[assembly: AssemblyVersion("1.6.1.1")] -[assembly: AssemblyFileVersion("1.6.1.1")] +[assembly: AssemblyVersion("1.6.1.2")] +[assembly: AssemblyFileVersion("1.6.1.2")] // sn.exe -Tp //[assembly: InternalsVisibleTo("MessagePack.Tests, PublicKey=" +