Skip to content
This repository was archived by the owner on May 16, 2022. It is now read-only.

Commit 4fdd90f

Browse files
neueccneuecc
committed
for 1.3.2
1 parent 70e90f8 commit 4fdd90f

File tree

19 files changed

+206
-69
lines changed

19 files changed

+206
-69
lines changed

‎docs/Utf8Json.AspNetCoreMvcFormatter.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata>
44
<id>Utf8Json.AspNetCoreMvcFormatter</id>
5-
<version>1.3.1</version>
5+
<version>1.3.2</version>
66
<title>Utf8Json AspNetCoreMvcFormatter</title>
77
<authors>neuecc</authors>
88
<owners>neuecc</owners>
@@ -13,11 +13,11 @@
1313
<tags>Json, Serialization, Formatter, Serializer, Unity, Xamarin, ASPNET</tags>
1414
<dependencies>
1515
<group targetFramework=".NETFramework4.7">
16-
<dependency id="Utf8Json" version="1.3.1" exclude="Build,Analyzers" />
16+
<dependency id="Utf8Json" version="1.3.2" exclude="Build,Analyzers" />
1717
<dependency id="Microsoft.AspNetCore.Mvc.Abstractions" version="2.0.0" exclude="Build,Analyzers" />
1818
</group>
1919
<group targetFramework=".NETStandard2.0">
20-
<dependency id="Utf8Json" version="1.3.1" exclude="Build,Analyzers" />
20+
<dependency id="Utf8Json" version="1.3.2" exclude="Build,Analyzers" />
2121
<dependency id="Microsoft.AspNetCore.Mvc.Abstractions" version="2.0.0" exclude="Build,Analyzers" />
2222
</group>
2323
</dependencies>

‎docs/Utf8Json.ImmutableCollection.nuspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata>
44
<id>Utf8Json.ImmutableCollection</id>
5-
<version>1.3.1</version>
5+
<version>1.3.2</version>
66
<title>Utf8Json Extension Resolver for ImmutableCollection</title>
77
<authors>neuecc</authors>
88
<owners>neuecc</owners>
@@ -12,15 +12,15 @@
1212
<tags>Json, Serialization, Formatter, Serializer, Unity, Xamarin</tags>
1313
<dependencies>
1414
<group targetFramework=".NETFramework4.7">
15-
<dependency id="Utf8Json" version="1.3.1" exclude="Build,Analyzers" />
15+
<dependency id="Utf8Json" version="1.3.2" exclude="Build,Analyzers" />
1616
<dependency id="System.Collections.Immutable" version="1.4.0" exclude="Build,Analyzers" />
1717
</group>
1818
<group targetFramework=".NETFramework4.5">
19-
<dependency id="Utf8Json" version="1.3.1" exclude="Build,Analyzers" />
19+
<dependency id="Utf8Json" version="1.3.2" exclude="Build,Analyzers" />
2020
<dependency id="System.Collections.Immutable" version="1.4.0" exclude="Build,Analyzers" />
2121
</group>
2222
<group targetFramework=".NETStandard2.0">
23-
<dependency id="Utf8Json" version="1.3.1" exclude="Build,Analyzers" />
23+
<dependency id="Utf8Json" version="1.3.2" exclude="Build,Analyzers" />
2424
<dependency id="System.Collections.Immutable" version="1.4.0" exclude="Build,Analyzers" />
2525
</group>
2626
</dependencies>

