@@ -307,12 +307,15 @@ private GitInstallationState ExtractGit(GitInstallationState state)
307
307
{
308
308
Logger . Info ( "Moving Git source:{0} target:{1}" , source . ToString ( ) , target . ToString ( ) ) ;
309
309
310
- target . DeleteIfExists ( ) ;
311
- target . EnsureParentDirectoryExists ( ) ;
310
+ Logger . Info ( "DeleteContents target:{0}" , target . ToString ( ) ) ;
311
+ target . DeleteContents ( ) ;
312
312
313
- Logger . Info ( "target Exists: {0}" , target . Exists ( ) ) ;
313
+ Logger . Info ( "MoveFiles fromPath: {0} toPath:{1}" , source . ToString ( ) , target . ToString ( ) ) ;
314
+ source . MoveFiles ( target , true ) ;
315
+
316
+ Logger . Info ( "Delete source:{0}" , source . ToString ( ) ) ;
317
+ source . Delete ( ) ;
314
318
315
- source . Move ( target ) ;
316
319
state . GitIsValid = true ;
317
320
state . IsCustomGitPath = state . GitExecutablePath != installDetails . GitExecutablePath ;
318
321
}
@@ -334,12 +337,12 @@ private GitInstallationState ExtractGit(GitInstallationState state)
334
337
var target = state . GitLfsInstallationPath ;
335
338
if ( unzipTask . Successful )
336
339
{
337
- Logger . Info ( "Moving Git source:{0} target:{1}" , source . ToString ( ) , target . ToString ( ) ) ;
340
+ Logger . Info ( "Moving GitLFS source:{0} target:{1}" , source . ToString ( ) , target . ToString ( ) ) ;
338
341
339
342
target . DeleteIfExists ( ) ;
340
343
target . EnsureParentDirectoryExists ( ) ;
341
344
342
- Logger . Info ( "target Exists: {0}" , target . Exists ( ) ) ;
345
+ Logger . Info ( "GitLFS target Exists: {0}" , target . Exists ( ) ) ;
343
346
344
347
source . Move ( target ) ;
345
348
state . GitLfsIsValid = true ;
0 commit comments