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

Commit 5b4e477

Browse files
neueccneuecc
committed
prepare 1.6.3
1 parent cca2c5b commit 5b4e477

File tree

28 files changed

+99
-90
lines changed

28 files changed

+99
-90
lines changed

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,11 @@ zfc arguments help:
473473
-m, --disallowinmetadata [optional, default=false]Don't generate in metadata type
474474
-g, --gencomparekeyonly [optional, default=false]Don't generate in EnumEqualityComparer except dictionary key
475475
-n, --namespace=VALUE [optional, default=ZeroFormatter]Set namespace root name
476+
-f, --forcedefaultresolver [optional, default=false]Force use DefaultResolver
476477
```
477478

479+
> Note: Some options is important for reduce code generation size and startup speed on IL2CPP, especially `-f` is recommend if you use only DefaultResolver.
480+
478481
```
479482
// Simple Case:
480483
zfc.exe -i "..\src\Sandbox.Shared.csproj" -o "ZeroFormatterGenerated.cs"

‎nuget/ZeroFormatter.Interfaces.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>ZeroFormatter.Interfaces</id>
5-
<version>1.6.2</version>
5+
<version>1.6.3</version>
66
<title>ZeroFormatter.Interfaces</title>
77
<authors>neuecc</authors>
88
<owners>y.neuecc</owners>
99
<projectUrl>https://github.com/neuecc/ZeroFormatter/</projectUrl>
1010
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1111
<description>Plain interfaces and KeyTuple of ZeroFormatter, it is used for define serializable targets.</description>
12-
<releaseNotes>fixed serialize issue when mutate under non-tracked collection.</releaseNotes>
12+
<releaseNotes>modify resolver priority for extend types. add -u option for zfc.exe.</releaseNotes>
1313
<tags>ZeroFormatter, Serialization, Formatter, Serializer</tags>
1414
<frameworkAssemblies>
1515
<frameworkAssembly assemblyName="System" targetFramework=".NETFramework3.5" />

‎nuget/ZeroFormatter.Unity.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>ZeroFormatter.Unity</id>
5-
<version>1.6.2</version>
5+
<version>1.6.3</version>
66
<title>ZeroFormatter.Unity</title>
77
<authors>neuecc</authors>
88
<owners>y.neuecc</owners>
99
<projectUrl>https://github.com/neuecc/ZeroFormatter/</projectUrl>
1010
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1111
<description>Infinitely fast serializer for .NET, .NET Core and Unity.</description>
12-
<releaseNotes>fixed serialize issue when mutate under non-tracked collection.</releaseNotes>
12+
<releaseNotes>modify resolver priority for extend types. add -u option for zfc.exe.</releaseNotes>
1313
<tags>ZeroFormatter, Serialization, Formatter, Serializer</tags>
1414
<frameworkAssemblies>
1515
<frameworkAssembly assemblyName="System" targetFramework="Unity Full v3.5" />
1616
<frameworkAssembly assemblyName="System.Core" targetFramework="Unity Full v3.5" />
1717
</frameworkAssemblies>
1818
<dependencies>
1919
<group targetFramework="Unity Full v3.5">
20-
<dependency id="ZeroFormatter.Interfaces" version="1.6.2" />
20+
<dependency id="ZeroFormatter.Interfaces" version="1.6.3" />
2121
</group>
2222
</dependencies>
2323
</metadata>

