for 1.3.2

neuecc · Nov 17, 2017 · 4fdd90f · 4fdd90f
1 parent 70e90f8
commit 4fdd90f
Show file tree

Hide file tree

Showing 19 changed files with 206 additions and 69 deletions.
diff --git a/docs/Utf8Json.AspNetCoreMvcFormatter.nuspec b/docs/Utf8Json.AspNetCoreMvcFormatter.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
     <metadata>
         <id>Utf8Json.AspNetCoreMvcFormatter</id>
-        <version>1.3.1</version>
+        <version>1.3.2</version>
         <title>Utf8Json AspNetCoreMvcFormatter</title>
         <authors>neuecc</authors>
         <owners>neuecc</owners>
@@ -13,11 +13,11 @@
         <tags>Json, Serialization, Formatter, Serializer, Unity, Xamarin, ASPNET</tags>
         <dependencies>
             <group targetFramework=".NETFramework4.7">
-                <dependency id="Utf8Json" version="1.3.1" exclude="Build,Analyzers" />
+                <dependency id="Utf8Json" version="1.3.2" exclude="Build,Analyzers" />
                 <dependency id="Microsoft.AspNetCore.Mvc.Abstractions" version="2.0.0" exclude="Build,Analyzers" />
             </group>
             <group targetFramework=".NETStandard2.0">
-                <dependency id="Utf8Json" version="1.3.1" exclude="Build,Analyzers" />
+                <dependency id="Utf8Json" version="1.3.2" exclude="Build,Analyzers" />
                 <dependency id="Microsoft.AspNetCore.Mvc.Abstractions" version="2.0.0" exclude="Build,Analyzers" />
             </group>
         </dependencies>

diff --git a/docs/Utf8Json.ImmutableCollection.nuspec b/docs/Utf8Json.ImmutableCollection.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
     <metadata>
         <id>Utf8Json.ImmutableCollection</id>
-        <version>1.3.1</version>
+        <version>1.3.2</version>
         <title>Utf8Json Extension Resolver for ImmutableCollection</title>
         <authors>neuecc</authors>
         <owners>neuecc</owners>
@@ -12,15 +12,15 @@
         <tags>Json, Serialization, Formatter, Serializer, Unity, Xamarin</tags>
         <dependencies>
             <group targetFramework=".NETFramework4.7">
-                <dependency id="Utf8Json" version="1.3.1" exclude="Build,Analyzers" />
+                <dependency id="Utf8Json" version="1.3.2" exclude="Build,Analyzers" />
                 <dependency id="System.Collections.Immutable" version="1.4.0" exclude="Build,Analyzers" />
             </group>
             <group targetFramework=".NETFramework4.5">
-                <dependency id="Utf8Json" version="1.3.1" exclude="Build,Analyzers" />
+                <dependency id="Utf8Json" version="1.3.2" exclude="Build,Analyzers" />
                 <dependency id="System.Collections.Immutable" version="1.4.0" exclude="Build,Analyzers" />
             </group>
             <group targetFramework=".NETStandard2.0">
-                <dependency id="Utf8Json" version="1.3.1" exclude="Build,Analyzers" />
+                <dependency id="Utf8Json" version="1.3.2" exclude="Build,Analyzers" />
                 <dependency id="System.Collections.Immutable" version="1.4.0" exclude="Build,Analyzers" />
             </group>
         </dependencies>

diff --git a/docs/Utf8Json.UnityShims.nuspec b/docs/Utf8Json.UnityShims.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
     <metadata>
         <id>Utf8Json.UnityShims</id>
-        <version>1.3.1</version>
+        <version>1.3.2</version>
         <title>Utf8Json UnityShims</title>
         <authors>neuecc</authors>
         <owners>neuecc</owners>
@@ -12,15 +12,15 @@
         <tags>Json, Serialization, Formatter, Serializer, Unity, Xamarin</tags>
         <dependencies>
             <group targetFramework=".NETFramework4.7">
-                <dependency id="Utf8Json" version="1.3.1" exclude="Build,Analyzers" />
+                <dependency id="Utf8Json" version="1.3.2" exclude="Build,Analyzers" />
                 <dependency id="System.Runtime.Serialization.Primitives" version="4.3.0" exclude="Build,Analyzers" />
             </group>
             <group targetFramework=".NETFramework4.5">
