From 571242896ae82e32f9baa4d308c68910c75ba0e9 Mon Sep 17 00:00:00 2001
From: Winniexu01 <v-wexu@microsoft.com>
Date: Wed, 11 Sep 2024 14:49:10 +0800
Subject: [PATCH 1/3] Publish prebuilt reports for each repo

---
 src/SourceBuild/content/Directory.Build.props          |  1 +
 .../content/repo-projects/Directory.Build.targets      | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props
index 598391fc0498..fdab92fe21be 100644
--- a/src/SourceBuild/content/Directory.Build.props
+++ b/src/SourceBuild/content/Directory.Build.props
@@ -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>
diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 857a107662b3..fb36ea0db8c3 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -517,12 +517,18 @@
     <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"

From 377f5fac18c57f437f2aec2dbe27ff3e84fb0433 Mon Sep 17 00:00:00 2001
From: Winniexu01 <v-wexu@microsoft.com>
Date: Wed, 11 Sep 2024 16:55:47 +0800
Subject: [PATCH 2/3] Update

---
 src/SourceBuild/content/repo-projects/Directory.Build.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index fb36ea0db8c3..6266a4ca9fcc 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -511,7 +511,7 @@
           Condition="'@(_InnerPackageCacheFiles)' != ''" />
   </Target>
 
-  <Target Name="MoveDotNetBuildArtifactsLogs"
+  <Target Name="MoveDotNetBuildLogs"
         Condition="'$(IsUtilityProject)' != 'true' and
                     Exists('$(ProjectDirectory)artifacts')">
     <ItemGroup>
@@ -639,7 +639,7 @@
     LogRepoArtifacts;
     CopyInnerBuildRestoredPackages;
     ExtractToolPackage;
-    MoveDotNetBuildArtifactsLogs;
+    MoveDotNetBuildLogs;
     CleanupRepo" />
 
   <Target Name="Test">

From 334e47d577451d78e9f5df010559654b95ae529b Mon Sep 17 00:00:00 2001
From: Wenwen <v-wexu@microsoft.com>
Date: Wed, 18 Sep 2024 08:39:07 +0000
Subject: [PATCH 3/3] Update

---
 src/SourceBuild/content/repo-projects/Directory.Build.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 6266a4ca9fcc..2faa62b19256 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -517,7 +517,7 @@
     <ItemGroup>
       <LogFilesToMove Include="$(ProjectDirectory)artifacts/**/*.log" />
       <LogFilesToMove Include="$(ProjectDirectory)artifacts/**/*.binlog" />
-      <PrebuiltReportsToMove Include="$(ProjectDirectory)artifacts/**/*usage.xml" />
+      <PrebuiltReportsToMove Include="$(ProjectDirectory)artifacts/sb/prebuilt-report/*" />
     </ItemGroup>
 
     <!-- Move the build logs -->