summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarek Safar <marek.safar@gmail.com>2018-12-23 03:36:33 +0100
committerDan Moseley <danmose@microsoft.com>2018-12-22 18:36:33 -0800
commit622455699eab8fc6959fb9f85469f14fb621b4df (patch)
treefe403aab6c50f431e0d4fc89b51a427212f604c4 /src
parent3b388c0d3c32b090be9b2de4576fed563b680376 (diff)
downloadcoreclr-622455699eab8fc6959fb9f85469f14fb621b4df.tar.gz
coreclr-622455699eab8fc6959fb9f85469f14fb621b4df.tar.bz2
coreclr-622455699eab8fc6959fb9f85469f14fb621b4df.zip
Moves CoreLib to shared location (#21654)
Diffstat (limited to 'src')
-rw-r--r--src/System.Private.CoreLib/System.Private.CoreLib.csproj1
-rw-r--r--src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems1
-rw-r--r--src/System.Private.CoreLib/shared/System/CoreLib.cs (renamed from src/System.Private.CoreLib/src/System/CoreLib.cs)2
3 files changed, 2 insertions, 2 deletions
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/src/System/CoreLib.cs b/src/System.Private.CoreLib/shared/System/CoreLib.cs
index 48a176496d..a476038803 100644
--- a/src/System.Private.CoreLib/src/System/CoreLib.cs
+++ b/src/System.Private.CoreLib/shared/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";