-                <dependency id="Utf8Json" version="1.3.1" exclude="Build,Analyzers" />
+                <dependency id="Utf8Json" version="1.3.2" exclude="Build,Analyzers" />
                 <dependency id="System.Runtime.Serialization.Primitives" version="4.3.0" exclude="Build,Analyzers" />
             </group>
             <group targetFramework=".NETStandard2.0">
-                <dependency id="Utf8Json" version="1.3.1" exclude="Build,Analyzers" />
+                <dependency id="Utf8Json" version="1.3.2" exclude="Build,Analyzers" />
                 <dependency id="System.Runtime.Serialization.Primitives" version="4.3.0" exclude="Build,Analyzers" />
             </group>
         </dependencies>

diff --git a/docs/Utf8Json.nuspec b/docs/Utf8Json.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
     <metadata>
         <id>Utf8Json</id>
-        <version>1.3.1</version>
+        <version>1.3.2</version>
         <title>Utf8Json</title>
         <authors>neuecc</authors>
         <owners>neuecc</owners>

diff --git a/docs/push.bat b/docs/push.bat
@@ -1,4 +1,4 @@
-nuget push Utf8Json.1.3.1.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push Utf8Json.ImmutableCollection.1.3.1.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push Utf8Json.UnityShims.1.3.1.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push Utf8Json.AspNetCoreMvcFormatter.1.3.1.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push Utf8Json.1.3.2.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push Utf8Json.ImmutableCollection.1.3.2.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push Utf8Json.UnityShims.1.3.2.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push Utf8Json.AspNetCoreMvcFormatter.1.3.2.nupkg -Source https://www.nuget.org/api/v2/package
diff --git a/sandbox/ConsoleAppNetCore/ConsoleAppNetCore.csproj b/sandbox/ConsoleAppNetCore/ConsoleAppNetCore.csproj
@@ -14,6 +14,10 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DumpAsm|AnyCPU'">
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\Utf8Json.ImmutableCollection\Utf8Json.ImmutableCollection.csproj" />
     <ProjectReference Include="..\..\src\Utf8Json\Utf8Json.csproj" />

diff --git a/src/Utf8Json.AspNetCoreMvcFormatter/_AssemblyInfo.cs b/src/Utf8Json.AspNetCoreMvcFormatter/_AssemblyInfo.cs
@@ -12,5 +12,5 @@
 [assembly: ComVisible(false)]
 
 [assembly: Guid("899f8b6c-c4c7-4e8b-9875-f61fdfb630bd")]
-[assembly: AssemblyVersion("1.3.1")]
-[assembly: AssemblyFileVersion("1.3.1")]
+[assembly: AssemblyVersion("1.3.2")]
+[assembly: AssemblyFileVersion("1.3.2")]
diff --git a/src/Utf8Json.ImmutableCollection/_AssemblyInfo.cs b/src/Utf8Json.ImmutableCollection/_AssemblyInfo.cs
@@ -12,5 +12,5 @@
 [assembly: ComVisible(false)]
 
 [assembly: Guid("2e7ac239-3db1-4772-9f47-5f62abb56ed0")]
-[assembly: AssemblyVersion("1.3.1")]
-[assembly: AssemblyFileVersion("1.3.1")]
+[assembly: AssemblyVersion("1.3.2")]
+[assembly: AssemblyFileVersion("1.3.2")]
diff --git a/src/Utf8Json.UnityClient/Assets/Scripts/RuntimeUnitTestToolkit/UnitTest.unity b/src/Utf8Json.UnityClient/Assets/Scripts/RuntimeUnitTestToolkit/UnitTest.unity
@@ -77,15 +77,17 @@ LightmapSettings:
     m_PVRDirectSampleCount: 32
     m_PVRSampleCount: 500
     m_PVRBounces: 2
-    m_PVRFiltering: 0
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
     m_PVRFilteringMode: 1
     m_PVRCulling: 1
     m_PVRFilteringGaussRadiusDirect: 1
     m_PVRFilteringGaussRadiusIndirect: 5
     m_PVRFilteringGaussRadiusAO: 2
