Skip to content
This repository has been archived by the owner on Jul 15, 2023. It is now read-only.

Commit

Permalink
Make sure directory enumeration happens after it's been populated
Browse files Browse the repository at this point in the history
Currently the glob enumeration happens too early. None of the outputs of the dependent projects have been produced. We need to enumerate the directory after evaluation, during the actual build and after the dependent projects have been built.
  • Loading branch information
KirillOsenkov committed Jan 22, 2018
1 parent 83f2e7a commit bfdf2b5
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions Installer/Installer.proj
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,6 @@
<Name>Microsoft.Vsts.Authentication</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<FilesToCopy Include="$(SolutionDir)\Cli-CredentialHelper\$(InputPath)\*.*" />
<FilesToCopy Include="$(SolutionDir)\Cli-Askpass\$(InputPath)\git-askpass.exe" />
<FilesToCopy Include="$(SolutionDir)\LICENSE.TXT" />
<FilesToCopy Include="$(SolutionDir)\README.md" />
<FilesToCopy Include="$(ProjectDir)\Setup.iss" />
</ItemGroup>
<ItemGroup>
<FilesToSign Include="$(SigningTarget)">
<Authenticode>Microsoft</Authenticode>
Expand All @@ -89,6 +82,16 @@
<Target Name="AfterBuild" AfterTargets="Build" />
<Target Name="Build" BeforeTargets="AfterBuild">
<MSBuild Projects="@(ProjectReference)" Targets="Build" />

<!-- need to declare the items after dependencies have built, so that glob enumeration happens after the files are produced-->
<ItemGroup>
<FilesToCopy Include="$(SolutionDir)\Cli-CredentialHelper\$(InputPath)\*.*" />
<FilesToCopy Include="$(SolutionDir)\Cli-Askpass\$(InputPath)\git-askpass.exe" />
<FilesToCopy Include="$(SolutionDir)\LICENSE.TXT" />
<FilesToCopy Include="$(SolutionDir)\README.md" />
<FilesToCopy Include="$(ProjectDir)\Setup.iss" />
</ItemGroup>

<MakeDir Directories="$(IntermediateOutputPath)" />
<MakeDir Directories="$(OutputPath)" />
<Copy SourceFiles="@(FilesToCopy)" DestinationFolder="$(IntermediateOutputPath)" />
Expand Down

0 comments on commit bfdf2b5

Please sign in to comment.