From d2625329c28a908dc67c2f5a779820c6df558c11 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Wed, 10 Jan 2024 05:44:34 +0100
Subject: [PATCH 1/4] Use runtime packs for NativeAOT on .NET 9.0 or higher

---
 .../targets/Microsoft.NET.Sdk.DefaultItems.props                | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props
index 038026fdf5ff..0a4f0fefc77e 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props
@@ -20,6 +20,8 @@ Copyright (c) .NET Foundation. All rights reserved.
   <PropertyGroup>
     <!-- Disable web SDK implicit package versions for ASP.NET packages, since the .NET SDK now handles that -->
     <EnableWebSdkImplicitPackageVersions>false</EnableWebSdkImplicitPackageVersions>
+    <!-- Unconditionally use runtime packs for NativeAOT on .NET 9.0 or higher -->
+    <PublishAotUsingRuntimePack Condition="'$(_IsPublishing)' == 'true' And '$(PublishAot)' == 'true' And ('$(_TargetFrameworkVersionWithoutV)' != '') And ('$(_TargetFrameworkVersionWithoutV)' >= '9.0')">true</PublishAotUsingRuntimePack>
   </PropertyGroup>
 
   <PropertyGroup>

From 3b4cde4a61b234010687c2c9c3516e2eba84705f Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Fri, 12 Jan 2024 16:57:14 +0100
Subject: [PATCH 2/4] PR feedback

---
 .../targets/Microsoft.NET.Sdk.DefaultItems.props                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props
index 0a4f0fefc77e..2437bd79bd20 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props
@@ -21,7 +21,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <!-- Disable web SDK implicit package versions for ASP.NET packages, since the .NET SDK now handles that -->
     <EnableWebSdkImplicitPackageVersions>false</EnableWebSdkImplicitPackageVersions>
     <!-- Unconditionally use runtime packs for NativeAOT on .NET 9.0 or higher -->
-    <PublishAotUsingRuntimePack Condition="'$(_IsPublishing)' == 'true' And '$(PublishAot)' == 'true' And ('$(_TargetFrameworkVersionWithoutV)' != '') And ('$(_TargetFrameworkVersionWithoutV)' >= '9.0')">true</PublishAotUsingRuntimePack>
+    <PublishAotUsingRuntimePack Condition="'$(_IsPublishing)' == 'true' And '$(PublishAotUsingRuntimePack)' == '' And '$(PublishAot)' == 'true' And ('$(_TargetFrameworkVersionWithoutV)' != '') And ('$(_TargetFrameworkVersionWithoutV)' >= '9.0')">true</PublishAotUsingRuntimePack>
   </PropertyGroup>
 
   <PropertyGroup>

From a2ebd12bd0cdd279dd11c25440d47edc76ae17f8 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Wed, 22 Jan 2025 00:39:02 +0100
Subject: [PATCH 3/4] Update
 src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props

Co-authored-by: Sven Boemer <sbomer@gmail.com>
---
 .../targets/Microsoft.NET.Sdk.DefaultItems.props                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props
index 2437bd79bd20..72d6f8823303 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props
@@ -21,7 +21,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <!-- Disable web SDK implicit package versions for ASP.NET packages, since the .NET SDK now handles that -->
     <EnableWebSdkImplicitPackageVersions>false</EnableWebSdkImplicitPackageVersions>
     <!-- Unconditionally use runtime packs for NativeAOT on .NET 9.0 or higher -->
-    <PublishAotUsingRuntimePack Condition="'$(_IsPublishing)' == 'true' And '$(PublishAotUsingRuntimePack)' == '' And '$(PublishAot)' == 'true' And ('$(_TargetFrameworkVersionWithoutV)' != '') And ('$(_TargetFrameworkVersionWithoutV)' >= '9.0')">true</PublishAotUsingRuntimePack>
+    <PublishAotUsingRuntimePack Condition="'$(_IsPublishing)' == 'true' And '$(PublishAotUsingRuntimePack)' == '' And '$(PublishAot)' == 'true' And ('$(_TargetFrameworkVersionWithoutV)' != '') And ('$(_TargetFrameworkVersionWithoutV)' >= '10.0')">true</PublishAotUsingRuntimePack>
   </PropertyGroup>
 
   <PropertyGroup>

From 81a87a6538f5659a37158c686eff8b959471bfe9 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Wed, 22 Jan 2025 01:44:08 +0100
Subject: [PATCH 4/4] Update
 src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props

Co-authored-by: Sven Boemer <sbomer@gmail.com>
---
 .../targets/Microsoft.NET.Sdk.DefaultItems.props                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props
index 72d6f8823303..d69e5e9b72f2 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props
@@ -20,7 +20,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   <PropertyGroup>
     <!-- Disable web SDK implicit package versions for ASP.NET packages, since the .NET SDK now handles that -->
     <EnableWebSdkImplicitPackageVersions>false</EnableWebSdkImplicitPackageVersions>
-    <!-- Unconditionally use runtime packs for NativeAOT on .NET 9.0 or higher -->
+    <!-- Unconditionally use runtime packs for NativeAOT on .NET 10.0 or higher -->
     <PublishAotUsingRuntimePack Condition="'$(_IsPublishing)' == 'true' And '$(PublishAotUsingRuntimePack)' == '' And '$(PublishAot)' == 'true' And ('$(_TargetFrameworkVersionWithoutV)' != '') And ('$(_TargetFrameworkVersionWithoutV)' >= '10.0')">true</PublishAotUsingRuntimePack>
   </PropertyGroup>