‎nuget/ZeroFormatter.nuspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>ZeroFormatter</id>
5-
<version>1.6.2</version>
5+
<version>1.6.3</version>
66
<title>ZeroFormatter</title>
77
<authors>neuecc</authors>
88
<owners>y.neuecc</owners>
99
<projectUrl>https://github.com/neuecc/ZeroFormatter/</projectUrl>
1010
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1111
<description>Infinitely fast serializer for .NET, .NET Core and Unity.</description>
12-
<releaseNotes>fixed serialize issue when mutate under non-tracked collection.</releaseNotes>
12+
<releaseNotes>modify resolver priority for extend types. add -u option for zfc.exe.</releaseNotes>
1313
<tags>ZeroFormatter, Serialization, Formatter, Serializer</tags>
1414
<frameworkAssemblies>
1515
<frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.5" />
1616
<frameworkAssembly assemblyName="System.Core" targetFramework=".NETFramework4.5" />
1717
</frameworkAssemblies>
1818
<dependencies>
1919
<group targetFramework=".NETFramework4.5">
20-
<dependency id="ZeroFormatter.Interfaces" version="1.6.2" />
20+
<dependency id="ZeroFormatter.Interfaces" version="1.6.3" />
2121
</group>
2222
<group targetFramework=".NETStandard1.6">
23-
<dependency id="ZeroFormatter.Interfaces" version="1.6.2" />
23+
<dependency id="ZeroFormatter.Interfaces" version="1.6.3" />
2424
<dependency id="System.Reflection.Emit" version="4.0.1" />
2525
<dependency id="System.Runtime" version="4.1.0" />
2626
<dependency id="System.Runtime.Extensions" version="4.1.0" />

‎nuget/push.bat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
REM nuget push ZeroFormatter.Analyzer.1.1.1.0.nupkg -Source https://www.nuget.org/api/v2/package
2-
nuget push ZeroFormatter.1.6.2.nupkg -Source https://www.nuget.org/api/v2/package
3-
nuget push ZeroFormatter.Interfaces.1.6.2.nupkg -Source https://www.nuget.org/api/v2/package
4-
nuget push ZeroFormatter.Unity.1.6.2.nupkg -Source https://www.nuget.org/api/v2/package
2+
nuget push ZeroFormatter.1.6.3.nupkg -Source https://www.nuget.org/api/v2/package
3+
nuget push ZeroFormatter.Interfaces.1.6.3.nupkg -Source https://www.nuget.org/api/v2/package
4+
nuget push ZeroFormatter.Unity.1.6.3.nupkg -Source https://www.nuget.org/api/v2/package

‎sandbox/PerformanceComparison/App.config‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
88
<dependentAssembly>
99
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
10-
<bindingRedirect oldVersion="0.0.0.0-4.4.0.0" newVersion="4.4.0.0" />
10+
<bindingRedirect oldVersion="0.0.0.0-4.4.1.0" newVersion="4.4.1.0" />
11+
</dependentAssembly>
12+
<dependentAssembly>
13+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
14+
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
1115
</dependentAssembly>
1216
</assemblyBinding>
1317
</runtime>

