diff --git a/eng/scripts/InstallTar.ps1 b/eng/scripts/InstallTar.ps1 index 93f419b213..12159a8d0b 100644 --- a/eng/scripts/InstallTar.ps1 +++ b/eng/scripts/InstallTar.ps1 @@ -25,13 +25,10 @@ $installDir = "$repoRoot\.tools\Git\win-x64" $tarCommand = "$installDir\usr\bin\tar.exe" $finalCommand = "$repoRoot\.tools\tar.exe" -Write-Host "Windows version and other information, because who knows" +Write-Host "Windows version and other information..." cmd.exe /c ver systeminfo.exe - Write-Host "Processor Architecture: $env:PROCESSOR_ARCHITECTURE" -Write-Host "Dumping environment" -Get-ChildItem env:\ Write-Host "Checking $env:SystemRoot\System32\tar.exe" Get-ChildItem "$env:SystemRoot\System32\ta*.exe" @@ -68,6 +65,7 @@ else { } } +New-Item "$repoRoot\.tools\" -ErrorAction SilentlyContinue -ItemType Directory Copy-Item "$tarCommand" "$finalCommand" -Verbose Write-Host "Tar now available at '$finalCommand'" diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj index ef06af8da3..a60b73a3cd 100644 --- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj @@ -172,8 +172,8 @@ This package is an internal implementation of the .NET Core SDK and is not meant Outputs="$(ZipArchiveOutputPath);$(TarArchiveOutputPath)" Condition="'$(IsPackable)' == 'true'"> + <_TarCommand>tar <_TarCommand Condition="Exists('$(RepoRoot).tools\tar.exe')">$(RepoRoot).tools\tar.exe - <_TarCommand Condition="'$(_TarCommand)' == ''">tar <_TarArchiveOutputPath>$(TarArchiveOutputPath) @@ -187,17 +187,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant Overwrite="true" /> - - + - - + WorkingDirectory="$(TargetingPackLayoutRoot)" />