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

Commit c8ea394

Browse files
neueccneuecc
committed
add three zfc options.
1 parent 354fbe5 commit c8ea394

File tree

29 files changed

+719
-71
lines changed

29 files changed

+719
-71
lines changed

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,9 @@ zfc arguments help:
468468
-t, --customtypes=VALUE [optional, default=empty]comma separated allows custom types
469469
-c, --conditionalsymbol=VALUE [optional, default=empty]conditional compiler symbol
470470
-r, --resolvername=VALUE [optional, default=DefaultResolver]Register CustomSerializer target
471+
-d, --disallowinternaltype [optional, default=false]Don't generate internal type", x => { DisallowInternalType = true; } },
472+
-e, --propertyenumonly, [optional, default=false]Generate only property enum type only", x => { PropertyEnumOnly = true; } },
473+
-m, --disallowinmetadata, [optional, default=false]Don't generate in metadata type", x => { DisallowInMetadata = true; } },
471474
```
472475

473476
```

‎nuget/ZeroFormatter.Interfaces.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/2011/08/nuspec.xsd">
33
<metadata>
44
<id>ZeroFormatter.Interfaces</id>
5-
<version>1.5.2</version>
5+
<version>1.5.3</version>
66
<title>ZeroFormatter.Interfaces</title>
77
<authors>neuecc</authors>
88
<owners>y.neuecc</owners>

‎nuget/ZeroFormatter.Unity.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>ZeroFormatter.Unity</id>
5-
<version>1.5.2</version>
5+
<version>1.5.3</version>
66
<title>ZeroFormatter.Unity</title>
77
<authors>neuecc</authors>
88
<owners>y.neuecc</owners>
@@ -17,7 +17,7 @@
1717
</frameworkAssemblies>
1818
<dependencies>
1919
<group targetFramework="Unity Full v3.5">
20-
<dependency id="ZeroFormatter.Interfaces" version="1.5.2" />
20+
<dependency id="ZeroFormatter.Interfaces" version="1.5.3" />
2121
</group>
2222
</dependencies>
2323
</metadata>

‎nuget/ZeroFormatter.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/2011/08/nuspec.xsd">
33
<metadata>
44
<id>ZeroFormatter</id>
5-
<version>1.5.2</version>
5+
<version>1.5.3</version>
66
<title>ZeroFormatter</title>
77
<authors>neuecc</authors>
88
<owners>y.neuecc</owners>
@@ -17,10 +17,10 @@
1717
</frameworkAssemblies>
1818
<dependencies>
1919
<group targetFramework=".NETFramework4.5">
20-
<dependency id="ZeroFormatter.Interfaces" version="1.5.2" />
20+
<dependency id="ZeroFormatter.Interfaces" version="1.5.3" />
2121
</group>
2222
<group targetFramework=".NETStandard1.6">
23-
<dependency id="ZeroFormatter.Interfaces" version="1.5.2" />
23+
<dependency id="ZeroFormatter.Interfaces" version="1.5.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.5.2.nupkg -Source https://www.nuget.org/api/v2/package
3-
nuget push ZeroFormatter.Interfaces.1.5.2.nupkg -Source https://www.nuget.org/api/v2/package
4-
nuget push ZeroFormatter.Unity.1.5.2.nupkg -Source https://www.nuget.org/api/v2/package
2+
nuget push ZeroFormatter.1.5.3.nupkg -Source https://www.nuget.org/api/v2/package
3+
nuget push ZeroFormatter.Interfaces.1.5.3.nupkg -Source https://www.nuget.org/api/v2/package
4+
nuget push ZeroFormatter.Unity.1.5.3.nupkg -Source https://www.nuget.org/api/v2/package

‎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.5.2.0")]
36-
[assembly: AssemblyFileVersion("1.5.2.0")]
35+
[assembly: AssemblyVersion("1.5.3.0")]
36+
[assembly: AssemblyFileVersion("1.5.3.0")]

‎sandbox/Sandbox.NETCore/project.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.5.2-*",
2+
"version": "1.5.3-*",
33
"buildOptions": {
44
"emitEntryPoint": true
55
},
@@ -9,8 +9,8 @@
99
"type": "platform",
1010
"version": "1.0.0"
1111
},
12-
"ZeroFormatter.Interfaces.NETCore": "1.5.2",
13-
"ZeroFormatter.NETCore": "1.5.2"
12+
"ZeroFormatter.Interfaces.NETCore": "1.5.3",
13+
"ZeroFormatter.NETCore": "1.5.3"
1414
},
1515

