Merge branch 'master' into fixes/init-view-bugs

Author: StanleyGoldman

GitHub.Unity.sln.DotSettings

@@ -342,6 +342,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EUnitTestFramework_002ESettings_002EMigrations_002ERemoveBuildPolicyAlwaysMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/UnitTesting/ShadowCopy/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/Housekeeping/UnitTestingMru/UnitTestSessionDefault/PlatformType/@EntryValue">x64</s:String>
 	</wpf:ResourceDictionary>

docs/contributing/how-to-build.md

@@ -9,14 +9,14 @@ This repository is LFS-enabled. To clone it, you should use a git client that su
 - Visual Studio 2015+ or Mono 4.x + bash shell (git bash).
   - Mono 5.x will not work
 - `UnityEngine.dll` and `UnityEditor.dll`.
-  - If you've installed Unity in the default location of `C:\Program Files\Unity` or `C:\Program Files (x86)\Unity`, the build will be able to reference these DLLs automatically. Otherwise, you'll need to copy these DLLs from your Unity installation into the `lib` directory in order for the build to work
+  - If you've installed Unity in the default location of `C:\Program Files\Unity` or `C:\Program Files (x86)\Unity`, the build will be able to reference these DLLs automatically. Otherwise, you'll need to copy these DLLs from `[Unity installation path]\Unity\Editor\Data\Managed` into the `lib` directory in order for the build to work
 
 ### MacOS
 
 - Mono 4.x required.
   - Mono 5.x will not work
 - `UnityEngine.dll` and `UnityEditor.dll`.
-  - If you've installed Unity in the default location of `/Applications/Unity`, the build will be able to reference these DLLs automatically. Otherwise, you'll need to copy these DLLs from your Unity installation into the `lib` directory in order for the build to work
+  - If you've installed Unity in the default location of `/Applications/Unity`, the build will be able to reference these DLLs automatically. Otherwise, you'll need to copy these DLLs from `[Unity installation path]/Unity.app/Contents/Managed` into the `lib` directory in order for the build to work
 
 ## How to Build
 
@@ -40,11 +40,11 @@ To be able to authenticate in GitHub for Unity, you'll need to:
 - [Register a new developer application](https://github.com/settings/developers) in your profile.
 - Copy [common/ApplicationInfo_Local.cs-example](../../common/ApplicationInfo_Local.cs-example) to `common/ApplicationInfo_Local.cs` and fill out the clientId/clientSecret fields for your application.
 
-The build needs to reference `UnityEngine.dll` and `UnityEditor.dll`. These DLLs are included with Unity. If you've installed Unity in the default location, the build will be able to find them automatically. If not, copy these DLLs from your Unity installation into the `lib` directory in order for the build to work.
+The build needs to reference `UnityEngine.dll` and `UnityEditor.dll`. These DLLs are included with Unity. If you've installed Unity in the default location, the build will be able to find them automatically. If not, copy these DLLs from `[your Unity installation path]\Unity\Editor\Data\Managed` into the `lib` directory in order for the build to work.
 
 ### Visual Studio
 
-To build with Visual Studio 2015 open the solution file `GitHub.Unity.sln`. Select `Build Solution` in the `Build` menu.
+To build with Visual Studio 2015+, open the solution file `GitHub.Unity.sln`. Select `Build Solution` in the `Build` menu.
 
 ### Mono and Bash (windows and mac)
 

src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj

@@ -186,6 +186,8 @@
     <EmbeddedResource Include="IconsAndLogos\small-logo-light%402x.png" />
     <EmbeddedResource Include="IconsAndLogos\small-logo-light.png" />
     <EmbeddedResource Include="IconsAndLogos\small-logo.png" />
+    <EmbeddedResource Include="IconsAndLogos\spinner-sprite%402x.png" />
+    <EmbeddedResource Include="IconsAndLogos\spinner-sprite.png" />
     <EmbeddedResource Include="IconsAndLogos\tracked-branch-indicator.png" />
     <EmbeddedResource Include="IconsAndLogos\untracked%402x.png" />
     <EmbeddedResource Include="IconsAndLogos\untracked.png" />

src/UnityExtension/Assets/Editor/GitHub.Unity/IconsAndLogos/spinner-sprite.png

@@ -12,8 +12,6 @@ namespace GitHub.Unity
     [Serializable]
     class HistoryView : Subview
     {
-        private const string HistoryFocusAll = "(All)";
-        private const string HistoryFocusSingle = "Focus: <b>{0}</b>";
         private const string PullButton = "Pull";
         private const string PullButtonCount = "Pull (<b>{0}</b>)";
         private const string PushButton = "Push";
@@ -48,7 +46,6 @@ class HistoryView : Subview
         [NonSerialized] private bool isBusy;
 
         [SerializeField] private Vector2 detailsScroll;
-        [SerializeField] private Object historyTarget;
         [SerializeField] private Vector2 scroll;
         [SerializeField] private string selectionID;
         [SerializeField] private int statusAhead;
@@ -99,10 +96,7 @@ public override void OnRepositoryChanged(IRepository oldRepository)
 
         public override void OnSelectionChange()
         {
-            if (!string.IsNullOrEmpty(AssetDatabase.GetAssetPath(Selection.activeObject)))
-            {
-                historyTarget = Selection.activeObject;
-            }
+
         }
 
         public override void OnGUI()
@@ -215,20 +209,6 @@ public void OnEmbeddedGUI()
             // History toolbar
             GUILayout.BeginHorizontal(EditorStyles.toolbar);
             {
-                // Target indicator / clear button
-                EditorGUI.BeginDisabledGroup(historyTarget == null);
-                {
-                    if (GUILayout.Button(
-                        historyTarget == null ? HistoryFocusAll : String.Format(HistoryFocusSingle, historyTarget.name),
-                        Styles.HistoryToolbarButtonStyle)
-                    )
-                    {
-                        historyTarget = null;
-                        Refresh();
-                    }
-                }
-                EditorGUI.EndDisabledGroup();
-
                 GUILayout.FlexibleSpace();
 
                 if (isPublished)
@@ -431,7 +411,7 @@ private void ScrollTo(int index, float offset = 0f)
 
         private LogEntryState GetEntryState(int index)
         {
-            return historyTarget == null ? (index < statusAhead ? LogEntryState.Local : LogEntryState.Normal) : LogEntryState.Normal;
+            return index < statusAhead ? LogEntryState.Local : LogEntryState.Normal;
         }
 
         /// <summary>