Skip to content

Arcade sdk cleanup #16755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ViktorHofer wants to merge 1 commit into
base: main
Choose a base branch
from
+48 −55
Open

Arcade sdk cleanup #16755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
27 changes: 23 additions & 4 deletions src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
22 changes: 0 additions & 22 deletions src/Microsoft.DotNet.Arcade.Sdk/tools/Imports.targets
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions src/Microsoft.DotNet.Arcade.Sdk/tools/Settings.props
View file
Open in desktop

This file was deleted.

Loading