Use chaining for custom .targets

Sergio0694 · Nov 24, 2024 · a32b58c · a32b58c
1 parent 1aa7077
commit a32b58c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/src/Directory.Build.BeforeMicrosoftCommon.targets b/src/Directory.Build.BeforeMicrosoftCommon.targets
@@ -42,8 +42,4 @@
   <PropertyGroup>
     <_ComputeSharpCustomBeforeMicrosoftCommonTargetsValid>true</_ComputeSharpCustomBeforeMicrosoftCommonTargetsValid>
   </PropertyGroup>
-
-  <!-- Import the original custom .targets, if it exists -->
-  <Import Project="$(_ComputeSharpCustomBeforeMicrosoftCommonTargets)"
-          Condition="'$(_ComputeSharpCustomBeforeMicrosoftCommonTargets)' != '' AND Exists('$(_ComputeSharpCustomBeforeMicrosoftCommonTargets)')"/>
 </Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -85,13 +85,12 @@
   </ItemGroup>
 
   <!--
-    Setup the custom .targets to run as 'CustomBeforeMicrosoftCommonTargets'. We also make a copy of the original value so
-    that we can manually import it ourselves after ours. This is because we want to be able to read properties that are set
-    in .csproj files, and set properties depending on those before the .NET SDK .targets are imported. This is necessary
-    to ensure that the .NET tooling works correctly with some of them (eg. with 'IsAotCompatible').
+    Setup the custom .targets to run as 'CustomBeforeMicrosoftCommonTargets'. This is because we want to be able to read
+    properties that are set in .csproj files, and set properties depending on those before the .NET SDK .targets are
+    imported. This is necessary to ensure that the .NET tooling works correctly with some of them (eg. with 'IsAotCompatible').
+    Note that '<Import>' supports multiple items, so we can just chain our .targets file to that property.
   -->
   <PropertyGroup>
-    <_ComputeSharpCustomBeforeMicrosoftCommonTargets>$(CustomBeforeMicrosoftCommonTargets)</_ComputeSharpCustomBeforeMicrosoftCommonTargets>
-    <CustomBeforeMicrosoftCommonTargets>$(MSBuildThisFileDirectory)Directory.Build.BeforeMicrosoftCommon.targets</CustomBeforeMicrosoftCommonTargets>
+    <CustomBeforeMicrosoftCommonTargets>$(CustomBeforeMicrosoftCommonTargets);$(MSBuildThisFileDirectory)Directory.Build.BeforeMicrosoftCommon.targets</CustomBeforeMicrosoftCommonTargets>
   </PropertyGroup>
 </Project>