Get Unity project building!

author: Andrew Arnott <andrewarnott@gmail.com> 2019-03-24 08:12:34 +0300
committer: Andrew Arnott <andrewarnott@gmail.com> 2019-03-24 17:01:47 +0300
commit: 6c1f9f096672b29014884ccab6e6a0b41c3e4cfc (patch)
tree: 258c0691ff5b9080d540a75553cdffa6d8464343
parent: da3f852a2ac09eff7d6326ee59f204ec6d00aafb (diff)
55 files changed, 224 insertions, 656 deletions
diff --git a/make_unity_symlink.bat b/make_unity_symlink.bat
index 93ebf430..0fdb753a 100644
--- a/make_unity_symlink.bat
+++ b/make_unity_symlink.bat
@@ -17,6 +17,17 @@ mklink ".\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\MessagePackCode
 mklink ".\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\MessagePackSerializer.cs" "..\..\..\..\MessagePack\MessagePackSerializer.cs"
 mklink ".\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\MessagePackSerializer.Json.cs" "..\..\..\..\MessagePack\MessagePackSerializer.Json.cs"
 mklink ".\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\MessagePackSerializer+NonGeneric.cs" "..\..\..\..\MessagePack\MessagePackSerializer+NonGeneric.cs"
+mklink ".\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\MessagePackReader.cs" "..\..\..\..\MessagePack\MessagePackReader.cs"
+mklink ".\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\MessagePackReader.Integers.cs" "..\..\..\..\MessagePack\MessagePackReader.Integers.cs"
+mklink ".\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\MessagePackWriter.cs" "..\..\..\..\MessagePack\MessagePackWriter.cs"
+mklink ".\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\BufferWriter.cs" "..\..\..\..\MessagePack\BufferWriter.cs"
+mklink ".\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\SequencePool.cs" "..\..\..\..\MessagePack\SequencePool.cs"
+mklink ".\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\SequenceReader.cs" "..\..\..\..\MessagePack\SequenceReader.cs"
+mklink ".\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\SequenceReaderExtensions.cs" "..\..\..\..\MessagePack\SequenceReaderExtensions.cs"
+mklink ".\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\StreamPolyfillExtensions.cs" "..\..\..\..\MessagePack\StreamPolyfillExtensions.cs"
+mklink ".\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\ExtensionHeader.cs" "..\..\..\..\MessagePack\ExtensionHeader.cs"
+mklink ".\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\ExtensionResult.cs" "..\..\..\..\MessagePack\ExtensionResult.cs"
+mklink ".\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Utilities.cs" "..\..\..\..\MessagePack\Utilities.cs"
 mklink ".\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Nil.cs" "..\..\..\..\MessagePack\Nil.cs"
 mklink ".\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\StringEncoding.cs" "..\..\..\..\MessagePack\StringEncoding.cs"
 mklink /D ".\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Formatters" "..\..\..\..\MessagePack\Formatters"
@@ -31,4 +42,5 @@ mklink /D ".\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\LZ4\Codec" "
 mklink ".\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\LZ4\LZ4MessagePackSerializer.cs" "..\..\..\..\..\MessagePack\LZ4\LZ4MessagePackSerializer.cs"
 mklink ".\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\LZ4\LZ4MessagePackSerializer.JSON.cs" "..\..\..\..\..\MessagePack\LZ4\LZ4MessagePackSerializer.JSON.cs"
 mklink ".\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\LZ4\LZ4MessagePackSerializer+NonGeneric.cs" "..\..\..\..\..\MessagePack\LZ4\LZ4MessagePackSerializer+NonGeneric.cs"
+
 popd
