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

Commit 528e728

Browse files
Merge branch 'master' into fixes/log-rotate
2 parents 17cd69d + 56a4662 commit 528e728

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ else
3232
nuget restore
3333
fi
3434

35-
xbuild GitHub.Unity.sln /property:Configuration=$Configuration /target:$Target
35+
xbuild GitHub.Unity.sln /verbosity:minimal /property:Configuration=$Configuration /target:$Target
3636

3737
cp -r unity/PackageProject/Assets/Editor/GitHub ../github-unity-test/GitHubExtensionProject/Assets/Editor || true
3838

src/GitHub.Api/Installer/GitInstaller.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,13 +203,16 @@ public Task<bool> SetupGitIfNeeded(NPath tempPath, IProgress<float> zipFileProgr
203203

204204
try
205205
{
206-
logger.Trace("Copying \"{0}\" to \"{1}\"", unzipPath, PackageDestinationDirectory);
206+
PackageDestinationDirectory.DeleteIfExists();
207+
PackageDestinationDirectory.EnsureParentDirectoryExists();
207208

208-
unzipPath.Copy(PackageDestinationDirectory);
209+
logger.Trace("Moving \"{0}\" to \"{1}\"", unzipPath, PackageDestinationDirectory);
210+
211+
unzipPath.Move(PackageDestinationDirectory);
209212
}
210213
catch (Exception ex)
211214
{
212-
logger.Error(ex, "Error CopyingArchive Source:\"{0}\" OutDir:\"{1}\"", tempPath, PackageDestinationDirectory);
215+
logger.Error(ex, "Error Moving \"{0}\" to \"{1}\"", tempPath, PackageDestinationDirectory);
213216
return TaskEx.FromResult(false);
214217
}
215218
unzipPath.DeleteIfExists();

0 commit comments

Comments
 (0)