fix zfc

neuecc · Dec 20, 2016 · f10f102 · f10f102
1 parent 3296b1b
commit f10f102
Show file tree

Hide file tree

Showing 31 changed files with 2,532 additions and 2,335 deletions.
diff --git a/nuget/ZeroFormatter.Interfaces.nuspec b/nuget/ZeroFormatter.Interfaces.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>ZeroFormatter.Interfaces</id>
-        <version>1.5.6</version>
+        <version>1.5.7</version>
         <title>ZeroFormatter.Interfaces</title>
         <authors>neuecc</authors>
         <owners>y.neuecc</owners>

diff --git a/nuget/ZeroFormatter.Unity.nuspec b/nuget/ZeroFormatter.Unity.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>ZeroFormatter.Unity</id>
-        <version>1.5.6</version>
+        <version>1.5.7</version>
         <title>ZeroFormatter.Unity</title>
         <authors>neuecc</authors>
         <owners>y.neuecc</owners>
@@ -17,7 +17,7 @@
         </frameworkAssemblies>
         <dependencies>
             <group targetFramework="Unity Full v3.5">
-                <dependency id="ZeroFormatter.Interfaces" version="1.5.6" />
+                <dependency id="ZeroFormatter.Interfaces" version="1.5.7" />
             </group>
         </dependencies>
     </metadata>

diff --git a/nuget/ZeroFormatter.nuspec b/nuget/ZeroFormatter.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>ZeroFormatter</id>
-        <version>1.5.6</version>
+        <version>1.5.7</version>
         <title>ZeroFormatter</title>
         <authors>neuecc</authors>
         <owners>y.neuecc</owners>
@@ -17,10 +17,10 @@
         </frameworkAssemblies>
         <dependencies>
             <group targetFramework=".NETFramework4.5">
-                <dependency id="ZeroFormatter.Interfaces" version="1.5.6" />
+                <dependency id="ZeroFormatter.Interfaces" version="1.5.7" />
             </group>
             <group targetFramework=".NETStandard1.6">
-                <dependency id="ZeroFormatter.Interfaces" version="1.5.6" />
+                <dependency id="ZeroFormatter.Interfaces" version="1.5.7" />
                 <dependency id="System.Reflection.Emit" version="4.0.1" />
                 <dependency id="System.Runtime" version="4.1.0" />
                 <dependency id="System.Runtime.Extensions" version="4.1.0" />

diff --git 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.5.6.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push ZeroFormatter.Interfaces.1.5.6.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push ZeroFormatter.Unity.1.5.6.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push ZeroFormatter.1.5.7.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push ZeroFormatter.Interfaces.1.5.7.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push ZeroFormatter.Unity.1.5.7.nupkg -Source https://www.nuget.org/api/v2/package
diff --git a/nuget/zfc.exe b/nuget/zfc.exe
diff --git a/nuget/zfc.exe.config b/nuget/zfc.exe.config
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+  </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.6.0.0" newVersion="4.6.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git 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.5.6.0")]
-[assembly: AssemblyFileVersion("1.5.6.0")]
+[assembly: AssemblyVersion("1.5.7.0")]
+[assembly: AssemblyFileVersion("1.5.7.0")]
diff --git a/sandbox/Sandbox.NETCore/project.json b/sandbox/Sandbox.NETCore/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.5.6-*",
+  "version": "1.5.7-*",
   "buildOptions": {
     "emitEntryPoint": true
   },
@@ -9,8 +9,8 @@
       "type": "platform",
       "version": "1.0.0"
     },
