Import root D.B.targets and set condition (dotnet/corefx#42261)

Commit migrated from https://github.com/dotnet/corefx/commit/34e4c520baa8535432011bb5ea527b8b81422b4d

diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 3495bd2..18721f9 100644 (file)
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -11,6 +11,7 @@
   <!-- TODO: Consolidate when moved to runtime repository: dotnet/corefx#42170 -->
   <PropertyGroup>
     <IsRuntimeRepository Condition="Exists('..\..\.dotnet-runtime-placeholder')">true</IsRuntimeRepository>
+    <SkipImportArcadeSdkFromRoot>true</SkipImportArcadeSdkFromRoot>
   </PropertyGroup>
   <Import Project="..\..\Directory.Build.props" Condition="'$(IsRuntimeRepository)' == 'true'" />
 

diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 4a02cd4..345ac4a 100644 (file)
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -1,4 +1,6 @@
 <Project InitialTargets="AddSkipGetTargetFrameworkToProjectReferences">
+  <Import Project="..\..\Directory.Build.targets" Condition="'$(IsRuntimeRepository)' == 'true'" />
+
   <PropertyGroup>
     <!-- Reset these properties back to blank, since they are defaulted by Microsoft.NET.Sdk -->
     <FileAlignment Condition="'$(FileAlignment)' == '512'" />