Merge branch 'master' into ui/i-made-a-huge-mistake

Author: shana

.gitignore

@@ -2,4 +2,6 @@
 packages/
 _NCrunch_GitHub.Unity
 *.user
-.DS_Store
+.DS_Store
+build/
+TestResult.xml

appveyor.yml

@@ -15,21 +15,28 @@ clone_script:
     }
     
     Set-Location $env:appveyor_build_folder
+
 install:
 - ps: >-
-    $full_build = Test-Path env:GHFU_KEY
-
     git submodule sync
 
     git submodule init
 
+    $full_build = Test-Path env:GHFU_KEY
+
     if ($full_build) {
-    	$fileContent = "-----BEGIN RSA PRIVATE KEY-----`n"
-    	$fileContent += $env:GHFU_KEY.Replace(' ', "`n")
-    	$fileContent += "`n-----END RSA PRIVATE KEY-----`n"
-    	Set-Content c:\users\appveyor\.ssh\id_rsa $fileContent
+      $fileContent = "-----BEGIN RSA PRIVATE KEY-----`n"
+      $fileContent += $env:GHFU_KEY.Replace(' ', "`n")
+      $fileContent += "`n-----END RSA PRIVATE KEY-----`n"
+      Set-Content c:\users\appveyor\.ssh\id_rsa $fileContent
     } else {
-
+      git submodule deinit script
+      $destdir = Join-Path $env:appveyor_build_folder 'lib'
+      $destfile = Join-Path $destdir 'deps.zip'
+      Set-Location $destdir
+      Invoke-WebRequest "https://ghfvs-installer.github.com/dependencies/deps.zip" -OutFile $destfile
+      &'7z' -bb3 x 'deps.zip'
+      Set-Location $env:appveyor_build_folder
     }
 
     git submodule update
@@ -45,4 +52,5 @@ test:
     - TimeSensitive
 artifacts:
 - path: unity\TestProject\Assets\Editor\*.dll
-- path: unity\TestProject\Assets\Editor\*.pdb
+- path: unity\TestProject\Assets\Editor\*.pdb
+- path: build\*.log

common/.gitignore

@@ -0,0 +1 @@
+ApplicationInfo_Local.cs

common/unitylocation.props

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <UnityDir Condition="$(UnityDir) == '' and Exists('$(SolutionDir)\script\lib\UnityEditor.dll')">$(SolutionDir)\script\lib\</UnityDir>
+    <UnityDir Condition="$(UnityDir) == '' and Exists('$(SolutionDir)\lib\UnityEditor.dll')">$(SolutionDir)\lib\</UnityDir>
+    <UnityDir Condition="$(UnityDir) == '' and Exists('C:\Program Files (x86)\Unity\Editor\Data\Managed\UnityEditor.dll')">C:\Program Files (x86)\Unity\Editor\Data\Managed\</UnityDir>
+    <UnityDir Condition="$(UnityDir) == '' and Exists('\Applications\Unity\Unity.app\Contents\Managed\UnityEditor.dll')">\Applications\Unity\Unity.app\Contents\Managed\</UnityDir>
+  </PropertyGroup>
+  <Target Name="BeforeBuild">
+    <PropertyGroup>
+      <ErrorText>Location of Unity dlls is not set. You'll need to install Unity in a known location (the default installation directory for your system), or copy UnityEngine.dll and UnityEditor.dll to the {0}lib folder</ErrorText>
+    </PropertyGroup>
+    <Error Condition="'$(UnityDir)' == ''" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)'))" />
+  </Target>
+</Project>

lib/.gitignore

@@ -0,0 +1 @@
+Unity*