‎docs/Utf8Json.UnityShims.nuspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata>
44
<id>Utf8Json.UnityShims</id>
5-
<version>1.3.1</version>
5+
<version>1.3.2</version>
66
<title>Utf8Json UnityShims</title>
77
<authors>neuecc</authors>
88
<owners>neuecc</owners>
@@ -12,15 +12,15 @@
1212
<tags>Json, Serialization, Formatter, Serializer, Unity, Xamarin</tags>
1313
<dependencies>
1414
<group targetFramework=".NETFramework4.7">
15-
<dependency id="Utf8Json" version="1.3.1" exclude="Build,Analyzers" />
15+
<dependency id="Utf8Json" version="1.3.2" exclude="Build,Analyzers" />
1616
<dependency id="System.Runtime.Serialization.Primitives" version="4.3.0" exclude="Build,Analyzers" />
1717
</group>
1818
<group targetFramework=".NETFramework4.5">
19-
<dependency id="Utf8Json" version="1.3.1" exclude="Build,Analyzers" />
19+
<dependency id="Utf8Json" version="1.3.2" exclude="Build,Analyzers" />
2020
<dependency id="System.Runtime.Serialization.Primitives" version="4.3.0" exclude="Build,Analyzers" />
2121
</group>
2222
<group targetFramework=".NETStandard2.0">
23-
<dependency id="Utf8Json" version="1.3.1" exclude="Build,Analyzers" />
23+
<dependency id="Utf8Json" version="1.3.2" exclude="Build,Analyzers" />
2424
<dependency id="System.Runtime.Serialization.Primitives" version="4.3.0" exclude="Build,Analyzers" />
2525
</group>
2626
</dependencies>

‎docs/Utf8Json.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata>
44
<id>Utf8Json</id>
5-
<version>1.3.1</version>
5+
<version>1.3.2</version>
66
<title>Utf8Json</title>
77
<authors>neuecc</authors>
88
<owners>neuecc</owners>

‎docs/push.bat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
nuget push Utf8Json.1.3.1.nupkg -Source https://www.nuget.org/api/v2/package
2-
nuget push Utf8Json.ImmutableCollection.1.3.1.nupkg -Source https://www.nuget.org/api/v2/package
3-
nuget push Utf8Json.UnityShims.1.3.1.nupkg -Source https://www.nuget.org/api/v2/package
4-
nuget push Utf8Json.AspNetCoreMvcFormatter.1.3.1.nupkg -Source https://www.nuget.org/api/v2/package
1+
nuget push Utf8Json.1.3.2.nupkg -Source https://www.nuget.org/api/v2/package
2+
nuget push Utf8Json.ImmutableCollection.1.3.2.nupkg -Source https://www.nuget.org/api/v2/package
3+
nuget push Utf8Json.UnityShims.1.3.2.nupkg -Source https://www.nuget.org/api/v2/package
4+
nuget push Utf8Json.AspNetCoreMvcFormatter.1.3.2.nupkg -Source https://www.nuget.org/api/v2/package

‎sandbox/ConsoleAppNetCore/ConsoleAppNetCore.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1515
</PropertyGroup>
1616

17+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DumpAsm|AnyCPU'">
18+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
19+
</PropertyGroup>
20+
1721
<ItemGroup>
1822
<ProjectReference Include="..\..\src\Utf8Json.ImmutableCollection\Utf8Json.ImmutableCollection.csproj" />
1923
<ProjectReference Include="..\..\src\Utf8Json\Utf8Json.csproj" />

‎src/Utf8Json.AspNetCoreMvcFormatter/_AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
[assembly: ComVisible(false)]
1313

1414
[assembly: Guid("899f8b6c-c4c7-4e8b-9875-f61fdfb630bd")]
15-
[assembly: AssemblyVersion("1.3.1")]
16-
[assembly: AssemblyFileVersion("1.3.1")]
15+
[assembly: AssemblyVersion("1.3.2")]
16+
[assembly: AssemblyFileVersion("1.3.2")]

‎src/Utf8Json.ImmutableCollection/_AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
[assembly: ComVisible(false)]
1313

1414
[assembly: Guid("2e7ac239-3db1-4772-9f47-5f62abb56ed0")]
15-
[assembly: AssemblyVersion("1.3.1")]
16-
[assembly: AssemblyFileVersion("1.3.1")]
15+
[assembly: AssemblyVersion("1.3.2")]
16+
[assembly: AssemblyFileVersion("1.3.2")]

