1.6.4

neuecc · Mar 1, 2017 · 17342a5 · 17342a5
1 parent 1c744ec
commit 17342a5
Show file tree

Hide file tree

Showing 39 changed files with 641 additions and 17,092 deletions.
diff --git a/.gitignore b/.gitignore
@@ -112,4 +112,11 @@ UpgradeLog*.XML
 tests/ZeroFormatter.UnityTests/bin/*
 tests/ZeroFormatter.UnityTests/Library/*
 tests/ZeroFormatter.UnityTests/obj/*
-tests/ZeroFormatter.UnityTests/Temp/*
+tests/ZeroFormatter.UnityTests/Temp/*
+
+#OTHERS
+
+nuget/*.zip
+nuget/*.nupkg
+nuget/zfc.exe
+nuget/zfc.exe.config
diff --git a/ZeroFormatter.sln b/ZeroFormatter.sln
@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26206.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_others", "_others", "{7FB78A03-3E9B-4E43-9A47-77D868ACCFD9}"
 	ProjectSection(SolutionItems) = preProject
-		global.json = global.json
+		.gitignore = .gitignore
 		LICENSE = LICENSE
 		nuget\pack.bat = nuget\pack.bat
 		nuget\push.bat = nuget\push.bat
@@ -16,6 +16,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_others", "_others", "{7FB7
 		nuget\ZeroFormatter.Unity.nuspec = nuget\ZeroFormatter.Unity.nuspec
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2CE059FD-1C8D-49B7-851E-4A5B385F63D5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sandbox", "sandbox", "{F29BFD74-5462-485D-851E-69B683F08C84}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4A106901-0A11-4D37-B5E6-D4DB7A43C41C}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZeroFormatter", "src\ZeroFormatter\ZeroFormatter.csproj", "{82049AFE-0913-4FA4-B924-AD5354952154}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZeroFormatter.Analyzer", "src\ZeroFormatter.Analyzer\ZeroFormatter.Analyzer.csproj", "{A15F092D-C6D9-4938-B288-7A8B6CF39A53}"
@@ -26,23 +32,17 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZeroFormatter.CodeGenerator
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZeroFormatter.Interfaces", "src\ZeroFormatter.Interfaces\ZeroFormatter.Interfaces.csproj", "{C051F473-427F-4062-94FB-CAE3FA460FC8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2CE059FD-1C8D-49B7-851E-4A5B385F63D5}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sandbox", "sandbox", "{F29BFD74-5462-485D-851E-69B683F08C84}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4A106901-0A11-4D37-B5E6-D4DB7A43C41C}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZeroFormatter.Tests", "tests\ZeroFormatter.Tests\ZeroFormatter.Tests.csproj", "{419EF6DC-7A15-4B50-88A4-E2AEDB73FA7F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sandbox", "sandbox\Sandbox\Sandbox.csproj", "{C8BA4A0F-5F66-442A-9516-D3E94C1E26F3}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ZeroFormatter.Interfaces.NETCore", "src\ZeroFormatter.Interfaces.NETCore\ZeroFormatter.Interfaces.NETCore.xproj", "{E486CA99-A9FC-4B7D-9FB5-38A53C995C87}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZeroFormatter.Interfaces.NETCore", "src\ZeroFormatter.Interfaces.NETCore\ZeroFormatter.Interfaces.NETCore.csproj", "{E486CA99-A9FC-4B7D-9FB5-38A53C995C87}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ZeroFormatter.NETCore", "src\ZeroFormatter.NETCore\ZeroFormatter.NETCore.xproj", "{C6B8E59E-ECF2-4AE9-A8F7-02E9BDAD57EB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZeroFormatter.NETCore", "src\ZeroFormatter.NETCore\ZeroFormatter.NETCore.csproj", "{C6B8E59E-ECF2-4AE9-A8F7-02E9BDAD57EB}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Sandbox.NETCore", "sandbox\Sandbox.NETCore\Sandbox.NETCore.xproj", "{105EFFE6-8855-4C8A-B20F-86C9E0AD5842}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sandbox.NETCore", "sandbox\Sandbox.NETCore\Sandbox.NETCore.csproj", "{105EFFE6-8855-4C8A-B20F-86C9E0AD5842}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ZeroFormatter.NETCore.Tests", "tests\ZeroFormatter.NETCore.Tests\ZeroFormatter.NETCore.Tests.xproj", "{0763A385-4EE0-45F3-8B20-0B0A71C74870}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZeroFormatter.NETCore.Tests", "tests\ZeroFormatter.NETCore.Tests\ZeroFormatter.NETCore.Tests.csproj", "{0763A385-4EE0-45F3-8B20-0B0A71C74870}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sandbox.Shared", "sandbox\Sandbox.Shared\Sandbox.Shared.csproj", "{944F22D3-20B1-4F6D-83FA-9331CD4ADF75}"
 EndProject
@@ -119,8 +119,8 @@ Global
 		{0763A385-4EE0-45F3-8B20-0B0A71C74870}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0763A385-4EE0-45F3-8B20-0B0A71C74870}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0763A385-4EE0-45F3-8B20-0B0A71C74870}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0763A385-4EE0-45F3-8B20-0B0A71C74870}.Unity|Any CPU.ActiveCfg = Unity|Any CPU
-		{0763A385-4EE0-45F3-8B20-0B0A71C74870}.Unity|Any CPU.Build.0 = Unity|Any CPU
+		{0763A385-4EE0-45F3-8B20-0B0A71C74870}.Unity|Any CPU.ActiveCfg = Release|Any CPU
+		{0763A385-4EE0-45F3-8B20-0B0A71C74870}.Unity|Any CPU.Build.0 = Release|Any CPU
 		{944F22D3-20B1-4F6D-83FA-9331CD4ADF75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{944F22D3-20B1-4F6D-83FA-9331CD4ADF75}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{944F22D3-20B1-4F6D-83FA-9331CD4ADF75}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/global.json b/global.json
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.6.3</version>
+        <version>1.6.4</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.6.3</version>
+        <version>1.6.4</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.6.3" />
+                <dependency id="ZeroFormatter.Interfaces" version="1.6.4" />
             </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.6.3</version>
+        <version>1.6.4</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.6.3" />
+                <dependency id="ZeroFormatter.Interfaces" version="1.6.4" />
             </group>
             <group targetFramework=".NETStandard1.6">
-                <dependency id="ZeroFormatter.Interfaces" version="1.6.3" />
+                <dependency id="ZeroFormatter.Interfaces" version="1.6.4" />
                 <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.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
+nuget push ZeroFormatter.1.6.4.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push ZeroFormatter.Interfaces.1.6.4.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push ZeroFormatter.Unity.1.6.4.nupkg -Source https://www.nuget.org/api/v2/package
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.6.3.0")]
-[assembly: AssemblyFileVersion("1.6.3.0")]
+[assembly: AssemblyVersion("1.6.4.0")]
+[assembly: AssemblyFileVersion("1.6.4.0")]
diff --git a/sandbox/Sandbox.NETCore/Sandbox.NETCore.csproj b/sandbox/Sandbox.NETCore/Sandbox.NETCore.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <VersionPrefix>1.6.4</VersionPrefix>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <AssemblyName>Sandbox.NETCore</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <PackageId>Sandbox.NETCore</PackageId>
+    <RuntimeFrameworkVersion>1.0.3</RuntimeFrameworkVersion>
+    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\ZeroFormatter.Interfaces.NETCore\ZeroFormatter.Interfaces.NETCore.csproj" />
+    <ProjectReference Include="..\..\src\ZeroFormatter.NETCore\ZeroFormatter.NETCore.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/sandbox/Sandbox.NETCore/Sandbox.NETCore.xproj b/sandbox/Sandbox.NETCore/Sandbox.NETCore.xproj
diff --git a/sandbox/Sandbox.NETCore/project.json b/sandbox/Sandbox.NETCore/project.json