From 2e29acc142418464086b64f81bf61cf745fc93a8 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Fri, 10 Dec 2021 10:10:05 -0800
Subject: [PATCH] Fix the logic that generates the fallback text file

---
 src/redist/targets/GenerateLayout.targets | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 3917efa60..a26cad868 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -463,9 +463,13 @@
   </Target>
 
   <Target Name="CopyIncludedWorkloadManifestFile" >
+
     <ItemGroup>
-      <WorkloadManifestFilesContent Include="$([MSBuild]::ValueOrDefault('%(BundledManifests.WorkloadManifestId)', '').ToLower())" />
+      <WorkloadManifestFilesContent Include="$([MSBuild]::ValueOrDefault('%(BundledManifests.Identity)', '').ToLower())" />
     </ItemGroup>
+
+    <Error Text="No workload manifest content found." Condition="'@(WorkloadManifestFilesContent->Count())' == '0'" />
+
     <WriteLinesToFile File="$(SdkOutputDirectory)IncludedWorkloadManifests.txt"
                       Lines="@(WorkloadManifestFilesContent)"
                       Overwrite="true" />