diff --git a/src/MessagePack.UnityClient/.gitignore b/src/MessagePack.UnityClient/.gitignore
new file mode 100644
index 00000000..7de09ed8
--- /dev/null
+++ b/src/MessagePack.UnityClient/.gitignore
@@ -0,0 +1,7 @@
+# VS project and solution files are built and rebuilt by Unity
+*.csproj
+*.sln
+
+# Unity wants to see binaries inside its Assets directory.
+# We link them in with make_unity_symlink.bat, but we don't want to actually commit them into git.
+Assets/*.dll
diff --git a/src/MessagePack.UnityClient/Assembly-CSharp.csproj b/src/MessagePack.UnityClient/Assembly-CSharp.csproj
deleted file mode 100644
index 36be934f..00000000
--- a/src/MessagePack.UnityClient/Assembly-CSharp.csproj
+++ /dev/null
@@ -1,428 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <LangVersion>4</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.20506</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <RootNamespace>
-    </RootNamespace>
-    <ProjectGuid>{57B7A568-FAC6-6E41-92BE-735D1F0B6CFA}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <AssemblyName>Assembly-CSharp</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <BaseDirectory>.</BaseDirectory>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>Temp\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_3_9;UNITY_2018_3;UNITY_2018;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_TEXTURE_STREAMING;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_VIDEO;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_EVENT_QUEUE;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_2_0;NET_LEGACY;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_VSTU</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn>0169</NoWarn>
-    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>Temp\bin\Release\</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn>0169</NoWarn>
-    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup>
-    <NoConfig>true</NoConfig>
-    <NoStdLib>true</NoStdLib>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-    <ImplicitlyExpandNETStandardFacades>false</ImplicitlyExpandNETStandardFacades>
-    <ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <UnityProjectGenerator>Unity/VSTU</UnityProjectGenerator>
-    <UnityProjectType>Game:1</UnityProjectType>
-    <UnityBuildTarget>StandaloneWindows64:19</UnityBuildTarget>
-    <UnityVersion>2018.3.9f1</UnityVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="UnityEngine">
-      <HintPath>C:\Program Files\Unity\Editor\Data\Managed/UnityEngine/UnityEngine.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEditor">
-      <HintPath>C:\Program Files\Unity\Editor\Data\Managed/UnityEditor.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Assets\RuntimeUnitTestToolkit\Assert.cs" />
-    <Compile Include="Assets\RuntimeUnitTestToolkit\ChainingAssertion.Unity.cs" />
-    <Compile Include="Assets\RuntimeUnitTestToolkit\UnitTestRunner.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Attributes.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\FloatBits.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Formatters\CollectionFormatter.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Formatters\DateTimeFormatters.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Formatters\DictionaryFormatter.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Formatters\DynamicObjectTypeFallbackFormatter.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Formatters\EnumAsStringFormatter.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Formatters\ForceSizePrimitiveFormatter.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Formatters\IgnoreFormatter.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Formatters\IMessagePackFormatter.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Formatters\MultiDimentionalArrayFormatter.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Formatters\NullableFormatter.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Formatters\PrimitiveFormatter.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Formatters\PrimitiveObjectFormatter.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Formatters\StandardClassLibraryFormatter.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Formatters\TupleFormatter.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Formatters\TypelessFormatter.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Formatters\UnsafeBinaryFormatters.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Formatters\ValueTupleFormatter.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\IFormatterResolver.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\IMessagePackSerializationCallbackReceiver.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Internal\AsymmetricKeyHashTable.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Internal\AutomataDictionary.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Internal\ByteArrayComparer.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Internal\ByteArrayStringHashTable.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Internal\CodeGenHelpers.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Internal\DateTimeConstants.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Internal\DynamicAssembly.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Internal\ExpressionUtility.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Internal\FarmHash.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Internal\GuidBits.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Internal\ILGeneratorExtensions.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Internal\ReflectionExtensions.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Internal\ThreadsafeTypeKeyHashTable.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Internal\TinyJsonReader.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Internal\UnsafeMemory.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Internal\UnsafeMemory.Low.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\LZ4\Codec\LZ4Codec.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\LZ4\Codec\LZ4Codec.Helper.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\LZ4\Codec\LZ4Codec.Safe.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\LZ4\Codec\LZ4Codec.Safe32.Dirty.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\LZ4\Codec\LZ4Codec.Safe64.Dirty.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\LZ4\Codec\LZ4Codec.Unsafe.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\LZ4\Codec\LZ4Codec.Unsafe32.Dirty.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\LZ4\Codec\LZ4Codec.Unsafe64.Dirty.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\LZ4\LZ4MessagePackSerializer.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\LZ4\LZ4MessagePackSerializer.JSON.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\LZ4\LZ4MessagePackSerializer+NonGeneric.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\MessagePackCode.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\MessagePackSerializer.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\MessagePackSerializer.Json.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\MessagePackSerializer+NonGeneric.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Nil.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Resolvers\AttributeFormatterResolver.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Resolvers\BuiltinResolver.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Resolvers\CachingFormatterResolver.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Resolvers\CompositeResolver.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Resolvers\ContractlessReflectionObjectResolver.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Resolvers\DynamicEnumAsStringResolver.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Resolvers\DynamicEnumResolver.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Resolvers\DynamicGenericResolver.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Resolvers\DynamicObjectResolver.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Resolvers\DynamicUnionResolver.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Resolvers\NativeDateTimeResolver.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Resolvers\PrimitiveObjectResolver.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Resolvers\StandardResolver.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Resolvers\TypelessContractlessStandardResolver.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Resolvers\TypelessObjectResolver.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Resolvers\UnsafeBinaryResolver.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\StringEncoding.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Unity\Formatters.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\Unity\UnityResolver.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\UnsafeExtensions\UnityBlitResolver.cs" />
-    <Compile Include="Assets\Scripts\MessagePack\UnsafeExtensions\UnsafeBlitFormatter.cs" />
-    <Compile Include="Assets\Scripts\Tests\_Loader.cs" />
-    <Compile Include="Assets\Scripts\Tests\Class1.cs" />
-    <Compile Include="Assets\Scripts\Tests\CollectionFormatterTest.cs" />
-    <Compile Include="Assets\Scripts\Tests\ContractlessTest.cs" />
-    <Compile Include="Assets\Scripts\Tests\FormatterTest.cs" />
-    <Compile Include="Assets\Scripts\Tests\LZ4Test.cs" />
-    <Compile Include="Assets\Scripts\Tests\MsgPack\PersonSerializer.cs" />
-    <Compile Include="Assets\Scripts\Tests\MsgPack\SexSerializer.cs" />
-    <Compile Include="Assets\Scripts\Tests\MsgPack\System_Nullable_1_Sex_Serializer.cs" />
-    <Compile Include="Assets\Scripts\Tests\MsgPack\System_Nullable_1_System_Int32_Serializer.cs" />
-    <Compile Include="Assets\Scripts\Tests\MultiDimentionalArrayTest.cs" />
-    <Compile Include="Assets\Scripts\Tests\ObjectResolverTest.cs" />
-    <Compile Include="Assets\Scripts\Tests\PerformanceTest.cs" />
-    <Compile Include="Assets\Scripts\Tests\SimpleTest.cs" />
-    <Compile Include="Assets\Scripts\Tests\UnionTest.cs" />
-    <Compile Include="Assets\Scripts\Tests\UnityBlitTest.cs" />
-    <Reference Include="Unity.PackageManagerUI.Editor">
-      <HintPath>D:/git/MessagePack-CSharp/src/MessagePack.UnityClient/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll</HintPath>
-    </Reference>
-    <Reference Include="Unity.TextMeshPro.Editor">
-      <HintPath>D:/git/MessagePack-CSharp/src/MessagePack.UnityClient/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
-    </Reference>
-    <Reference Include="Unity.CollabProxy.Editor">
-      <HintPath>D:/git/MessagePack-CSharp/src/MessagePack.UnityClient/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll</HintPath>
-    </Reference>
-    <Reference Include="Unity.TextMeshPro">
-      <HintPath>D:/git/MessagePack-CSharp/src/MessagePack.UnityClient/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
-    </Reference>
-    <Reference Include="Unity.Analytics.DataPrivacy">
-      <HintPath>D:/git/MessagePack-CSharp/src/MessagePack.UnityClient/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.AIModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.ARModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ARModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.AccessibilityModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.AccessibilityModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.AnimationModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.AnimationModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.AssetBundleModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.AssetBundleModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.AudioModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.AudioModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.BaselibModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.BaselibModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.ClothModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ClothModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.ClusterInputModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterInputModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.ClusterRendererModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.CoreModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.CrashReportingModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.CrashReportingModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.DirectorModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.DirectorModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.FileSystemHttpModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.FileSystemHttpModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.GameCenterModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.GameCenterModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.GridModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.GridModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.HotReloadModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.HotReloadModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.IMGUIModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.IMGUIModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.ImageConversionModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ImageConversionModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.InputModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.InputModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.JSONSerializeModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.JSONSerializeModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.LocalizationModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.LocalizationModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.ParticleSystemModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ParticleSystemModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.PerformanceReportingModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.PerformanceReportingModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.PhysicsModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.PhysicsModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.Physics2DModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.Physics2DModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.ProfilerModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ProfilerModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.ScreenCaptureModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ScreenCaptureModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.SharedInternalsModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.SharedInternalsModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.SpriteMaskModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteMaskModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.SpriteShapeModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteShapeModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.StreamingModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.StreamingModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.StyleSheetsModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.StyleSheetsModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.SubstanceModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.SubstanceModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.TLSModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.TLSModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.TerrainModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.TerrainPhysicsModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainPhysicsModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.TextCoreModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.TextCoreModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.TextRenderingModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.TextRenderingModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.TilemapModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.TilemapModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.TimelineModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.TimelineModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.UIModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UIModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.UIElementsModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.UNETModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UNETModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.UmbraModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UmbraModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.UnityAnalyticsModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UnityAnalyticsModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.UnityConnectModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UnityConnectModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.UnityTestProtocolModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UnityTestProtocolModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.UnityWebRequestModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.UnityWebRequestAssetBundleModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAssetBundleModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.UnityWebRequestAudioModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAudioModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.UnityWebRequestTextureModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestTextureModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.UnityWebRequestWWWModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestWWWModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.VFXModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.VFXModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.VRModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.VRModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.VehiclesModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.VehiclesModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.VideoModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.VideoModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.WindModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.WindModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.XRModule">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.XRModule.dll</HintPath>
-    </Reference>
-    <Reference Include="Unity.Locator">
-      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/Unity.Locator.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.UI">
-      <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.TestRunner">
-      <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/UnityEngine.TestRunner.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework">
-      <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.Timeline">
-      <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.Networking">
-      <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.GoogleAudioSpatializer">
-      <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityGoogleAudioSpatializer/RuntimeEditor/UnityEngine.GoogleAudioSpatializer.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.SpatialTracking">
-      <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnitySpatialTracking/RuntimeEditor/UnityEngine.SpatialTracking.dll</HintPath>
-    </Reference>
-    <Reference Include="MsgPack">
-      <HintPath>D:/git/MessagePack-CSharp/src/MessagePack.UnityClient/Assets/Scripts/Tests/MsgPack/MsgPack.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.Advertisements">
-      <HintPath>D:/git/MessagePack-CSharp/src/MessagePack.UnityClient/Library/PackageCache/com.unity.ads@2.0.8/UnityEngine.Advertisements.dll</HintPath>
-    </Reference>
-    <Reference Include="Unity.Analytics.Editor">
-      <HintPath>D:/git/MessagePack-CSharp/src/MessagePack.UnityClient/Library/PackageCache/com.unity.analytics@3.2.2/Unity.Analytics.Editor.dll</HintPath>
-    </Reference>
-    <Reference Include="Unity.Analytics.StandardEvents">
-      <HintPath>D:/git/MessagePack-CSharp/src/MessagePack.UnityClient/Library/PackageCache/com.unity.analytics@3.2.2/Unity.Analytics.StandardEvents.dll</HintPath>
-    </Reference>
-    <Reference Include="Unity.Analytics.Tracker">
-      <HintPath>D:/git/MessagePack-CSharp/src/MessagePack.UnityClient/Library/PackageCache/com.unity.analytics@3.2.2/Unity.Analytics.Tracker.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.Purchasing">
-      <HintPath>D:/git/MessagePack-CSharp/src/MessagePack.UnityClient/Library/PackageCache/com.unity.purchasing@2.0.3/UnityEngine.Purchasing.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib">
-      <HintPath>C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/2.0-api/mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <HintPath>C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/2.0-api/System.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Core">
-      <HintPath>C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/2.0-api/System.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.Serialization">
-      <HintPath>C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/2.0-api/System.Runtime.Serialization.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml">
-      <HintPath>C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/2.0-api/System.Xml.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <HintPath>C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/2.0-api/System.Xml.Linq.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityScript">
-      <HintPath>C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/2.0-api/UnityScript.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityScript.Lang">
-      <HintPath>C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/2.0-api/UnityScript.Lang.dll</HintPath>
-    </Reference>
-    <Reference Include="Boo.Lang">
-      <HintPath>C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/2.0-api/Boo.Lang.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="GenerateTargetFrameworkMonikerAttribute" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
-\ No newline at end of file
diff --git a/src/MessagePack.UnityClient/Assets/RuntimeUnitTestToolkit/UnitTest.unity b/src/MessagePack.UnityClient/Assets/RuntimeUnitTestToolkit/UnitTest.unity
index d7b30e9e..367f592e 100644
--- 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/BufferWriter.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/BufferWriter.cs
new file mode 120000
index 00000000..f57f3602
--- /dev/null
+++ b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/BufferWriter.cs
@@ -0,0 +1 @@
+../../../../MessagePack/BufferWriter.cs
+\ No newline at end of file
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/ExtensionHeader.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/ExtensionHeader.cs
new file mode 120000
index 00000000..331f98bc
--- /dev/null
+++ b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/ExtensionHeader.cs
@@ -0,0 +1 @@
+../../../../MessagePack/ExtensionHeader.cs
+\ No newline at end of file
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/ExtensionResult.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/ExtensionResult.cs
new file mode 120000
index 00000000..8add9ba0
--- /dev/null
+++ b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/ExtensionResult.cs
@@ -0,0 +1 @@
+../../../../MessagePack/ExtensionResult.cs
+\ No newline at end of file
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/LZ4/LZ4MessagePackSerializer.NonGeneric.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/LZ4/LZ4MessagePackSerializer.NonGeneric.cs
deleted file mode 120000
index 3476a464..00000000
--- a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/LZ4/LZ4MessagePackSerializer.NonGeneric.cs
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../MessagePack/LZ4/LZ4MessagePackSerializer.NonGeneric.cs
-\ No newline at end of file
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackReader.Integers.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackReader.Integers.cs
new file mode 120000
index 00000000..2f074760
--- /dev/null
+++ b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackReader.Integers.cs
@@ -0,0 +1 @@
+../../../../MessagePack/MessagePackReader.Integers.cs
+\ No newline at end of file
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackReader.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackReader.cs
new file mode 120000
index 00000000..699e607d
--- /dev/null
+++ b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackReader.cs
@@ -0,0 +1 @@
+../../../../MessagePack/MessagePackReader.cs
+\ No newline at end of file
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackSerializer.NonGeneric.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackSerializer.NonGeneric.cs
deleted file mode 120000
index 3675790a..00000000
--- a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackSerializer.NonGeneric.cs
+++ /dev/null
@@ -1 +0,0 @@
-../../../../MessagePack/MessagePackSerializer.NonGeneric.cs
-\ No newline at end of file
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackWriter.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackWriter.cs
new file mode 120000
index 00000000..b49c2076
--- /dev/null
+++ b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackWriter.cs
@@ -0,0 +1 @@
+../../../../MessagePack/MessagePackWriter.cs
+\ No newline at end of file
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/SequencePool.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/SequencePool.cs
new file mode 120000
index 00000000..9f23f50d
--- /dev/null
+++ b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/SequencePool.cs
@@ -0,0 +1 @@
+../../../../MessagePack/SequencePool.cs
+\ No newline at end of file
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/SequenceReader.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/SequenceReader.cs
new file mode 120000
index 00000000..8d58401e
--- /dev/null
+++ b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/SequenceReader.cs
@@ -0,0 +1 @@
+../../../../MessagePack/SequenceReader.cs
+\ No newline at end of file
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/SequenceReaderExtensions.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/SequenceReaderExtensions.cs
new file mode 120000
index 00000000..f9937bc4
--- /dev/null
+++ b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/SequenceReaderExtensions.cs
@@ -0,0 +1 @@
+../../../../MessagePack/SequenceReaderExtensions.cs
+\ No newline at end of file
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/StreamPolyfillExtensions.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/StreamPolyfillExtensions.cs
new file mode 120000
index 00000000..635bb5f7
--- /dev/null
+++ b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/StreamPolyfillExtensions.cs
@@ -0,0 +1 @@
+../../../../MessagePack/StreamPolyfillExtensions.cs
+\ No newline at end of file
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Utilities.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Utilities.cs
new file mode 120000
index 00000000..4021562e
--- /dev/null
+++ b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Utilities.cs
@@ -0,0 +1 @@
+../../../../MessagePack/Utilities.cs
+\ No newline at end of file
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/Tests/CollectionFormatterTest.cs b/src/MessagePack.UnityClient/Assets/Scripts/Tests/CollectionFormatterTest.cs
index a40c0343..9ab41177 100644
--- a/src/MessagePack.UnityClient/Assets/Scripts/Tests/CollectionFormatterTest.cs
+++ b/src/MessagePack.UnityClient/Assets/Scripts/Tests/CollectionFormatterTest.cs
@@ -1,15 +1,17 @@
-using RuntimeUnitTestToolkit;
-using SharedData;
-using System;
+using System;
 using System.Collections.Generic;
+using RuntimeUnitTestToolkit;
+using SharedData;
 
 namespace MessagePack.UnityClient.Tests
 {
     public class CollectionFormatterTest
     {
-        T Convert<T>(T value)
+        private readonly MessagePackSerializer serializer = new MessagePackSerializer(MsgPackUnsafeDefaultResolver.Instance);
+
+        private T Convert<T>(T value)
         {
-            return MessagePackSerializer.Deserialize<T>(MessagePackSerializer.Serialize(value));
+            return this.serializer.Deserialize<T>(this.serializer.Serialize(value));
         }
 
         public void DictionaryTestAll()
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/Tests/ContractlessTest.cs b/src/MessagePack.UnityClient/Assets/Scripts/Tests/ContractlessTest.cs
index 8e72eacd..b1459432 100644
--- a/src/MessagePack.UnityClient/Assets/Scripts/Tests/ContractlessTest.cs
+++ b/src/MessagePack.UnityClient/Assets/Scripts/Tests/ContractlessTest.cs
@@ -7,20 +7,22 @@ namespace MessagePack.UnityClient.Tests
 {
     public class Contractless
     {
+        MessagePackSerializer serializer = new MessagePackSerializer();
+
         T Convert<T>(T value)
         {
-            return MessagePackSerializer.Deserialize<T>(MessagePackSerializer.Serialize(value));
+            return serializer.Deserialize<T>(serializer.Serialize(value));
         }
 
         public void Versioning()
         {
-            var v1 = MessagePack.MessagePackSerializer.Serialize(new V1 { ABCDEFG1 = 10, ABCDEFG3 = 99 }, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
-            var v2 = MessagePack.MessagePackSerializer.Serialize(new V2 { ABCDEFG1 = 350, ABCDEFG2 = 34, ABCDEFG3 = 500 }, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
+            var v1 = serializer.Serialize(new V1 { ABCDEFG1 = 10, ABCDEFG3 = 99 }, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
+            var v2 = serializer.Serialize(new V2 { ABCDEFG1 = 350, ABCDEFG2 = 34, ABCDEFG3 = 500 }, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
 
-            var v1_1 = MessagePack.MessagePackSerializer.Deserialize<V1>(v1, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
-            var v1_2 = MessagePack.MessagePackSerializer.Deserialize<V1>(v2, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
-            var v2_1 = MessagePack.MessagePackSerializer.Deserialize<V2>(v1, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
-            var v2_2 = MessagePack.MessagePackSerializer.Deserialize<V2>(v2, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
+            var v1_1 = serializer.Deserialize<V1>(v1, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
+            var v1_2 = serializer.Deserialize<V1>(v2, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
+            var v2_1 = serializer.Deserialize<V2>(v1, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
+            var v2_2 = serializer.Deserialize<V2>(v2, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
 
             v1_1.ABCDEFG1.Is(10); v1_1.ABCDEFG3.Is(99);
             v1_2.ABCDEFG1.Is(350); v1_2.ABCDEFG3.Is(500);
@@ -30,8 +32,8 @@ namespace MessagePack.UnityClient.Tests
 
         public void DuplicateAutomata()
         {
-            var bin = MessagePack.MessagePackSerializer.Serialize(new Dup { ABCDEFGH = 10, ABCDEFGHIJKL = 99 }, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
-            var v = MessagePackSerializer.Deserialize<Dup>(bin, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
+            var bin = serializer.Serialize(new Dup { ABCDEFGH = 10, ABCDEFGHIJKL = 99 }, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
+            var v = serializer.Deserialize<Dup>(bin, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
 
             v.ABCDEFGH.Is(10);
             v.ABCDEFGHIJKL.Is(99);
@@ -51,8 +53,8 @@ namespace MessagePack.UnityClient.Tests
                 MyP8 = 7373731,
                 MyP9 = 73573731,
             };
-            var bin = MessagePack.MessagePackSerializer.Serialize(o, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
-            var v = MessagePackSerializer.Deserialize<BinSearchSmall>(bin, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
+            var bin = serializer.Serialize(o, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
+            var v = serializer.Deserialize<BinSearchSmall>(bin, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
 
             v.MyP1.Is(o.MyP1);
             v.MyP2.Is(o.MyP2);
@@ -79,8 +81,8 @@ namespace MessagePack.UnityClient.Tests
                 MyProperty8 = 7373731,
                 MyProperty9 = 73573731,
             };
-            var bin = MessagePack.MessagePackSerializer.Serialize(o, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
-            var v = MessagePackSerializer.Deserialize<BinSearchWithBranch>(bin, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
+            var bin = serializer.Serialize(o, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
+            var v = serializer.Deserialize<BinSearchWithBranch>(bin, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
 
             v.MyProperty1.Is(o.MyProperty1);
             v.MyProperty2.Is(o.MyProperty2);
@@ -102,8 +104,8 @@ namespace MessagePack.UnityClient.Tests
                 MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty2MyProperty = 532525252,
                 OAFADFZEWFSDFSDFKSLJFWEFNWOZFUSEWWEFWEWFFFFFFFFFFFFFFZFEWBFOWUEGWHOUDGSOGUDSZNOFRWEUFWGOWHOGHWOG000000000000000000000000000000000000000HOGZ = 3352666,
             };
-            var bin = MessagePack.MessagePackSerializer.Serialize(o, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
-            var v = MessagePackSerializer.Deserialize<LongestString>(bin, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
+            var bin = serializer.Serialize(o, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
+            var v = serializer.Deserialize<LongestString>(bin, MessagePack.Resolvers.ContractlessStandardResolver.Instance);
 
             v.MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1.Is(o.MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1);
             v.MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty2.Is(o.MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty1MyProperty2);
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/Tests/FormatterTest.cs b/src/MessagePack.UnityClient/Assets/Scripts/Tests/FormatterTest.cs
index ec30e302..443eeb24 100644
--- a/src/MessagePack.UnityClient/Assets/Scripts/Tests/FormatterTest.cs
+++ b/src/MessagePack.UnityClient/Assets/Scripts/Tests/FormatterTest.cs
@@ -1,14 +1,16 @@
-using RuntimeUnitTestToolkit;
+using System;
+using RuntimeUnitTestToolkit;
 using SharedData;
-using System;
 
 namespace MessagePack.UnityClient.Tests
 {
     public class FormatterTest
     {
-        T Convert<T>(T value)
+        private readonly MessagePackSerializer serializer = new MessagePackSerializer(MsgPackUnsafeDefaultResolver.Instance);
+
+        private T Convert<T>(T value)
         {
-            return MessagePackSerializer.Deserialize<T>(MessagePackSerializer.Serialize(value));
+            return this.serializer.Deserialize<T>(this.serializer.Serialize(value));
         }
 
         public void PrimitiveFormatterTest()
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/Tests/LZ4Test.cs b/src/MessagePack.UnityClient/Assets/Scripts/Tests/LZ4Test.cs
index a9a8482e..04448e46 100644
--- a/src/MessagePack.UnityClient/Assets/Scripts/Tests/LZ4Test.cs
+++ b/src/MessagePack.UnityClient/Assets/Scripts/Tests/LZ4Test.cs
@@ -8,24 +8,26 @@ namespace MessagePack.UnityClient.Tests
 {
     public class LZ4Test
     {
+        private readonly MessagePackSerializer lz4Serializer = new LZ4MessagePackSerializer();
+
         public void TestSmall()
         {
-            MessagePackBinary.GetMessagePackType(LZ4MessagePackSerializer.Serialize(100), 0).Is(MessagePackType.Integer);
-            MessagePackBinary.GetMessagePackType(LZ4MessagePackSerializer.Serialize("test"), 0).Is(MessagePackType.String);
-            MessagePackBinary.GetMessagePackType(LZ4MessagePackSerializer.Serialize(false), 0).Is(MessagePackType.Boolean);
+            new MessagePackReader(lz4Serializer.Serialize(100)).NextMessagePackType.Is(MessagePackType.Integer);
+            new MessagePackReader(lz4Serializer.Serialize("test")).NextMessagePackType.Is(MessagePackType.String);
+            new MessagePackReader(lz4Serializer.Serialize(false)).NextMessagePackType.Is(MessagePackType.Boolean);
         }
 
         public void CompressionData()
         {
             var originalData = Enumerable.Range(1, 1000).Select(x => x).ToArray();
-            var lz4Data = LZ4MessagePackSerializer.Serialize(originalData);
+            var lz4Data = lz4Serializer.Serialize(originalData);
 
-            MessagePackBinary.GetMessagePackType(lz4Data, 0).Is(MessagePackType.Extension);
-            int r;
-            var header = MessagePackBinary.ReadExtensionFormatHeader(lz4Data, 0, out r);
+            var reader = new MessagePackReader(lz4Data);
+            reader.NextMessagePackType.Is(MessagePackType.Extension);
+            var header = reader.ReadExtensionFormatHeader();
             header.TypeCode.Is((sbyte)LZ4MessagePackSerializer.ExtensionTypeCode);
 
-            var decompress = LZ4MessagePackSerializer.Deserialize<int[]>(lz4Data);
+            var decompress = lz4Serializer.Deserialize<int[]>(lz4Data);
             decompress.IsCollection(originalData);
 
 
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/Tests/MultiDimentionalArrayTest.cs b/src/MessagePack.UnityClient/Assets/Scripts/Tests/MultiDimentionalArrayTest.cs
index 9c9346c5..74dbbc5d 100644
--- a/src/MessagePack.UnityClient/Assets/Scripts/Tests/MultiDimentionalArrayTest.cs
+++ b/src/MessagePack.UnityClient/Assets/Scripts/Tests/MultiDimentionalArrayTest.cs
@@ -50,36 +50,30 @@ namespace MessagePack.UnityClient.Tests
 
     public class ValueTupleFormatter<T1, T2> : IMessagePackFormatter<ValueTuple<T1, T2>>
     {
-        public int Serialize(ref byte[] bytes, int offset, ValueTuple<T1, T2> value, IFormatterResolver formatterResolver)
+        public void Serialize(ref MessagePackWriter writer, ValueTuple<T1, T2> value, IFormatterResolver formatterResolver)
         {
-            var startOffset = offset;
-            offset += MessagePackBinary.WriteArrayHeader(ref bytes, offset, 2);
+            writer.WriteArrayHeader(2);
 
-            offset += formatterResolver.GetFormatterWithVerify<T1>().Serialize(ref bytes, offset, value.Item1, formatterResolver);
-            offset += formatterResolver.GetFormatterWithVerify<T2>().Serialize(ref bytes, offset, value.Item2, formatterResolver);
+            formatterResolver.GetFormatterWithVerify<T1>().Serialize(ref writer, value.Item1, formatterResolver);
+            formatterResolver.GetFormatterWithVerify<T2>().Serialize(ref writer, value.Item2, formatterResolver);
 
-            return offset - startOffset;
+            
         }
 
-        public ValueTuple<T1, T2> Deserialize(byte[] bytes, int offset, IFormatterResolver formatterResolver, out int readSize)
+        public ValueTuple<T1, T2> Deserialize(ref MessagePackReader reader, IFormatterResolver formatterResolver)
         {
-            if (MessagePackBinary.IsNil(bytes, offset))
+            if (reader.IsNil)
             {
                 throw new InvalidOperationException("Data is Nil, ValueTuple can not be null.");
             }
             else
             {
-                var startOffset = offset;
-                var count = MessagePackBinary.ReadArrayHeader(bytes, offset, out readSize);
+                var count = reader.ReadArrayHeader();
                 if (count != 2) throw new InvalidOperationException("Invalid ValueTuple count");
-                offset += readSize;
 
-                var item1 = formatterResolver.GetFormatterWithVerify<T1>().Deserialize(bytes, offset, formatterResolver, out readSize);
-                offset += readSize;
-                var item2 = formatterResolver.GetFormatterWithVerify<T2>().Deserialize(bytes, offset, formatterResolver, out readSize);
-                offset += readSize;
+                var item1 = formatterResolver.GetFormatterWithVerify<T1>().Deserialize(ref reader, formatterResolver);
+                var item2 = formatterResolver.GetFormatterWithVerify<T2>().Deserialize(ref reader, formatterResolver);
 
-                readSize = offset - startOffset;
                 return new ValueTuple<T1, T2>(item1, item2);
             }
         }
@@ -88,39 +82,30 @@ namespace MessagePack.UnityClient.Tests
 
     public class ValueTupleFormatter<T1, T2, T3> : IMessagePackFormatter<ValueTuple<T1, T2, T3>>
     {
-        public int Serialize(ref byte[] bytes, int offset, ValueTuple<T1, T2, T3> value, IFormatterResolver formatterResolver)
+        public void Serialize(ref MessagePackWriter writer, ValueTuple<T1, T2, T3> value, IFormatterResolver formatterResolver)
         {
-            var startOffset = offset;
-            offset += MessagePackBinary.WriteArrayHeader(ref bytes, offset, 3);
+            writer.WriteArrayHeader(3);
 
-            offset += formatterResolver.GetFormatterWithVerify<T1>().Serialize(ref bytes, offset, value.Item1, formatterResolver);
-            offset += formatterResolver.GetFormatterWithVerify<T2>().Serialize(ref bytes, offset, value.Item2, formatterResolver);
-            offset += formatterResolver.GetFormatterWithVerify<T3>().Serialize(ref bytes, offset, value.Item3, formatterResolver);
-
-            return offset - startOffset;
+            formatterResolver.GetFormatterWithVerify<T1>().Serialize(ref writer, value.Item1, formatterResolver);
+            formatterResolver.GetFormatterWithVerify<T2>().Serialize(ref writer, value.Item2, formatterResolver);
+            formatterResolver.GetFormatterWithVerify<T3>().Serialize(ref writer, value.Item3, formatterResolver);
         }
 
-        public ValueTuple<T1, T2, T3> Deserialize(byte[] bytes, int offset, IFormatterResolver formatterResolver, out int readSize)
+        public ValueTuple<T1, T2, T3> Deserialize(ref MessagePackReader reader, IFormatterResolver formatterResolver)
         {
-            if (MessagePackBinary.IsNil(bytes, offset))
+            if (reader.IsNil)
             {
                 throw new InvalidOperationException("Data is Nil, ValueTuple can not be null.");
             }
             else
             {
-                var startOffset = offset;
-                var count = MessagePackBinary.ReadArrayHeader(bytes, offset, out readSize);
+                var count = reader.ReadArrayHeader();
                 if (count != 3) throw new InvalidOperationException("Invalid ValueTuple count");
-                offset += readSize;
 
-                var item1 = formatterResolver.GetFormatterWithVerify<T1>().Deserialize(bytes, offset, formatterResolver, out readSize);
-                offset += readSize;
-                var item2 = formatterResolver.GetFormatterWithVerify<T2>().Deserialize(bytes, offset, formatterResolver, out readSize);
-                offset += readSize;
-                var item3 = formatterResolver.GetFormatterWithVerify<T3>().Deserialize(bytes, offset, formatterResolver, out readSize);
-                offset += readSize;
+                var item1 = formatterResolver.GetFormatterWithVerify<T1>().Deserialize(ref reader, formatterResolver);
+                var item2 = formatterResolver.GetFormatterWithVerify<T2>().Deserialize(ref reader, formatterResolver);
+                var item3 = formatterResolver.GetFormatterWithVerify<T3>().Deserialize(ref reader, formatterResolver);
 
-                readSize = offset - startOffset;
                 return new ValueTuple<T1, T2, T3>(item1, item2, item3);
             }
         }
@@ -129,42 +114,34 @@ namespace MessagePack.UnityClient.Tests
 
     public class ValueTupleFormatter<T1, T2, T3, T4> : IMessagePackFormatter<ValueTuple<T1, T2, T3, T4>>
     {
-        public int Serialize(ref byte[] bytes, int offset, ValueTuple<T1, T2, T3, T4> value, IFormatterResolver formatterResolver)
+        public void Serialize(ref MessagePackWriter writer, ValueTuple<T1, T2, T3, T4> value, IFormatterResolver formatterResolver)
         {
-            var startOffset = offset;
-            offset += MessagePackBinary.WriteArrayHeader(ref bytes, offset, 4);
+            writer.WriteArrayHeader(4);
 
-            offset += formatterResolver.GetFormatterWithVerify<T1>().Serialize(ref bytes, offset, value.Item1, formatterResolver);
-            offset += formatterResolver.GetFormatterWithVerify<T2>().Serialize(ref bytes, offset, value.Item2, formatterResolver);
-            offset += formatterResolver.GetFormatterWithVerify<T3>().Serialize(ref bytes, offset, value.Item3, formatterResolver);
-            offset += formatterResolver.GetFormatterWithVerify<T4>().Serialize(ref bytes, offset, value.Item4, formatterResolver);
+            formatterResolver.GetFormatterWithVerify<T1>().Serialize(ref writer, value.Item1, formatterResolver);
+            formatterResolver.GetFormatterWithVerify<T2>().Serialize(ref writer, value.Item2, formatterResolver);
+            formatterResolver.GetFormatterWithVerify<T3>().Serialize(ref writer, value.Item3, formatterResolver);
+            formatterResolver.GetFormatterWithVerify<T4>().Serialize(ref writer, value.Item4, formatterResolver);
 
-            return offset - startOffset;
+            
         }
 
-        public ValueTuple<T1, T2, T3, T4> Deserialize(byte[] bytes, int offset, IFormatterResolver formatterResolver, out int readSize)
+        public ValueTuple<T1, T2, T3, T4> Deserialize(ref MessagePackReader reader, IFormatterResolver formatterResolver)
         {
-            if (MessagePackBinary.IsNil(bytes, offset))
+            if (reader.IsNil)
             {
                 throw new InvalidOperationException("Data is Nil, ValueTuple can not be null.");
             }
             else
             {
-                var startOffset = offset;
-                var count = MessagePackBinary.ReadArrayHeader(bytes, offset, out readSize);
+                var count = reader.ReadArrayHeader();
                 if (count != 4) throw new InvalidOperationException("Invalid ValueTuple count");
-                offset += readSize;
-
-                var item1 = formatterResolver.GetFormatterWithVerify<T1>().Deserialize(bytes, offset, formatterResolver, out readSize);
-                offset += readSize;
-                var item2 = formatterResolver.GetFormatterWithVerify<T2>().Deserialize(bytes, offset, formatterResolver, out readSize);
-                offset += readSize;
-                var item3 = formatterResolver.GetFormatterWithVerify<T3>().Deserialize(bytes, offset, formatterResolver, out readSize);
-                offset += readSize;
-                var item4 = formatterResolver.GetFormatterWithVerify<T4>().Deserialize(bytes, offset, formatterResolver, out readSize);
-                offset += readSize;
-
-                readSize = offset - startOffset;
+
+                var item1 = formatterResolver.GetFormatterWithVerify<T1>().Deserialize(ref reader, formatterResolver);
+                var item2 = formatterResolver.GetFormatterWithVerify<T2>().Deserialize(ref reader, formatterResolver);
+                var item3 = formatterResolver.GetFormatterWithVerify<T3>().Deserialize(ref reader, formatterResolver);
+                var item4 = formatterResolver.GetFormatterWithVerify<T4>().Deserialize(ref reader, formatterResolver);
+
                 return new ValueTuple<T1, T2, T3, T4>(item1, item2, item3, item4);
             }
         }
@@ -192,10 +169,12 @@ namespace MessagePack.UnityClient.Tests
 
     public class MultiDimentionalArrayTest
     {
+        MessagePackSerializer serializer = new MessagePackSerializer();
+
         T Convert<T>(T value)
         {
             var resolver = new IntTupleRegistered();
-            return MessagePackSerializer.Deserialize<T>(MessagePackSerializer.Serialize(value, resolver), resolver);
+            return serializer.Deserialize<T>(serializer.Serialize(value, resolver), resolver);
         }
 
         public void MDArrayTest()
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/Tests/ObjectResolverTest.cs b/src/MessagePack.UnityClient/Assets/Scripts/Tests/ObjectResolverTest.cs
index 42ac1c97..c1bf4c87 100644
--- a/src/MessagePack.UnityClient/Assets/Scripts/Tests/ObjectResolverTest.cs
+++ b/src/MessagePack.UnityClient/Assets/Scripts/Tests/ObjectResolverTest.cs
@@ -8,9 +8,11 @@ namespace MessagePack.UnityClient.Tests
 {
     public class ObjectResolverTest
     {
+        private readonly MessagePackSerializer serializer = new MessagePackSerializer();
+
         T Convert<T>(T value)
         {
-            return MessagePackSerializer.Deserialize<T>(MessagePackSerializer.Serialize(value));
+            return serializer.Deserialize<T>(serializer.Serialize(value));
         }
 
 
@@ -43,7 +45,7 @@ namespace MessagePack.UnityClient.Tests
                     BytesSpecial = new byte[] { 1, 4, 6 }
                 };
 
-                MessagePackSerializer.Serialize(o);
+                serializer.Serialize(o);
                 //var c = Convert(o);
 
                 //c.Prop1.Is(o.Prop1);
@@ -69,16 +71,16 @@ namespace MessagePack.UnityClient.Tests
         public void Null()
         {
             SimpleIntKeyData n = null;
-            var bytes = MessagePackSerializer.Serialize(n);
-            MessagePackBinary.IsNil(bytes, 0).IsTrue();
+            var bytes = serializer.Serialize(n);
+            new MessagePackReader(bytes).IsNil.IsTrue();
             bytes.Length.Is(1);
 
-            MessagePackSerializer.Deserialize<SimpleIntKeyData>(bytes).IsNull();
+            serializer.Deserialize<SimpleIntKeyData>(bytes).IsNull();
 
             // deserialize from nil
             Assert.Throws<InvalidOperationException>(() =>
             {
-                MessagePackSerializer.Deserialize<SimpleStructIntKeyData>(bytes);
+                serializer.Deserialize<SimpleStructIntKeyData>(bytes);
             });
         }
 
@@ -123,26 +125,26 @@ namespace MessagePack.UnityClient.Tests
                 MyProperty1 = 100,
             };
 
-            var v1Bytes = MessagePackSerializer.Serialize(v1);
-            var v2Bytes = MessagePackSerializer.Serialize(v2);
-            var v0Bytes = MessagePackSerializer.Serialize(v0);
+            var v1Bytes = serializer.Serialize(v1);
+            var v2Bytes = serializer.Serialize(v2);
+            var v0Bytes = serializer.Serialize(v0);
 
-            var a = MessagePackSerializer.Deserialize<Version1>(v1Bytes);
+            var a = serializer.Deserialize<Version1>(v1Bytes);
             a.MyProperty1.Is(100);
             a.MyProperty2.Is(200);
             a.MyProperty3.Is(300);
 
-            var b = MessagePackSerializer.Deserialize<Version2>(v2Bytes);
+            var b = serializer.Deserialize<Version2>(v2Bytes);
             b.MyProperty1.Is(100);
             b.MyProperty2.Is(200);
             b.MyProperty3.Is(300);
             b.MyProperty5.Is(500);
 
-            var c = MessagePackSerializer.Deserialize<Version0>(v0Bytes);
+            var c = serializer.Deserialize<Version0>(v0Bytes);
             c.MyProperty1.Is(100);
 
             // smaller than schema
-            var v2_ = MessagePackSerializer.Deserialize<Version2>(v1Bytes);
+            var v2_ = serializer.Deserialize<Version2>(v1Bytes);
             v2_.MyProperty1.Is(v1.MyProperty1);
             v2_.MyProperty2.Is(v1.MyProperty2);
             v2_.MyProperty3.Is(v1.MyProperty3);
@@ -150,7 +152,7 @@ namespace MessagePack.UnityClient.Tests
 
             // larger than schema
 
-            var v0_ = MessagePackSerializer.Deserialize<Version0>(v1Bytes);
+            var v0_ = serializer.Deserialize<Version0>(v1Bytes);
             v0_.MyProperty1.Is(v1.MyProperty1);
         }
 
@@ -188,12 +190,12 @@ namespace MessagePack.UnityClient.Tests
                 After = 1999
             };
 
-            var v1Bytes = MessagePackSerializer.Serialize(v1);
-            var v2Bytes = MessagePackSerializer.Serialize(v2);
-            var v0Bytes = MessagePackSerializer.Serialize(v0);
+            var v1Bytes = serializer.Serialize(v1);
+            var v2Bytes = serializer.Serialize(v2);
+            var v0Bytes = serializer.Serialize(v0);
 
             // smaller than schema
-            var v2_ = MessagePackSerializer.Deserialize<HolderV2>(v1Bytes);
+            var v2_ = serializer.Deserialize<HolderV2>(v1Bytes);
             v2_.MyProperty1.MyProperty1.Is(v1.MyProperty1.MyProperty1);
             v2_.MyProperty1.MyProperty2.Is(v1.MyProperty1.MyProperty2);
             v2_.MyProperty1.MyProperty3.Is(v1.MyProperty1.MyProperty3);
@@ -201,8 +203,8 @@ namespace MessagePack.UnityClient.Tests
             v2_.After.Is(9999);
 
             // larger than schema
-            var v1Json = MessagePackSerializer.ToJson(v1Bytes);
-            var v0_ = MessagePackSerializer.Deserialize<HolderV0>(v1Bytes);
+            var v1Json = serializer.ConvertToJson(v1Bytes);
+            var v0_ = serializer.Deserialize<HolderV0>(v1Bytes);
             v0_.MyProperty1.MyProperty1.Is(v1.MyProperty1.MyProperty1);
             v0_.After.Is(9999);
         }
@@ -213,27 +215,27 @@ namespace MessagePack.UnityClient.Tests
                 var before = false;
 
                 var c1 = new Callback2(0, () => before = true, () => { });
-                var d = MessagePackSerializer.Serialize(c1);
+                var d = serializer.Serialize(c1);
                 before.IsTrue();
                 Callback2.CalledAfter = false;
-                MessagePackSerializer.Deserialize<Callback2>(d);
+                serializer.Deserialize<Callback2>(d);
                 Callback2.CalledAfter.IsTrue();
             }
             {
                 var c1 = new Callback1_2(0);
-                var d = MessagePackSerializer.Serialize(c1);
+                var d = serializer.Serialize(c1);
                 c1.CalledBefore.IsTrue();
-                MessagePackSerializer.Deserialize<Callback1_2>(d).CalledAfter.IsTrue();
+                serializer.Deserialize<Callback1_2>(d).CalledAfter.IsTrue();
             }
             {
                 var before = false;
 
                 var c1 = new Callback2_2(0, () => before = true, () => { });
-                var d = MessagePackSerializer.Serialize(c1);
+                var d = serializer.Serialize(c1);
                 before.IsTrue();
 
                 Callback2.CalledAfter = false;
-                MessagePackSerializer.Deserialize<Callback2_2>(d);
+                serializer.Deserialize<Callback2_2>(d);
                 Callback2_2.CalledAfter.IsTrue();
             }
         }
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/Tests/PerformanceTest.cs b/src/MessagePack.UnityClient/Assets/Scripts/Tests/PerformanceTest.cs
index f5867e12..6bf7cf46 100644
--- a/src/MessagePack.UnityClient/Assets/Scripts/Tests/PerformanceTest.cs
+++ b/src/MessagePack.UnityClient/Assets/Scripts/Tests/PerformanceTest.cs
@@ -109,22 +109,17 @@ namespace MessagePack.UnityClient.Tests
     public class TempVector3Formatter : global::MessagePack.Formatters.IMessagePackFormatter<Vector3>
     {
 
-        public int Serialize(ref byte[] bytes, int offset, Vector3 value, global::MessagePack.IFormatterResolver formatterResolver)
+        public void Serialize(ref MessagePackWriter writer, Vector3 value, global::MessagePack.IFormatterResolver formatterResolver)
         {
-            var startOffset = offset;
-            offset += global::MessagePack.MessagePackBinary.WriteFixedArrayHeaderUnsafe(ref bytes, offset, 3);
-            offset += global::MessagePack.MessagePackBinary.WriteSingle(ref bytes, offset, value.x);
-            offset += global::MessagePack.MessagePackBinary.WriteSingle(ref bytes, offset, value.y);
-            offset += global::MessagePack.MessagePackBinary.WriteSingle(ref bytes, offset, value.z);
-
-            return offset - startOffset;
+            writer.WriteFixedArrayHeaderUnsafe(3);
+            writer.Write(value.x);
+            writer.Write(value.y);
+            writer.Write(value.z);
         }
 
-        public Vector3 Deserialize(byte[] bytes, int offset, global::MessagePack.IFormatterResolver formatterResolver, out int readSize)
+        public Vector3 Deserialize(ref MessagePackReader reader, global::MessagePack.IFormatterResolver formatterResolver)
         {
-            var startOffset = offset;
-            var length = global::MessagePack.MessagePackBinary.ReadArrayHeader(bytes, offset, out readSize);
-            offset += readSize;
+            var length = reader.ReadArrayHeader();
 
             var __MyProperty1__ = default(float);
             var __MyProperty2__ = default(float);
@@ -136,23 +131,20 @@ namespace MessagePack.UnityClient.Tests
                 switch (key)
                 {
                     case 0:
-                        __MyProperty1__ = global::MessagePack.MessagePackBinary.ReadSingle(bytes, offset, out readSize);
+                        __MyProperty1__ = reader.ReadSingle();
                         break;
                     case 1:
-                        __MyProperty2__ = global::MessagePack.MessagePackBinary.ReadSingle(bytes, offset, out readSize);
+                        __MyProperty2__ = reader.ReadSingle();
                         break;
                     case 2:
-                        __MyProperty3__ = global::MessagePack.MessagePackBinary.ReadSingle(bytes, offset, out readSize);
+                        __MyProperty3__ = reader.ReadSingle();
                         break;
                     default:
-                        readSize = global::MessagePack.MessagePackBinary.ReadNext(bytes, offset);
+                        reader.Skip();
                         break;
                 }
-                offset += readSize;
             }
 
-            readSize = offset - startOffset;
-
             return new Vector3(__MyProperty1__, __MyProperty2__, __MyProperty3__);
         }
     }
@@ -163,6 +155,9 @@ namespace MessagePack.UnityClient.Tests
     {
         const int Iteration = 500; // 500 iteration.
 
+        private readonly MessagePackSerializer serializer = new MessagePackSerializer(MsgPackUnsafeDefaultResolver.Instance);
+        private readonly MessagePackSerializer lz4Serializer = new LZ4MessagePackSerializer(MsgPackUnsafeDefaultResolver.Instance);
+
         Person p;
         Person[] l;
         PersonLike p2;
@@ -193,9 +188,6 @@ namespace MessagePack.UnityClient.Tests
         // Test Initialize:)
         public void _Init()
         {
-            // MessagePack Prepare
-            MessagePackSerializer.SetDefaultResolver(MsgPackUnsafeDefaultResolver.Instance);
-
             // MsgPack Prepare
             MsgPack.Serialization.MessagePackSerializer.PrepareType<Sex>();
             this.msgPackContext = new MsgPack.Serialization.SerializationContext();
@@ -220,11 +212,11 @@ namespace MessagePack.UnityClient.Tests
             this.l = Enumerable.Range(1000, 1000).Select(x => new Person { Age = x, FirstName = "Windows", LastName = "Server", Sex = Sex.Female }).ToArray();
             this.l2 = new PersonLikeVector { List = Enumerable.Range(1000, 1000).Select(x => new PersonLike { Age = x, FirstName = "Windows", LastName = "Server", Sex = Sex2.Female }).ToArray() };
 
-            msgPackCSharpFormatterSingleBytes = MessagePack.MessagePackSerializer.Serialize(p);
-            msgPackCSharpArrayBytes = MessagePack.MessagePackSerializer.Serialize(l);
+            msgPackCSharpFormatterSingleBytes = this.serializer.Serialize(p);
+            msgPackCSharpArrayBytes = this.serializer.Serialize(l);
 
-            msgPackCSharpLZ4FormatterSingleBytes = MessagePack.LZ4MessagePackSerializer.Serialize(p);
-            msgPackCSharpLZ4ArrayBytes = MessagePack.LZ4MessagePackSerializer.Serialize(l);
+            msgPackCSharpLZ4FormatterSingleBytes = this.lz4Serializer.Serialize(p);
+            msgPackCSharpLZ4ArrayBytes = this.lz4Serializer.Serialize(l);
 
             var serializer1 = this.msgPackContext.GetSerializer<Person>();
             msgpackSingleBytes = serializer1.PackSingleObject(p);
@@ -243,8 +235,8 @@ namespace MessagePack.UnityClient.Tests
             v3Array = Enumerable.Range(1, 100).Select(_ => new Vector3 { x = 12345.12345f, y = 3994.35226f, z = 325125.52426f }).ToArray();
             v3Wrapper = new Vector3ArrayWrapper { List = v3Array };
 
-            msgPackCSharpv3Bytes = MessagePack.MessagePackSerializer.Serialize(v3);
-            msgPackCSharpv3ArrayBytes = MessagePack.MessagePackSerializer.Serialize(v3Array);
+            msgPackCSharpv3Bytes = this.serializer.Serialize(v3);
+            msgPackCSharpv3ArrayBytes = this.serializer.Serialize(v3Array);
             var serializer3 = this.msgPackContext.GetSerializer<Vector3>();
             msgpackv3Bytes = serializer3.PackSingleObject(v3);
             var serializer4 = this.msgPackContext.GetSerializer<Vector3[]>();
@@ -264,7 +256,7 @@ namespace MessagePack.UnityClient.Tests
         {
             for (int i = 0; i < Iteration; i++)
             {
-                MessagePack.MessagePackSerializer.Serialize(p);
+                this.serializer.Serialize(p);
             }
         }
 
@@ -272,7 +264,7 @@ namespace MessagePack.UnityClient.Tests
         {
             for (int i = 0; i < Iteration; i++)
             {
-                MessagePack.MessagePackSerializer.Serialize(l);
+                this.serializer.Serialize(l);
             }
         }
 
@@ -280,7 +272,7 @@ namespace MessagePack.UnityClient.Tests
         {
             for (int i = 0; i < Iteration; i++)
             {
-                MessagePack.MessagePackSerializer.Deserialize<Person>(msgPackCSharpFormatterSingleBytes);
+                this.serializer.Deserialize<Person>(msgPackCSharpFormatterSingleBytes);
             }
         }
 
@@ -288,7 +280,7 @@ namespace MessagePack.UnityClient.Tests
         {
             for (int i = 0; i < Iteration; i++)
             {
-                MessagePack.MessagePackSerializer.Deserialize<Person[]>(msgPackCSharpArrayBytes);
+                this.serializer.Deserialize<Person[]>(msgPackCSharpArrayBytes);
             }
         }
 
@@ -298,7 +290,7 @@ namespace MessagePack.UnityClient.Tests
         {
             for (int i = 0; i < Iteration; i++)
             {
-                MessagePack.LZ4MessagePackSerializer.Serialize(p);
+                this.lz4Serializer.Serialize(p);
             }
         }
 
@@ -306,7 +298,7 @@ namespace MessagePack.UnityClient.Tests
         {
             for (int i = 0; i < Iteration; i++)
             {
-                MessagePack.LZ4MessagePackSerializer.Serialize(l);
+                this.lz4Serializer.Serialize(l);
             }
         }
 
@@ -314,7 +306,7 @@ namespace MessagePack.UnityClient.Tests
         {
             for (int i = 0; i < Iteration; i++)
             {
-                MessagePack.LZ4MessagePackSerializer.Deserialize<Person>(msgPackCSharpLZ4FormatterSingleBytes);
+                this.lz4Serializer.Deserialize<Person>(msgPackCSharpLZ4FormatterSingleBytes);
             }
         }
 
@@ -322,13 +314,10 @@ namespace MessagePack.UnityClient.Tests
         {
             for (int i = 0; i < Iteration; i++)
             {
-                MessagePack.LZ4MessagePackSerializer.Deserialize<Person[]>(msgPackCSharpLZ4ArrayBytes);
+                this.lz4Serializer.Deserialize<Person[]>(msgPackCSharpLZ4ArrayBytes);
             }
         }
 
-
-
-
         public void MsgPackSerializeSingle()
         {
             var serializer = this.msgPackContext.GetSerializer<Person>();
@@ -408,7 +397,7 @@ namespace MessagePack.UnityClient.Tests
         {
             for (int i = 0; i < Iteration; i++)
             {
-                MessagePack.MessagePackSerializer.Serialize(v3);
+                this.serializer.Serialize(v3);
             }
         }
 
@@ -416,7 +405,7 @@ namespace MessagePack.UnityClient.Tests
         {
             for (int i = 0; i < Iteration; i++)
             {
-                MessagePack.MessagePackSerializer.Serialize(v3Array);
+                this.serializer.Serialize(v3Array);
             }
         }
 
@@ -424,7 +413,7 @@ namespace MessagePack.UnityClient.Tests
         {
             for (int i = 0; i < Iteration; i++)
             {
-                MessagePack.MessagePackSerializer.Deserialize<Vector3>(msgPackCSharpv3Bytes);
+                this.serializer.Deserialize<Vector3>(msgPackCSharpv3Bytes);
             }
         }
 
@@ -432,7 +421,7 @@ namespace MessagePack.UnityClient.Tests
         {
             for (int i = 0; i < Iteration; i++)
             {
-                MessagePack.MessagePackSerializer.Deserialize<Vector3[]>(msgPackCSharpv3ArrayBytes);
+                this.serializer.Deserialize<Vector3[]>(msgPackCSharpv3ArrayBytes);
             }
         }
 
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/Tests/UnionTest.cs b/src/MessagePack.UnityClient/Assets/Scripts/Tests/UnionTest.cs
index 2a8574c1..a19bea66 100644
--- a/src/MessagePack.UnityClient/Assets/Scripts/Tests/UnionTest.cs
+++ b/src/MessagePack.UnityClient/Assets/Scripts/Tests/UnionTest.cs
@@ -6,54 +6,56 @@ namespace MessagePack.UnityClient.Tests
 {
     public class UnionTest
     {
+        private readonly MessagePackSerializer serializer = new MessagePackSerializer(MsgPackUnsafeDefaultResolver.Instance);
+
         public void Union()
         {
             {
                 var data = new MySubUnion1 { One = 23 };
                 var data2 = new MySubUnion1 { One = 23 };
 
-                var unionData1 = MessagePackSerializer.Serialize<IUnionChecker>(data);
-                var unionData2 = MessagePackSerializer.Serialize<IUnionChecker2>(data2);
+                var unionData1 = this.serializer.Serialize<IUnionChecker>(data);
+                var unionData2 = this.serializer.Serialize<IUnionChecker2>(data2);
 
-                var reData1 = MessagePackSerializer.Deserialize<IUnionChecker>(unionData1);
-                var reData2 = MessagePackSerializer.Deserialize<IUnionChecker>(unionData1);
+                var reData1 = this.serializer.Deserialize<IUnionChecker>(unionData1);
+                var reData2 = this.serializer.Deserialize<IUnionChecker>(unionData1);
 
                 reData1.IsInstanceOf<IUnionChecker>();
                 reData2.IsInstanceOf<IUnionChecker2>();
 
-                var null1 = MessagePackSerializer.Serialize<IUnionChecker>(null);
+                var null1 = this.serializer.Serialize<IUnionChecker>(null);
 
-                var null2 = MessagePackSerializer.Serialize<IUnionChecker2>(null);
+                var null2 = this.serializer.Serialize<IUnionChecker2>(null);
 
-                MessagePackSerializer.Deserialize<IUnionChecker>(null1).IsNull();
-                MessagePackSerializer.Deserialize<IUnionChecker2>(null1).IsNull();
+                this.serializer.Deserialize<IUnionChecker>(null1).IsNull();
+                this.serializer.Deserialize<IUnionChecker2>(null1).IsNull();
 
 
-                var hoge = MessagePackSerializer.Serialize<IIVersioningUnion>(new VersioningUnion { FV = 0 });
-                MessagePackSerializer.Deserialize<IUnionChecker>(hoge).IsNull();
+                var hoge = this.serializer.Serialize<IIVersioningUnion>(new VersioningUnion { FV = 0 });
+                this.serializer.Deserialize<IUnionChecker>(hoge).IsNull();
             }
             {
                 var data = new MySubUnion2 { Two = 23 };
                 var data2 = new MySubUnion2 { Two = 23 };
 
-                var unionData1 = MessagePackSerializer.Serialize<IUnionChecker>(data);
-                var unionData2 = MessagePackSerializer.Serialize<IUnionChecker2>(data2);
+                var unionData1 = this.serializer.Serialize<IUnionChecker>(data);
+                var unionData2 = this.serializer.Serialize<IUnionChecker2>(data2);
 
-                var reData1 = MessagePackSerializer.Deserialize<IUnionChecker>(unionData1);
-                var reData2 = MessagePackSerializer.Deserialize<IUnionChecker>(unionData1);
+                var reData1 = this.serializer.Deserialize<IUnionChecker>(unionData1);
+                var reData2 = this.serializer.Deserialize<IUnionChecker>(unionData1);
 
                 reData1.IsInstanceOf<IUnionChecker>();
                 reData2.IsInstanceOf<IUnionChecker2>();
 
-                var null1 = MessagePackSerializer.Serialize<IUnionChecker>(null);
-                var null2 = MessagePackSerializer.Serialize<IUnionChecker2>(null);
+                var null1 = this.serializer.Serialize<IUnionChecker>(null);
+                var null2 = this.serializer.Serialize<IUnionChecker2>(null);
 
-                MessagePackSerializer.Deserialize<IUnionChecker>(null1).IsNull();
-                MessagePackSerializer.Deserialize<IUnionChecker2>(null1).IsNull();
+                this.serializer.Deserialize<IUnionChecker>(null1).IsNull();
+                this.serializer.Deserialize<IUnionChecker2>(null1).IsNull();
 
 
-                var hoge = MessagePackSerializer.Serialize<IIVersioningUnion>(new VersioningUnion { FV = 0 });
-                MessagePackSerializer.Deserialize<IUnionChecker>(hoge).IsNull();
+                var hoge = this.serializer.Serialize<IIVersioningUnion>(new VersioningUnion { FV = 0 });
+                this.serializer.Deserialize<IUnionChecker>(hoge).IsNull();
             }
         }
     }
diff --git a/src/MessagePack.UnityClient/Assets/csc.rsp b/src/MessagePack.UnityClient/Assets/csc.rsp
deleted file mode 100644
index 46ef8438..00000000
--- a/src/MessagePack.UnityClient/Assets/csc.rsp
+++ /dev/null
@@ -1 +0,0 @@
--unsafe
-\ No newline at end of file
diff --git a/src/MessagePack.UnityClient/Assets/gmcs.rsp b/src/MessagePack.UnityClient/Assets/gmcs.rsp
deleted file mode 100644
index 46ef8438..00000000
--- a/src/MessagePack.UnityClient/Assets/gmcs.rsp
+++ /dev/null
@@ -1 +0,0 @@
--unsafe
-\ No newline at end of file
diff --git a/src/MessagePack.UnityClient/Assets/mcs.rsp b/src/MessagePack.UnityClient/Assets/mcs.rsp
deleted file mode 100644
index 46ef8438..00000000
--- a/src/MessagePack.UnityClient/Assets/mcs.rsp
+++ /dev/null
@@ -1 +0,0 @@
--unsafe
-\ No newline at end of file
diff --git a/src/MessagePack.UnityClient/Assets/smcs.rsp b/src/MessagePack.UnityClient/Assets/smcs.rsp
deleted file mode 100644
index 46ef8438..00000000
--- a/src/MessagePack.UnityClient/Assets/smcs.rsp
+++ /dev/null
@@ -1 +0,0 @@
--unsafe
-\ No newline at end of file
diff --git a/src/MessagePack.UnityClient/MessagePack.UnityClient.sln b/src/MessagePack.UnityClient/MessagePack.UnityClient.sln
deleted file mode 100644
index fcd35ef0..00000000
--- a/src/MessagePack.UnityClient/MessagePack.UnityClient.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{57B7A568-FAC6-6E41-92BE-735D1F0B6CFA}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{57B7A568-FAC6-6E41-92BE-735D1F0B6CFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{57B7A568-FAC6-6E41-92BE-735D1F0B6CFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{57B7A568-FAC6-6E41-92BE-735D1F0B6CFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{57B7A568-FAC6-6E41-92BE-735D1F0B6CFA}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/src/MessagePack.UnityClient/ProjectSettings/AudioManager.asset b/src/MessagePack.UnityClient/ProjectSettings/AudioManager.asset
index 3ed61ed1..4f31e744 100644
--- a/src/MessagePack.UnityClient/ProjectSettings/AudioManager.asset
+++ b/src/MessagePack.UnityClient/ProjectSettings/AudioManager.asset
diff --git a/src/MessagePack.UnityClient/ProjectSettings/ClusterInputManager.asset b/src/MessagePack.UnityClient/ProjectSettings/ClusterInputManager.asset
index 9dc1232f..e7886b26 100644
--- a/src/MessagePack.UnityClient/ProjectSettings/ClusterInputManager.asset
+++ b/src/MessagePack.UnityClient/ProjectSettings/ClusterInputManager.asset
diff --git a/src/MessagePack.UnityClient/ProjectSettings/DynamicsManager.asset b/src/MessagePack.UnityClient/ProjectSettings/DynamicsManager.asset
index ba583ee4..b3c263d3 100644
--- a/src/MessagePack.UnityClient/ProjectSettings/DynamicsManager.asset
+++ b/src/MessagePack.UnityClient/ProjectSettings/DynamicsManager.asset
diff --git a/src/MessagePack.UnityClient/ProjectSettings/EditorBuildSettings.asset b/src/MessagePack.UnityClient/ProjectSettings/EditorBuildSettings.asset
index 24f8f25a..0147887e 100644
--- a/src/MessagePack.UnityClient/ProjectSettings/EditorBuildSettings.asset
+++ b/src/MessagePack.UnityClient/ProjectSettings/EditorBuildSettings.asset
diff --git a/src/MessagePack.UnityClient/ProjectSettings/EditorSettings.asset b/src/MessagePack.UnityClient/ProjectSettings/EditorSettings.asset
index 4e95322a..29dea529 100644
--- a/src/MessagePack.UnityClient/ProjectSettings/EditorSettings.asset
+++ b/src/MessagePack.UnityClient/ProjectSettings/EditorSettings.asset
diff --git a/src/MessagePack.UnityClient/ProjectSettings/GraphicsSettings.asset b/src/MessagePack.UnityClient/ProjectSettings/GraphicsSettings.asset
index 83e98c30..cd1c3d65 100644
--- a/src/MessagePack.UnityClient/ProjectSettings/GraphicsSettings.asset
+++ b/src/MessagePack.UnityClient/ProjectSettings/GraphicsSettings.asset
diff --git a/src/MessagePack.UnityClient/ProjectSettings/InputManager.asset b/src/MessagePack.UnityClient/ProjectSettings/InputManager.asset
index 39373766..17c8f538 100644
--- a/src/MessagePack.UnityClient/ProjectSettings/InputManager.asset
+++ b/src/MessagePack.UnityClient/ProjectSettings/InputManager.asset
diff --git a/src/MessagePack.UnityClient/ProjectSettings/NavMeshAreas.asset b/src/MessagePack.UnityClient/ProjectSettings/NavMeshAreas.asset
index 8bb0dbbf..3b0b7c3d 100644
--- a/src/MessagePack.UnityClient/ProjectSettings/NavMeshAreas.asset
+++ b/src/MessagePack.UnityClient/ProjectSettings/NavMeshAreas.asset
diff --git a/src/MessagePack.UnityClient/ProjectSettings/NetworkManager.asset b/src/MessagePack.UnityClient/ProjectSettings/NetworkManager.asset
index 25aecf9b..5dc6a831 100644
--- a/src/MessagePack.UnityClient/ProjectSettings/NetworkManager.asset
+++ b/src/MessagePack.UnityClient/ProjectSettings/NetworkManager.asset
diff --git a/src/MessagePack.UnityClient/ProjectSettings/Physics2DSettings.asset b/src/MessagePack.UnityClient/ProjectSettings/Physics2DSettings.asset
index a5662057..57760e2e 100644
--- a/src/MessagePack.UnityClient/ProjectSettings/Physics2DSettings.asset
+++ b/src/MessagePack.UnityClient/ProjectSettings/Physics2DSettings.asset
diff --git a/src/MessagePack.UnityClient/ProjectSettings/PresetManager.asset b/src/MessagePack.UnityClient/ProjectSettings/PresetManager.asset
index e58f57ce..820e662d 100644
--- a/src/MessagePack.UnityClient/ProjectSettings/PresetManager.asset
+++ b/src/MessagePack.UnityClient/ProjectSettings/PresetManager.asset
diff --git a/src/MessagePack.UnityClient/ProjectSettings/ProjectSettings.asset b/src/MessagePack.UnityClient/ProjectSettings/ProjectSettings.asset
index b055d76d..027d099f 100644
--- a/src/MessagePack.UnityClient/ProjectSettings/ProjectSettings.asset
+++ b/src/MessagePack.UnityClient/ProjectSettings/ProjectSettings.asset
diff --git a/src/MessagePack.UnityClient/ProjectSettings/QualitySettings.asset b/src/MessagePack.UnityClient/ProjectSettings/QualitySettings.asset
index b68e7d91..0621bef1 100644
--- a/src/MessagePack.UnityClient/ProjectSettings/QualitySettings.asset
+++ b/src/MessagePack.UnityClient/ProjectSettings/QualitySettings.asset
diff --git a/src/MessagePack.UnityClient/ProjectSettings/TagManager.asset b/src/MessagePack.UnityClient/ProjectSettings/TagManager.asset
index 37f4364f..17cb8036 100644
--- a/src/MessagePack.UnityClient/ProjectSettings/TagManager.asset
+++ b/src/MessagePack.UnityClient/ProjectSettings/TagManager.asset
diff --git a/src/MessagePack.UnityClient/ProjectSettings/TimeManager.asset b/src/MessagePack.UnityClient/ProjectSettings/TimeManager.asset
index 4816400d..06bcc6d2 100644
--- a/src/MessagePack.UnityClient/ProjectSettings/TimeManager.asset
+++ b/src/MessagePack.UnityClient/ProjectSettings/TimeManager.asset
diff --git a/src/MessagePack.UnityClient/ProjectSettings/UnityConnectSettings.asset b/src/MessagePack.UnityClient/ProjectSettings/UnityConnectSettings.asset
index 7b5665a0..b169ebd2 100644
--- a/src/MessagePack.UnityClient/ProjectSettings/UnityConnectSettings.asset
+++ b/src/MessagePack.UnityClient/ProjectSettings/UnityConnectSettings.asset
diff --git a/src/MessagePack.UnityClient/ProjectSettings/VFXManager.asset b/src/MessagePack.UnityClient/ProjectSettings/VFXManager.asset
index 066e7908..6e0eaca4 100644
--- a/src/MessagePack.UnityClient/ProjectSettings/VFXManager.asset
+++ b/src/MessagePack.UnityClient/ProjectSettings/VFXManager.asset
diff --git a/src/MessagePack.UnityClient/link_assets.bat b/src/MessagePack.UnityClient/link_assets.bat
new file mode 100644
index 00000000..263852f2
--- /dev/null
+++ b/src/MessagePack.UnityClient/link_assets.bat
@@ -0,0 +1,20 @@
+:: Link in the binaries we build or restore, that Unity expects inside its Assets directory.
+@SETLOCAL
+@if "%CONFIG%"=="" SET CONFIG=Release
+@IF NOT EXIST "%~dp0..\..\bin\MessagePack\%CONFIG%\net47" (
+    dotnet build src\MessagePack -c release -f net47
+    IF ERRORLEVEL 1 EXIT /B %ERRORLEVEL%
+)
+
+@pushd %~dp0
+
+mklink ".\Assets\Microsoft.VisualStudio.Validation.dll" "..\..\..\bin\MessagePack\%CONFIG%\net47\Microsoft.VisualStudio.Validation.dll"
+mklink ".\Assets\Microsoft.VisualStudio.Threading.dll" "..\..\..\bin\MessagePack\%CONFIG%\net47\Microsoft.VisualStudio.Threading.dll"
+mklink ".\Assets\Nerdbank.Streams.dll" "..\..\..\bin\MessagePack\%CONFIG%\net47\Nerdbank.Streams.dll"
+mklink ".\Assets\System.IO.Pipelines.dll" "..\..\..\bin\MessagePack\%CONFIG%\net47\System.IO.Pipelines.dll"
+mklink ".\Assets\System.Buffers.dll" "..\..\..\bin\MessagePack\%CONFIG%\net47\System.Buffers.dll"
+mklink ".\Assets\System.Memory.dll" "..\..\..\bin\MessagePack\%CONFIG%\net47\System.Memory.dll"
+mklink ".\Assets\System.Runtime.CompilerServices.Unsafe.dll" "..\..\..\bin\MessagePack\%CONFIG%\net47\System.Runtime.CompilerServices.Unsafe.dll"
+mklink ".\Assets\System.Threading.Tasks.Extensions.dll" "..\..\..\bin\MessagePack\%CONFIG%\net47\System.Threading.Tasks.Extensions.dll"
+
+@popd
diff --git a/src/MessagePack.UnityShims/Formatters.cs b/src/MessagePack.UnityShims/Formatters.cs
index e1d3ff8c..e500c14c 100644
--- a/src/MessagePack.UnityShims/Formatters.cs
+++ b/src/MessagePack.UnityShims/Formatters.cs
@@ -856,13 +856,13 @@ namespace MessagePack.Unity
 #if UNITY_2017_2_OR_NEWER
     public sealed class Vector2IntFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::UnityEngine.Vector2Int>
     {
-        public void Serialize(ref MessagePackWriter writerglobal::UnityEngine.Vector2Int value, global::MessagePack.IFormatterResolver formatterResolver)
+        public void Serialize(ref MessagePackWriter writer, global::UnityEngine.Vector2Int value, global::MessagePack.IFormatterResolver formatterResolver)
         {
             writer.WriteFixedArrayHeaderUnsafe(2);
             writer.WriteInt32(value.x);
             writer.WriteInt32(value.y);
         }
-        public global::UnityEngine.Vector2Int Deserialize(ref MessagePackReader readerglobal::MessagePack.IFormatterResolver formatterResolver)
+        public global::UnityEngine.Vector2Int Deserialize(ref MessagePackReader reader, global::MessagePack.IFormatterResolver formatterResolver)
         {
             if (reader.IsNil)
             {
@@ -897,14 +897,14 @@ namespace MessagePack.Unity
 
     public sealed class Vector3IntFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::UnityEngine.Vector3Int>
     {
-        public void Serialize(ref BufferWriterwriterglobal::UnityEngine.Vector3Int value, global::MessagePack.IFormatterResolver formatterResolver)
+        public void Serialize(ref MessagePackWriter writer, global::UnityEngine.Vector3Int value, global::MessagePack.IFormatterResolver formatterResolver)
         {
             writer.WriteFixedArrayHeaderUnsafe(3);
             writer.WriteInt32(value.x);
             writer.WriteInt32(value.y);
             writer.WriteInt32(value.z);
         }
-        public global::UnityEngine.Vector3Int Deserialize(ref MessagePackReader readerglobal::MessagePack.IFormatterResolver formatterResolver)
+        public global::UnityEngine.Vector3Int Deserialize(ref MessagePackReader reader, global::MessagePack.IFormatterResolver formatterResolver)
         {
             if (reader.IsNil)
             {
@@ -944,13 +944,13 @@ namespace MessagePack.Unity
 
     public sealed class RangeIntFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::UnityEngine.RangeInt>
     {
-        public void Serialize(ref BufferWriterwriterglobal::UnityEngine.RangeInt value, global::MessagePack.IFormatterResolver formatterResolver)
+        public void Serialize(ref MessagePackWriter writer, global::UnityEngine.RangeInt value, global::MessagePack.IFormatterResolver formatterResolver)
         {
             writer.WriteFixedArrayHeaderUnsafe(2);
             writer.WriteInt32(value.start);
             writer.WriteInt32(value.length);
         }
-        public global::UnityEngine.RangeInt Deserialize(ref MessagePackReader readerglobal::MessagePack.IFormatterResolver formatterResolver)
+        public global::UnityEngine.RangeInt Deserialize(ref MessagePackReader reader, global::MessagePack.IFormatterResolver formatterResolver)
         {
             if (reader.IsNil)
             {
@@ -985,7 +985,7 @@ namespace MessagePack.Unity
 
     public sealed class RectIntFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::UnityEngine.RectInt>
     {
-        public void Serialize(ref BufferWriterwriterglobal::UnityEngine.RectInt value, global::MessagePack.IFormatterResolver formatterResolver)
+        public void Serialize(ref MessagePackWriter writer, global::UnityEngine.RectInt value, global::MessagePack.IFormatterResolver formatterResolver)
         {
             writer.WriteFixedArrayHeaderUnsafe(4);
             writer.WriteInt32(value.x);
@@ -993,7 +993,7 @@ namespace MessagePack.Unity
             writer.WriteInt32(value.width);
             writer.WriteInt32(value.height);
         }
-        public global::UnityEngine.RectInt Deserialize(ref MessagePackReader readerglobal::MessagePack.IFormatterResolver formatterResolver)
+        public global::UnityEngine.RectInt Deserialize(ref MessagePackReader reader, global::MessagePack.IFormatterResolver formatterResolver)
         {
             if (reader.IsNil)
             {
@@ -1038,13 +1038,13 @@ namespace MessagePack.Unity
 
     public sealed class BoundsIntFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::UnityEngine.BoundsInt>
     {
-        public void Serialize(ref BufferWriterwriterglobal::UnityEngine.BoundsInt value, global::MessagePack.IFormatterResolver formatterResolver)
+        public void Serialize(ref MessagePackWriter writer, global::UnityEngine.BoundsInt value, global::MessagePack.IFormatterResolver formatterResolver)
         {
             writer.WriteFixedArrayHeaderUnsafe(2);
             formatterResolver.GetFormatterWithVerify<global::UnityEngine.Vector3Int>().Serialize(ref writer, value.position, formatterResolver);
             formatterResolver.GetFormatterWithVerify<global::UnityEngine.Vector3Int>().Serialize(ref writer, value.size, formatterResolver);
         }
-        public global::UnityEngine.BoundsInt Deserialize(ref MessagePackReader readerglobal::MessagePack.IFormatterResolver formatterResolver)
+        public global::UnityEngine.BoundsInt Deserialize(ref MessagePackReader reader, global::MessagePack.IFormatterResolver formatterResolver)
         {
             if (reader.IsNil)
             {
diff --git a/src/MessagePack/Internal/DynamicAssembly.cs b/src/MessagePack/Internal/DynamicAssembly.cs
index e452a0f5..181c918d 100644
--- a/src/MessagePack/Internal/DynamicAssembly.cs
+++ b/src/MessagePack/Internal/DynamicAssembly.cs
@@ -1,5 +1,4 @@
 #if !UNITY_WSA
-#if !NET_STANDARD_2_0
 
 using System;
 using System.Reflection;
@@ -76,4 +75,3 @@ namespace MessagePack.Internal
 }
 
 #endif
-#endif
-\ No newline at end of file
diff --git a/src/MessagePack/LZ4/Codec/LZ4Codec.Unsafe32.Dirty.cs b/src/MessagePack/LZ4/Codec/LZ4Codec.Unsafe32.Dirty.cs
index 30a39547..8136ad38 100644
--- a/src/MessagePack/LZ4/Codec/LZ4Codec.Unsafe32.Dirty.cs
+++ b/src/MessagePack/LZ4/Codec/LZ4Codec.Unsafe32.Dirty.cs
@@ -1,4 +1,4 @@
-#if ENABLE_UNSAFE_MSGPACK
+#if ENABLE_UNSAFE_MSGPACK || true
 
 #region LZ4 original
 
diff --git a/src/MessagePack/LZ4/Codec/LZ4Codec.Unsafe64.Dirty.cs b/src/MessagePack/LZ4/Codec/LZ4Codec.Unsafe64.Dirty.cs
index d765c531..9b383091 100644
--- a/src/MessagePack/LZ4/Codec/LZ4Codec.Unsafe64.Dirty.cs
+++ b/src/MessagePack/LZ4/Codec/LZ4Codec.Unsafe64.Dirty.cs
@@ -1,4 +1,4 @@
-#if ENABLE_UNSAFE_MSGPACK
+#if ENABLE_UNSAFE_MSGPACK || true
 
 #region LZ4 original
 
diff --git a/src/MessagePack/Resolvers/DynamicEnumResolver.cs b/src/MessagePack/Resolvers/DynamicEnumResolver.cs
index 9d106fcb..b034a7ff 100644
--- a/src/MessagePack/Resolvers/DynamicEnumResolver.cs
+++ b/src/MessagePack/Resolvers/DynamicEnumResolver.cs
@@ -1,5 +1,4 @@
 #if !UNITY_WSA
-#if !NET_STANDARD_2_0
 
 using System;
 using System.Buffers;
@@ -119,4 +118,3 @@ namespace MessagePack.Resolvers
 }
 
 #endif
-#endif
-\ No newline at end of file
diff --git a/src/MessagePack/Resolvers/DynamicObjectResolver.cs b/src/MessagePack/Resolvers/DynamicObjectResolver.cs
index 9e34a935..44ffe9cd 100644
--- a/src/MessagePack/Resolvers/DynamicObjectResolver.cs
+++ b/src/MessagePack/Resolvers/DynamicObjectResolver.cs
@@ -1,5 +1,4 @@
 #if !UNITY_WSA
-#if !NET_STANDARD_2_0
 
 using System;
 using System.Linq;
@@ -1783,4 +1782,3 @@ namespace MessagePack.Internal
 }
 
 #endif
-#endif
diff --git a/src/MessagePack/Resolvers/DynamicUnionResolver.cs b/src/MessagePack/Resolvers/DynamicUnionResolver.cs
index 68a4dd23..2e58df1c 100644
--- a/src/MessagePack/Resolvers/DynamicUnionResolver.cs
+++ b/src/MessagePack/Resolvers/DynamicUnionResolver.cs
@@ -12,7 +12,6 @@ using System.Buffers;
 namespace MessagePack.Resolvers
 {
 #if !UNITY_WSA
-#if !NET_STANDARD_2_0
 
     /// <summary>
     /// UnionResolver by dynamic code generation.
@@ -408,7 +407,6 @@ namespace MessagePack.Resolvers
     }
 
 #endif
-#endif
 }
 
 namespace MessagePack.Internal
author	Andrew Arnott <andrewarnott@gmail.com>	2019-03-24 08:12:34 +0300
committer	Andrew Arnott <andrewarnott@gmail.com>	2019-03-24 17:01:47 +0300
commit	6c1f9f096672b29014884ccab6e6a0b41c3e4cfc (patch)
tree	258c0691ff5b9080d540a75553cdffa6d8464343
parent	da3f852a2ac09eff7d6326ee59f204ec6d00aafb (diff)