From c0806dddee08fb0ad52d70fe78d136238e151f00 Mon Sep 17 00:00:00 2001
From: Michael Yanni <miyanni@microsoft.com>
Date: Wed, 7 Feb 2024 10:16:57 -0800
Subject: [PATCH] Fix bugged BundledDotnetTools.targets execution (wasn't
 processing the item group properly).

---
 src/redist/targets/BundledDotnetTools.targets | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/redist/targets/BundledDotnetTools.targets b/src/redist/targets/BundledDotnetTools.targets
index 43bdeeeeb..03888a03f 100644
--- a/src/redist/targets/BundledDotnetTools.targets
+++ b/src/redist/targets/BundledDotnetTools.targets
@@ -16,18 +16,12 @@
   </ItemGroup>
 
   <Target Name="LayoutBundledTools" DependsOnTargets="SetupBundledComponents">
-    <PropertyGroup>
-      <PackageToRestore>%(BundledDotnetTool.Identity)</PackageToRestore>
-      <PackageVersionToRestore>%(BundledDotnetTool.Version)</PackageVersionToRestore>
-      <RestoredToolRoot>$([System.IO.Path]::GetFullPath('$(NuGetPackageRoot)/$(PackageToRestore)/$(PackageVersionToRestore)'))</RestoredToolRoot>
-    </PropertyGroup>
-
     <ItemGroup>
       <BundledToolLayoutProject Include="$(MSBuildThisFileDirectory)..\projects\DownloadPackage.csproj">
         <!-- For this unique RestoreProjectStyle, see: https://aka.ms/global-tools-nuget -->
         <Properties>
-          PackageToRestore=$(PackageToRestore);
-          PackageVersionToRestore=$(PackageVersionToRestore);
+          PackageToRestore=%(BundledDotnetTool.Identity);
+          PackageVersionToRestore=%(BundledDotnetTool.Version);
           TargetFramework=$(TargetFramework);
           RestoreProjectStyle=DotnetToolReference
         </Properties>
@@ -37,14 +31,13 @@
     <MSBuild BuildInParallel="False" Projects="@(BundledToolLayoutProject)" />
 
     <ItemGroup>
-      <BundledToolFiles Include="$(RestoredToolRoot)\**\*.*" />
-      <BundledToolFiles Remove="$(RestoredToolRoot)\*.*" />
+      <BundledToolFiles Include="%(BundledDotnetTool.RestoredPackagePath)\**\*.*" PackageToRestore="%(BundledDotnetTool.Identity)" PackageVersionToRestore="%(BundledDotnetTool.Version)" />
+      <BundledToolFiles Remove="%(BundledDotnetTool.RestoredPackagePath)\*.*" />
     </ItemGroup>
 
     <Copy SourceFiles="@(BundledToolFiles)"
-          DestinationFiles="@(BundledToolFiles->'$(SdkOutputDirectory)DotnetTools/$(PackageToRestore)\$(PackageVersionToRestore)\%(RecursiveDir)%(Filename)%(Extension)')"
-          SkipUnchangedFiles="true"
-          Condition="'$(PackageToRestore)' != ''" />
+          DestinationFiles="@(BundledToolFiles->'$(SdkOutputDirectory)DotnetTools/%(PackageToRestore)\%(PackageVersionToRestore)\%(RecursiveDir)%(Filename)%(Extension)')"
+          SkipUnchangedFiles="true" />
   </Target>
 
 </Project>