Use chaining for custom .targets

Sergio0694 · Nov 24, 2024 · b38629f · b38629f
1 parent f615d88
commit b38629f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/...ctory.Build.BeforeMicrosoftCommon.targets → ...uild.BeforeMicrosoftNETSdkTargets.targets b/...ctory.Build.BeforeMicrosoftCommon.targets → ...uild.BeforeMicrosoftNETSdkTargets.targets
@@ -40,10 +40,6 @@
 
   <!-- Add a marker value to verify from a later .targets that this .targets has been correctly invoked -->
   <PropertyGroup>
-    <_ComputeSharpCustomBeforeMicrosoftCommonTargetsValid>true</_ComputeSharpCustomBeforeMicrosoftCommonTargetsValid>
+    <_ComputeSharpBeforeMicrosoftNETSdkTargetsValid>true</_ComputeSharpBeforeMicrosoftNETSdkTargetsValid>
   </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 'BeforeMicrosoftNETSdkTargets'. 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 the
+    .NET SDK doesn't use 'Exists' here, and '<Import>' supports multiple items, so we can just chain our .targets file directly.
   -->
   <PropertyGroup>
-    <_ComputeSharpCustomBeforeMicrosoftCommonTargets>$(CustomBeforeMicrosoftCommonTargets)</_ComputeSharpCustomBeforeMicrosoftCommonTargets>
-    <CustomBeforeMicrosoftCommonTargets>$(MSBuildThisFileDirectory)Directory.Build.BeforeMicrosoftCommon.targets</CustomBeforeMicrosoftCommonTargets>
+    <BeforeMicrosoftNETSdkTargets>$(BeforeMicrosoftNETSdkTargets);$(MSBuildThisFileDirectory)Directory.Build.BeforeMicrosoftNETSdkTargets.targets</BeforeMicrosoftNETSdkTargets>
   </PropertyGroup>
 </Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -78,10 +78,10 @@
     </ItemGroup>
   </Target>
 
-  <!-- Emit an error if our custom 'BeforeCommon' .targets file has not been invoked -->
-  <Target Name="_ComputeSharpCheckForInvalidCustomBeforeMicrosoftCommonTargets"
+  <!-- Emit an error if our custom 'BeforeMicrosoftNETSdkTargets' .targets file has not been invoked -->
+  <Target Name="_ComputeSharpCheckForInvalidBeforeMicrosoftNETSdkTargets"
           BeforeTargets="_CheckForInvalidConfigurationAndPlatform;CoreCompile">
-    <Error Condition ="'$(_ComputeSharpCustomBeforeMicrosoftCommonTargetsValid)' != 'true'"
-           Text="The '_ComputeSharpCustomBeforeMicrosoftCommonTargetsValid' marker property is not set."/>
+    <Error Condition ="'$(_ComputeSharpBeforeMicrosoftNETSdkTargetsValid)' != 'true'"
+           Text="The '_ComputeSharpBeforeMicrosoftNETSdkTargetsValid' marker property is not set."/>
   </Target>
 </Project>