Merge branch 'master' into enhancements/git-path-view

Author: StanleyGoldman

common/SolutionInfo.cs

@@ -31,6 +31,6 @@
 namespace System
 {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "0.20.0";
+        internal const string Version = "0.21.0";
     }
 }

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

@@ -45,6 +45,7 @@ class SettingsView : Subview
         [SerializeField] private bool hasRemote;
         [NonSerialized] private bool remoteHasChanged;
         [NonSerialized] private bool userDataHasChanged;
+        [NonSerialized] private bool locksHaveChanged;
 
         [SerializeField] private string newGitName;
         [SerializeField] private string newGitEmail;
@@ -71,6 +72,7 @@ public override void OnEnable()
 
             remoteHasChanged = true;
             metricsHasChanged = true;
+            locksHaveChanged = true;
         }
 
         public override void OnDisable()
@@ -208,7 +210,7 @@ private void MaybeUpdateData()
 
             userDataHasChanged = Repository.User.Name != gitName || Repository.User.Email != gitEmail;
 
-            if (!remoteHasChanged && !userDataHasChanged)
+            if (!remoteHasChanged && !userDataHasChanged && !locksHaveChanged)
                 return;
 
             if (userDataHasChanged)
@@ -234,6 +236,12 @@ private void MaybeUpdateData()
                     newRepositoryRemoteUrl = repositoryRemoteUrl = activeRemote.Value.Url;
                 }
             }
+
+            if (locksHaveChanged)
+            {
+                locksHaveChanged = false;
+                lockedFiles = Repository.CurrentLocks.ToList();
+            }
         }
 
         private void Repository_OnActiveRemoteChanged(string remote)