From 44d77508f61b537f4623fe5b0be659f5c7339467 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <7412651+ViktorHofer@users.noreply.github.com>
Date: Fri, 24 Apr 2026 11:16:31 +0200
Subject: [PATCH] Small clean-up in Arcade SDK

---
 src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.props | 26 ++++++++++++++++-
 .../sdk/Sdk.targets                           | 27 +++++++++++++++---
 .../tools/Imports.targets                     | 22 ---------------
 .../tools/Settings.props                      | 28 -------------------
 4 files changed, 48 insertions(+), 55 deletions(-)
 delete mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/Imports.targets
 delete mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/Settings.props

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.props b/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.props
index b560dbf5b65..a006999a8ca 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.props
+++ b/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.props
@@ -1,6 +1,30 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project>
 
-  <Import Project="..\tools\Settings.props" />
+  <PropertyGroup>
+    <ArcadeSdkDir>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', '..', 'tools'))</ArcadeSdkDir>
+
+    <_ArcadeOverriddenCustomBeforeMicrosoftCommonTargets>$(CustomBeforeMicrosoftCommonTargets)</_ArcadeOverriddenCustomBeforeMicrosoftCommonTargets>
+    <_ArcadeOverriddenCustomBeforeMicrosoftCommonCrossTargetingTargets>$(CustomBeforeMicrosoftCommonCrossTargetingTargets)</_ArcadeOverriddenCustomBeforeMicrosoftCommonCrossTargetingTargets>
+    <CustomBeforeMicrosoftCommonTargets>$(ArcadeSdkDir)BeforeCommonTargets.targets</CustomBeforeMicrosoftCommonTargets>
+    <CustomBeforeMicrosoftCommonCrossTargetingTargets>$(ArcadeSdkDir)BeforeCommonTargets.CrossTargeting.targets</CustomBeforeMicrosoftCommonCrossTargetingTargets>
+    <BeforeMicrosoftNETSdkTargets>$(BeforeMicrosoftNETSdkTargets);$(ArcadeSdkDir)BeforeNETSdkTargets.targets</BeforeMicrosoftNETSdkTargets>
+    <!-- MSBuild has "global" variables (ie command-line or MSBuild task properties) override local declarations.  That's generally not the behavior that we want in Arcade.
+         We want to be able to have Arcade MSBuild a project / target with the property set as a default, but let the project override that value.  To work around MSBuild,
+         we pass in `_blah` and set it to a local property (`blah`) which is not global. -->
+    <NETCORE_ENGINEERING_TELEMETRY Condition="'$(NETCORE_ENGINEERING_TELEMETRY)' == ''">$(_NETCORE_ENGINEERING_TELEMETRY)</NETCORE_ENGINEERING_TELEMETRY>
+  </PropertyGroup>
+
+  <Import Project="$(ArcadeSdkDir)BuildTasks.props" />
+  <Import Project="$(ArcadeSdkDir)ProjectLayout.props" />
+  <Import Project="$(ArcadeSdkDir)DefaultVersions.props"/>
+  <Import Project="$(ArcadeSdkDir)StrongName.props"/>
+  <Import Project="$(ArcadeSdkDir)ProjectDefaults.props"/>
+  <Import Project="$(ArcadeSdkDir)Tests.props" Condition="'$(DisableArcadeTestFramework)' != 'true'" />
+  <Import Project="$(ArcadeSdkDir)Workarounds.props"/>
+  <Import Project="$(ArcadeSdkDir)TargetFrameworkDefaults.props"/>
+
+  <Import Project="$(ArcadeSdkDir)Compiler.props" Condition="'$(UsingToolMicrosoftNetCompilers)' == 'true'" />
+  <Import Project="$(ArcadeSdkDir)VisualStudio.props" Condition="'$(UsingToolVSSDK)' == 'true' and '$(MSBuildRuntimeType)' != 'Core'"/>
 
 </Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.targets b/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.targets
