From a9e2a941da6a8399f0c8b5415b7a48a0bfbf9bfc Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Fri, 17 Sep 2021 17:58:36 -0700
Subject: [PATCH 1/2] Create userlocal workload installation marker file for
 source build

Fixes https://github.com/dotnet/source-build/issues/2460
---
 src/redist/targets/GenerateLayout.targets | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 26ada8fd09eb..384a41c62f28 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -466,6 +466,12 @@
                       Overwrite="true" />
   </Target>
 
+  <Target Name="LayoutWorkloadUserLocalMarker">
+    <WriteLinesToFile File="$(RedistLayoutPath)metadata/workloads/userlocal"
+                      Overwrite="true" />
+  </Target>
+  
+
   <Target Name="LayoutAppHostTemplate" DependsOnTargets="RunResolvePackageDependencies">
 
     <PropertyGroup>
@@ -535,6 +541,7 @@
                             LayoutRuntimeGraph;
                             LayoutTemplates;
                             LayoutManifests;
+                            LayoutWorkloadUserLocalMarker;
                             LayoutBundledTools;
                             RetargetTools;
                             CrossgenLayout;

From c534227572e14c1070e93a4cc0b29387edaee7e2 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Mon, 20 Sep 2021 12:10:59 -0700
Subject: [PATCH 2/2] Only write marker file for source-build, and use correct
 path

---
 src/redist/targets/GenerateLayout.targets | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 384a41c62f28..66da486cafad 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -466,8 +466,9 @@
                       Overwrite="true" />
   </Target>
 
-  <Target Name="LayoutWorkloadUserLocalMarker">
-    <WriteLinesToFile File="$(RedistLayoutPath)metadata/workloads/userlocal"
+  <Target Name="LayoutWorkloadUserLocalMarker"
+          Condition="'$(DotNetBuildFromSource)' == 'true'">
+    <WriteLinesToFile File="$(RedistLayoutPath)metadata/workloads/$(CliProductBandVersion)00/userlocal"
                       Overwrite="true" />
   </Target>