Use BuildLib 0.2.7

Author: veblush

README.md

@@ -12,7 +12,7 @@ Visit [Release](https://github.com/SaladLab/Json.Net.Unity3D/releases)
 page to get latest Json.NET unity-package.
 
 To use this library in IL2CPP build settings, you need to add
-[link.xml](https://github.com/SaladLab/Json.Net.Unity3D/blob/master/src/UnityPackage/Assets/link.xml) to your project's asset folder.
+[link.xml](https://github.com/SaladLab/Json.Net.Unity3D/blob/master/src/UnityTest/Assets/link.xml) to your project's asset folder.
 For detailed information about link.xml, read unity [manual](http://docs.unity3d.com/Manual/iphone-playerSizeOptimization.html) about this.
 
 ## What's the deal?

appveyor.yml

@@ -1,10 +1,12 @@
-version: 8.0.2.{build}
+version: 8.0.3.{build}
 os: Visual Studio 2015
-configuration: Release
 init:
 - git config --global core.autocrlf true
-before_build:
-- cmd: nuget restore
-build:
-  project: Json.Net.Unity3D.sln
-  verbosity: minimal
+test: off
+build_script:
+- cmd: build.cmd ci
+artifacts:
+  - path: './bin/unity/*.unitypackage'
+    name: UnityPackage
+cache:
+- packages -> **\packages.config

build.cmd

@@ -2,11 +2,23 @@
 
 pushd %~dp0
 
-tools\nuget\NuGet.exe update -self
-tools\nuget\NuGet.exe install FAKE -ConfigFile tools\nuget\Nuget.Config -OutputDirectory packages -ExcludeVersion -Version 4.7.3
-tools\nuget\NuGet.exe install nunit.runners -ConfigFile tools\nuget\Nuget.Config -OutputDirectory packages\FAKE -ExcludeVersion -Version 2.6.4
+SET PACKAGEPATH=.\packages\
+SET NUGET=.\tools\nuget\NuGet.exe
+SET NUGETOPTIONS=-ConfigFile .\tools\nuget\NuGet.Config -OutputDirectory %PACKAGEPATH% -ExcludeVersion
+
+IF NOT EXIST %PACKAGEPATH%FAKE\Ver_4.25.4 (
+  RD /S/Q %PACKAGEPATH%FAKE
+  %NUGET% install FAKE -Version 4.25.4 %NUGETOPTIONS%
+  COPY NUL %PACKAGEPATH%FAKE\Ver_4.25.4
+)
+
+IF NOT EXIST %PACKAGEPATH%FAKE.BuildLib\Ver_0.2.7 (
+  RD /S/Q %PACKAGEPATH%FAKE.BuildLib
+  %NUGET% install FAKE.BuildLib -Version 0.2.7 %NUGETOPTIONS%
+  COPY NUL %PACKAGEPATH%FAKE.BuildLib\Ver_0.2.7
+)
 
 set encoding=utf-8
-packages\FAKE\tools\FAKE.exe build.fsx %*
+"%PACKAGEPATH%FAKE\tools\FAKE.exe" build.fsx %*
 
 popd

build.fsx

@@ -1,80 +1,59 @@
 #I @"packages/FAKE/tools"
+#I @"packages/FAKE.BuildLib/lib/net451"
 #r "FakeLib.dll"
+#r "BuildLib.dll"
 
 open Fake
 open Fake.FileHelper
+open BuildLib
 open System.IO
 
-// ---------------------------------------------------------------------------- Variables
+let solution = 
+    initSolution
+        "./Json.Net.Unity3D.sln" "Release" []
 
-let buildSolutionFile = "./Json.Net.Unity3D.sln"
-let buildConfiguration = "Release"
-let binDir = "bin"
-let testDir = binDir @@ "test"
+Target "Clean" <| fun _ -> cleanBin
 
-// ------------------------------------------------------------------------- Unity Helper
+Target "Restore" <| fun _ -> restoreNugetPackages solution
 
-let UnityPath = 
-    @"C:\Program Files\Unity\Editor\Unity.exe" 
-
-let Unity projectPath args = 
-    let result = Shell.Exec(UnityPath, "-quit -batchmode -logFile -projectPath \"" + projectPath + "\" " + args) 
-    if result < 0 then failwithf "Unity exited with error %d" result 
-
-// ------------------------------------------------------------------------------ Targets
-
-Target "Clean" (fun _ -> 
-    CleanDirs [binDir]
-)
-
-Target "Build" (fun _ ->
+Target "Build" <| fun _ ->
     // Regular
-    !! buildSolutionFile
-    |> MSBuild "" "Rebuild" [ "Configuration", buildConfiguration ]
-    |> Log "Build-Output: "
+    buildSolution solution
     // Lite
-    !! buildSolutionFile
-    |> MSBuild "" "Rebuild" [ "Configuration", buildConfiguration + "Lite" ]
-    |> Log "Build-Output: "    
-)
+    !!solution.SolutionFile
+    |> MSBuild "" "Rebuild" [ "Configuration", solution.Configuration + "Lite" ]
+    |> Log "Build-Output: "
+
 
-Target "Test" (fun _ ->  
+Target "Test" <| fun _ -> 
+    let nunitRunnerDir = lazy ((getNugetPackage "NUnit.Runners" "2.6.4") @@ "tools")
     ensureDirectory testDir
-    !! ("./src/**/bin/" + buildConfiguration + "/*.Tests.dll")
+    !! ("./src/**/bin/" + solution.Configuration + "/*.Tests.dll")
     |> NUnit (fun p -> 
-        {p with 
-            DisableShadowCopy = true;
-            OutputFile = testDir @@ "TestResult.xml" })
-)
+        {p with ToolPath = nunitRunnerDir.Force()
+                DisableShadowCopy = true;
+                OutputFile = testDir @@ "test.xml" })
+
+Target "PackUnity" <| fun _ ->
+    packUnityPackage "./src/UnityPackage/JsonNet.unitypackage.json"
+    packUnityPackage "./src/UnityPackage/JsonNet-Lite.unitypackage.json"
 
-Target "Package" (fun _ ->
-    (!! ("src/Newtonsoft.Json/bin/" + buildConfiguration + "/Newtonsoft.Json.dll*")) |> Copy "src/UnityPackage/Assets/Middlewares/JsonNet"
-    (!! ("src/Newtonsoft.Json/bin/" + buildConfiguration + "Lite/Newtonsoft.Json.dll*")) |> Copy "src/UnityPackageLite/Assets/Middlewares/JsonNet"
-    (!! ("src/Newtonsoft.Json.Tests/bin/" + buildConfiguration + "/Newtonsoft.Json.Tests.dll*")) |> Copy "src/UnityPackage/Assets/Editor"
-    Unity (Path.GetFullPath "src/UnityPackage") "-executeMethod PackageBuilder.BuildPackage"
-    Unity (Path.GetFullPath "src/UnityPackageLite") "-executeMethod PackageBuilder.BuildPackage"
-    (!! "src/UnityPackage/*.unitypackage") |> Seq.iter (fun p -> MoveFile binDir p)
-    (!! "src/UnityPackageLite/*.unitypackage") |> Seq.iter (fun p -> MoveFile binDir p)
-)
+Target "Pack" <| fun _ -> ()
 
-Target "Help" (fun _ ->  
-    List.iter printfn [
-      "usage:"
-      "build [target]"
-      ""
-      " Targets for building:"
-      " * Build        Build"
-      " * Test         Test"
-      " * Package      Build Unity Package"
-      ""]
-)
+Target "CI" <| fun _ -> ()
 
-// --------------------------------------------------------------------------- Dependency
+Target "Help" <| fun _ ->
+    showUsage solution (fun _ -> None)
 
-// Build order
 "Clean"
+  ==> "Restore"
   ==> "Build"
   ==> "Test"
-  ==> "Package"
 
-RunTargetOrDefault "Package"
+"Build" ==> "PackUnity"
+"PackUnity" ==> "Pack"
+
+"Test" ==> "CI"
+"Pack" ==> "CI"
+
+RunTargetOrDefault "Help"