index a55e12a0efc..69da708c648 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.targets
@@ -10,10 +10,29 @@
     <_BeforeCommonTargetsHookUsed Condition="'$(_ArcadeBeforeCommonTargetsImported)' != 'true'">false</_BeforeCommonTargetsHookUsed>
   </PropertyGroup>
 
-  <Import Project="..\tools\BeforeCommonTargets.targets" Condition="'$(_ArcadeBeforeCommonTargetsImported)' != 'true' and '$(IsCrossTargetingBuild)' != 'true'"/>
-  <Import Project="..\tools\BeforeCommonTargets.CrossTargeting.targets" Condition="'$(_ArcadeBeforeCommonTargetsImported)' != 'true' and '$(IsCrossTargetingBuild)' == 'true'"/>
+  <Import Project="$(ArcadeSdkDir)BeforeCommonTargets.targets" Condition="'$(_ArcadeBeforeCommonTargetsImported)' != 'true' and '$(IsCrossTargetingBuild)' != 'true'"/>
+  <Import Project="$(ArcadeSdkDir)BeforeCommonTargets.CrossTargeting.targets" Condition="'$(_ArcadeBeforeCommonTargetsImported)' != 'true' and '$(IsCrossTargetingBuild)' == 'true'"/>
 
-  <Import Project="..\tools\Imports.targets" Condition="'$(_SuppressAllTargets)' != 'true' or '$(_SuppressSdkImports)' == 'false'" />
-  <Import Project="..\tools\Empty.targets" Condition="'$(_SuppressAllTargets)' == 'true'" />
+  <ImportGroup Condition="'$(_SuppressAllTargets)' != 'true' or '$(_SuppressSdkImports)' == 'false'">
+    <Import Project="$(ArcadeSdkDir)ProjectDefaults.targets"/>
+    <Import Project="$(ArcadeSdkDir)StrongName.targets"/>
+    <Import Project="$(ArcadeSdkDir)GenerateChecksums.targets" />
+    <Import Project="$(ArcadeSdkDir)GenerateInternalsVisibleTo.targets" />
+    <Import Project="$(ArcadeSdkDir)GenerateResxSource.targets" />
+    <Import Project="$(ArcadeSdkDir)Workarounds.targets"/>
+    <Import Project="$(ArcadeSdkDir)RepositoryInfo.targets"/>
+    <Import Project="$(ArcadeSdkDir)Version.targets"/>
+
+    <Import Project="$(ArcadeSdkDir)Tests.targets" Condition="'$(DisableArcadeTestFramework)' != 'true'" />
+    <Import Project="$(ArcadeSdkDir)Pack.targets" Condition="'$(__ImportPackTargets)' == 'true'" />
+
+    <Import Project="$(ArcadeSdkDir)Performance.targets" Condition="'$(DisableArcadeTestFramework)' != 'true'" />
+    <Import Project="$(ArcadeSdkDir)Localization.targets" />
+    <Import Project="$(ArcadeSdkDir)VisualStudio.targets" Condition="'$(UsingToolVSSDK)' == 'true' and ('$(IsVsixProject)' == 'true' or '$(IsSwixProject)' == 'true' or '$(GeneratePkgDefFile)' == 'true') and '$(MSBuildRuntimeType)' != 'Core'"/>
+    <Import Project="$(ArcadeSdkDir)OptimizationData.targets" Condition="'$(UsingToolIbcOptimization)' == 'true'"/>
+    <Import Project="$(ArcadeSdkDir)SymStore.targets" Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(OS)' == 'Windows_NT'"/>
+  </ImportGroup>
+
+  <Import Project="$(ArcadeSdkDir)Empty.targets" Condition="'$(_SuppressAllTargets)' == 'true'" />
 
 </Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Imports.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/Imports.targets
