Merge branch 'master' into fixes/secure-keychain-adapter

Author: StanleyGoldman

src/GitHub.Api/GitHub.Api.csproj

@@ -239,6 +239,9 @@
     <Compile Include="$(SolutionDir)\script\src\MetricsService.cs">
       <Link>Metrics\MetricsService.cs</Link>
     </Compile>
+    <Compile Include="$(SolutionDir)\script\src\ApplicationInfo_Local.cs">
+      <Link>Properties\ApplicationInfo_Local.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\submodules\dotnet-httpClient35\System.Net.Http\System.Net.Http-net_3_5.csproj">

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/AuthenticationWindow.cs

@@ -29,6 +29,10 @@ public static IView Open(Action<bool> onClose = null)
 
         public override void OnGUI()
         {
+            if (authView == null)
+            {
+                CreateViews();
+            }
             authView.OnGUI();
         }
 

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs

@@ -52,13 +52,13 @@ private static bool ContextMenu_CanLock()
 
             var alreadyLocked = locks.Any(x =>
             {
-                return repositoryPath == x.Path;
+                return repositoryPath == x.Path.ToNPath();
 
             });
             GitFileStatus status = GitFileStatus.None;
             if (entries != null)
             {
-                status = entries.FirstOrDefault(x => repositoryPath == x.Path).Status;
+                status = entries.FirstOrDefault(x => repositoryPath == x.Path.ToNPath()).Status;
             }
             return !alreadyLocked && status != GitFileStatus.Untracked && status != GitFileStatus.Ignored;
         }
@@ -100,7 +100,7 @@ private static bool ContextMenu_CanUnlock()
             NPath assetPath = AssetDatabase.GetAssetPath(selected.GetInstanceID()).ToNPath();
             NPath repositoryPath = EntryPoint.Environment.GetRepositoryPath(assetPath);
 
-            var isLocked = locks.Any(x => repositoryPath == x.Path);
+            var isLocked = locks.Any(x => repositoryPath == x.Path.ToNPath());
             return isLocked;
         }