Use correct token for task cancellation to work

Author: shana

src/GitHub.Api/Git/Repository.cs

@@ -382,7 +382,7 @@ private void HandleBranchCacheUpdatedEvent(CacheUpdateEvent cacheUpdateEvent)
 
         private void RepositoryManagerOnCurrentBranchUpdated(ConfigBranch? branch, ConfigRemote? remote)
         {
-            new ActionTask(CancellationToken.None, () => {
+            new ActionTask(TaskManager.Instance.Token, () => {
                 if (!Nullable.Equals(CurrentConfigBranch, branch))
                 {
                     var currentBranch = branch != null ? (GitBranch?)GetLocalGitBranch(branch.Value) : null;
@@ -403,7 +403,7 @@ private void RepositoryManagerOnCurrentBranchUpdated(ConfigBranch? branch, Confi
 
         private void RepositoryManagerOnGitStatusUpdated(GitStatus gitStatus)
         {
-            new ActionTask(CancellationToken.None, () => {
+            new ActionTask(TaskManager.Instance.Token, () => {
                 CurrentChanges = gitStatus.Entries;
                 CurrentAhead = gitStatus.Ahead;
                 CurrentBehind = gitStatus.Behind;
@@ -412,22 +412,22 @@ private void RepositoryManagerOnGitStatusUpdated(GitStatus gitStatus)
 
         private void RepositoryManagerOnGitAheadBehindStatusUpdated(GitAheadBehindStatus aheadBehindStatus)
         {
-            new ActionTask(CancellationToken.None, () => {
+            new ActionTask(TaskManager.Instance.Token, () => {
                 CurrentAhead = aheadBehindStatus.Ahead;
                 CurrentBehind = aheadBehindStatus.Behind;
             }) { Affinity = TaskAffinity.UI }.Start();
         }
 
         private void RepositoryManagerOnGitLogUpdated(List<GitLogEntry> gitLogEntries)
         {
-            new ActionTask(CancellationToken.None, () => {
+            new ActionTask(TaskManager.Instance.Token, () => {
                 CurrentLog = gitLogEntries;
             }) { Affinity = TaskAffinity.UI }.Start();
         }
 
         private void RepositoryManagerOnGitLocksUpdated(List<GitLock> gitLocks)
         {
-            new ActionTask(CancellationToken.None, () => {
+            new ActionTask(TaskManager.Instance.Token, () => {
                     CurrentLocks = gitLocks;
                 })
                 { Affinity = TaskAffinity.UI }.Start();
@@ -436,7 +436,7 @@ private void RepositoryManagerOnGitLocksUpdated(List<GitLock> gitLocks)
         private void RepositoryManagerOnRemoteBranchesUpdated(Dictionary<string, ConfigRemote> remotes,
             Dictionary<string, Dictionary<string, ConfigBranch>> branches)
         {
-            new ActionTask(CancellationToken.None, () => {
+            new ActionTask(TaskManager.Instance.Token, () => {
                 cacheContainer.BranchCache.SetRemotes(remotes, branches);
                 Remotes = ConfigRemotes.Values.Select(GetGitRemote).ToArray();
                 RemoteBranches = RemoteConfigBranches.Values.SelectMany(x => x.Values).Select(GetRemoteGitBranch).ToArray();
@@ -445,7 +445,7 @@ private void RepositoryManagerOnRemoteBranchesUpdated(Dictionary<string, ConfigR
 
         private void RepositoryManagerOnLocalBranchesUpdated(Dictionary<string, ConfigBranch> branches)
         {
-            new ActionTask(CancellationToken.None, () => {
+            new ActionTask(TaskManager.Instance.Token, () => {
                 cacheContainer.BranchCache.SetLocals(branches);
                 UpdateLocalBranches();
             }) { Affinity = TaskAffinity.UI }.Start();

src/GitHub.Api/Git/RepositoryManager.cs

@@ -327,7 +327,7 @@ public void UpdateLocks()
 
         private ITask<T> HookupHandlers<T>(ITask<T> task, bool isExclusive, bool filesystemChangesExpected)
         {
-            return new ActionTask(CancellationToken.None, () => {
+            return new ActionTask(TaskManager.Instance.Token, () => {
                     if (isExclusive)
                     {
                         Logger.Trace("Starting Operation - Setting Busy Flag");

src/tests/IntegrationTests/BaseGitEnvironmentTest.cs

@@ -56,7 +56,7 @@ public override void OnSetup()
             TestRepoMasterTwoRemotes = TestBasePath.Combine("IOTestsRepo", "IOTestsRepo_master_two_remotes");
 
             Logger.Trace("Extracting Zip File to {0}", TestBasePath);
-            ZipHelper.ExtractZipFile(TestZipFilePath, TestBasePath.ToString(), CancellationToken.None);
+            ZipHelper.ExtractZipFile(TestZipFilePath, TestBasePath.ToString(), TaskManager.Token);
             Logger.Trace("Extracted Zip File");
         }
 

src/tests/IntegrationTests/BasePlatformIntegrationTest.cs

@@ -40,16 +40,16 @@ protected void InitializePlatform(NPath repoPath, NPath environmentPath, bool en
                 var gitArchivePath = AssemblyResources.ToFile(ResourceType.Platform, "git.zip", zipArchivesPath, Environment);
                 var gitLfsArchivePath = AssemblyResources.ToFile(ResourceType.Platform, "git-lfs.zip", zipArchivesPath, Environment);
 
-                var gitInstaller = new GitInstaller(Environment, CancellationToken.None, installDetails, gitArchivePath, gitLfsArchivePath);
+                var gitInstaller = new GitInstaller(Environment, TaskManager.Token, installDetails, gitArchivePath, gitLfsArchivePath);
 
                 NPath result = null;
                 Exception ex = null;
 
-                gitInstaller.SetupGitIfNeeded(new ActionTask<NPath>(CancellationToken.None, (b, path) => {
+                gitInstaller.SetupGitIfNeeded(new ActionTask<NPath>(TaskManager.Token, (b, path) => {
                         result = path;
                         autoResetEvent.Set();
                     }),
-                    new ActionTask(CancellationToken.None, (b, exception) => {
+                    new ActionTask(TaskManager.Token, (b, exception) => {
                         ex = exception;
                         autoResetEvent.Set();
                     }));