diff options
author | David Wrighton <davidwr@microsoft.com> | 2019-10-15 06:21:20 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-15 06:21:20 +0300 |
commit | 60b91101f4bf192394412dfbabcf695a29398b38 (patch) | |
tree | 0398ff2087c0ff8be895cc165e421a3117d32880 /src/coreclr/Directory.Build.props | |
parent | f43e4215da821912a0f9506bda99bde9807367d9 (diff) |
Buildwork to remove dir.props files (dotnet/coreclr#26960)
- Remove dir.props and dir.targets
- Move all hierarchical build work into Directory.Build.props and Directory.Build.targets
- Remove some vestiges of BuildTools
- Remove concept of "Arcade" build. All product components (and nearly all of test) now include the Arcade Sdk
- Convert test tree to use nuget.config instead of RestoreSources
- Managed binaries now use the arcade convention for storing their intermediates
Commit migrated from https://github.com/dotnet/coreclr/commit/2a17098515dbf530c831fa084d981396f97715c8
Diffstat (limited to 'src/coreclr/Directory.Build.props')
-rw-r--r-- | src/coreclr/Directory.Build.props | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/coreclr/Directory.Build.props b/src/coreclr/Directory.Build.props index a8222e98553..7a035eafceb 100644 --- a/src/coreclr/Directory.Build.props +++ b/src/coreclr/Directory.Build.props @@ -1,8 +1,8 @@ <Project> <!-- Ensure our properties are set before Arcade defines defaults --> - <Import Project="dir.common.props" Condition="'$(ArcadeBuild)' == 'True'" /> - <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(ArcadeBuild)' == 'True'"/> + <Import Project="dir.common.props" /> + <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" /> <PropertyGroup Condition="'$(CopyrightNetFoundation)' != ''"> <Copyright>$(CopyrightNetFoundation)</Copyright> @@ -10,6 +10,10 @@ </PropertyGroup> <PropertyGroup> + <SignAssembly Condition="'$(UsingMicrosoftNETSdk)'!='true'">false</SignAssembly> + </PropertyGroup> + + <PropertyGroup> <CL_MPCount>$(NumberOfCores)</CL_MPCount> </PropertyGroup> <PropertyGroup> |