1.0.1

MessagePack-CSharp · Mar 13, 2017 · 353ab92 · 353ab92
1 parent 209f301
commit 353ab92
Show file tree

Hide file tree

Showing 25 changed files with 564 additions and 268 deletions.
diff --git a/.gitignore b/.gitignore
@@ -271,4 +271,5 @@ src/MessagePack.UnityClient/Temp/*
 nuget/mpc.exe
 nuget/mpc.exe.config
 
-nuget/tools/*
+nuget/tools/*
+nuget/unity/tools/*
diff --git a/LICENSE b/LICENSE
@@ -1,3 +1,5 @@
+MessagePack for C#
+
 MIT License
 
 Copyright (c) 2017 Yoshifumi Kawai

diff --git a/README.md b/README.md
diff --git a/nuget/MessagePack.AspNetCoreMvcFormatter.nuspec b/nuget/MessagePack.AspNetCoreMvcFormatter.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>MessagePack.AspNetCoreMvcFormatter</id>
-    <version>0.8.5</version>
+    <version>1.0.1</version>
     <title>ASP.NET Core MVC Input/Output MessagePack formatter</title>
     <authors>neuecc</authors>
     <owners>neuecc</owners>
@@ -17,11 +17,11 @@
     </frameworkAssemblies>
     <dependencies>
       <group targetFramework=".NETFramework4.5">
-        <dependency id="MessagePack" version="0.8.5" />
+        <dependency id="MessagePack" version="1.0.1" />
         <dependency id="Microsoft.AspNetCore.Mvc.Abstractions" version="1.1.2" />
       </group>
       <group targetFramework=".NETStandard1.4">
-        <dependency id="MessagePack" version="0.8.5" />
+        <dependency id="MessagePack" version="1.0.1" />
         <dependency id="Microsoft.AspNetCore.Mvc.Abstractions" version="1.1.2" />
       </group>
     </dependencies>

diff --git a/nuget/MessagePack.ImmutableCollection.nuspec b/nuget/MessagePack.ImmutableCollection.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>MessagePack.ImmutableCollection</id>
-    <version>0.8.5</version>
+    <version>1.0.1</version>
     <title>MessagePack for C# Extension Support for ImmutableCollection</title>
     <authors>neuecc</authors>
     <owners>neuecc</owners>
@@ -17,11 +17,11 @@
     </frameworkAssemblies>
     <dependencies>
       <group targetFramework=".NETFramework4.5">
-        <dependency id="MessagePack" version="0.8.5" />
+        <dependency id="MessagePack" version="1.0.1" />
         <dependency id="System.Collections.Immutable" version="1.3.1" />
       </group>
       <group targetFramework=".NETStandard1.4">
-        <dependency id="MessagePack" version="0.8.5" />
+        <dependency id="MessagePack" version="1.0.1" />
         <dependency id="System.Collections.Immutable" version="1.3.1" />
       </group>
     </dependencies>

diff --git a/nuget/MessagePack.ReactiveProperty.nuspec b/nuget/MessagePack.ReactiveProperty.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>MessagePack.ReactiveProperty</id>
-    <version>0.8.5</version>
+    <version>1.0.1</version>
     <title>MessagePack for C# Extension Support for ReactiveProperty</title>
     <authors>neuecc</authors>
     <owners>neuecc</owners>
@@ -17,11 +17,11 @@
     </frameworkAssemblies>
     <dependencies>
       <group targetFramework=".NETFramework4.5">
-        <dependency id="MessagePack" version="0.8.5" />
+        <dependency id="MessagePack" version="1.0.1" />
         <dependency id="ReactiveProperty" version="3.5.1" />
       </group>
       <group targetFramework=".NETStandard1.4">
-        <dependency id="MessagePack" version="0.8.5" />
+        <dependency id="MessagePack" version="1.0.1" />
         <dependency id="ReactiveProperty" version="3.5.1" />
       </group>
     </dependencies>

diff --git a/nuget/MessagePack.UnityShims.nuspec b/nuget/MessagePack.UnityShims.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>MessagePack.UnityShims</id>
-    <version>0.8.5</version>
+    <version>1.0.1</version>
     <title>MessagePack for C# Extension Support for Unity(add pseudo Vector type and fast Vectory[] extension formatter)</title>
     <authors>neuecc</authors>
     <owners>neuecc</owners>
@@ -17,10 +17,10 @@
     </frameworkAssemblies>
     <dependencies>
       <group targetFramework=".NETFramework4.5">
-        <dependency id="MessagePack" version="0.8.5" />
+        <dependency id="MessagePack" version="1.0.1" />
       </group>
       <group targetFramework=".NETStandard1.4">
-        <dependency id="MessagePack" version="0.8.5" />
+        <dependency id="MessagePack" version="1.0.1" />
       </group>
     </dependencies>
   </metadata>

diff --git a/nuget/MessagePack.nuspec b/nuget/MessagePack.nuspec
@@ -2,14 +2,14 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>MessagePack</id>
-    <version>0.8.5</version>
+    <version>1.0.1</version>
     <title>MessagePack for C#</title>
     <authors>neuecc</authors>
     <owners>neuecc</owners>
     <projectUrl>https://github.com/neuecc/MessagePack-CSharp/</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Extremely Fast MessagePack Serializer for C#(.NET, .NET Core, Unity, Xamarin).</description>
-    <releaseNotes>for supports LZ4.</releaseNotes>
+    <releaseNotes>first stable version.</releaseNotes>
     <tags>MsgPack, MessagePack, Serialization, Formatter, Serializer, Unity, Xamarin</tags>
     <frameworkAssemblies>
       <frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.5" />

diff --git a/nuget/pack.bat b/nuget/pack.bat
@@ -2,4 +2,5 @@ nuget pack MessagePack.nuspec
 nuget pack MessagePack.ImmutableCollection.nuspec
 nuget pack MessagePack.ReactiveProperty.nuspec
 nuget pack MessagePack.UnityShims.nuspec
+nuget pack MessagePack.AspNetCoreMvcFormatter.nuspec
 nuget pack MessagePackAnalyzer.nuspec
diff --git a/nuget/push.bat b/nuget/push.bat
@@ -1,5 +1,6 @@
-nuget push MessagePack.0.8.5.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push MessagePack.ImmutableCollection.0.8.5.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push MessagePack.ReactiveProperty.0.8.5.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push MessagePack.UnityShims.0.8.5.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push MessagePack.1.0.1.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push MessagePack.ImmutableCollection.1.0.1.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push MessagePack.ReactiveProperty.1.0.1.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push MessagePack.UnityShims.1.0.1.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push MessagePack.MessagePack.AspNetCoreMvcFormatter.1.0.1.nupkg -Source https://www.nuget.org/api/v2/package
 REM nuget push MessagePackAnalyzer.1.4.0.nupkg -Source https://www.nuget.org/api/v2/package
diff --git a/nuget/unity/MessagePack.1.0.1.unitypackage b/nuget/unity/MessagePack.1.0.1.unitypackage
diff --git a/nuget/unity/tools/mpc.exe.config b/nuget/unity/tools/mpc.exe.config
diff --git a/sandbox/PertNetFramework/Program.cs b/sandbox/PertNetFramework/Program.cs
@@ -67,7 +67,7 @@ static void Main(string[] args)
 
             var rand = new Random(100);
             Person[] l = Enumerable.Range(1, 100)
-                .Select(x =>  new Person
+                .Select(x => new Person
                 {
                     Age = x,
                     FirstName = "Windows",

diff --git a/sandbox/Sandbox/Program.cs b/sandbox/Sandbox/Program.cs
@@ -109,27 +109,128 @@ public class Takox
         public int tako { get; set; }
     }
 
+    [MessagePackObject]
+    public class MyClass
+    {
+        // Key is serialization index, it is important for versioning.
+        [Key(0)]
+        public int Age { get; set; }
+
+        [Key(1)]
+        public string FirstName { get; set; }
+
+        [Key(2)]
+        public string LastName { get; set; }
+
+        // public members and does not serialize target, mark IgnoreMemberttribute
+        [IgnoreMember]
+        public string FullName { get { return FirstName + LastName; } }
+    }
+
+
+    [MessagePackObject(keyAsPropertyName: true)]
+    public class Sample1
+    {
+        [Key(0)]
+        public int Foo { get; set; }
+        [Key(1)]
+        public int Bar { get; set; }
+    }
+
+    [MessagePackObject]
+    public class Sample2
+    {
+        [Key("foo")]
+        public int Foo { get; set; }
+        [Key("bar")]
+        public int Bar { get; set; }
+    }
+
+
+    [MessagePackObject]
+    public class IntKeySample
+    {
+        [Key(3)]
+        public int A { get; set; }
+        [Key(10)]
+        public int B { get; set; }
+    }
+
+
+
+    public class ContractlessSample
+    {
+        public int MyProperty1 { get; set; }
+        public int MyProperty2 { get; set; }
+    }
+
+
+
+    [MessagePackObject]
+    public struct Point
+    {
+        [Key(0)]
+        public readonly int X;
+        [Key(1)]
+        public readonly int Y;
+
+        // can't find matched constructor parameter, parameterType mismatch. type:Point parameterIndex:0 paramterType:ValueTuple`2
+        public Point((int, int) p)
+        {
+            X = p.Item1;
+            Y = p.Item2;
+        }
+
+        [SerializationConstructor]
+        public Point(int x, int y)
+        {
+            this.X = x;
+            this.Y = y;
+        }
+    }
+
+    // mark inheritance types
+    [MessagePack.Union(0, typeof(FooClass))]
+    [MessagePack.Union(1, typeof(BarClass))]
+    public interface IUnionSample
+    {
+    }
+
+    [MessagePackObject]
+    public class FooClass : IUnionSample
+    {
+        [Key(0)]
+        public int XYZ { get; set; }
+    }
+
+    [MessagePackObject]
+    public class BarClass : IUnionSample
+    {
+        [Key(0)]
+        public string OPQ { get; set; }
+    }
+
+
     class Program
     {
         static void Main(string[] args)
         {
+// composite same as StandardResolver
+CompositeResolver.RegisterAndSetAsDefault(
+    MessagePack.Resolvers.BuiltinResolver.Instance,
 
+    // replace enumasstring resolver
+    MessagePack.Resolvers.DynamicEnumAsStringResolver.Instance,
+
+    MessagePack.Resolvers.DynamicGenericResolver.Instance,
+    MessagePack.Resolvers.DynamicUnionResolver.Instance,
+    MessagePack.Resolvers.DynamicObjectResolver.Instance,
+
+    // final fallback(last priority)
+    MessagePack.Resolvers.DynamicContractlessObjectResolver.Instance
+);
 
-            var bytes = new byte[0];
-            MessagePackBinary.WriteString(ref bytes, 0, "あいうえおあいうえおあいうえお");
 
-            var p = new Person
-            {
-                Age = 99999,
-                FirstName = "Windows",
-                LastName = "Server",
-                Sex = Sex.Male,
-            };
-            Person[] l = Enumerable.Range(1, 100).Select(x => new Person { Age = x, FirstName = "Windows", LastName = "Server", Sex = Sex.Female }).ToArray();
-
-            Benchmark(p);
-            Console.WriteLine();
-            Benchmark(l);
 
         }
 
@@ -505,4 +606,5 @@ public IHogeMoge Deserialize(byte[] bytes, int offset, IFormatterResolver format
 
         }
     }
+
 }
diff --git a/src/MessagePack.UnityClient/Assets/RuntimeUnitTestToolkit/UnitTest.unity b/src/MessagePack.UnityClient/Assets/RuntimeUnitTestToolkit/UnitTest.unity
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Shims/Reflection.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Shims/Reflection.cs
@@ -24,6 +24,14 @@ public bool IsClass
             }
         }
 
+        public bool IsPublic
+        {
+            get
+            {
+                return type.IsPublic;
+            }
+        }
+
         public bool IsValueType
         {
             get