-    m_PVRFilteringAtrousColorSigma: 1
-    m_PVRFilteringAtrousNormalSigma: 1
-    m_PVRFilteringAtrousPositionSigma: 1
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
   m_LightingDataAsset: {fileID: 0}
   m_UseShadowmask: 1
 --- !u!196 &4
@@ -107,6 +109,8 @@ NavMeshSettings:
     manualTileSize: 0
     tileSize: 256
     accuratePlacement: 0
+    debug:
+      m_Flags: 0
   m_NavMeshData: {fileID: 0}
 --- !u!1 &99089799
 GameObject:
@@ -133,7 +137,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 99089799}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 380.5, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 254163424}
@@ -492,7 +496,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1264454898}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: -385.5, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1903152286}
@@ -568,7 +572,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1337584756}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 375.5, y: -35, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1003975943}
@@ -719,7 +723,6 @@ GameObject:
   - component: {fileID: 1502002502}
   - component: {fileID: 1502002501}
   - component: {fileID: 1502002506}
-  - component: {fileID: 1502002505}
   m_Layer: 5
   m_Name: Canvas
   m_TagString: Untagged
@@ -791,8 +794,8 @@ RectTransform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1502002500}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 766, y: 376, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 2146835024}
   m_Father: {fileID: 0}
@@ -803,33 +806,22 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
---- !u!114 &1502002505
+--- !u!114 &1502002506
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1502002500}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 16155e678c92ab94cafdaaedd94de614, type: 3}
+  m_Script: {fileID: 11500000, guid: 660baed073888b8438569f57e42679b2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   clearButton: {fileID: 1337584758}
   list: {fileID: 1903152286}
   listScrollBar: {fileID: 99089801}
   logText: {fileID: 1607029148}
   logScrollBar: {fileID: 2074381937}
---- !u!114 &1502002506
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1502002500}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 660baed073888b8438569f57e42679b2, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &1585551015
 GameObject:
   m_ObjectHideFlags: 0
@@ -917,7 +909,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1607029146}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: -365.5, y: 376, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 2044738990}
@@ -1055,7 +1047,6 @@ Camera:
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
-  m_StereoMirrorMode: 0
 --- !u!4 &1709652162
 Transform:
   m_ObjectHideFlags: 0
@@ -1094,7 +1085,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1903152285}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: -380.5, y: 376, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1337584757}
@@ -1172,7 +1163,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 2044738989}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 385.5, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1607029147}
@@ -1274,7 +1265,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 2074381935}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 380.5, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1442485889}

diff --git a/src/Utf8Json.UnityClient/ProjectSettings/DynamicsManager.asset b/src/Utf8Json.UnityClient/ProjectSettings/DynamicsManager.asset
@@ -17,3 +17,4 @@ PhysicsManager:
   m_EnablePCM: 1
   m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
   m_AutoSimulation: 1
+  m_AutoSyncTransforms: 1
diff --git a/src/Utf8Json.UnityClient/ProjectSettings/Physics2DSettings.asset b/src/Utf8Json.UnityClient/ProjectSettings/Physics2DSettings.asset
@@ -24,6 +24,7 @@ Physics2DSettings:
   m_QueriesStartInColliders: 1
   m_ChangeStopsCallbacks: 0
   m_CallbacksOnDisable: 1
+  m_AutoSyncTransforms: 1
   m_AlwaysShowColliders: 0
   m_ShowColliderSleep: 1
   m_ShowColliderContacts: 0

diff --git a/src/Utf8Json.UnityClient/ProjectSettings/ProjectVersion.txt b/src/Utf8Json.UnityClient/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2017.1.0f1
+m_EditorVersion: 2017.2.0f3
diff --git a/src/Utf8Json.UnityClient/UnityPackageManager/manifest.json b/src/Utf8Json.UnityClient/UnityPackageManager/manifest.json
@@ -0,0 +1,4 @@
+{
+	"dependencies": {
+	}
+}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		m_EditorVersion: 2017.1.0f1
		m_EditorVersion: 2017.2.0f3