Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit f71f68a

Browse files
committed
Tweak some things
1 parent b6f5c0e commit f71f68a

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

src/GitHub.Api/Application/ApplicationManagerBase.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,15 @@ public void Run(bool firstRun)
8484
if (path.IsInitialized)
8585
return;
8686

87-
Logger.Trace("No git path found in settings");
87+
Logger.Trace("Using portable git");
8888

8989
var gitInstaller = new GitInstaller(Environment, ProcessManager, TaskManager);
9090

91-
// if successful, continue with environment initialization, otherwise try to find an existing git installation
9291
var task = gitInstaller.SetupGitIfNeeded();
9392
task.Progress(progressReporter.UpdateProgress);
9493
task.OnEnd += (thisTask, result, success, exception) =>
9594
{
96-
thisTask.Then(initEnvironmentTask, taskIsTopOfChain: true);
95+
thisTask.GetEndOfChain().Then(initEnvironmentTask, taskIsTopOfChain: true);
9796
};
9897

9998
// append installer task to top chain

src/GitHub.Api/Installer/UnzipTask.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ class UnzipTask : TaskBase<NPath>
99
private readonly NPath extractedPath;
1010
private readonly IZipHelper zipHelper;
1111
private readonly IFileSystem fileSystem;
12-
private readonly string expectedMD5;
1312

1413
public UnzipTask(CancellationToken token, NPath archiveFilePath, NPath extractedPath,
1514
IZipHelper zipHelper, IFileSystem fileSystem)

src/tests/IntegrationTests/Installer/GitInstallerTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void GitInstallTest()
5151

5252
var gitInstaller = new GitInstaller(Environment, ProcessManager, TaskManager, installDetails);
5353
var startTask = gitInstaller.SetupGitIfNeeded();
54-
var endTask = new FuncTask<NPath, NPath>(CancellationToken.None, (s, path) => path);
54+
var endTask = new FuncTask<NPath, NPath>(TaskManager.Token, (s, path) => path);
5555
startTask.OnEnd += (thisTask, path, success, exception) => thisTask.GetEndOfChain().Then(endTask);
5656
startTask.Start();
5757
NPath? resultPath = null;

0 commit comments

Comments
 (0)