Add retry of finding and using Tar

Author: dougbu

eng/scripts/InstallTar.ps1

@@ -21,7 +21,7 @@ Set-StrictMode -Version 1
 
 # Find tar. If not found, install Git to get it.
 $repoRoot = (Join-Path $PSScriptRoot "..\.." -Resolve)
-$installDir = "$repoRoot\.tools\Git\win-x64\"
+$installDir = "$repoRoot\.tools\Git\win-x64"
 $tarCommand = "$installDir\usr\bin\tar.exe"
 
 if (Test-Path "$env:SystemRoot\System32\tar.exe") {
@@ -48,17 +48,16 @@ else {
     $Uri = "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/git/Git-${GitVersion}-64-bit.zip"
 
     Import-Module -Name (Join-Path $PSScriptRoot "..\common\native\CommonLibrary.psm1" -Resolve)
-    $InstallStatus = CommonLibrary\DownloadAndExtract -Uri $Uri -InstallDirectory "$installDir" -Force:$Force -Verbose
+    $InstallStatus = CommonLibrary\DownloadAndExtract -Uri $Uri -InstallDirectory "$installDir\" -Force:$Force -Verbose
 
     if ($InstallStatus -Eq $False) {
         Write-Error "Installation failed"
         exit 1
     }
 }
 
+Write-Host "Tar now available at `"$tarCommand`""
+$env:TarCommand = "`"$tarCommand`""
 if ($env:TF_BUILD) {
-    Write-Host "##vso[task.setvariable variable=TarCommand;]$tarCommand"
-}
-else {
-    Write-Host "Tar now available at '$tarCommand'"
+    Write-Host "##vso[task.setvariable variable=TarCommand]`"$tarCommand`""
 }

src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj

@@ -171,6 +171,12 @@ This package is an internal implementation of the .NET Core SDK and is not meant
           Condition="'$(IsPackable)' == 'true'">
     <PropertyGroup>
       <TarCommand Condition="'$(TarCommand)' == ''">tar</TarCommand>
+      <_RetryCommand>PowerShell -NoProfile -NoLogo -ExecutionPolicy Bypass -Command</_RetryCommand>
+      <_RetryCommand>$(_RetryCommand) &quot;[System.Threading.Thread]::CurrentThread.CurrentCulture = '';</_RetryCommand>
+      <_RetryCommand>$(_RetryCommand) [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';</_RetryCommand>
+      <_RetryCommand>$(_RetryCommand) try { & '$(RepoRoot)\eng\scripts\InstallTar.ps1' -Verbose;</_RetryCommand>
+      <_RetryCommand>$(_RetryCommand) & $env:TarCommand -czf $(_TarArchiveOutputPath) .;</_RetryCommand>
+      <_RetryCommand>$(_RetryCommand) exit $LASTEXITCODE } catch { write-host $_; exit 1 }&quot;<_RetryCommand>
 
       <!-- For the tar packed with git, transform e.g. "C:\root\AspNetCore\File.tar.gz" to "/C/root/AspNetCore/File.tar.gz". -->
       <_TarArchiveOutputPath>$(TarArchiveOutputPath)</_TarArchiveOutputPath>
@@ -184,9 +190,20 @@ This package is an internal implementation of the .NET Core SDK and is not meant
       Overwrite="true" />
 
     <!-- Requires Windows 10 version 1803 or newer -->
-    <Exec
-      Command="$(TarCommand) -czf $(_TarArchiveOutputPath) ."
-      WorkingDirectory="$(TargetingPackLayoutRoot)" />
+    <Exec Command="$(TarCommand) -czf $(_TarArchiveOutputPath) ."
+        WorkingDirectory="$(TargetingPackLayoutRoot)"
+        IgnoreExitCode="true"
+        Condition="'$(OS)' == 'Windows_NT'">
+      <Output TaskParameter="ExitCode" PropertyName="_TarExitCode" />
+    </Exec>
+    <Exec Command="$(_RetryCommand)"
+        WorkingDirectory="$(TargetingPackLayoutRoot)"
+        Condition="'$(OS)' == 'Windows_NT' AND '$(_TarExitCode)' != '0'" />
+
+    <Exec Command="tar -czf $(_TarArchiveOutputPath) ."
+        WorkingDirectory="$(TargetingPackLayoutRoot)"
+        Condition="'$(OS)' != 'Windows_NT'" />
+
     <Message Importance="High" Text="$(MSBuildProjectName) -> $(TarArchiveOutputPath)" />
   </Target>