‎sandbox/PerformanceComparison/PerformanceComparison.csproj‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
<Prefer32Bit>false</Prefer32Bit>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="FSharp.Core, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
40-
<HintPath>..\..\packages\FSharp.Core.4.0.1.7-alpha\lib\net40\FSharp.Core.dll</HintPath>
39+
<Reference Include="FSharp.Core, Version=4.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
40+
<HintPath>..\..\packages\FSharp.Core.4.1.0\lib\net40\FSharp.Core.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
4343
<Reference Include="FsPickler, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -52,50 +52,58 @@
5252
<HintPath>..\..\packages\FsPickler.Json.3.2.0\lib\net45\FsPickler.Json.dll</HintPath>
5353
<Private>True</Private>
5454
</Reference>
55-
<Reference Include="Google.Protobuf, Version=3.1.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
56-
<HintPath>..\..\packages\Google.Protobuf.3.1.0\lib\net45\Google.Protobuf.dll</HintPath>
55+
<Reference Include="Google.Protobuf, Version=3.2.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
56+
<HintPath>..\..\packages\Google.Protobuf.3.2.0\lib\net45\Google.Protobuf.dll</HintPath>
5757
<Private>True</Private>
5858
</Reference>
59-
<Reference Include="Jil, Version=2.14.5.0, Culture=neutral, processorArchitecture=MSIL">
60-
<HintPath>..\..\packages\Jil.2.14.5\lib\net45\Jil.dll</HintPath>
59+
<Reference Include="Jil, Version=2.15.0.0, Culture=neutral, processorArchitecture=MSIL">
60+
<HintPath>..\..\packages\Jil.2.15.0\lib\net45\Jil.dll</HintPath>
6161
<Private>True</Private>
6262
</Reference>
6363
<Reference Include="MessagePack, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
64-
<SpecificVersion>False</SpecificVersion>
65-
<HintPath>MessagePackCSharp_Alpha\MessagePack.dll</HintPath>
64+
<HintPath>..\..\packages\MessagePack.0.1.0-beta\lib\net45\MessagePack.dll</HintPath>
65+
<Private>True</Private>
6666
</Reference>
6767
<Reference Include="MsgPack, Version=0.9.0.0, Culture=neutral, PublicKeyToken=a2625990d5dc0167, processorArchitecture=MSIL">
68-
<HintPath>..\..\packages\MsgPack.Cli.0.9.0-beta1\lib\net46\MsgPack.dll</HintPath>
68+
<HintPath>..\..\packages\MsgPack.Cli.0.9.0-beta2\lib\net46\MsgPack.dll</HintPath>
6969
<Private>True</Private>
7070
</Reference>
7171
<Reference Include="NetSerializer, Version=4.1.0.0, Culture=neutral, processorArchitecture=MSIL">
7272
<HintPath>..\..\packages\NetSerializer.4.1.0\lib\net45\NetSerializer.dll</HintPath>
7373
<Private>True</Private>
7474
</Reference>
75-
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
76-
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
75+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
76+
<HintPath>..\..\packages\Newtonsoft.Json.10.0.1-beta1\lib\net45\Newtonsoft.Json.dll</HintPath>
7777
<Private>True</Private>
7878
</Reference>
7979
<Reference Include="protobuf-net, Version=2.1.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
8080
<HintPath>..\..\packages\protobuf-net.2.1.0\lib\net451\protobuf-net.dll</HintPath>
8181
<Private>True</Private>
8282
</Reference>
83-
<Reference Include="Sigil, Version=4.6.1.0, Culture=neutral, PublicKeyToken=2d06c3494341c8ab, processorArchitecture=MSIL">
84-
<HintPath>..\..\packages\Sigil.4.6.1\lib\net45\Sigil.dll</HintPath>
83+
<Reference Include="Sigil, Version=4.7.0.0, Culture=neutral, PublicKeyToken=2d06c3494341c8ab, processorArchitecture=MSIL">
84+
<HintPath>..\..\packages\Sigil.4.7.0\lib\net45\Sigil.dll</HintPath>
8585
<Private>True</Private>
8686
</Reference>
8787
<Reference Include="System" />
8888
<Reference Include="System.Core" />
8989
<Reference Include="System.Runtime.Serialization" />
9090
<Reference Include="System.Runtime.Serialization.Primitives" />
91+
<Reference Include="System.Threading.Tasks.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
92+
<HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
93+
<Private>True</Private>
94+
</Reference>
95+
<Reference Include="System.ValueTuple, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
96+
<HintPath>..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
97+
<Private>True</Private>
98+
</Reference>
9199
<Reference Include="System.Xml.Linq" />
92100
<Reference Include="System.Data.DataSetExtensions" />
93101
<Reference Include="Microsoft.CSharp" />
94102
<Reference Include="System.Data" />
95103
<Reference Include="System.Net.Http" />
96104
<Reference Include="System.Xml" />
97105
<Reference Include="Wire, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
98-
<HintPath>..\..\packages\Wire.0.8.1\lib\net45\Wire.dll</HintPath>
106+
<HintPath>..\..\packages\Wire.0.8.2\lib\net45\Wire.dll</HintPath>
99107
<Private>True</Private>
100108
</Reference>
101109
</ItemGroup>
@@ -136,7 +144,6 @@
136144
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
137145
</Content>
138146
<Content Include="FlatBuffers\flatc.exe" />
139-
<Content Include="MessagePackCSharp_Alpha\MessagePack.dll" />
140147
<Content Include="Protobuf3\protoc.exe" />
141148
</ItemGroup>
142149
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎sandbox/PerformanceComparison/Program.cs‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -428,27 +428,19 @@ static T SerializeMsgPack<T>(T original)
428428
T copy = default(T);
429429
byte[] bytes = null;
430430

