From d582d5f6eadc27298abcd8d1f724f3c9af9b3f50 Mon Sep 17 00:00:00 2001
From: Sven Boemer <sbomer@gmail.com>
Date: Mon, 17 Jun 2024 17:32:48 +0000
Subject: [PATCH 1/2] Default DynamicCodeSupported to true for CoreCLR

---
 .../illink/src/ILLink.Tasks/build/Microsoft.NET.ILLink.targets   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/tools/illink/src/ILLink.Tasks/build/Microsoft.NET.ILLink.targets b/src/tools/illink/src/ILLink.Tasks/build/Microsoft.NET.ILLink.targets
index d6d45f475fc33..35d8f3ae24a79 100644
--- a/src/tools/illink/src/ILLink.Tasks/build/Microsoft.NET.ILLink.targets
+++ b/src/tools/illink/src/ILLink.Tasks/build/Microsoft.NET.ILLink.targets
@@ -55,6 +55,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <_ComObjectDescriptorSupport Condition="'$(_ComObjectDescriptorSupport)' == ''">false</_ComObjectDescriptorSupport>
     <_DesignerHostSupport Condition="'$(_DesignerHostSupport)' == ''">false</_DesignerHostSupport>
     <_DefaultValueAttributeSupport Condition="'$(_DefaultValueAttributeSupport)' == ''">false</_DefaultValueAttributeSupport>
+    <DynamicCodeSupport Condition="'$(DynamicCodeSupport)' == ''">true</DynamicCodeSupport>
   </PropertyGroup>
 
 

From 146a42d4f5fad70262bea809e9889bb0f5148803 Mon Sep 17 00:00:00 2001
From: Sven Boemer <sbomer@gmail.com>
Date: Thu, 20 Jun 2024 22:05:45 +0000
Subject: [PATCH 2/2] Fix crossgen2_publish

---
 src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj
index 657ac23590a03..3fbdc4590fdc1 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj
@@ -53,6 +53,9 @@
     <!-- Use .dwarf files instead of .dsym files since our symbol exporting may not safely handle folders. -->
     <NativeSymbolExt Condition="'$(_IsApplePlatform)' == 'true'">.dwarf</NativeSymbolExt>
     <DsymUtilOptions Condition="'$(_IsApplePlatform)' == 'true'">--flat</DsymUtilOptions>
+    <!-- Prevent getting DynamicCodeSupport=true default from ILLink targets that are imported
+         with the Sdk.targets import above, before Native AOT defaults get a chance to set it -->
+    <DynamicCodeSupport>false</DynamicCodeSupport>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(NativeAotSupported)' == 'true'">