From 6a6caf3bb474e90233bf4c8adb1688536e7767b1 Mon Sep 17 00:00:00 2001
From: Jan Kotas <jkotas@microsoft.com>
Date: Thu, 25 Jan 2024 21:41:37 -0800
Subject: [PATCH 1/2] Enable native AOT for non-portable crossgen2

- Add a breadcrumb for non-portable build into the Native AOT runtime pack
- Use the breadcrumb to add system OpenSSL libs to the linker command
  line

Contributes to #66859
---
 src/coreclr/nativeaot/BuildIntegration/BuildIntegration.proj | 5 +++++
 .../BuildIntegration/Microsoft.NETCore.Native.Unix.targets   | 5 +++++
 src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj     | 2 --
 .../Microsoft.NETCore.App.Crossgen2.sfxproj                  | 2 --
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/BuildIntegration.proj b/src/coreclr/nativeaot/BuildIntegration/BuildIntegration.proj
index a70f6a4f801b6d..94c527953657b7 100644
--- a/src/coreclr/nativeaot/BuildIntegration/BuildIntegration.proj
+++ b/src/coreclr/nativeaot/BuildIntegration/BuildIntegration.proj
@@ -16,6 +16,11 @@
     <WriteLinesToFile
       File="$(RuntimeBinDir)/aotsdk/debugucrt.txt"
       Condition="'$(TargetsWindows)'=='true' and '$(Configuration)' != 'Release'" />
+
+    <!-- Create breadcrumb to add additional libraries for non-portable builds -->
+    <WriteLinesToFile
+      File="$(RuntimeBinDir)/aotsdk/nonportable.txt"
+      Condition="'$(TargetsWindows)'!='true' and '$(PortableBuild)' != 'true'" />
   </Target>
 
   <Target Name="Restore" />
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
index 19485ec753df50..1b38cbd3efa379 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
@@ -142,6 +142,11 @@ The .NET Foundation licenses this file to you under the MIT license.
       <StaticICULibs Include="-Wl,-Bdynamic" Condition="'$(StaticExecutable)' != 'true'" />
     </ItemGroup>
 
+    <ItemGroup Condition="'$(StaticOpenSslLinking)' != 'true' and Exists('$(IlcSdkPath)nonportable.txt')">
+      <NativeSystemLibrary Include="ssl" />
+      <NativeSystemLibrary Include="crypto" />
+    </ItemGroup>
+
     <ItemGroup Condition="'$(StaticOpenSslLinking)' == 'true' and '$(NativeLib)' != 'Static'">
       <NativeLibrary Include="$(IntermediateOutputPath)libs/System.Security.Cryptography.Native/build/libSystem.Security.Cryptography.Native.OpenSsl.a" />
       <DirectPInvoke Include="libSystem.Security.Cryptography.Native.OpenSsl" />
diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj
index 522561c9c8a366..984ca91f13a7dd 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj
@@ -7,8 +7,6 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <!-- Can't use NativeAOT in non-portable build yet https://github.com/dotnet/runtime/issues/66859 -->
-    <NativeAotSupported Condition="'$(PortableBuild)' != 'true'">false</NativeAotSupported>
     <NativeAotSupported Condition="$(OutputRID.StartsWith('tizen')) == 'true'">false</NativeAotSupported>
     <NativeAotSupported Condition="$(OutputRID.EndsWith('-arm')) == 'true'">false</NativeAotSupported>
     <!-- Publish crossgen2 as a single-file app on native-OS builds. Cross-OS NativeAOT compilation is not supported yet -->
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj
index 599adf5008634b..b36f9e956632ca 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj
@@ -20,8 +20,6 @@
     <ShouldVerifyClosure>false</ShouldVerifyClosure>
     <!-- Publish crossgen2 as a single-file app on native-OS builds. Cross-OS NativeAOT compilation is not supported yet -->
     <NativeAotSupported Condition="'$(CrossBuild)' == 'true' and '$(TargetOS)' != '$(HostOS)'">false</NativeAotSupported>
-    <!-- Can't use NativeAOT in source build yet https://github.com/dotnet/runtime/issues/66859 -->
-    <NativeAotSupported Condition="'$(DotNetBuildFromSource)' == 'true'">false</NativeAotSupported>
   </PropertyGroup>
 
   <ItemGroup>

From 5aa708417e1293f3572ce368f7fd6121dffcc7df Mon Sep 17 00:00:00 2001
From: Jan Kotas <jkotas@microsoft.com>
Date: Fri, 26 Jan 2024 09:45:15 -0800
Subject: [PATCH 2/2] FB

---
 .../nativeaot/BuildIntegration/BuildIntegration.proj        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/coreclr/nativeaot/BuildIntegration/BuildIntegration.proj b/src/coreclr/nativeaot/BuildIntegration/BuildIntegration.proj
index 94c527953657b7..d631285448ee9e 100644
--- a/src/coreclr/nativeaot/BuildIntegration/BuildIntegration.proj
+++ b/src/coreclr/nativeaot/BuildIntegration/BuildIntegration.proj
@@ -15,12 +15,18 @@
     <!-- Create breadcrumb to disable dynamic linking of release crt for debug runtime -->
     <WriteLinesToFile
       File="$(RuntimeBinDir)/aotsdk/debugucrt.txt"
+      Overwrite="true"
       Condition="'$(TargetsWindows)'=='true' and '$(Configuration)' != 'Release'" />
 
     <!-- Create breadcrumb to add additional libraries for non-portable builds -->
     <WriteLinesToFile
       File="$(RuntimeBinDir)/aotsdk/nonportable.txt"
+      Overwrite="true"
       Condition="'$(TargetsWindows)'!='true' and '$(PortableBuild)' != 'true'" />
+    <Delete
+      Files="$(RuntimeBinDir)/aotsdk/nonportable.txt"
+      Condition="'$(TargetsWindows)'=='true' or '$(PortableBuild)' == 'true'" />
+
   </Target>
 
   <Target Name="Restore" />