From 5b4e4770bab7ca77e76ae797b3924916ddd6dc68 Mon Sep 17 00:00:00 2001 From: neuecc Date: Mon, 27 Feb 2017 22:06:55 +0900 Subject: [PATCH] prepare 1.6.3 --- README.md | 3 ++ nuget/ZeroFormatter.Interfaces.nuspec | 4 +- nuget/ZeroFormatter.Unity.nuspec | 6 +-- nuget/ZeroFormatter.nuspec | 8 ++-- nuget/push.bat | 6 +-- sandbox/PerformanceComparison/App.config | 6 ++- .../PerformanceComparison.csproj | 37 +++++++++++------- sandbox/PerformanceComparison/Program.cs | 12 +----- .../Properties/AssemblyInfo.cs | 4 +- sandbox/PerformanceComparison/packages.config | 18 +++++---- sandbox/Sandbox.NETCore/project.json | 6 +-- sandbox/Sandbox.NETCore/project.lock.json | 14 +++---- .../Sandbox.Shared/Properties/AssemblyInfo.cs | 4 +- sandbox/Sandbox/Properties/AssemblyInfo.cs | 4 +- .../source.extension.vsixmanifest | 2 +- src/ZeroFormatter.CodeGenerator/Program.cs | 1 - .../Properties/AssemblyInfo.cs | 4 +- .../project.json | 2 +- .../Properties/AssemblyInfo.cs | 4 +- src/ZeroFormatter.NETCore/project.json | 4 +- src/ZeroFormatter.NETCore/project.lock.json | 6 +-- src/ZeroFormatter/Properties/AssemblyInfo.cs | 4 +- .../ZeroFormatter.NETCore.Tests/project.json | 8 ++-- .../project.lock.json | 18 ++++----- .../Properties/AssemblyInfo.cs | 4 +- .../Assets/Dlls/Sandbox.Shared.dll | Bin 31744 -> 31744 bytes .../Assets/Dlls/ZeroFormatter.Interfaces.dll | Bin 16896 -> 16896 bytes .../Assets/Dlls/ZeroFormatter.dll | Bin 103936 -> 103936 bytes 28 files changed, 99 insertions(+), 90 deletions(-) diff --git a/README.md b/README.md index fe0ee40..f38c272 100644 --- a/README.md +++ b/README.md @@ -473,8 +473,11 @@ zfc arguments help: -m, --disallowinmetadata [optional, default=false]Don't generate in metadata type -g, --gencomparekeyonly [optional, default=false]Don't generate in EnumEqualityComparer except dictionary key -n, --namespace=VALUE [optional, default=ZeroFormatter]Set namespace root name + -f, --forcedefaultresolver [optional, default=false]Force use DefaultResolver ``` +> Note: Some options is important for reduce code generation size and startup speed on IL2CPP, especially `-f` is recommend if you use only DefaultResolver. + ``` // Simple Case: zfc.exe -i "..\src\Sandbox.Shared.csproj" -o "ZeroFormatterGenerated.cs" diff --git a/nuget/ZeroFormatter.Interfaces.nuspec b/nuget/ZeroFormatter.Interfaces.nuspec index c56754a..02d6839 100644 --- a/nuget/ZeroFormatter.Interfaces.nuspec +++ b/nuget/ZeroFormatter.Interfaces.nuspec @@ -2,14 +2,14 @@ ZeroFormatter.Interfaces - 1.6.2 + 1.6.3 ZeroFormatter.Interfaces neuecc y.neuecc https://github.com/neuecc/ZeroFormatter/ false Plain interfaces and KeyTuple of ZeroFormatter, it is used for define serializable targets. - fixed serialize issue when mutate under non-tracked collection. + modify resolver priority for extend types. add -u option for zfc.exe. ZeroFormatter, Serialization, Formatter, Serializer diff --git a/nuget/ZeroFormatter.Unity.nuspec b/nuget/ZeroFormatter.Unity.nuspec index 047d9db..7a4ef71 100644 --- a/nuget/ZeroFormatter.Unity.nuspec +++ b/nuget/ZeroFormatter.Unity.nuspec @@ -2,14 +2,14 @@ ZeroFormatter.Unity - 1.6.2 + 1.6.3 ZeroFormatter.Unity neuecc y.neuecc https://github.com/neuecc/ZeroFormatter/ false Infinitely fast serializer for .NET, .NET Core and Unity. - fixed serialize issue when mutate under non-tracked collection. + modify resolver priority for extend types. add -u option for zfc.exe. ZeroFormatter, Serialization, Formatter, Serializer @@ -17,7 +17,7 @@ - + diff --git a/nuget/ZeroFormatter.nuspec b/nuget/ZeroFormatter.nuspec index 308f553..5c29239 100644 --- a/nuget/ZeroFormatter.nuspec +++ b/nuget/ZeroFormatter.nuspec @@ -2,14 +2,14 @@ ZeroFormatter - 1.6.2 + 1.6.3 ZeroFormatter neuecc y.neuecc https://github.com/neuecc/ZeroFormatter/ false Infinitely fast serializer for .NET, .NET Core and Unity. - fixed serialize issue when mutate under non-tracked collection. + modify resolver priority for extend types. add -u option for zfc.exe. ZeroFormatter, Serialization, Formatter, Serializer @@ -17,10 +17,10 @@ - + - + diff --git a/nuget/push.bat b/nuget/push.bat index c9f011e..42ba205 100644 --- a/nuget/push.bat +++ b/nuget/push.bat @@ -1,4 +1,4 @@ REM nuget push ZeroFormatter.Analyzer.1.1.1.0.nupkg -Source https://www.nuget.org/api/v2/package -nuget push ZeroFormatter.1.6.2.nupkg -Source https://www.nuget.org/api/v2/package -nuget push ZeroFormatter.Interfaces.1.6.2.nupkg -Source https://www.nuget.org/api/v2/package -nuget push ZeroFormatter.Unity.1.6.2.nupkg -Source https://www.nuget.org/api/v2/package +nuget push ZeroFormatter.1.6.3.nupkg -Source https://www.nuget.org/api/v2/package +nuget push ZeroFormatter.Interfaces.1.6.3.nupkg -Source https://www.nuget.org/api/v2/package +nuget push ZeroFormatter.Unity.1.6.3.nupkg -Source https://www.nuget.org/api/v2/package diff --git a/sandbox/PerformanceComparison/App.config b/sandbox/PerformanceComparison/App.config index 7956c88..499a0a7 100644 --- a/sandbox/PerformanceComparison/App.config +++ b/sandbox/PerformanceComparison/App.config @@ -7,7 +7,11 @@ - + + + + + diff --git a/sandbox/PerformanceComparison/PerformanceComparison.csproj b/sandbox/PerformanceComparison/PerformanceComparison.csproj index a163e09..99feca1 100644 --- a/sandbox/PerformanceComparison/PerformanceComparison.csproj +++ b/sandbox/PerformanceComparison/PerformanceComparison.csproj @@ -36,8 +36,8 @@ false - - ..\..\packages\FSharp.Core.4.0.1.7-alpha\lib\net40\FSharp.Core.dll + + ..\..\packages\FSharp.Core.4.1.0\lib\net40\FSharp.Core.dll True @@ -52,42 +52,50 @@ ..\..\packages\FsPickler.Json.3.2.0\lib\net45\FsPickler.Json.dll True - - ..\..\packages\Google.Protobuf.3.1.0\lib\net45\Google.Protobuf.dll + + ..\..\packages\Google.Protobuf.3.2.0\lib\net45\Google.Protobuf.dll True - - ..\..\packages\Jil.2.14.5\lib\net45\Jil.dll + + ..\..\packages\Jil.2.15.0\lib\net45\Jil.dll True - False - MessagePackCSharp_Alpha\MessagePack.dll + ..\..\packages\MessagePack.0.1.0-beta\lib\net45\MessagePack.dll + True - ..\..\packages\MsgPack.Cli.0.9.0-beta1\lib\net46\MsgPack.dll + ..\..\packages\MsgPack.Cli.0.9.0-beta2\lib\net46\MsgPack.dll True ..\..\packages\NetSerializer.4.1.0\lib\net45\NetSerializer.dll True - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.10.0.1-beta1\lib\net45\Newtonsoft.Json.dll True ..\..\packages\protobuf-net.2.1.0\lib\net451\protobuf-net.dll True - - ..\..\packages\Sigil.4.6.1\lib\net45\Sigil.dll + + ..\..\packages\Sigil.4.7.0\lib\net45\Sigil.dll True + + ..\..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll + True + + + ..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll + True + @@ -95,7 +103,7 @@ - ..\..\packages\Wire.0.8.1\lib\net45\Wire.dll + ..\..\packages\Wire.0.8.2\lib\net45\Wire.dll True @@ -136,7 +144,6 @@ PreserveNewest - diff --git a/sandbox/PerformanceComparison/Program.cs b/sandbox/PerformanceComparison/Program.cs index deec356..ce7c71d 100644 --- a/sandbox/PerformanceComparison/Program.cs +++ b/sandbox/PerformanceComparison/Program.cs @@ -428,19 +428,11 @@ static T SerializeMsgPack(T original) T copy = default(T); byte[] bytes = null; - // Note:We should check MessagePackSerializer.Get() on every iteration - // But currenly MsgPack-Cli has bug of get serializer - // https://github.com/msgpack/msgpack-cli/issues/191 - // so, get serializer at first. - // and If enum serialization options to ByUnderlyingValue, gets more fast but we check default option only. - - var serializer = MsgPack.Serialization.MessagePackSerializer.Get(); - using (new Measure("Serialize")) { for (int i = 0; i < Iteration; i++) { - bytes = serializer.PackSingleObject(original); + bytes = MsgPack.Serialization.MessagePackSerializer.Get().PackSingleObject(original); } } @@ -448,7 +440,7 @@ static T SerializeMsgPack(T original) { for (int i = 0; i < Iteration; i++) { - copy = serializer.UnpackSingleObject(bytes); + copy = MsgPack.Serialization.MessagePackSerializer.Get().UnpackSingleObject(bytes); } } diff --git a/sandbox/PerformanceComparison/Properties/AssemblyInfo.cs b/sandbox/PerformanceComparison/Properties/AssemblyInfo.cs index 59ad8d7..fe7b7ee 100644 --- a/sandbox/PerformanceComparison/Properties/AssemblyInfo.cs +++ b/sandbox/PerformanceComparison/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.6.2.0")] -[assembly: AssemblyFileVersion("1.6.2.0")] +[assembly: AssemblyVersion("1.6.3.0")] +[assembly: AssemblyFileVersion("1.6.3.0")] diff --git a/sandbox/PerformanceComparison/packages.config b/sandbox/PerformanceComparison/packages.config index 37c3939..a5ccdbd 100644 --- a/sandbox/PerformanceComparison/packages.config +++ b/sandbox/PerformanceComparison/packages.config @@ -1,15 +1,19 @@  - + - - - + + + + - + - - + + + + + \ No newline at end of file diff --git a/sandbox/Sandbox.NETCore/project.json b/sandbox/Sandbox.NETCore/project.json index 2e0b4db..69dcd3a 100644 --- a/sandbox/Sandbox.NETCore/project.json +++ b/sandbox/Sandbox.NETCore/project.json @@ -1,5 +1,5 @@ { - "version": "1.6.2-*", + "version": "1.6.3-*", "buildOptions": { "emitEntryPoint": true }, @@ -9,8 +9,8 @@ "type": "platform", "version": "1.0.0" }, - "ZeroFormatter.Interfaces.NETCore": "1.6.2", - "ZeroFormatter.NETCore": "1.6.2" + "ZeroFormatter.Interfaces.NETCore": "1.6.3", + "ZeroFormatter.NETCore": "1.6.3" }, "frameworks": { diff --git a/sandbox/Sandbox.NETCore/project.lock.json b/sandbox/Sandbox.NETCore/project.lock.json index 5a48018..27277b1 100644 --- a/sandbox/Sandbox.NETCore/project.lock.json +++ b/sandbox/Sandbox.NETCore/project.lock.json @@ -1992,7 +1992,7 @@ "lib/netstandard1.3/_._": {} } }, - "ZeroFormatter.Interfaces.NETCore/1.6.2": { + "ZeroFormatter.Interfaces.NETCore/1.6.3": { "type": "project", "framework": ".NETStandard,Version=v1.1", "dependencies": { @@ -2006,7 +2006,7 @@ "netstandard1.1/ZeroFormatter.Interfaces.NETCore.dll": {} } }, - "ZeroFormatter.NETCore/1.6.2": { + "ZeroFormatter.NETCore/1.6.3": { "type": "project", "framework": ".NETStandard,Version=v1.6", "dependencies": { @@ -2024,7 +2024,7 @@ "System.Text.Encoding": "4.0.11", "System.Text.Encoding.Extensions": "4.0.11", "System.Threading": "4.0.11", - "ZeroFormatter.Interfaces.NETCore": "1.6.2" + "ZeroFormatter.Interfaces.NETCore": "1.6.3" }, "compile": { "netstandard1.6/ZeroFormatter.NETCore.dll": {} @@ -6627,12 +6627,12 @@ "ref/xamarinwatchos10/_._" ] }, - "ZeroFormatter.Interfaces.NETCore/1.6.2": { + "ZeroFormatter.Interfaces.NETCore/1.6.3": { "type": "project", "path": "../../src/ZeroFormatter.Interfaces.NETCore/project.json", "msbuildProject": "../../src/ZeroFormatter.Interfaces.NETCore/ZeroFormatter.Interfaces.NETCore.xproj" }, - "ZeroFormatter.NETCore/1.6.2": { + "ZeroFormatter.NETCore/1.6.3": { "type": "project", "path": "../../src/ZeroFormatter.NETCore/project.json", "msbuildProject": "../../src/ZeroFormatter.NETCore/ZeroFormatter.NETCore.xproj" @@ -6641,8 +6641,8 @@ "projectFileDependencyGroups": { "": [ "Microsoft.NETCore.App >= 1.0.0", - "ZeroFormatter.Interfaces.NETCore >= 1.6.2", - "ZeroFormatter.NETCore >= 1.6.2" + "ZeroFormatter.Interfaces.NETCore >= 1.6.3", + "ZeroFormatter.NETCore >= 1.6.3" ], ".NETCoreApp,Version=v1.0": [] }, diff --git a/sandbox/Sandbox.Shared/Properties/AssemblyInfo.cs b/sandbox/Sandbox.Shared/Properties/AssemblyInfo.cs index 4b4d54b..f8585a6 100644 --- a/sandbox/Sandbox.Shared/Properties/AssemblyInfo.cs +++ b/sandbox/Sandbox.Shared/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.6.2.0")] -[assembly: AssemblyFileVersion("1.6.2.0")] +[assembly: AssemblyVersion("1.6.3.0")] +[assembly: AssemblyFileVersion("1.6.3.0")] diff --git a/sandbox/Sandbox/Properties/AssemblyInfo.cs b/sandbox/Sandbox/Properties/AssemblyInfo.cs index e87d510..d7d8043 100644 --- a/sandbox/Sandbox/Properties/AssemblyInfo.cs +++ b/sandbox/Sandbox/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.6.2.0")] -[assembly: AssemblyFileVersion("1.6.2.0")] +[assembly: AssemblyVersion("1.6.3.0")] +[assembly: AssemblyFileVersion("1.6.3.0")] diff --git a/src/ZeroFormatter.Analyzer.Vsix/source.extension.vsixmanifest b/src/ZeroFormatter.Analyzer.Vsix/source.extension.vsixmanifest index e6cf2ef..deacb66 100644 --- a/src/ZeroFormatter.Analyzer.Vsix/source.extension.vsixmanifest +++ b/src/ZeroFormatter.Analyzer.Vsix/source.extension.vsixmanifest @@ -1,7 +1,7 @@  - + ZeroFormatterAnalyzer New Launcher of ZeroFormatter.Analyzer diff --git a/src/ZeroFormatter.CodeGenerator/Program.cs b/src/ZeroFormatter.CodeGenerator/Program.cs index 033df6f..4a64b01 100644 --- a/src/ZeroFormatter.CodeGenerator/Program.cs +++ b/src/ZeroFormatter.CodeGenerator/Program.cs @@ -86,7 +86,6 @@ static void Main(string[] args) var cmdArgs = new CommandlineArguments(args); if (!cmdArgs.IsParsed) { - new System.Threading.Tasks.Dataflow.ActionBlock(x => Console.WriteLine(x)); return; } diff --git a/src/ZeroFormatter.CodeGenerator/Properties/AssemblyInfo.cs b/src/ZeroFormatter.CodeGenerator/Properties/AssemblyInfo.cs index a89abda..d2e66c9 100644 --- a/src/ZeroFormatter.CodeGenerator/Properties/AssemblyInfo.cs +++ b/src/ZeroFormatter.CodeGenerator/Properties/AssemblyInfo.cs @@ -33,5 +33,5 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.6.2.0")] -[assembly: AssemblyFileVersion("1.6.2.0")] +[assembly: AssemblyVersion("1.6.3.0")] +[assembly: AssemblyFileVersion("1.6.3.0")] diff --git a/src/ZeroFormatter.Interfaces.NETCore/project.json b/src/ZeroFormatter.Interfaces.NETCore/project.json index 7f0ee37..2e11848 100644 --- a/src/ZeroFormatter.Interfaces.NETCore/project.json +++ b/src/ZeroFormatter.Interfaces.NETCore/project.json @@ -1,5 +1,5 @@ { - "version": "1.6.2", + "version": "1.6.3", "buildOptions": { "outputName": "ZeroFormatter.Interfaces", "compile": "../ZeroFormatter.Interfaces/*.cs" diff --git a/src/ZeroFormatter.Interfaces/Properties/AssemblyInfo.cs b/src/ZeroFormatter.Interfaces/Properties/AssemblyInfo.cs index 8df12ce..ae02b4b 100644 --- a/src/ZeroFormatter.Interfaces/Properties/AssemblyInfo.cs +++ b/src/ZeroFormatter.Interfaces/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.6.2.0")] -[assembly: AssemblyFileVersion("1.6.2.0")] +[assembly: AssemblyVersion("1.6.3.0")] +[assembly: AssemblyFileVersion("1.6.3.0")] diff --git a/src/ZeroFormatter.NETCore/project.json b/src/ZeroFormatter.NETCore/project.json index 590021d..520caf0 100644 --- a/src/ZeroFormatter.NETCore/project.json +++ b/src/ZeroFormatter.NETCore/project.json @@ -1,5 +1,5 @@ { - "version": "1.6.2", + "version": "1.6.3", "buildOptions": { "allowUnsafe": true, "outputName": "ZeroFormatter", @@ -24,7 +24,7 @@ "System.Text.Encoding.Extensions": "4.0.11", "System.Collections.Concurrent": "4.0.12", "System.ObjectModel": "4.0.12", - "ZeroFormatter.Interfaces.NETCore": "1.6.2" + "ZeroFormatter.Interfaces.NETCore": "1.6.3" }, "frameworks": { "netstandard1.6": { diff --git a/src/ZeroFormatter.NETCore/project.lock.json b/src/ZeroFormatter.NETCore/project.lock.json index 8eeec33..b245cc4 100644 --- a/src/ZeroFormatter.NETCore/project.lock.json +++ b/src/ZeroFormatter.NETCore/project.lock.json @@ -359,7 +359,7 @@ "ref/netstandard1.3/System.Threading.Tasks.dll": {} } }, - "ZeroFormatter.Interfaces.NETCore/1.6.2": { + "ZeroFormatter.Interfaces.NETCore/1.6.3": { "type": "project", "framework": ".NETStandard,Version=v1.1", "dependencies": { @@ -2001,7 +2001,7 @@ "ref/xamarinwatchos10/_._" ] }, - "ZeroFormatter.Interfaces.NETCore/1.6.2": { + "ZeroFormatter.Interfaces.NETCore/1.6.3": { "type": "project", "path": "../ZeroFormatter.Interfaces.NETCore/project.json", "msbuildProject": "../ZeroFormatter.Interfaces.NETCore/ZeroFormatter.Interfaces.NETCore.xproj" @@ -2023,7 +2023,7 @@ "System.Text.Encoding >= 4.0.11", "System.Text.Encoding.Extensions >= 4.0.11", "System.Threading >= 4.0.11", - "ZeroFormatter.Interfaces.NETCore >= 1.6.2" + "ZeroFormatter.Interfaces.NETCore >= 1.6.3" ], ".NETStandard,Version=v1.6": [] }, diff --git a/src/ZeroFormatter/Properties/AssemblyInfo.cs b/src/ZeroFormatter/Properties/AssemblyInfo.cs index 8bd0cb3..b32aca7 100644 --- a/src/ZeroFormatter/Properties/AssemblyInfo.cs +++ b/src/ZeroFormatter/Properties/AssemblyInfo.cs @@ -33,8 +33,8 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.6.2.0")] -[assembly: AssemblyFileVersion("1.6.2.0")] +[assembly: AssemblyVersion("1.6.3.0")] +[assembly: AssemblyFileVersion("1.6.3.0")] [assembly: InternalsVisibleTo("ZeroFormatter.Tests")] diff --git a/tests/ZeroFormatter.NETCore.Tests/project.json b/tests/ZeroFormatter.NETCore.Tests/project.json index 52210b5..4bdd9c5 100644 --- a/tests/ZeroFormatter.NETCore.Tests/project.json +++ b/tests/ZeroFormatter.NETCore.Tests/project.json @@ -1,5 +1,5 @@ { - "version": "1.6.2-*", + "version": "1.6.3-*", "testRunner": "xunit", "dependencies": { "Microsoft.CSharp": "4.0.1", @@ -8,11 +8,11 @@ "System.Dynamic.Runtime": "4.0.11", "xunit": "2.2.0-beta3-build3402", "dotnet-test-xunit": "2.2.0-preview2-build1029", - "ZeroFormatter.Interfaces.NETCore": "1.6.2", - "ZeroFormatter.NETCore": "1.6.2" + "ZeroFormatter.Interfaces.NETCore": "1.6.3", + "ZeroFormatter.NETCore": "1.6.3" }, "frameworks": { - "netcoreapp1.6.2": { + "netcoreapp1.6.3": { "dependencies": { "Microsoft.NETCore.App": { "type": "platform", diff --git a/tests/ZeroFormatter.NETCore.Tests/project.lock.json b/tests/ZeroFormatter.NETCore.Tests/project.lock.json index d91d634..a0469ed 100644 --- a/tests/ZeroFormatter.NETCore.Tests/project.lock.json +++ b/tests/ZeroFormatter.NETCore.Tests/project.lock.json @@ -2,7 +2,7 @@ "locked": false, "version": 2, "targets": { - ".NETCoreApp,Version=v1.6.2": { + ".NETCoreApp,Version=v1.6.3": { "dotnet-test-xunit/2.2.0-preview2-build1029": { "type": "package", "dependencies": { @@ -2489,7 +2489,7 @@ "lib/netstandard1.1/xunit.runner.utility.dotnet.dll": {} } }, - "ZeroFormatter.Interfaces.NETCore/1.6.2": { + "ZeroFormatter.Interfaces.NETCore/1.6.3": { "type": "project", "framework": ".NETStandard,Version=v1.1", "dependencies": { @@ -2503,7 +2503,7 @@ "netstandard1.1/ZeroFormatter.Interfaces.NETCore.dll": {} } }, - "ZeroFormatter.NETCore/1.6.2": { + "ZeroFormatter.NETCore/1.6.3": { "type": "project", "framework": ".NETStandard,Version=v1.6", "dependencies": { @@ -2521,7 +2521,7 @@ "System.Text.Encoding": "4.0.11", "System.Text.Encoding.Extensions": "4.0.11", "System.Threading": "4.0.11", - "ZeroFormatter.Interfaces.NETCore": "1.6.2" + "ZeroFormatter.Interfaces.NETCore": "1.6.3" }, "compile": { "netstandard1.6/ZeroFormatter.NETCore.dll": {} @@ -7573,12 +7573,12 @@ "xunit.runner.utility.nuspec" ] }, - "ZeroFormatter.Interfaces.NETCore/1.6.2": { + "ZeroFormatter.Interfaces.NETCore/1.6.3": { "type": "project", "path": "../../src/ZeroFormatter.Interfaces.NETCore/project.json", "msbuildProject": "../../src/ZeroFormatter.Interfaces.NETCore/ZeroFormatter.Interfaces.NETCore.xproj" }, - "ZeroFormatter.NETCore/1.6.2": { + "ZeroFormatter.NETCore/1.6.3": { "type": "project", "path": "../../src/ZeroFormatter.NETCore/project.json", "msbuildProject": "../../src/ZeroFormatter.NETCore/ZeroFormatter.NETCore.xproj" @@ -7590,12 +7590,12 @@ "NETStandard.Library >= 1.6.0", "System.Diagnostics.Contracts >= 4.0.1", "System.Dynamic.Runtime >= 4.0.11", - "ZeroFormatter.Interfaces.NETCore >= 1.6.2", - "ZeroFormatter.NETCore >= 1.6.2", + "ZeroFormatter.Interfaces.NETCore >= 1.6.3", + "ZeroFormatter.NETCore >= 1.6.3", "dotnet-test-xunit >= 2.2.0-preview2-build1029", "xunit >= 2.2.0-beta3-build3402" ], - ".NETCoreApp,Version=v1.6.2": [ + ".NETCoreApp,Version=v1.6.3": [ "Microsoft.NETCore.App >= 1.0.1" ] }, diff --git a/tests/ZeroFormatter.Tests/Properties/AssemblyInfo.cs b/tests/ZeroFormatter.Tests/Properties/AssemblyInfo.cs index 2851520..877bd4c 100644 --- a/tests/ZeroFormatter.Tests/Properties/AssemblyInfo.cs +++ b/tests/ZeroFormatter.Tests/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.6.2.0")] -[assembly: AssemblyFileVersion("1.6.2.0")] +[assembly: AssemblyVersion("1.6.3.0")] +[assembly: AssemblyFileVersion("1.6.3.0")] diff --git a/tests/ZeroFormatter.UnityTests/Assets/Dlls/Sandbox.Shared.dll b/tests/ZeroFormatter.UnityTests/Assets/Dlls/Sandbox.Shared.dll index 08643962deb15a590d798cc6bdefbb298c6237d0..364e7ef4cc2c2ce89f4d6257fedda783a5d35f2f 100644 GIT binary patch delta 93 zcmZqp!PxMFaY6^PwDOjX-Od4w%#+Uts4_Bd{u=OFLLlQ=?$S>x-(BZ*=lkVP3{u|w vA#*JUqw(f>MIV?snHks^7#SECm^V)^^JN5zJ}s{YQj=3F&4HY`mB~y1)S)7l delta 93 zcmZqp!PxMFaY6_4Wv%{=-Od4wOq0(Cs4_Bb{u=OFLf}i;)~|)y;l9(ZK7GL>UuCfQ vL*`lzMx)L1ias!NGBL0*FfuSOFm0Y*=F12aeOg`*q$a0Ungcm=E0dW38A~I4 diff --git a/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.Interfaces.dll b/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.Interfaces.dll index 27d9f537850aecbaa5958db94eeaab9742b46102..1ae7295a10aa061e84e2094b2cdb50417d7d9950 100644 GIT binary patch delta 136 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 delta 12469 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