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

---
 .../System.Private.CoreLib.csproj                  |  1 -
 .../shared/System.Private.CoreLib.Shared.projitems |  1 +
 .../shared/System/CoreLib.cs                       | 22 ++++++++++++++++++++++
 src/System.Private.CoreLib/src/System/CoreLib.cs   | 22 ----------------------
 4 files changed, 23 insertions(+), 23 deletions(-)
 create mode 100644 src/System.Private.CoreLib/shared/System/CoreLib.cs
 delete mode 100644 src/System.Private.CoreLib/src/System/CoreLib.cs

(limited to 'src')

diff --git a/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/System.Private.CoreLib/System.Private.CoreLib.csproj
index 18de69be17..c0b8b36bbc 100644
--- a/src/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/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/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems b/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems
index 96c5b52f68..fe69d3d0c2 100644
--- a/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems
+++ b/src/System.Private.CoreLib/shared/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/System.Private.CoreLib/shared/System/CoreLib.cs b/src/System.Private.CoreLib/shared/System/CoreLib.cs
new file mode 100644
index 0000000000..a476038803
--- /dev/null
+++ b/src/System.Private.CoreLib/shared/System/CoreLib.cs
@@ -0,0 +1,22 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace System
+{
+    // This class is used to define the name of the base class library
+    internal static class CoreLib
+    {
+        public const string Name = "System.Private.CoreLib";
+
+        public static string FixupCoreLibName(string strToFixup)
+        {
+            if (!string.IsNullOrEmpty(strToFixup))
+            {
+                strToFixup = strToFixup.Replace("mscorlib", System.CoreLib.Name);
+            }
+
+            return strToFixup;
+        }
+    }
+}
diff --git a/src/System.Private.CoreLib/src/System/CoreLib.cs b/src/System.Private.CoreLib/src/System/CoreLib.cs
deleted file mode 100644
index 48a176496d..0000000000
--- a/src/System.Private.CoreLib/src/System/CoreLib.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace System
-{
-    // This class is used to define the name of the base class library
-    internal class CoreLib
-    {
-        public const string Name = "System.Private.CoreLib";
-
-        public static string FixupCoreLibName(string strToFixup)
-        {
-            if (!string.IsNullOrEmpty(strToFixup))
-            {
-                strToFixup = strToFixup.Replace("mscorlib", System.CoreLib.Name);
-            }
-
-            return strToFixup;
-        }
-    }
-}
-- 
cgit v1.2.3