Update CoreLib sources path and import runtime (dotnet/coreclr#27858)

Commit migrated from https://github.com/dotnet/coreclr/commit/1f2dda30f315b7047f4ec8a5276d888d82f06941

diff --git a/src/coreclr/Directory.Build.props b/src/coreclr/Directory.Build.props
index 7a035eafceb6f7b8aba3a295a570d7ede5ad9eb6..f0d09d6b3295231c24e4d0b85483a5070b2c0bac 100644 (file)
--- a/src/coreclr/Directory.Build.props
+++ b/src/coreclr/Directory.Build.props
@@ -1,5 +1,12 @@
 <Project>
 
+  <!-- TODO: Consolidate when moved to runtime repository: dotnet/corefx#42170 -->
+  <PropertyGroup>
+    <IsRuntimeRepository Condition="Exists('$(MSBuildThisFileDirectory)..\..\.dotnet-runtime-placeholder')">true</IsRuntimeRepository>
+    <SkipImportArcadeSdkFromRoot>true</SkipImportArcadeSdkFromRoot>
+  </PropertyGroup>
+  <Import Project="..\..\Directory.Build.props" Condition="'$(IsRuntimeRepository)' == 'true'" />
+
   <!-- Ensure our properties are set before Arcade defines defaults -->
   <Import Project="dir.common.props" />
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />

diff --git a/src/coreclr/Directory.Build.targets b/src/coreclr/Directory.Build.targets
index 97c9613c855fa53727beaa21f4f5423b1e47d6dc..209aece178bc06f3448cf2ba6ecaa11c49d2fd5c 100644 (file)
--- a/src/coreclr/Directory.Build.targets
+++ b/src/coreclr/Directory.Build.targets
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
+  <!-- TODO: Consolidate when moved to runtime repository: dotnet/corefx#42170 -->
+  <Import Project="..\..\Directory.Build.targets" Condition="'$(IsRuntimeRepository)' == 'true'" />
+
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 
   <PropertyGroup>

diff --git a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
index ac5cba74361a7f97b8a473b1f367d65e401d451b..96d02ccd5dda12d4b5b0a2726730a169617c0f1f 100644 (file)
--- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -125,7 +125,9 @@
   <PropertyGroup>
     <CommonPath>$(MSBuildThisFileDirectory)Common</CommonPath>
     <BclSourcesRoot>$(MSBuildThisFileDirectory)src</BclSourcesRoot>
-    <SharedBclSourcesRoot>$(MSBuildThisFileDirectory)shared</SharedBclSourcesRoot>
+    <!-- TODO: Consolidate when moved to runtime repository: dotnet/corefx#42170 -->
+    <SharedBclSourcesRoot Condition="'$(IsRuntimeRepository)' != 'true'">$(MSBuildThisFileDirectory)shared</SharedBclSourcesRoot>
+    <SharedBclSourcesRoot Condition="'$(IsRuntimeRepository)' == 'true'">$(RepoRoot)src\libraries\System.Private.CoreLib\src</SharedBclSourcesRoot>
   </PropertyGroup>
 
   <!-- Msbuild variables needed to get CoreCLR features to be set properly. -->
@@ -414,7 +416,7 @@
     <Compile Include="$(CommonPath)\NotImplemented.cs" />
     <Compile Include="$(CommonPath)\System\SR.cs" />
   </ItemGroup>
-  <Import Project="shared\System.Private.CoreLib.Shared.projitems" />
+  <Import Project="$(SharedBclSourcesRoot)\System.Private.CoreLib.Shared.projitems" />
   <PropertyGroup>
     <CheckCDefines Condition="'$(CheckCDefines)'==''">true</CheckCDefines>
   </PropertyGroup>