Merge branch 'master' into enhancements/removing-old-tree-code

# Conflicts:
#	src/GitHub.Api/GitHub.Api.csproj
#	src/tests/UnitTests/UnitTests.csproj

Author: StanleyGoldman

common/SolutionInfo.cs

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

src/GitHub.Api/Git/GitStatusEntry.cs

@@ -20,7 +20,6 @@ public GitStatusEntry(string path, string fullPath, string projectPath,
         {
             Guard.ArgumentNotNullOrWhiteSpace(path, "path");
             Guard.ArgumentNotNullOrWhiteSpace(fullPath, "fullPath");
-            Guard.ArgumentNotNullOrWhiteSpace(projectPath, "projectPath");
 
             this.path = path;
             this.status = status;

src/GitHub.Api/Git/RepositoryManager.cs

@@ -446,13 +446,14 @@ private void WatcherOnLocalBranchesChanged()
         {
             Logger.Trace("WatcherOnLocalBranchesChanged");
             UpdateLocalBranches();
+            UpdateGitLog();
         }
 
         private void WatcherOnRepositoryCommitted()
         {
             Logger.Trace("WatcherOnRepositoryCommitted");
             UpdateGitLog();
-            UpdateGitAheadBehindStatus();
+            UpdateGitStatus();
         }
 
         private void WatcherOnRepositoryChanged()

src/GitHub.Api/Git/TreeData.cs

@@ -6,8 +6,6 @@ public interface ITreeData
     {
         string Path { get; }
         bool IsActive { get; }
-        string CustomStringTag { get;}
-        int CustomIntTag { get; }
     }
 
     [Serializable]
@@ -24,10 +22,6 @@ public GitBranchTreeData(GitBranch gitBranch)
 
         public string Path => GitBranch.Name;
         public bool IsActive => GitBranch.IsActive;
-
-        public string CustomStringTag => null;
-
-        public int CustomIntTag => 0;
     }
 
     [Serializable]
@@ -42,12 +36,11 @@ public GitStatusEntryTreeData(GitStatusEntry gitStatusEntry)
             this.gitStatusEntry = gitStatusEntry;
         }
 
-        public string Path => gitStatusEntry.ProjectPath;
+        public string Path => gitStatusEntry.Path;
+        public string ProjectPath => gitStatusEntry.ProjectPath;
         public bool IsActive => false;
         public GitStatusEntry GitStatusEntry => gitStatusEntry;
 
-        public string CustomStringTag => gitStatusEntry.ProjectPath;
-
-        public int CustomIntTag => (int)gitStatusEntry.Status;
+        public GitFileStatus FileStatus => gitStatusEntry.Status;
     }
 }

src/GitHub.Api/GitHub.Api.csproj

@@ -236,7 +236,7 @@
     <Compile Include="Extensions\UriExtensions.cs" />
     <Compile Include="Platform\Platform.cs" />
     <Compile Include="Git\GitCredentialManager.cs" />
-    <Compile Include="UI\TreeLoader.cs" />
+    <Compile Include="UI\TreeBase.cs" />
   </ItemGroup>
   <Choose>
     <When Condition="$(Buildtype) == 'Internal'">