Skip to content

Commit e79b82c

Browse files
committed
Add support for workspace git installation
- simplify the workaround conditions; paths will exist only on Windows - reorder workaround conditions to prefer system `tar`
1 parent dd98058 commit e79b82c

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,12 @@ This package is an internal implementation of the .NET Core SDK and is not meant
173173
<!-- Work around issues finding the `tar` command on CI machines. -->
174174
<TarCommand>tar</TarCommand>
175175
<TarCommand
176-
Condition="'$(OS)' == 'Windows_NT' AND Exists('$(SystemRoot)\System32\tar.exe')">"$(SystemRoot)\System32\tar.exe"</TarCommand>
176+
Condition="Exists('$(MSBuildProgramFiles32)\Git\usr\bin\tar.exe')">"$(MSBuildProgramFiles32)\Git\usr\bin\tar.exe"</TarCommand>
177177
<TarCommand
178-
Condition="'$(OS)' == 'Windows_NT' AND Exists('$(ProgramFiles)\Git\usr\bin\tar.exe')">"$(ProgramFiles)\Git\usr\bin\tar.exe"</TarCommand>
178+
Condition="Exists('$(ProgramFiles)\Git\usr\bin\tar.exe')">"$(ProgramFiles)\Git\usr\bin\tar.exe"</TarCommand>
179179
<TarCommand
180-
Condition="'$(OS)' == 'Windows_NT' AND Exists('$(MSBuildProgramFiles32)\Git\usr\bin\tar.exe')">"$(MSBuildProgramFiles32)\Git\usr\bin\tar.exe"</TarCommand>
180+
Condition="Exists('$(AGENT_HOMEDIRECTORY)\externals\git\usr\bin\tar.exe')">"$(AGENT_HOMEDIRECTORY)\externals\git\usr\bin\tar.exe"</TarCommand>
181+
<TarCommand Condition="Exists('$(SystemRoot)\System32\tar.exe')">"$(SystemRoot)\System32\tar.exe"</TarCommand>
181182

182183
<!-- For the tar packed with git, transform e.g. "C:\root\AspNetCore\File.tar.gz" to "/C/root/AspNetCore/File.tar.gz". -->
183184
<_TarArchiveOutputPath>$(TarArchiveOutputPath)</_TarArchiveOutputPath>

0 commit comments

Comments
 (0)