From ff0c538bcde4ebaebd195c2df35d03f2f2be64b5 Mon Sep 17 00:00:00 2001
From: Sven Boemer <sbomer@gmail.com>
Date: Fri, 21 Jun 2024 09:46:03 -0700
Subject: [PATCH] Default DynamicCodeSupport to true for CoreCLR (#103594)

Fixes https://github.com/dotnet/runtime/issues/80398
---
 src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj       | 3 +++
 .../illink/src/ILLink.Tasks/build/Microsoft.NET.ILLink.targets | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj
index 657ac23590a039..3fbdc4590fdc1a 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'">
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 aab515a7258bea..2d1526dc69ac5a 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>
     <UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == ''">false</UseSystemResourceKeys>
   </PropertyGroup>