From 678563223370e6ec46cd4dc02cbda91a3c2a2de2 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 5 Feb 2024 13:39:59 +0100
Subject: [PATCH 1/3] Update CreateRuntimeRootILLinkDescriptorFile.targets

Use `TaskHostFactory` to run the task out-of-process to not lock the live produced file.
---
 .../CreateRuntimeRootILLinkDescriptorFile.targets          | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets b/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
index cf8be3e4e906b6..efa5ae1cdcfa44 100644
--- a/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
+++ b/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
@@ -23,13 +23,16 @@
 
   <!--
         Generates the xml root descriptor file for ILLink. The file contains roots required by the runtime.
-        This gets generated by mono IL linker which lives in https://github.com/dotnet/runtime/blob/main/src/tools/illink
+        This gets generated by the linker.
         If it fails, it'll spit out some cryptic error messages that's hard to debug.
         You can debug it by setting /maxcpucount:1 in the msbuild command to force it to not spawn up a bunch
         of child processes, and attach a debugger to msbuild. After that you can set a bp on the exception
         you are seeing.
   -->
-  <UsingTask TaskName="CreateRuntimeRootILLinkDescriptorFile" AssemblyFile="$(ILLinkTasksAssembly)" Condition="'$(ILLinkTasksAssembly)' != ''" />
+  <UsingTask TaskName="CreateRuntimeRootILLinkDescriptorFile"
+             AssemblyFile="$(ILLinkTasksAssembly)"
+             TaskFactory="TaskHostFactory"
+             Condition="'$(ILLinkTasksAssembly)' != ''" />
   <Target Name="_CreateILLinkRuntimeRootDescriptorFile"
           DependsOnTargets="_CombineILLinkTrimXmlFilePaths"
           Inputs="$(_NamespaceFilePath);$(_MscorlibFilePath);$(_CortypeFilePath);$(_RexcepFilePath);$(_ILLinkDescriptorsIntermediatePath)"

From d464a69d1993e385204ace16281bd35f74fadb49 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 5 Feb 2024 14:06:30 +0100
Subject: [PATCH 2/3] Update CreateRuntimeRootILLinkDescriptorFile.targets

---
 .../CreateRuntimeRootILLinkDescriptorFile.targets            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets b/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
index efa5ae1cdcfa44..12ab5ae0c34332 100644
--- a/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
+++ b/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
@@ -47,7 +47,10 @@
                                            RuntimeRootDescriptorFilePath="$(_ILLinkRuntimeRootDescriptorFilePath)" />
   </Target>
 
-  <UsingTask TaskName="CombineLinkerXmlFiles" AssemblyFile="$(ILLinkTasksAssembly)" Condition="'$(ILLinkTasksAssembly)' != ''" />
+  <UsingTask TaskName="CombineLinkerXmlFiles"
+             AssemblyFile="$(ILLinkTasksAssembly)"
+             TaskFactory="TaskHostFactory"
+             Condition="'$(ILLinkTasksAssembly)' != ''" />
   <Target Name="_CombineILLinkTrimXmlFilePaths"
           Inputs="@(_ILLinkDescriptorsFilePaths)"
           Outputs="$(_ILLinkDescriptorsIntermediatePath)">

From dd6c4c3aeabc1c9470aa7b08757e4e08ab14e545 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 5 Feb 2024 14:43:59 +0100
Subject: [PATCH 3/3] Update CreateRuntimeRootILLinkDescriptorFile.targets

---
 .../CreateRuntimeRootILLinkDescriptorFile.targets               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets b/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
index 12ab5ae0c34332..1445f8794695d9 100644
--- a/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
+++ b/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <CompileDependsOn>_CreateILLinkRuntimeRootDescriptorFile;$(CompileDependsOn)</CompileDependsOn>
+    <CompileDependsOn Condition="'$(DesignTimeBuild)' != 'true'">$(CompileDependsOn);_CreateILLinkRuntimeRootDescriptorFile</CompileDependsOn>
   </PropertyGroup>
 
   <PropertyGroup>