From 05ae8010bd8dad0ff57715998ca206e93e9946d4 Mon Sep 17 00:00:00 2001
From: Jan Kotas <jkotas@microsoft.com>
Date: Wed, 22 Jun 2022 23:26:05 -0700
Subject: [PATCH] [NativeAOT] Enable dynamic linking of ucrt for release
 runtime (#71182)

This is enabled for release runtime only, same as how we do it for regular CoreCLR builds.
---
 .../nativeaot/BuildIntegration/BuildIntegration.proj        | 5 +++++
 .../BuildIntegration/Microsoft.NETCore.Native.Windows.props | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/src/coreclr/nativeaot/BuildIntegration/BuildIntegration.proj b/src/coreclr/nativeaot/BuildIntegration/BuildIntegration.proj
index 624760868cf2..a70f6a4f801b 100644
--- a/src/coreclr/nativeaot/BuildIntegration/BuildIntegration.proj
+++ b/src/coreclr/nativeaot/BuildIntegration/BuildIntegration.proj
@@ -11,6 +11,11 @@
 
   <Target Name="Build">
     <Copy SourceFiles="@(Content)" DestinationFolder="$(OutputPath)" />
+
+    <!-- Create breadcrumb to disable dynamic linking of release crt for debug runtime -->
+    <WriteLinesToFile
+      File="$(RuntimeBinDir)/aotsdk/debugucrt.txt"
+      Condition="'$(TargetsWindows)'=='true' and '$(Configuration)' != 'Release'" />
   </Target>
 
   <Target Name="Restore" />
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.props b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.props
index d8c01d5a199c..e0e595e2f8c9 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.props
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.props
@@ -86,6 +86,12 @@ The .NET Foundation licenses this file to you under the MIT license.
       <LinkerArg Condition="'$(ControlFlowGuard)' == 'Guard'" Include="/guard:cf" />
     </ItemGroup>
 
+    <ItemGroup Condition="!Exists('$(IlcSdkPath)debugucrt.txt')">
+      <!-- Force ucrt to be dynamically linked for release runtime -->
+      <LinkerArg Include="/NODEFAULTLIB:libucrt.lib" />
+      <LinkerArg Include="/DEFAULTLIB:ucrt.lib" />
+    </ItemGroup>
+
     <ItemGroup Condition="'$(Configuration)' != 'Debug'">
       <LinkerArg Include="/OPT:REF" />
       <LinkerArg Include="/OPT:ICF" />