Merge branch 'master' into fixes/pinvoke-of-doom

Author: StanleyGoldman

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -80,7 +80,9 @@ public ITask InitializeRepository()
             var targetPath = NPath.CurrentDirectory;
 
             var unityYamlMergeExec = Environment.UnityApplication.Parent.Combine("Tools", "UnityYAMLMerge");
-            var yamlMergeCommand = $@"'{unityYamlMergeExec}' merge -p ""$BASE"" ""$REMOTE"" ""$LOCAL"" ""$MERGED""";
+            var yamlMergeCommand = Environment.IsWindows
+                ? $@"'{unityYamlMergeExec}' merge -p ""$BASE"" ""$REMOTE"" ""$LOCAL"" ""$MERGED"""
+                : $@"'{unityYamlMergeExec}' merge -p '$BASE' '$REMOTE' '$LOCAL' '$MERGED'";
 
             var gitignore = targetPath.Combine(".gitignore");
             var gitAttrs = targetPath.Combine(".gitattributes");

src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs

@@ -2,23 +2,32 @@
 using System.Collections.Generic;
 using UnityEditor;
 using UnityEngine;
+using Debug = System.Diagnostics.Debug;
 
 namespace GitHub.Unity
 {
     sealed class ApplicationCache : ScriptObjectSingleton<ApplicationCache>
     {
         [SerializeField] private bool firstRun = true;
+
+        [NonSerialized] private bool? val;
+
         public bool FirstRun
         {
             get
             {
-                var val = firstRun;
+                if (!val.HasValue)
+                {
+                    val = firstRun;
+                }
+
                 if (firstRun)
                 {
                     firstRun = false;
                     Save(true);
                 }
-                return val;
+
+                return val.Value;
             }
         }
     }