From 597a012bfed4a7f31e7d91a66a4c6348a8419bbf Mon Sep 17 00:00:00 2001
From: Sven Boemer <sbomer@gmail.com>
Date: Tue, 5 Sep 2023 17:10:55 +0000
Subject: [PATCH] Separate imports

This will make it easier to use different conditions for the two.
---
 eng/illink.targets                    | 2 --
 eng/testing/tests.mobile.targets      | 1 +
 src/coreclr/Directory.Build.targets   | 1 +
 src/libraries/Directory.Build.targets | 2 +-
 src/mono/Directory.Build.targets      | 1 +
 5 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/eng/illink.targets b/eng/illink.targets
index 0649c4f8818f2..3636c029fc901 100644
--- a/eng/illink.targets
+++ b/eng/illink.targets
@@ -1,7 +1,5 @@
 <Project>
 
-  <Import Project="$(MSBuildThisFileDirectory)liveILLink.targets" />
-
   <PropertyGroup>
     <IsTrimmable Condition="'$(IsTrimmable)' == ''">true</IsTrimmable>
     <PrepareResourcesDependsOn>_EmbedILLinkXmls;$(PrepareResourcesDependsOn)</PrepareResourcesDependsOn>
diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 589a3fb90753a..ae6df8a7d1d29 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -165,5 +165,6 @@
           DependsOnTargets="InstallWorkloadUsingArtifacts"
           Condition="'$(InstallWorkloadForTesting)' == 'true'" />
 
+  <Import Project="$(RepositoryEngineeringDir)liveILLink.targets" Condition="'$(EnableAggressiveTrimming)' == 'true' or '$(EnableSoftTrimming)' == 'true'" />
   <Import Project="$(RepositoryEngineeringDir)illink.targets" Condition="'$(EnableAggressiveTrimming)' == 'true' or '$(EnableSoftTrimming)' == 'true'" />
 </Project>
diff --git a/src/coreclr/Directory.Build.targets b/src/coreclr/Directory.Build.targets
index 77095b48bfe2f..2a92ec9155fd6 100644
--- a/src/coreclr/Directory.Build.targets
+++ b/src/coreclr/Directory.Build.targets
@@ -27,6 +27,7 @@
   </Target>
 
   <!-- Import targets here to have TargetPath and other macros defined. Limit to CoreLib. -->
+  <Import Condition="'$(MSBuildProjectName)' == 'System.Private.CoreLib' or '$(IsNativeAotProject)' == 'true'" Project="$(RepositoryEngineeringDir)liveILLink.targets" />
   <Import Condition="'$(MSBuildProjectName)' == 'System.Private.CoreLib' or '$(IsNativeAotProject)' == 'true'" Project="$(RepositoryEngineeringDir)illink.targets" />
 
 </Project>
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index acd5edc193262..b26bf1ef0f5c1 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -126,7 +126,7 @@
   <Import Project="$(RepositoryEngineeringDir)testing\runsettings.targets" Condition="'$(EnableRunSettingsSupport)' == 'true'" />
   <Import Project="$(RepositoryEngineeringDir)testing\coverage.targets" Condition="'$(EnableRunSettingsSupport)' == 'true' or '$(EnableCoverageSupport)' == 'true'" />
   <Import Project="$(RepositoryEngineeringDir)slngen.targets" Condition="'$(IsSlnGen)' == 'true'" />
-
+  <Import Project="$(RepositoryEngineeringDir)liveILLink.targets" Condition="'$(IsSourceProject)' == 'true' or '$(ExplicitlyImportCustomILLinkTargets)' == 'true'" />
   <Import Project="$(RepositoryEngineeringDir)illink.targets" Condition="'$(IsSourceProject)' == 'true' or '$(ExplicitlyImportCustomILLinkTargets)' == 'true'" />
   <Import Project="$(RepositoryEngineeringDir)AvoidRestoreCycleOnSelfReference.targets" Condition="'$(AvoidRestoreCycleOnSelfReference)' == 'true'" />
   <Import Project="$(RepositoryEngineeringDir)nativeSanitizers.targets" />
diff --git a/src/mono/Directory.Build.targets b/src/mono/Directory.Build.targets
index fb807fd715fea..78c94138e1e69 100644
--- a/src/mono/Directory.Build.targets
+++ b/src/mono/Directory.Build.targets
@@ -2,5 +2,6 @@
   <Import Project="..\..\Directory.Build.targets" />
 
   <!-- Import targets here to have TargetPath and other macros defined. Limit to CoreLib. -->
+  <Import Condition="'$(MSBuildProjectName)' == 'System.Private.CoreLib'" Project="$(RepositoryEngineeringDir)liveILLink.targets" />
   <Import Condition="'$(MSBuildProjectName)' == 'System.Private.CoreLib'" Project="$(RepositoryEngineeringDir)illink.targets" />
 </Project>