‎src/Utf8Json.UnityClient/Assets/Scripts/RuntimeUnitTestToolkit/UnitTest.unity

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,17 @@ LightmapSettings:
7777
m_PVRDirectSampleCount: 32
7878
m_PVRSampleCount: 500
7979
m_PVRBounces: 2
80-
m_PVRFiltering: 0
80+
m_PVRFilterTypeDirect: 0
81+
m_PVRFilterTypeIndirect: 0
82+
m_PVRFilterTypeAO: 0
8183
m_PVRFilteringMode: 1
8284
m_PVRCulling: 1
8385
m_PVRFilteringGaussRadiusDirect: 1
8486
m_PVRFilteringGaussRadiusIndirect: 5
8587
m_PVRFilteringGaussRadiusAO: 2
86-
m_PVRFilteringAtrousColorSigma: 1
87-
m_PVRFilteringAtrousNormalSigma: 1
88-
m_PVRFilteringAtrousPositionSigma: 1
88+
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
89+
m_PVRFilteringAtrousPositionSigmaIndirect: 2
90+
m_PVRFilteringAtrousPositionSigmaAO: 1
8991
m_LightingDataAsset: {fileID: 0}
9092
m_UseShadowmask: 1
9193
--- !u!196 &4
@@ -107,6 +109,8 @@ NavMeshSettings:
107109
manualTileSize: 0
108110
tileSize: 256
109111
accuratePlacement: 0
112+
debug:
113+
m_Flags: 0
110114
m_NavMeshData: {fileID: 0}
111115
--- !u!1 &99089799
112116
GameObject:
@@ -133,7 +137,7 @@ RectTransform:
133137
m_PrefabInternal: {fileID: 0}
134138
m_GameObject: {fileID: 99089799}
135139
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
136-
m_LocalPosition: {x: 0, y: 0, z: 0}
140+
m_LocalPosition: {x: 380.5, y: 0, z: 0}
137141
m_LocalScale: {x: 1, y: 1, z: 1}
138142
m_Children:
139143
- {fileID: 254163424}
@@ -492,7 +496,7 @@ RectTransform:
492496
m_PrefabInternal: {fileID: 0}
493497
m_GameObject: {fileID: 1264454898}
494498
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
495-
m_LocalPosition: {x: 0, y: 0, z: 0}
499+
m_LocalPosition: {x: -385.5, y: 0, z: 0}
496500
m_LocalScale: {x: 1, y: 1, z: 1}
497501
m_Children:
498502
- {fileID: 1903152286}
@@ -568,7 +572,7 @@ RectTransform:
568572
m_PrefabInternal: {fileID: 0}
569573
m_GameObject: {fileID: 1337584756}
570574
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
571-
m_LocalPosition: {x: 0, y: 0, z: 0}
575+
m_LocalPosition: {x: 375.5, y: -35, z: 0}
572576
m_LocalScale: {x: 1, y: 1, z: 1}
573577
m_Children:
574578
- {fileID: 1003975943}
@@ -719,7 +723,6 @@ GameObject:
719723
- component: {fileID: 1502002502}
720724
- component: {fileID: 1502002501}
721725
- component: {fileID: 1502002506}
722-
- component: {fileID: 1502002505}
723726
m_Layer: 5
724727
m_Name: Canvas
725728
m_TagString: Untagged
@@ -791,8 +794,8 @@ RectTransform:
791794
m_PrefabInternal: {fileID: 0}
792795
m_GameObject: {fileID: 1502002500}
793796
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
794-
m_LocalPosition: {x: 0, y: 0, z: 0}
795-
m_LocalScale: {x: 0, y: 0, z: 0}
797+
m_LocalPosition: {x: 766, y: 376, z: 0}
798+
m_LocalScale: {x: 1, y: 1, z: 1}
796799
m_Children:
797800
- {fileID: 2146835024}
798801
m_Father: {fileID: 0}
@@ -803,33 +806,22 @@ RectTransform:
803806
m_AnchoredPosition: {x: 0, y: 0}
804807
m_SizeDelta: {x: 0, y: 0}
805808
m_Pivot: {x: 0, y: 0}
806-
--- !u!114 &1502002505
809+
--- !u!114 &1502002506
807810
MonoBehaviour:
808811
m_ObjectHideFlags: 0
809812
m_PrefabParentObject: {fileID: 0}
810813
m_PrefabInternal: {fileID: 0}
811814
m_GameObject: {fileID: 1502002500}
812815
m_Enabled: 1
813816
m_EditorHideFlags: 0
814-
m_Script: {fileID: 11500000, guid: 16155e678c92ab94cafdaaedd94de614, type: 3}
817+
m_Script: {fileID: 11500000, guid: 660baed073888b8438569f57e42679b2, type: 3}
815818
m_Name:
816819
m_EditorClassIdentifier:
817820
clearButton: {fileID: 1337584758}
818821
list: {fileID: 1903152286}
819822
listScrollBar: {fileID: 99089801}
820823
logText: {fileID: 1607029148}
821824
logScrollBar: {fileID: 2074381937}
822-
--- !u!114 &1502002506
823-
MonoBehaviour:
824-
m_ObjectHideFlags: 0
825-
m_PrefabParentObject: {fileID: 0}
826-
m_PrefabInternal: {fileID: 0}
827-
m_GameObject: {fileID: 1502002500}
828-
m_Enabled: 1
829-
m_EditorHideFlags: 0
830-
m_Script: {fileID: 11500000, guid: 660baed073888b8438569f57e42679b2, type: 3}
831-
m_Name:
832-
m_EditorClassIdentifier:
833825
--- !u!1 &1585551015
834826
GameObject:
835827
m_ObjectHideFlags: 0
@@ -917,7 +909,7 @@ RectTransform:
917909
m_PrefabInternal: {fileID: 0}
918910
m_GameObject: {fileID: 1607029146}
919911
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
920-
m_LocalPosition: {x: 0, y: 0, z: 0}
912+
m_LocalPosition: {x: -365.5, y: 376, z: 0}
921913
m_LocalScale: {x: 1, y: 1, z: 1}
922914
m_Children: []
923915
m_Father: {fileID: 2044738990}
@@ -1055,7 +1047,6 @@ Camera:
10551047
m_OcclusionCulling: 1
10561048
m_StereoConvergence: 10
10571049
m_StereoSeparation: 0.022
1058-
m_StereoMirrorMode: 0
10591050
--- !u!4 &1709652162
10601051
Transform:
10611052
m_ObjectHideFlags: 0
@@ -1094,7 +1085,7 @@ RectTransform:
10941085
m_PrefabInternal: {fileID: 0}
10951086
m_GameObject: {fileID: 1903152285}
10961087
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
1097-
m_LocalPosition: {x: 0, y: 0, z: 0}
1088+
m_LocalPosition: {x: -380.5, y: 376, z: 0}
10981089
m_LocalScale: {x: 1, y: 1, z: 1}
10991090
m_Children:
11001091
- {fileID: 1337584757}
@@ -1172,7 +1163,7 @@ RectTransform:
11721163
m_PrefabInternal: {fileID: 0}
11731164
m_GameObject: {fileID: 2044738989}
11741165
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1175-
m_LocalPosition: {x: 0, y: 0, z: 0}
1166+
m_LocalPosition: {x: 385.5, y: 0, z: 0}
11761167
m_LocalScale: {x: 1, y: 1, z: 1}
11771168
m_Children:
11781169
- {fileID: 1607029147}
@@ -1274,7 +1265,7 @@ RectTransform:
12741265
m_PrefabInternal: {fileID: 0}
12751266
m_GameObject: {fileID: 2074381935}
12761267
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
1277-
m_LocalPosition: {x: 0, y: 0, z: 0}
1268+
m_LocalPosition: {x: 380.5, y: 0, z: 0}
12781269
m_LocalScale: {x: 1, y: 1, z: 1}
12791270
m_Children:
12801271
- {fileID: 1442485889}

‎src/Utf8Json.UnityClient/ProjectSettings/DynamicsManager.asset

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ PhysicsManager:
1717
m_EnablePCM: 1
1818
m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
1919
m_AutoSimulation: 1
20+
m_AutoSyncTransforms: 1

‎src/Utf8Json.UnityClient/ProjectSettings/Physics2DSettings.asset

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Physics2DSettings:
2424
m_QueriesStartInColliders: 1
2525
m_ChangeStopsCallbacks: 0
2626
m_CallbacksOnDisable: 1
27+
m_AutoSyncTransforms: 1
2728
m_AlwaysShowColliders: 0
2829
m_ShowColliderSleep: 1
2930
m_ShowColliderContacts: 0

‎src/Utf8Json.UnityClient/ProjectSettings/ProjectVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
m_EditorVersion: 2017.1.0f1
1+
m_EditorVersion: 2017.2.0f3

‎src/Utf8Json.UnityClient/UnityPackageManager/manifest.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"dependencies": {
3+
}
4+
}

0 commit comments

Comments
 (0)