Fix regression in SBRP usage report

dotnet · Jan 24, 2025 · e95779f · e95779f
1 parent b687d2d
commit e95779f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props
@@ -178,6 +178,7 @@
 
     <GitInfoDir>$([MSBuild]::NormalizeDirectory('$(PrereqsDir)', 'git-info'))</GitInfoDir>
 
+    <ProjectAssetsJsonBackupDir>$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', 'project-assets-json'))</ProjectAssetsJsonBackupDir>
     <PackageReportDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'prebuilt-report'))</PackageReportDir>
     <ResultingPrebuiltPackagesDir>$([MSBuild]::NormalizeDirectory('$(PackageReportDir)', 'prebuilt-packages'))</ResultingPrebuiltPackagesDir>
     <SbrpRepoSrcDir>$([MSBuild]::NormalizeDirectory('$(SrcDir)', 'source-build-reference-packages', 'src'))</SbrpRepoSrcDir>

diff --git a/src/SourceBuild/content/eng/finish-source-only.proj b/src/SourceBuild/content/eng/finish-source-only.proj
@@ -26,7 +26,7 @@
           BeforeTargets="Build"
           Condition="'$(ReportSbrpUsage)' == 'true'">
     <WriteSbrpUsageReport SbrpRepoSrcPath="$(SbrpRepoSrcDir)"
-                          SrcPath="$(SrcDir)"
+                          ProjectAssetsJsonPath="$(ProjectAssetsJsonBackupDir)"
                           OutputPath="$(ArtifactsLogDir)" />
   </Target>
 

diff --git a/...Build/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/WriteSbrpUsageReport.cs b/...Build/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/WriteSbrpUsageReport.cs
@@ -31,10 +31,10 @@ public class WriteSbrpUsageReport : Task
     public required string SbrpRepoSrcPath { get; set; }
 
     /// <summary>
-    /// Path to the VMR src directory.
+    /// Path to the build's project.asserts.json files.
     /// </summary>
     [Required]
-    public required string SrcPath { get; set; }
+    public required string ProjectAssetsJsonPath { get; set; }
 
     /// <summary>
     /// Path to the usage report to.
@@ -144,7 +144,7 @@ private void ReadSbrpPackages(string packageType, bool trackTfms)
 
     private void ScanProjectReferences()
     {
-        foreach (string projectJsonFile in Directory.GetFiles(SrcPath, "project.assets.json", SearchOption.AllDirectories))
+        foreach (string projectJsonFile in Directory.GetFiles(ProjectAssetsJsonPath, "project.assets.json", SearchOption.AllDirectories))
         {
             LockFile lockFile = new LockFileFormat().Read(projectJsonFile);
             foreach (LockFileTargetLibrary lib in lockFile.Targets.SelectMany(t => t.Libraries))

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -642,10 +642,6 @@
   <!-- Make a copy of project.assets.json files for prebuilt report generation. -->
   <Target Name="BackupProjectAssetsJsonFiles"
           Condition="'$(DotNetBuildSourceOnly)' == 'true'">
-    <PropertyGroup>
-      <ProjectAssetsJsonBackupDir>$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', 'project-assets-json'))</ProjectAssetsJsonBackupDir>
-    </PropertyGroup>
-
     <ItemGroup>
       <ProjectAssetsJsonFile Include="$(RepoArtifactsDir)**/project.assets.json" />
     </ItemGroup>