431-
// Note:We should check MessagePackSerializer.Get<T>() on every iteration
432-
// But currenly MsgPack-Cli has bug of get serializer
433-
// https://github.com/msgpack/msgpack-cli/issues/191
434-
// so, get serializer at first.
435-
// and If enum serialization options to ByUnderlyingValue, gets more fast but we check default option only.
436-
437-
var serializer = MsgPack.Serialization.MessagePackSerializer.Get<T>();
438-
439431
using (new Measure("Serialize"))
440432
{
441433
for (int i = 0; i < Iteration; i++)
442434
{
443-
bytes = serializer.PackSingleObject(original);
435+
bytes = MsgPack.Serialization.MessagePackSerializer.Get<T>().PackSingleObject(original);
444436
}
445437
}
446438

447439
using (new Measure("Deserialize"))
448440
{
449441
for (int i = 0; i < Iteration; i++)
450442
{
451-
copy = serializer.UnpackSingleObject(bytes);
443+
copy = MsgPack.Serialization.MessagePackSerializer.Get<T>().UnpackSingleObject(bytes);
452444
}
453445
}
454446

‎sandbox/PerformanceComparison/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.6.2.0")]
36-
[assembly: AssemblyFileVersion("1.6.2.0")]
35+
[assembly: AssemblyVersion("1.6.3.0")]
36+
[assembly: AssemblyFileVersion("1.6.3.0")]

‎sandbox/PerformanceComparison/packages.config‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="FSharp.Core" version="4.0.1.7-alpha" targetFramework="net461" />
3+
<package id="FSharp.Core" version="4.1.0" targetFramework="net461" />
44
<package id="FsPickler" version="3.2.0" targetFramework="net461" />
55
<package id="FsPickler.CSharp" version="3.2.0" targetFramework="net461" />
66
<package id="FsPickler.Json" version="3.2.0" targetFramework="net461" />
7-
<package id="Google.Protobuf" version="3.1.0" targetFramework="net461" />
8-
<package id="Jil" version="2.14.5" targetFramework="net461" />
9-
<package id="MsgPack.Cli" version="0.9.0-beta1" targetFramework="net461" />
7+
<package id="Google.Protobuf" version="3.2.0" targetFramework="net461" />
8+
<package id="Jil" version="2.15.0" targetFramework="net461" />
9+
<package id="MessagePack" version="0.1.0-beta" targetFramework="net461" />
10+
<package id="MsgPack.Cli" version="0.9.0-beta2" targetFramework="net461" />
1011
<package id="NetSerializer" version="4.1.0" targetFramework="net461" />
11-
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
12+
<package id="Newtonsoft.Json" version="10.0.1-beta1" targetFramework="net461" />
1213
<package id="protobuf-net" version="2.1.0" targetFramework="net461" />
13-
<package id="Sigil" version="4.6.1" targetFramework="net461" />
14-
<package id="Wire" version="0.8.1" targetFramework="net461" />
14+
<package id="Sigil" version="4.7.0" targetFramework="net461" />
15+
<package id="System.Reflection.Emit" version="4.3.0" targetFramework="net461" />
16+
<package id="System.Threading.Tasks.Extensions" version="4.3.0" targetFramework="net461" />
17+
<package id="System.ValueTuple" version="4.3.0" targetFramework="net461" />
18+
<package id="Wire" version="0.8.2" targetFramework="net461" />
1519
</packages>

0 commit comments

Comments
 (0)