From ca9ed190d47d90d700fe78d2063f98ab889b4d2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?=
 <MichalStrehovsky@users.noreply.github.com>
Date: Sat, 17 Feb 2024 02:01:19 +0900
Subject: [PATCH] Add linux-arm native AOT support (#18703)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
---
 src/redist/targets/GenerateBundledVersions.targets | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 94b2b73cf..6c5a7a912 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -362,8 +362,6 @@
         win-x64;
         " />
 
-      <!-- The subset of ILCompiler target RIDs that are officially supported. Should be a subset of
-           https://github.com/dotnet/runtime/blob/main/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/ILCompilerRIDs.props -->
       <Net80ILCompilerSupportedRids Include="
         @(Net70ILCompilerSupportedRids);
         osx-x64;
@@ -372,7 +370,15 @@
         freebsd-arm64;
         " />
 
-      <ILCompilerSupportedRids Include="@(Net80ILCompilerSupportedRids)" />
+      <Net90ILCompilerSupportedRids Include="
+        @(Net80ILCompilerSupportedRids);
+        linux-arm;
+        linux-musl-arm;
+        " />
+
+      <!-- The subset of ILCompiler target RIDs that are officially supported. Should be a subset of
+           https://github.com/dotnet/runtime/blob/main/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/ILCompilerRIDs.props -->
+      <ILCompilerSupportedRids Include="@(Net90ILCompilerSupportedRids)" />
 
       <Net80NativeAOTRuntimePackRids Include="
           ios-arm64;
@@ -395,8 +401,10 @@
       <Net90NativeAOTRuntimePackRids Include="
           @(Net80NativeAOTRuntimePackRids);
           linux-x64;
+          linux-arm;
           linux-arm64;
           linux-musl-x64;
+          linux-musl-arm;
           linux-musl-arm64;
           win-x64;
           win-arm64;