From be5b9bef7d2a12c7836c1c317a0c87962d7c1634 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Thu, 17 Aug 2023 13:59:33 -0500
Subject: [PATCH] Fix case sensitive comparison issue and optimize
 WritePrebuiltUsageData (#17211)

---
 .../repo-projects/Directory.Build.targets     | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index e1a5734ad..d77295d2a 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -628,25 +628,24 @@
       DataFile="$(PackageReportDataFile)"
       ProjectAssetsJsonArchiveFile="$(ProjectAssetsJsonArchiveFile)" />
 
-    <!-- Copy all restored packages to resulting prebuilt folder -->
+    <!-- Copy packages detected as prebuilts to the artifacts prebuilt folder -->
     <ItemGroup>
-      <UsedPrebuiltPackageFiles Include="@(AllRestoredPackageFiles)" />
+      <AllowedPackageFiles Include="@(TarballPrebuiltPackageFile)" />
+      <AllowedPackageFiles Include="@(SourceBuiltPackageFiles)" />
+      <AllowedPackageFiles Include="@(ReferencePackageFiles)" />
+      <AllowedPackageFiles>
+        <LCFilename>$([System.String]::Copy(%(Filename)).ToLower())</LCFilename>
+      </AllowedPackageFiles>
+
+      <PrebuiltPackageFiles Include="@(AllRestoredPackageFiles)" >
+        <LCFilename>$([System.String]::Copy(%(Filename)).ToLower())</LCFilename>
+      </PrebuiltPackageFiles>
+      <PrebuiltPackageFiles Remove="@(AllowedPackageFiles)" MatchOnMetadata="LCFilename" />
     </ItemGroup>
     <Copy
-      SourceFiles="@(UsedPrebuiltPackageFiles)"
+      SourceFiles="@(PrebuiltPackageFiles)"
       DestinationFolder="$(ResultingPrebuiltPackagesDir)" />
 
-    <!-- Remove packages that are known to be built -->
-    <ItemGroup>
-      <BuiltPackageFiles Include="@(TarballPrebuiltPackageFile)" />
-      <BuiltPackageFiles Include="@(SourceBuiltPackageFiles)" />
-      <BuiltPackageFiles Include="@(ReferencePackageFiles)" />
-      <BuiltPackageFiles>
-        <LCFilename>$([System.String]::Copy(%(Filename)).ToLower())</LCFilename>
-      </BuiltPackageFiles>
-    </ItemGroup>
-    <Delete Files="@(BuiltPackageFiles->'$(ResultingPrebuiltPackagesDir)%(LCFilename)%(Extension)')" />
-
     <WriteLinesToFile File="$(RepoCompletedSemaphorePath)WritePrebuiltUsageData.complete" Overwrite="true" />
   </Target>