1616
"frameworks": {

‎sandbox/Sandbox.NETCore/project.lock.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1992,7 +1992,7 @@
19921992
"lib/netstandard1.3/_._": {}
19931993
}
19941994
},
1995-
"ZeroFormatter.Interfaces.NETCore/1.5.2": {
1995+
"ZeroFormatter.Interfaces.NETCore/1.5.3": {
19961996
"type": "project",
19971997
"framework": ".NETStandard,Version=v1.1",
19981998
"dependencies": {
@@ -2006,7 +2006,7 @@
20062006
"netstandard1.1/ZeroFormatter.Interfaces.NETCore.dll": {}
20072007
}
20082008
},
2009-
"ZeroFormatter.NETCore/1.5.2": {
2009+
"ZeroFormatter.NETCore/1.5.3": {
20102010
"type": "project",
20112011
"framework": ".NETStandard,Version=v1.6",
20122012
"dependencies": {
@@ -2024,7 +2024,7 @@
20242024
"System.Text.Encoding": "4.0.11",
20252025
"System.Text.Encoding.Extensions": "4.0.11",
20262026
"System.Threading": "4.0.11",
2027-
"ZeroFormatter.Interfaces.NETCore": "1.5.2"
2027+
"ZeroFormatter.Interfaces.NETCore": "1.5.3"
20282028
},
20292029
"compile": {
20302030
"netstandard1.6/ZeroFormatter.NETCore.dll": {}
@@ -6627,12 +6627,12 @@
66276627
"ref/xamarinwatchos10/_._"
66286628
]
66296629
},
6630-
"ZeroFormatter.Interfaces.NETCore/1.5.2": {
6630+
"ZeroFormatter.Interfaces.NETCore/1.5.3": {
66316631
"type": "project",
66326632
"path": "../../src/ZeroFormatter.Interfaces.NETCore/project.json",
66336633
"msbuildProject": "../../src/ZeroFormatter.Interfaces.NETCore/ZeroFormatter.Interfaces.NETCore.xproj"
66346634
},
6635-
"ZeroFormatter.NETCore/1.5.2": {
6635+
"ZeroFormatter.NETCore/1.5.3": {
66366636
"type": "project",
66376637
"path": "../../src/ZeroFormatter.NETCore/project.json",
66386638
"msbuildProject": "../../src/ZeroFormatter.NETCore/ZeroFormatter.NETCore.xproj"
@@ -6641,8 +6641,8 @@
66416641
"projectFileDependencyGroups": {
66426642
"": [
66436643
"Microsoft.NETCore.App >= 1.0.0",
6644-
"ZeroFormatter.Interfaces.NETCore >= 1.5.2",
6645-
"ZeroFormatter.NETCore >= 1.5.2"
6644+
"ZeroFormatter.Interfaces.NETCore >= 1.5.3",
6645+
"ZeroFormatter.NETCore >= 1.5.3"
66466646
],
66476647
".NETCoreApp,Version=v1.0": []
66486648
},

‎sandbox/Sandbox.Shared/InnerClass.cs‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
using ZeroFormatter;
7+
8+
namespace Sandbox.Shared
9+
{
10+
public class InnerClassA
11+
{
12+
public enum InnerEnum
13+
{
14+
A, B, C
15+
}
16+
17+
[ZeroFormattable]
18+
public class InnerObject
19+
{
20+
[Index(0)]
21+
public virtual int MyProperty { get; set; }
22+
}
23+
}
24+
25+
public class InnerClassB
26+
{
27+
public enum InnerEnum
28+
{
29+
A, B, C
30+
}
31+
32+
private enum NgGenerateEnum
33+
{
34+
A, B, C
35+
}
36+
37+
enum NgGenerateEnum2
38+
{
39+
Z
40+
}
41+
42+
[ZeroFormattable]
43+
public class InnerObject
44+
{
45+
[Index(0)]
46+
public virtual int MyProperty { get; set; }
47+
48+
49+
[Index(1)]
50+
public virtual InsideEnum MyProperty2 { get; set; }
51+
52+
53+
[Index(2)]
54+
public virtual TypeCode MyProperty3 { get; set; }
55+
}
56+
}
57+
58+
[ZeroFormattable]
59+
class InternalOkGenerateType
60+
{
61+
[Index(0)]
62+
public virtual int MyProperty { get; set; }
63+
}
64+
65+
public enum OutSideEnum
66+
{
67+
A, B, C
68+
}
69+
70+
public enum InsideEnum
71+
{
72+
A, B, C
73+
}
74+
}

‎sandbox/Sandbox.Shared/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.5.2.0")]
36-
[assembly: AssemblyFileVersion("1.5.2.0")]
35+
[assembly: AssemblyVersion("1.5.3.0")]
36+
[assembly: AssemblyFileVersion("1.5.3.0")]

0 commit comments

Comments
 (0)