Merge branch 'master' into features/lock-files-view

Author: StanleyGoldman

generate-package.sh

@@ -5,7 +5,7 @@ if [ $# -lt 3 ]; then
 	exit 1
 fi
 
-LFS_MD5="4294df6cbb467b8133553570450757c7"
+LFS_MD5="d0d59164a4b7b35685502d7c5f747f2f"
 GIT_MD5="50570ed932559f294d1a1361801740b9"
 MD5=""
 

src/GitHub.Api/PlatformResources/mac/git-lfs.json

@@ -1 +1 @@
-{"md5":"108b2832cc3d1e6f1ffe792069ad3d21","url":"http://ghfvs-installer.github.com/unity/git/windows/git-lfs.zip","releaseNotes":null,"releaseNotesUrl":null,"message":null,"executableMd5":"d0d59164a4b7b35685502d7c5f747f2f","version":"2.4.0"}
+{"md5":"c78270c2c94a4adce4beeef3010c732e","url":"http://ghfvs-installer.github.com/unity/git/git-lfs.zip","releaseNotes":null,"releaseNotesUrl":null,"message":null,"version":"2.4.0"}

src/GitHub.Api/PlatformResources/mac/git-lfs.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:59a817fa5fa9cbd38eff9422eb576f31e3a225d5be387b292dc827faddfe785b
+oid sha256:d8d924dfef97d579305a485f30ad3866f775b295394be199eb487faca4357672
 size 2831355

src/GitHub.Api/Primitives/Package.cs

@@ -44,7 +44,7 @@ public static Package Load(IEnvironment environment, UriString packageFeed)
             if (!feed.IsInitialized)
             {
                 // try from assembly resources
-                feed = AssemblyResources.ToFile(ResourceType.Platform, packageFeed.Filename, environment.UserCachePath.Combine(packageFeed.Filename), environment);
+                feed = AssemblyResources.ToFile(ResourceType.Platform, packageFeed.Filename, environment.UserCachePath, environment);
             }
 
             if (feed.IsInitialized)

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

@@ -119,8 +119,6 @@ public override void OnSelectionChange()
 
         public override void OnFocusChanged()
         {
-            Logger.Debug("OnFocusChanged: {0}", HasFocus);
-
             base.OnFocusChanged();
             var hasFocus = HasFocus;
             if (treeChanges.ViewHasFocus != hasFocus)

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

@@ -60,7 +60,8 @@ public class UpdateCheckWindow :  EditorWindow
 
         public static void CheckForUpdates()
         {
-            var download = new DownloadTask(TaskManager.Instance.Token, EntryPoint.Environment.FileSystem, UpdateFeedUrl, EntryPoint.Environment.UserCachePath);
+            var download = new DownloadTask(TaskManager.Instance.Token, EntryPoint.Environment.FileSystem, UpdateFeedUrl, EntryPoint.Environment.UserCachePath)
+                .Catch(e => true);
             download.OnEnd += (thisTask, result, success, exception) =>
             {
                 if (success)