-    "ZeroFormatter.Interfaces.NETCore": "1.5.6",
-    "ZeroFormatter.NETCore": "1.5.6"
+    "ZeroFormatter.Interfaces.NETCore": "1.5.7",
+    "ZeroFormatter.NETCore": "1.5.7"
   },
 
   "frameworks": {

diff --git 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.5.6": {
+      "ZeroFormatter.Interfaces.NETCore/1.5.7": {
         "type": "project",
         "framework": ".NETStandard,Version=v1.1",
         "dependencies": {
@@ -2006,7 +2006,7 @@
           "netstandard1.1/ZeroFormatter.Interfaces.NETCore.dll": {}
         }
       },
-      "ZeroFormatter.NETCore/1.5.6": {
+      "ZeroFormatter.NETCore/1.5.7": {
         "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.5.6"
+          "ZeroFormatter.Interfaces.NETCore": "1.5.7"
         },
         "compile": {
           "netstandard1.6/ZeroFormatter.NETCore.dll": {}
@@ -6627,12 +6627,12 @@
         "ref/xamarinwatchos10/_._"
       ]
     },
-    "ZeroFormatter.Interfaces.NETCore/1.5.6": {
+    "ZeroFormatter.Interfaces.NETCore/1.5.7": {
       "type": "project",
       "path": "../../src/ZeroFormatter.Interfaces.NETCore/project.json",
       "msbuildProject": "../../src/ZeroFormatter.Interfaces.NETCore/ZeroFormatter.Interfaces.NETCore.xproj"
     },
-    "ZeroFormatter.NETCore/1.5.6": {
+    "ZeroFormatter.NETCore/1.5.7": {
       "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.5.6",
-      "ZeroFormatter.NETCore >= 1.5.6"
+      "ZeroFormatter.Interfaces.NETCore >= 1.5.7",
+      "ZeroFormatter.NETCore >= 1.5.7"
     ],
     ".NETCoreApp,Version=v1.0": []
   },

diff --git a/sandbox/Sandbox.Shared/Bar/MyClass.cs b/sandbox/Sandbox.Shared/Bar/MyClass.cs
@@ -87,6 +87,18 @@ public class MyClass2
         public virtual MogeMoge Mone { get; set; }
     }
 
+    [ZeroFormattable]
+    public struct GetOnly
+    {
+        [Index(0)]
+        public int X { get; }
+
+        public GetOnly(int x)
+        {
+            this.X = x;
+        }
+    }
+
     public enum MogeMoge
     {
         Apple, Orange

diff --git 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.5.6.0")]
-[assembly: AssemblyFileVersion("1.5.6.0")]
+[assembly: AssemblyVersion("1.5.7.0")]
+[assembly: AssemblyFileVersion("1.5.7.0")]
diff --git 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.5.6.0")]
-[assembly: AssemblyFileVersion("1.5.6.0")]
+[assembly: AssemblyVersion("1.5.7.0")]
+[assembly: AssemblyFileVersion("1.5.7.0")]
diff --git a/src/ZeroFormatter.Analyzer.Vsix/source.extension.vsixmanifest b/src/ZeroFormatter.Analyzer.Vsix/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="ZeroFormatterAnalyzer.343bae8e-c880-437c-9e30-748b9e0f9b6e" Version="1.5.6" Language="en-US" Publisher="neuecc"/>
+        <Identity Id="ZeroFormatterAnalyzer.343bae8e-c880-437c-9e30-748b9e0f9b6e" Version="1.5.7" Language="en-US" Publisher="neuecc"/>
         <DisplayName>ZeroFormatterAnalyzer</DisplayName>
         <Description xml:space="preserve">New Launcher of ZeroFormatter.Analyzer</Description>
     </Metadata>

diff --git 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.5.6.0")]
-[assembly: AssemblyFileVersion("1.5.6.0")]
+[assembly: AssemblyVersion("1.5.7.0")]
+[assembly: AssemblyFileVersion("1.5.7.0")]
diff --git a/src/ZeroFormatter.CodeGenerator/TypeCollector.cs b/src/ZeroFormatter.CodeGenerator/TypeCollector.cs
@@ -538,8 +538,8 @@ void CollectObjectSegment(INamedTypeSymbol type, bool fromNullable, bool asKey)
                     Name = property.Name,
                     Type = memberType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat),
                     Index = (int)index.Value,
-                    IsGetProtected = (propSymbol != null) ? propSymbol.GetMethod.DeclaredAccessibility == Accessibility.Protected : false,
-                    IsSetProtected = (propSymbol != null) ? propSymbol.SetMethod.DeclaredAccessibility == Accessibility.Protected : false,
+                    IsGetProtected = (propSymbol != null) ? propSymbol?.GetMethod?.DeclaredAccessibility == Accessibility.Protected : false,
+                    IsSetProtected = (propSymbol != null) ? propSymbol?.SetMethod?.DeclaredAccessibility == Accessibility.Protected : false,
                     FixedSize = length ?? 0,
                     IsProperty = propSymbol != null,
                     IsCacheSegment = !KnownFormatterSpec.IsLazySegment(memberType),

diff --git a/src/ZeroFormatter.Interfaces.NETCore/project.json b/src/ZeroFormatter.Interfaces.NETCore/project.json
@@ -1,5 +1,5 @@
 {
-	"version": "1.5.6",
+	"version": "1.5.7",
 	"buildOptions": {
 		"outputName": "ZeroFormatter.Interfaces",
 		"compile": "../ZeroFormatter.Interfaces/*.cs"

diff --git 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.5.6.0")]
-[assembly: AssemblyFileVersion("1.5.6.0")]
+[assembly: AssemblyVersion("1.5.7.0")]
+[assembly: AssemblyFileVersion("1.5.7.0")]
diff --git a/src/ZeroFormatter.NETCore/project.json b/src/ZeroFormatter.NETCore/project.json
@@ -1,5 +1,5 @@
 {
-	"version": "1.5.6",
+	"version": "1.5.7",
 	"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.5.6"
+		"ZeroFormatter.Interfaces.NETCore": "1.5.7"
 	},
 	"frameworks": {
 		"netstandard1.6": {

diff --git 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.5.6": {
+      "ZeroFormatter.Interfaces.NETCore/1.5.7": {
         "type": "project",
         "framework": ".NETStandard,Version=v1.1",
         "dependencies": {
@@ -2001,7 +2001,7 @@
         "ref/xamarinwatchos10/_._"
       ]
     },
-    "ZeroFormatter.Interfaces.NETCore/1.5.6": {
+    "ZeroFormatter.Interfaces.NETCore/1.5.7": {
       "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.5.6"
+      "ZeroFormatter.Interfaces.NETCore >= 1.5.7"
     ],
     ".NETStandard,Version=v1.6": []
   },

diff --git 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.5.6.0")]
-[assembly: AssemblyFileVersion("1.5.6.0")]
+[assembly: AssemblyVersion("1.5.7.0")]
+[assembly: AssemblyFileVersion("1.5.7.0")]
 
 
 [assembly: InternalsVisibleTo("ZeroFormatter.Tests")]

diff --git a/tests/ZeroFormatter.NETCore.Tests/project.json b/tests/ZeroFormatter.NETCore.Tests/project.json
@@ -1,5 +1,5 @@
 {
-	"version": "1.5.6-*",
+	"version": "1.5.7-*",
 	"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.5.6",
-		"ZeroFormatter.NETCore": "1.5.6"
+		"ZeroFormatter.Interfaces.NETCore": "1.5.7",
+		"ZeroFormatter.NETCore": "1.5.7"
 	},
 	"frameworks": {
-		"netcoreapp1.5.6": {
+		"netcoreapp1.5.7": {
 			"dependencies": {
 				"Microsoft.NETCore.App": {
 					"type": "platform",

diff --git 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.5.6": {
+    ".NETCoreApp,Version=v1.5.7": {
       "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.5.6": {
+      "ZeroFormatter.Interfaces.NETCore/1.5.7": {
         "type": "project",
         "framework": ".NETStandard,Version=v1.1",
         "dependencies": {
@@ -2503,7 +2503,7 @@
           "netstandard1.1/ZeroFormatter.Interfaces.NETCore.dll": {}
         }
       },
-      "ZeroFormatter.NETCore/1.5.6": {
+      "ZeroFormatter.NETCore/1.5.7": {
         "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.5.6"
+          "ZeroFormatter.Interfaces.NETCore": "1.5.7"
         },
         "compile": {
           "netstandard1.6/ZeroFormatter.NETCore.dll": {}
@@ -7573,12 +7573,12 @@
         "xunit.runner.utility.nuspec"
       ]
     },
-    "ZeroFormatter.Interfaces.NETCore/1.5.6": {
+    "ZeroFormatter.Interfaces.NETCore/1.5.7": {
       "type": "project",
       "path": "../../src/ZeroFormatter.Interfaces.NETCore/project.json",
       "msbuildProject": "../../src/ZeroFormatter.Interfaces.NETCore/ZeroFormatter.Interfaces.NETCore.xproj"
     },
-    "ZeroFormatter.NETCore/1.5.6": {
+    "ZeroFormatter.NETCore/1.5.7": {
       "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.5.6",
-      "ZeroFormatter.NETCore >= 1.5.6",
+      "ZeroFormatter.Interfaces.NETCore >= 1.5.7",
+      "ZeroFormatter.NETCore >= 1.5.7",
       "dotnet-test-xunit >= 2.2.0-preview2-build1029",
       "xunit >= 2.2.0-beta3-build3402"
     ],
-    ".NETCoreApp,Version=v1.5.6": [
+    ".NETCoreApp,Version=v1.5.7": [
       "Microsoft.NETCore.App >= 1.0.1"
     ]
   },

diff --git 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.5.6.0")]
-[assembly: AssemblyFileVersion("1.5.6.0")]
+[assembly: AssemblyVersion("1.5.7.0")]
+[assembly: AssemblyFileVersion("1.5.7.0")]
diff --git a/tests/ZeroFormatter.UnityTests/Assets/Dlls/Sandbox.Shared.dll b/tests/ZeroFormatter.UnityTests/Assets/Dlls/Sandbox.Shared.dll
diff --git a/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.Interfaces.dll b/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.Interfaces.dll
diff --git a/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.Interfaces.dll.mdb b/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.Interfaces.dll.mdb
diff --git a/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.Interfaces.dll.mdb.meta b/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.Interfaces.dll.mdb.meta
diff --git a/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.dll b/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.dll
diff --git a/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.dll.mdb b/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.dll.mdb