From d1a8b2e2b8b01866fae2dcaed659be40373927f5 Mon Sep 17 00:00:00 2001
From: Marek Safar <marek.safar@gmail.com>
Date: Sun, 23 Dec 2018 03:36:33 +0100
Subject: [PATCH] Moves CoreLib to shared location (dotnet/coreclr#21654)

Commit migrated from https://github.com/dotnet/coreclr/commit/622455699eab8fc6959fb9f85469f14fb621b4df
---
 src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj    | 1 -
 .../System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems  | 1 +
 .../src => libraries}/System.Private.CoreLib/src/System/CoreLib.cs      | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/{coreclr/src => libraries}/System.Private.CoreLib/src/System/CoreLib.cs (95%)

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 18de69b..c0b8b36 100644
--- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -138,7 +138,6 @@
     <Compile Include="$(BclSourcesRoot)\System\Collections\Generic\ComparerHelpers.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Collections\Generic\EqualityComparer.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Collections\ObjectModel\ReadOnlyDictionary.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\CoreLib.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Currency.cs" />
     <Compile Include="$(BclSourcesRoot)\System\DefaultBinder.CanConvert.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Delegate.cs" />
diff --git a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
index 96c5b52..fe69d3d 100644
--- a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
+++ b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
@@ -167,6 +167,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\Configuration\Assemblies\AssemblyVersionCompatibility.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Convert.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Convert.Base64.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\CoreLib.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\CurrentSystemTimeZone.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\DataMisalignedException.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\DateTime.cs" />
diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/CoreLib.cs b/src/libraries/System.Private.CoreLib/src/System/CoreLib.cs
similarity index 95%
rename from src/coreclr/src/System.Private.CoreLib/src/System/CoreLib.cs
rename to src/libraries/System.Private.CoreLib/src/System/CoreLib.cs
index 48a1764..a476038 100644
--- a/src/coreclr/src/System.Private.CoreLib/src/System/CoreLib.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/CoreLib.cs
@@ -5,7 +5,7 @@
 namespace System
 {
     // This class is used to define the name of the base class library
-    internal class CoreLib
+    internal static class CoreLib
     {
         public const string Name = "System.Private.CoreLib";
 
-- 
2.7.4