deleted file mode 100644
index a50d2207589..00000000000
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Imports.targets
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project>
-
-  <Import Project="ProjectDefaults.targets"/>
-  <Import Project="StrongName.targets"/>
-  <Import Project="GenerateChecksums.targets" />
-  <Import Project="GenerateInternalsVisibleTo.targets" />
-  <Import Project="GenerateResxSource.targets" />
-  <Import Project="Workarounds.targets"/>
-  <Import Project="RepositoryInfo.targets"/>
-  <Import Project="Version.targets"/>
-
-  <Import Project="Tests.targets" Condition="'$(DisableArcadeTestFramework)' != 'true'" />
-  <Import Project="Pack.targets" Condition="'$(__ImportPackTargets)' == 'true'" />
-
-  <Import Project="Performance.targets" Condition="'$(DisableArcadeTestFramework)' != 'true'" />
-  <Import Project="Localization.targets" />
-  <Import Project="VisualStudio.targets" Condition="'$(UsingToolVSSDK)' == 'true' and ('$(IsVsixProject)' == 'true' or '$(IsSwixProject)' == 'true' or '$(GeneratePkgDefFile)' == 'true') and '$(MSBuildRuntimeType)' != 'Core'"/>
-  <Import Project="OptimizationData.targets" Condition="'$(UsingToolIbcOptimization)' == 'true'"/>
-  <Import Project="SymStore.targets" Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(OS)' == 'Windows_NT'"/>
-
-</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Settings.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/Settings.props
deleted file mode 100644
index 0b1d6c41d43..00000000000
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Settings.props
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project>
-
-  <PropertyGroup>
-    <_ArcadeOverriddenCustomBeforeMicrosoftCommonTargets>$(CustomBeforeMicrosoftCommonTargets)</_ArcadeOverriddenCustomBeforeMicrosoftCommonTargets>
-    <_ArcadeOverriddenCustomBeforeMicrosoftCommonCrossTargetingTargets>$(CustomBeforeMicrosoftCommonCrossTargetingTargets)</_ArcadeOverriddenCustomBeforeMicrosoftCommonCrossTargetingTargets>
-    <CustomBeforeMicrosoftCommonTargets>$(MSBuildThisFileDirectory)BeforeCommonTargets.targets</CustomBeforeMicrosoftCommonTargets>
-    <CustomBeforeMicrosoftCommonCrossTargetingTargets>$(MSBuildThisFileDirectory)BeforeCommonTargets.CrossTargeting.targets</CustomBeforeMicrosoftCommonCrossTargetingTargets>
-    <BeforeMicrosoftNETSdkTargets>$(BeforeMicrosoftNETSdkTargets);$(MSBuildThisFileDirectory)BeforeNETSdkTargets.targets</BeforeMicrosoftNETSdkTargets>
-    <!-- MSBuild has "global" variables (ie command-line or MSBuild task properties) override local declarations.  That's generally not the behavior that we want in Arcade.
-         We want to be able to have Arcade MSBuild a project / target with the property set as a default, but let the project override that value.  To work around MSBuild,
-         we pass in `_blah` and set it to a local property (`blah`) which is not global. -->
-    <NETCORE_ENGINEERING_TELEMETRY Condition="'$(NETCORE_ENGINEERING_TELEMETRY)' == ''">$(_NETCORE_ENGINEERING_TELEMETRY)</NETCORE_ENGINEERING_TELEMETRY>
-  </PropertyGroup>
-
-  <Import Project="BuildTasks.props" />
-  <Import Project="ProjectLayout.props" />
-  <Import Project="DefaultVersions.props"/>
-  <Import Project="StrongName.props"/>
-  <Import Project="ProjectDefaults.props"/>
-  <Import Project="Tests.props" Condition="'$(DisableArcadeTestFramework)' != 'true'" />
-  <Import Project="Workarounds.props"/>
-  <Import Project="TargetFrameworkDefaults.props"/>
-
-  <Import Project="Compiler.props" Condition="'$(UsingToolMicrosoftNetCompilers)' == 'true'" />
-  <Import Project="VisualStudio.props" Condition="'$(UsingToolVSSDK)' == 'true' and '$(MSBuildRuntimeType)' != 'Core'"/>
-
-</Project>