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 @@ - + + $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', '..', 'tools')) + + <_ArcadeOverriddenCustomBeforeMicrosoftCommonTargets>$(CustomBeforeMicrosoftCommonTargets) + <_ArcadeOverriddenCustomBeforeMicrosoftCommonCrossTargetingTargets>$(CustomBeforeMicrosoftCommonCrossTargetingTargets) + $(ArcadeSdkDir)BeforeCommonTargets.targets + $(ArcadeSdkDir)BeforeCommonTargets.CrossTargeting.targets + $(BeforeMicrosoftNETSdkTargets);$(ArcadeSdkDir)BeforeNETSdkTargets.targets + + $(_NETCORE_ENGINEERING_TELEMETRY) + + + + + + + + + + + + + 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 - - + + - - + + + + + + + + + + + + + + + + + + + + + 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 @@ - - - - - - - - - - - - - - - - - - - - - - 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 @@ - - - - - <_ArcadeOverriddenCustomBeforeMicrosoftCommonTargets>$(CustomBeforeMicrosoftCommonTargets) - <_ArcadeOverriddenCustomBeforeMicrosoftCommonCrossTargetingTargets>$(CustomBeforeMicrosoftCommonCrossTargetingTargets) - $(MSBuildThisFileDirectory)BeforeCommonTargets.targets - $(MSBuildThisFileDirectory)BeforeCommonTargets.CrossTargeting.targets - $(BeforeMicrosoftNETSdkTargets);$(MSBuildThisFileDirectory)BeforeNETSdkTargets.targets - - $(_NETCORE_ENGINEERING_TELEMETRY) - - - - - - - - - - - - - - -