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

Commit 4682d1b

Browse files
Merge branch 'enhancements/async-git-setup' into enhancements/git-setup-download
# Conflicts: # src/GitHub.Api/Installer/GitInstaller.cs # src/tests/IntegrationTests/Installer/GitInstallerTests.cs
2 parents cc42d0d + db6d33a commit 4682d1b

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/GitHub.Api/Installer/GitInstaller.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@ public void SetupGitIfNeeded(ActionTask<NPath> onSuccess, ITask onFailure)
139139
installDetails.GitInstallPath.EnsureParentDirectoryExists();
140140
gitExtractPath.Move(installDetails.GitInstallPath);
141141

142+
Logger.Trace("Deleting targetGitLfsExecPath:\"{0}\"", targetGitLfsExecPath);
143+
targetGitLfsExecPath.DeleteIfExists();
144+
142145
Logger.Trace("Deleting tempZipPath:\"{0}\"", tempZipExtractPath);
143146
tempZipExtractPath.DeleteIfExists();
144147
})
@@ -153,7 +156,7 @@ public void SetupGitIfNeeded(ActionTask<NPath> onSuccess, ITask onFailure)
153156
}
154157
else
155158
{
156-
Logger.Trace("SetupGitIfNeeded: Failed");
159+
Logger.Warning("SetupGitIfNeeded: Failed");
157160

158161
onFailure.Start();
159162
}
@@ -166,7 +169,6 @@ public void SetupGitIfNeeded(ActionTask<NPath> onSuccess, ITask onFailure)
166169

167170
resultTask.Start();
168171
}
169-
170172
}).Start();
171173
}
172174

src/tests/IntegrationTests/SetUpFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public void Setup()
1414

1515
Logging.LogAdapter = new MultipleLogAdapter(
1616
new FileLogAdapter($"..\\{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}-integration-tests.log")
17-
, new ConsoleLogAdapter()
17+
//, new ConsoleLogAdapter()
1818
);
1919
}
2020
}

0 commit comments

Comments
 (0)