From ef7f871e7b49309fcf1289f3e0bfbaebaeeed7b3 Mon Sep 17 00:00:00 2001
From: Jackson Schuster <jschuster@microsoft.com>
Date: Tue, 14 Mar 2023 13:36:41 -0700
Subject: [PATCH 1/4] Don't get AOT package in restore for < net7

---
 .../Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs
index 0e698136a02c..8e32f407faa9 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs
@@ -369,7 +369,7 @@ var runtimeRequiredByDeployment
                 }
             }
             
-            if (AotEnabled)
+            if (AotEnabled && _normalizedTargetFrameworkVersion.Major >= 7)
             {
                 if (!AddToolPack(ToolPackType.ILCompiler, _normalizedTargetFrameworkVersion, packagesToDownload, implicitPackageReferences))
                 {

From 4d16ce5638ff7f000e8756c5f24b2f3d25206937 Mon Sep 17 00:00:00 2001
From: Jackson Schuster <jschuster@microsoft.com>
Date: Tue, 14 Mar 2023 15:51:57 -0700
Subject: [PATCH 2/4] Error during publish when there are no valid ilcompiler
 packs

---
 .../targets/Microsoft.NET.Publish.targets                      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets
index 8360910d1e42..eb0472b25a9d 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets
@@ -128,6 +128,9 @@ Copyright (c) .NET Foundation. All rights reserved.
                    ResourceName="PublishProfileNotPresent" 
                    FormatArguments="$(PublishProfile)"/>
 
+    <NETSdkError Condition="'@(TargetILCompilerPack)' == '' and '@(HostILCompilerPack)' == ''"
+                 ResourceName="AotNoValidRuntimePackageError" />
+
     <!-- Projects in a solution cannot have conflicting configurations. This checks if PublishRelease conflicted at runtime to avoid extra project evaluations.
     SolutionExt is used to check if we are publishing a solution. Will be undefined if not.-->
     <NETSdkError Condition="'$(_IsPublishing)' == 'true' and

From 1ce7679642ecfab496104e236003a785cf0d3198 Mon Sep 17 00:00:00 2001
From: Jackson Schuster <jschuster@microsoft.com>
Date: Fri, 9 Jun 2023 15:20:34 -0700
Subject: [PATCH 3/4] Fix warning

---
 .../targets/Microsoft.NET.Publish.targets                     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets
index 2c3c8fdeff52..4f63e7170f98 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets
@@ -138,8 +138,8 @@ Copyright (c) .NET Foundation. All rights reserved.
                    ResourceName="PublishProfileNotPresent"
                    FormatArguments="$(PublishProfile)"/>
 
-    <NETSdkError Condition="'@(TargetILCompilerPack)' == '' and '@(HostILCompilerPack)' == ''"
-                 ResourceName="AotNoValidRuntimePackageError" />
+    <NETSdkError Condition="'$(PublishAOT)' == 'true' and '@(TargetILCompilerPack)' == '' and '@(HostILCompilerPack)' == ''"
+                 ResourceName="AotUnsupportedTargetFramework" />
 
     <!-- Projects in a solution cannot have conflicting configurations. This checks if PublishRelease conflicted at runtime to avoid extra project evaluations.
     SolutionExt is used to check if we are publishing a solution. Will be undefined if not.-->

From 2e2e0fda681402a85e03d1db430018bbcc0211b8 Mon Sep 17 00:00:00 2001
From: Jackson Schuster <jschuster@microsoft.com>
Date: Fri, 9 Jun 2023 15:22:09 -0700
Subject: [PATCH 4/4] add comment

---
 .../targets/Microsoft.NET.Publish.targets                        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets
index 4f63e7170f98..610de805b461 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets
@@ -138,6 +138,7 @@ Copyright (c) .NET Foundation. All rights reserved.
                    ResourceName="PublishProfileNotPresent"
                    FormatArguments="$(PublishProfile)"/>
 
+    <!-- If the TFM is valid, ProcessFrameworkReferences task will warn in restore. If we reach here without a ILCompiler pack, its an invalid TFM -->
     <NETSdkError Condition="'$(PublishAOT)' == 'true' and '@(TargetILCompilerPack)' == '' and '@(HostILCompilerPack)' == ''"
                  ResourceName="AotUnsupportedTargetFramework" />