Cleanup to match conventions

diff --git a/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/System.Private.CoreLib/System.Private.CoreLib.csproj
index f471ad6..126c626 100644 (file)
--- a/src/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -123,6 +123,7 @@
     <Compile Include="$(BclSourcesRoot)\Internal\Runtime\Augments\RuntimeThread.cs" />
     <Compile Include="$(BclSourcesRoot)\Microsoft\Win32\UnsafeNativeMethods.cs" />
     <Compile Include="$(BclSourcesRoot)\Microsoft\Win32\Win32Native.cs" />
+    <Compile Include="$(BclSourcesRoot)\System\__Canon.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Activator.cs" />
     <Compile Include="$(BclSourcesRoot)\System\AppContext.cs" />
     <Compile Include="$(BclSourcesRoot)\System\ArgIterator.cs" />
@@ -137,6 +138,7 @@
     <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" />
@@ -178,7 +180,7 @@
     <Compile Include="$(BclSourcesRoot)\System\MissingMemberException.CoreCLR.cs" />
     <Compile Include="$(BclSourcesRoot)\System\MulticastDelegate.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Numerics\Hashing\HashHelpers.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Object.cs" />
+    <Compile Include="$(BclSourcesRoot)\System\Object.CoreCLR.cs" />
     <Compile Include="$(BclSourcesRoot)\System\OleAutBinder.cs" Condition="'$(FeatureClassicCominterop)' == 'true'" />
     <Compile Include="$(BclSourcesRoot)\System\Reflection\Assembly.CoreCLR.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Reflection\AssemblyName.cs" />

diff --git a/src/System.Private.CoreLib/shared/System/Object.cs b/src/System.Private.CoreLib/shared/System/Object.cs
index 0885c88..8d875fc 100644 (file)
--- a/src/System.Private.CoreLib/shared/System/Object.cs
+++ b/src/System.Private.CoreLib/shared/System/Object.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 
 namespace System
@@ -25,7 +24,6 @@ namespace System
 
         // Returns a String which represents the object instance.  The default
         // for an object is to return the fully qualified name of the class.
-        // 
         public virtual string ToString()
         {
             return GetType().ToString();
@@ -35,8 +33,6 @@ namespace System
         // Equal to this.  Equality is defined as object equality for reference
         // types and bitwise equality for value types using a loader trick to
         // replace Equals with EqualsValue for value types).
-        // 
-
         public virtual bool Equals(object obj)
         {
             return RuntimeHelpers.Equals(this, obj);
@@ -69,17 +65,15 @@ namespace System
         // Calling it on the same object multiple times will return the same value, so
         // it will technically meet the needs of a hash function, but it's less than ideal.
         // Objects (& especially value classes) should override this method.
-        // 
         public virtual int GetHashCode()
         {
             return RuntimeHelpers.GetHashCode(this);
         }
 
         // Allow an object to free resources before the object is reclaimed by the GC.
-        // 
         [NonVersionable]
         ~Object()
         {
         }
     }
-}
\ No newline at end of file
+}

diff --git a/src/System.Private.CoreLib/src/System/CoreLib.cs b/src/System.Private.CoreLib/src/System/CoreLib.cs
new file mode 100644 (file)
index 0000000..48a1764
--- /dev/null
+++ b/src/System.Private.CoreLib/src/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 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/Object.CoreCLR.cs b/src/System.Private.CoreLib/src/System/Object.CoreCLR.cs
new file mode 100644 (file)
index 0000000..bbd498a
--- /dev/null
+++ b/src/System.Private.CoreLib/src/System/Object.CoreCLR.cs
@@ -0,0 +1,25 @@
+// 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.
+
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace System
+{
+    [ClassInterface(ClassInterfaceType.AutoDispatch)]
+    [ComVisible(true)]
+    public partial class Object
+    {
+        // Returns a Type object which represent this object instance.
+        [MethodImplAttribute(MethodImplOptions.InternalCall)]
+        public extern Type GetType();
+
+        // Returns a new object instance that is a memberwise copy of this 
+        // object.  This is always a shallow copy of the instance. The method is protected
+        // so that other object may only call this method on themselves.  It is intended to
+        // support the ICloneable interface.
+        [MethodImplAttribute(MethodImplOptions.InternalCall)]
+        protected extern object MemberwiseClone();
+    }
+}

diff --git a/src/System.Private.CoreLib/src/System/Object.cs b/src/System.Private.CoreLib/src/System/Object.cs
deleted file mode 100644 (file)
index ab4e43e..0000000
--- a/src/System.Private.CoreLib/src/System/Object.cs
+++ /dev/null
@@ -1,70 +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.
-
-/*============================================================
-**
-**
-**
-** Object is the root class for all CLR objects.  This class
-** defines only the basics.
-**
-** 
-===========================================================*/
-
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
-
-namespace System
-{
-    // The Object is the root class for all object in the CLR System. Object 
-    // is the super class for all other CLR objects and provide a set of methods and low level
-    // services to subclasses.  These services include object synchronization and support for clone
-    // operations.
-    //
-    [ClassInterface(ClassInterfaceType.AutoDispatch)]
-    [ComVisible(true)]
-    public partial class Object
-    {
-        // Returns a Type object which represent this object instance.
-        // 
-        [MethodImplAttribute(MethodImplOptions.InternalCall)]
-        public extern Type GetType();
-
-        // Returns a new object instance that is a memberwise copy of this 
-        // object.  This is always a shallow copy of the instance. The method is protected
-        // so that other object may only call this method on themselves.  It is entended to
-        // support the ICloneable interface.
-        // 
-        [MethodImplAttribute(MethodImplOptions.InternalCall)]
-        protected extern object MemberwiseClone();
-    }
-
-
-    // Internal methodtable used to instantiate the "canonical" methodtable for generic instantiations.
-    // The name "__Canon" will never been seen by users but it will appear a lot in debugger stack traces
-    // involving generics so it is kept deliberately short as to avoid being a nuisance.
-
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComVisible(true)]
-    internal class __Canon
-    {
-    }
-
-    // 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;
-        }
-    }
-}

diff --git a/src/System.Private.CoreLib/src/System/__Canon.cs b/src/System.Private.CoreLib/src/System/__Canon.cs
new file mode 100644 (file)
index 0000000..7fbfa75
--- /dev/null
+++ b/src/System.Private.CoreLib/src/System/__Canon.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using System.Runtime.InteropServices;
+
+namespace System
+{
+    // Internal methodtable used to instantiate the "canonical" methodtable for generic instantiations.
+    // The name "__Canon" will never been seen by users but it will appear a lot in debugger stack traces
+    // involving generics so it is kept deliberately short as to avoid being a nuisance.
+
+    [ClassInterface(ClassInterfaceType.None)]
+    [ComVisible(true)]
+    internal class __Canon
+    {
+    }
+}