Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/SourceBuild/content/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@

<PackageReportDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'prebuilt-report'))</PackageReportDir>
<ResultingPrebuiltPackagesDir>$([MSBuild]::NormalizeDirectory('$(PackageReportDir)', 'prebuilt-packages'))</ResultingPrebuiltPackagesDir>
<DotNetBuildPrebuiltReportDir>$([MSBuild]::NormalizeDirectory('$(PackageReportDir)', '$(MSBuildProjectName)'))</DotNetBuildPrebuiltReportDir>

<SbrpRepoSrcDir>$([MSBuild]::NormalizeDirectory('$(SrcDir)', 'source-build-reference-packages', 'src'))</SbrpRepoSrcDir>
<ReferencePackagesDir>$([MSBuild]::NormalizeDirectory('$(PrereqsPackagesDir)', 'reference'))</ReferencePackagesDir>
Expand Down
14 changes: 10 additions & 4 deletions src/SourceBuild/content/repo-projects/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -511,18 +511,24 @@
Condition="'@(_InnerPackageCacheFiles)' != ''" />
</Target>

<Target Name="MoveDotNetBuildArtifactsLogs"
<Target Name="MoveDotNetBuildLogs"
Condition="'$(IsUtilityProject)' != 'true' and
Exists('$(ProjectDirectory)artifacts')">
<ItemGroup>
<LogFilesToMove Include="$(ProjectDirectory)artifacts/**/*.log" />
<LogFilesToMove Include="$(ProjectDirectory)artifacts/**/*.binlog" />
<PrebuiltReportsToMove Include="$(ProjectDirectory)artifacts/**/*usage.xml" />
</ItemGroup>

<!-- Move the build logs -->
<Move SourceFiles="@(LogFilesToMove)"
DestinationFolder="$(DotNetBuildArtifactsLogDir)"
Condition="'@(LogFilesToMove)' != ''" />
Condition="'@(LogFilesToMove)' != ''" />

<!-- Move the prebuilt reports -->
<Move SourceFiles="@(PrebuiltReportsToMove)"
DestinationFolder="$(DotNetBuildPrebuiltReportDir)"
Condition="'@(PrebuiltReportsToMove)' != ''" />
</Target>

<Target Name="CleanupRepo"
Expand Down Expand Up @@ -633,7 +639,7 @@
LogRepoArtifacts;
CopyInnerBuildRestoredPackages;
ExtractToolPackage;
MoveDotNetBuildArtifactsLogs;
MoveDotNetBuildLogs;
CleanupRepo" />

<Target Name="Test">
Expand Down