From efe14963402cc97e217916c849aeb36ed3964ae2 Mon Sep 17 00:00:00 2001
From: Sarah Oslund <sfoslund@microsoft.com>
Date: Mon, 22 Mar 2021 13:31:24 -0700
Subject: [PATCH] Fix workload manifest generation to handle case sensitive
 file systems

---
 src/redist/targets/BundledManifests.targets | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets
index 4fc7125b8..fc2184252 100644
--- a/src/redist/targets/BundledManifests.targets
+++ b/src/redist/targets/BundledManifests.targets
@@ -18,6 +18,12 @@
     <PackageDownload Include="@(BundledManifestsForPackageDownload)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <BundledManifests Update="@(BundledManifests)" >
+      <RestoredNupkgContentPath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(Identity)', '').ToLower())/$([MSBuild]::ValueOrDefault('%(Version)', '').ToLower())</RestoredNupkgContentPath>
+    </BundledManifests>
+  </ItemGroup>
+
   <Target Name="LayoutManifests"
         DependsOnTargets="LayoutManifestsForSDK;LayoutManifestsForMSI" />
 
@@ -60,10 +66,6 @@
     </GenerateGuidFromName>
       
     <ItemGroup>
-      <BundledManifests Update="@(BundledManifests)" >
-        <RestoredNupkgContentPath>$(NuGetPackageRoot)%(Identity)/%(Version)</RestoredNupkgContentPath>
-      </BundledManifests>
-      
       <ManifestContent Include="%(BundledManifests.RestoredNupkgContentPath)\**\*.json;%(BundledManifests.RestoredNupkgContentPath)\**\*.targets"
                        DestinationPath="%(WorkloadManifestId)/"/>
     </ItemGroup>