Delete moved files and fix build breaks

14 files changed, 32 insertions, 348 deletions

diff --git a/src/Common/src/Interop/Windows/advapi32/Interop.RegDeleteValue.cs b/src/Common/src/Interop/Windows/advapi32/Interop.RegDeleteValue.cs
deleted file mode 100644
index 2597b23d0..000000000
--- a/src/Common/src/Interop/Windows/advapi32/Interop.RegDeleteValue.cs
+++ /dev/null
@@ -1,16 +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.
-
-using System;
-using System.Runtime.InteropServices;
-using Microsoft.Win32.SafeHandles;
-
-internal partial class Interop
-{
-    internal partial class Advapi32
-    {
-        [DllImport("advapi32.dll", CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegDeleteValueW")]
-        internal static extern int RegDeleteValue(SafeRegistryHandle hKey, string lpValueName);
-    }
-}
diff --git a/src/Common/src/Interop/Windows/advapi32/Interop.RegSetValueEx.cs b/src/Common/src/Interop/Windows/advapi32/Interop.RegSetValueEx.cs
deleted file mode 100644
index 59e038d95..000000000
--- a/src/Common/src/Interop/Windows/advapi32/Interop.RegSetValueEx.cs
+++ /dev/null
@@ -1,17 +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.
-
-using System;
-using System.Runtime.InteropServices;
-using Microsoft.Win32;
-using Microsoft.Win32.SafeHandles;
-
-internal partial class Interop
-{
-    internal partial class Advapi32
-    {
-        [DllImport("advapi32.dll", CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegSetValueExW")]
-        internal static extern int RegSetValueEx(SafeRegistryHandle hKey, string lpValueName, int Reserved, RegistryValueKind dwType, string lpData, int cbData);
-    }
-}
diff --git a/src/Common/src/Interop/Windows/mincore/Interop.RegCreateKeyEx.cs b/src/Common/src/Interop/Windows/mincore/Interop.RegCreateKeyEx.cs
deleted file mode 100644
index b1ccf69b9..000000000
--- a/src/Common/src/Interop/Windows/mincore/Interop.RegCreateKeyEx.cs
+++ /dev/null
@@ -1,27 +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.
-
-using Microsoft.Win32.SafeHandles;
-using System;
-using System.Runtime.InteropServices;
-
-internal partial class Interop
-{
-    internal partial class mincore
-    {
-        // Note: RegCreateKeyEx won't set the last error on failure - it returns
-        // an error code if it fails.
-        [DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegCreateKeyExW")]
-        internal static extern int RegCreateKeyEx(
-            SafeRegistryHandle hKey,
-            string lpSubKey,
-            int Reserved,
-            string lpClass,
-            int dwOptions,
-            int samDesired,
-            ref Kernel32.SECURITY_ATTRIBUTES secAttrs,
-            out SafeRegistryHandle hkResult,
-            out int lpdwDisposition);
-    }
-}
diff --git a/src/Common/src/Interop/Windows/mincore/Interop.RegEnumKeyEx.cs b/src/Common/src/Interop/Windows/mincore/Interop.RegEnumKeyEx.cs
deleted file mode 100644
index 6196c98b0..000000000
--- a/src/Common/src/Interop/Windows/mincore/Interop.RegEnumKeyEx.cs
+++ /dev/null
@@ -1,25 +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.
-
-using Microsoft.Win32.SafeHandles;
-using System;
-using System.Runtime.InteropServices;
-using System.Text;
-
-internal partial class Interop
-{
-    internal partial class mincore
-    {
-        [DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegEnumKeyExW")]
-        internal static extern unsafe int RegEnumKeyEx(
-            SafeRegistryHandle hKey,
-            int dwIndex,
-            char* lpName,
-            ref int lpcbName,
-            int[] lpReserved,
-            [Out]StringBuilder lpClass,
-            int[] lpcbClass,
-            long[] lpftLastWriteTime);
-    }
-}
diff --git a/src/Common/src/Interop/Windows/mincore/Interop.RegEnumValue.cs b/src/Common/src/Interop/Windows/mincore/Interop.RegEnumValue.cs
deleted file mode 100644
index 6d88c517c..000000000
--- a/src/Common/src/Interop/Windows/mincore/Interop.RegEnumValue.cs
+++ /dev/null
@@ -1,24 +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.
-
-using Microsoft.Win32.SafeHandles;
-using System;
-using System.Runtime.InteropServices;
-
-internal partial class Interop
-{
-    internal partial class mincore
-    {
-        [DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegEnumValueW")]
-        internal static extern unsafe int RegEnumValue(
-            SafeRegistryHandle hKey,
-            int dwIndex,
-            char* lpValueName,
-            ref int lpcbValueName,
-            IntPtr lpReserved_MustBeZero,
-            int[] lpType,
-            byte[] lpData,
-            int[] lpcbData);
-    }
-}
diff --git a/src/Common/src/Interop/Windows/mincore/Interop.RegFlushKey.cs b/src/Common/src/Interop/Windows/mincore/Interop.RegFlushKey.cs
deleted file mode 100644
index 25f8ff240..000000000
--- a/src/Common/src/Interop/Windows/mincore/Interop.RegFlushKey.cs
+++ /dev/null
@@ -1,15 +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.
-
-using Microsoft.Win32.SafeHandles;
-using System.Runtime.InteropServices;
-
-internal partial class Interop
-{
-    internal partial class mincore
-    {
-        [DllImport(Libraries.Registry_L1)]
-        internal static extern int RegFlushKey(SafeRegistryHandle hKey);
-    }
-}
diff --git a/src/Common/src/Interop/Windows/mincore/Interop.RegOpenKeyEx.cs b/src/Common/src/Interop/Windows/mincore/Interop.RegOpenKeyEx.cs
deleted file mode 100644
index 9e8d9382f..000000000
--- a/src/Common/src/Interop/Windows/mincore/Interop.RegOpenKeyEx.cs
+++ /dev/null
@@ -1,30 +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.
-
-using Microsoft.Win32.SafeHandles;
-using System;
-using System.Runtime.InteropServices;
-
-internal partial class Interop
-{
-    internal partial class mincore
-    {
-        [DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegOpenKeyExW")]
-        internal static extern int RegOpenKeyEx(
-            SafeRegistryHandle hKey,
-            string lpSubKey,
-            int ulOptions,
-            int samDesired,
-            out SafeRegistryHandle hkResult);
-
-
-        [DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegOpenKeyExW")]
-        internal static extern int RegOpenKeyEx(
-            IntPtr hKey,
-            string lpSubKey,
-            int ulOptions,
-            int samDesired,
-            out SafeRegistryHandle hkResult);
-    }
-}
diff --git a/src/Common/src/Interop/Windows/mincore/Interop.RegQueryInfoKey.cs b/src/Common/src/Interop/Windows/mincore/Interop.RegQueryInfoKey.cs
deleted file mode 100644
index 19a688440..000000000
--- a/src/Common/src/Interop/Windows/mincore/Interop.RegQueryInfoKey.cs
+++ /dev/null
@@ -1,29 +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.
-
-using Microsoft.Win32.SafeHandles;
-using System;
-using System.Runtime.InteropServices;
-using System.Text;
-
-internal partial class Interop
-{
-    internal partial class mincore
-    {
-        [DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegQueryInfoKeyW")]
-        internal static extern int RegQueryInfoKey(
-            SafeRegistryHandle hKey,
-            [Out]StringBuilder lpClass,
-            int[] lpcbClass,
-            IntPtr lpReserved_MustBeZero,
-            ref int lpcSubKeys,
-            int[] lpcbMaxSubKeyLen,
-            int[] lpcbMaxClassLen,
-            ref int lpcValues,
-            int[] lpcbMaxValueNameLen,
-            int[] lpcbMaxValueLen,
-            int[] lpcbSecurityDescriptor,
-            int[] lpftLastWriteTime);
-    }
-}
diff --git a/src/Common/src/Interop/Windows/mincore/Interop.RegQueryValueEx.cs b/src/Common/src/Interop/Windows/mincore/Interop.RegQueryValueEx.cs
deleted file mode 100644
index 8c748aa67..000000000
--- a/src/Common/src/Interop/Windows/mincore/Interop.RegQueryValueEx.cs
+++ /dev/null
@@ -1,59 +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.
-
-using Microsoft.Win32.SafeHandles;
-using System;
-using System.Runtime.InteropServices;
-using System.Text;
-
-internal partial class Interop
-{
-    internal partial class mincore
-    {
-        [DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegQueryValueExW")]
-        internal static extern int RegQueryValueEx(
-            SafeRegistryHandle hKey,
-            string lpValueName,
-            int[] lpReserved,
-            ref int lpType,
-            [Out] byte[] lpData,
-            ref int lpcbData);
-
-        [DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegQueryValueExW")]
-        internal static extern int RegQueryValueEx(
-            SafeRegistryHandle hKey,
-            string lpValueName,
-            int[] lpReserved,
-            ref int lpType,
-            ref int lpData,
-            ref int lpcbData);
-
-        [DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegQueryValueExW")]
-        internal static extern int RegQueryValueEx(
-            SafeRegistryHandle hKey,
-            string lpValueName,
-            int[] lpReserved,
-            ref int lpType,
-            ref long lpData,
-            ref int lpcbData);
-
-        [DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegQueryValueExW")]
-        internal static extern int RegQueryValueEx(
-            SafeRegistryHandle hKey,
-            string lpValueName,
-            int[] lpReserved,
-            ref int lpType,
-            [Out] char[] lpData,
-            ref int lpcbData);
-
-        [DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegQueryValueExW")]
-        internal static extern int RegQueryValueEx(
-            SafeRegistryHandle hKey,
-            string lpValueName,
-            int[] lpReserved,
-            ref int lpType,
-            [Out]StringBuilder lpData,
-            ref int lpcbData);
-    }
-}
diff --git a/src/Common/src/Interop/Windows/mincore/Interop.RegistryOptions.cs b/src/Common/src/Interop/Windows/mincore/Interop.RegistryOptions.cs
deleted file mode 100644
index c5133fd30..000000000
--- a/src/Common/src/Interop/Windows/mincore/Interop.RegistryOptions.cs
+++ /dev/null
@@ -1,44 +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.
-
-internal partial class Interop
-{
-    internal partial class mincore
-    {
-        internal partial class RegistryOptions
-        {
-            internal const int REG_OPTION_NON_VOLATILE = 0x0000;     // (default) keys are persisted beyond reboot/unload
-            internal const int REG_OPTION_VOLATILE = 0x0001;        // All keys created by the function are volatile
-            internal const int REG_OPTION_CREATE_LINK = 0x0002;     // They key is a symbolic link
-            internal const int REG_OPTION_BACKUP_RESTORE = 0x0004;  // Use SE_BACKUP_NAME process special privileges
-        }
-
-        internal partial class RegistryOperations
-        {
-            internal const int KEY_QUERY_VALUE = 0x0001;
-            internal const int KEY_SET_VALUE = 0x0002;
-            internal const int KEY_CREATE_SUB_KEY = 0x0004;
-            internal const int KEY_ENUMERATE_SUB_KEYS = 0x0008;
-            internal const int KEY_NOTIFY = 0x0010;
-            internal const int KEY_CREATE_LINK = 0x0020;
-            internal const int KEY_READ = ((STANDARD_RIGHTS_READ |
-                                                               KEY_QUERY_VALUE |
-                                                               KEY_ENUMERATE_SUB_KEYS |
-                                                               KEY_NOTIFY)
-                                                              &
-                                                              (~SYNCHRONIZE));
-
-            internal const int KEY_WRITE = ((STANDARD_RIGHTS_WRITE |
-                                                               KEY_SET_VALUE |
-                                                               KEY_CREATE_SUB_KEY)
-                                                              &
-                                                              (~SYNCHRONIZE));
-
-            internal const int SYNCHRONIZE = 0x00100000;
-            internal const int READ_CONTROL = 0x00020000;
-            internal const int STANDARD_RIGHTS_READ = READ_CONTROL;
-            internal const int STANDARD_RIGHTS_WRITE = READ_CONTROL;
-        }
-    }
-}
diff --git a/src/System.Private.CoreLib/src/Microsoft/Win32/RegistryKey.Windows.cs b/src/System.Private.CoreLib/src/Microsoft/Win32/RegistryKey.Windows.cs
index 492247757..a8fb1c187 100644
--- a/src/System.Private.CoreLib/src/Microsoft/Win32/RegistryKey.Windows.cs
+++ b/src/System.Private.CoreLib/src/Microsoft/Win32/RegistryKey.Windows.cs
@@ -82,7 +82,7 @@ namespace Microsoft.Win32
         {
             if (_hkey != null && IsDirty())
             {
-                Interop.mincore.RegFlushKey(_hkey);
+                Interop.Advapi32.RegFlushKey(_hkey);
             }
         }
 
@@ -93,7 +93,7 @@ namespace Microsoft.Win32
 
             // By default, the new key will be writable.
             SafeRegistryHandle result = null;
-            int ret = Interop.mincore.RegCreateKeyEx(_hkey,
+            int ret = Interop.Advapi32.RegCreateKeyEx(_hkey,
                 subkey,
                 0,
                 null,
@@ -185,7 +185,7 @@ namespace Microsoft.Win32
         private RegistryKey InternalOpenSubKeyCore(string name, RegistryRights rights, bool throwOnPermissionFailure)
         {
             SafeRegistryHandle result = null;
-            int ret = Interop.mincore.RegOpenKeyEx(_hkey, name, 0, ((int)rights | (int)_regView), out result);
+            int ret = Interop.Advapi32.RegOpenKeyEx(_hkey, name, 0, ((int)rights | (int)_regView), out result);
             if (ret == 0 && !result.IsInvalid)
             {
                 RegistryKey key = new RegistryKey(result, IsWritable((int)rights), false, _remoteKey, false, _regView);
@@ -242,7 +242,7 @@ namespace Microsoft.Win32
 
                 // open the base key so that RegistryKey.Handle will return a valid handle
                 SafeRegistryHandle result;
-                ret = Interop.mincore.RegOpenKeyEx(baseKey,
+                ret = Interop.Advapi32.RegOpenKeyEx(baseKey,
                     null,
                     0,
                     (int)GetRegistryKeyRights(IsWritable()) | (int)_regView,
@@ -264,7 +264,7 @@ namespace Microsoft.Win32
         {
             int subkeys = 0;
             int junk = 0;
-            int ret = Interop.mincore.RegQueryInfoKey(_hkey,
+            int ret = Interop.Advapi32.RegQueryInfoKey(_hkey,
                                       null,
                                       null,
                                       IntPtr.Zero,
@@ -297,7 +297,7 @@ namespace Microsoft.Win32
                 for (int i = 0; i < subkeys; i++)
                 {
                     namelen = name.Length; // Don't remove this. The API's doesn't work if this is not properly initialized.
-                    int ret = Interop.mincore.RegEnumKeyEx(_hkey,
+                    int ret = Interop.Advapi32.RegEnumKeyEx(_hkey,
                         i,
                         namePtr,
                         ref namelen,
@@ -321,7 +321,7 @@ namespace Microsoft.Win32
         {
             int values = 0;
             int junk = 0;
-            int ret = Interop.mincore.RegQueryInfoKey(_hkey,
+            int ret = Interop.Advapi32.RegQueryInfoKey(_hkey,
                                       null,
                                       null,
                                       IntPtr.Zero,
@@ -355,7 +355,7 @@ namespace Microsoft.Win32
                 {
                     namelen = name.Length;
 
-                    int ret = Interop.mincore.RegEnumValue(_hkey,
+                    int ret = Interop.Advapi32.RegEnumValue(_hkey,
                         i,
                         namePtr,
                         ref namelen,
@@ -384,7 +384,7 @@ namespace Microsoft.Win32
             int type = 0;
             int datasize = 0;
 
-            int ret = Interop.mincore.RegQueryValueEx(_hkey, name, null, ref type, (byte[])null, ref datasize);
+            int ret = Interop.Advapi32.RegQueryValueEx(_hkey, name, null, ref type, (byte[])null, ref datasize);
 
             if (ret != 0)
             {
@@ -395,7 +395,7 @@ namespace Microsoft.Win32
 
                     int r;
                     byte[] blob = new byte[size];
-                    while (Interop.Errors.ERROR_MORE_DATA == (r = Interop.mincore.RegQueryValueEx(_hkey, name, null, ref type, blob, ref sizeInput)))
+                    while (Interop.Errors.ERROR_MORE_DATA == (r = Interop.Advapi32.RegQueryValueEx(_hkey, name, null, ref type, blob, ref sizeInput)))
                     {
                         if (size == int.MaxValue)
                         {
@@ -446,7 +446,7 @@ namespace Microsoft.Win32
                 case Interop.Advapi32.RegistryValues.REG_BINARY:
                     {
                         byte[] blob = new byte[datasize];
-                        ret = Interop.mincore.RegQueryValueEx(_hkey, name, null, ref type, blob, ref datasize);
+                        ret = Interop.Advapi32.RegQueryValueEx(_hkey, name, null, ref type, blob, ref datasize);
                         data = blob;
                     }
                     break;
@@ -460,7 +460,7 @@ namespace Microsoft.Win32
                         long blob = 0;
                         Debug.Assert(datasize == 8, "datasize==8");
                         // Here, datasize must be 8 when calling this
-                        ret = Interop.mincore.RegQueryValueEx(_hkey, name, null, ref type, ref blob, ref datasize);
+                        ret = Interop.Advapi32.RegQueryValueEx(_hkey, name, null, ref type, ref blob, ref datasize);
 
                         data = blob;
                     }
@@ -475,7 +475,7 @@ namespace Microsoft.Win32
                         int blob = 0;
                         Debug.Assert(datasize == 4, "datasize==4");
                         // Here, datasize must be four when calling this
-                        ret = Interop.mincore.RegQueryValueEx(_hkey, name, null, ref type, ref blob, ref datasize);
+                        ret = Interop.Advapi32.RegQueryValueEx(_hkey, name, null, ref type, ref blob, ref datasize);
 
                         data = blob;
                     }
@@ -497,7 +497,7 @@ namespace Microsoft.Win32
                         }
                         char[] blob = new char[datasize / 2];
 
-                        ret = Interop.mincore.RegQueryValueEx(_hkey, name, null, ref type, blob, ref datasize);
+                        ret = Interop.Advapi32.RegQueryValueEx(_hkey, name, null, ref type, blob, ref datasize);
                         if (blob.Length > 0 && blob[blob.Length - 1] == (char)0)
                         {
                             data = new string(blob, 0, blob.Length - 1);
@@ -527,7 +527,7 @@ namespace Microsoft.Win32
                         }
                         char[] blob = new char[datasize / 2];
 
-                        ret = Interop.mincore.RegQueryValueEx(_hkey, name, null, ref type, blob, ref datasize);
+                        ret = Interop.Advapi32.RegQueryValueEx(_hkey, name, null, ref type, blob, ref datasize);
 
                         if (blob.Length > 0 && blob[blob.Length - 1] == (char)0)
                         {
@@ -562,7 +562,7 @@ namespace Microsoft.Win32
                         }
                         char[] blob = new char[datasize / 2];
 
-                        ret = Interop.mincore.RegQueryValueEx(_hkey, name, null, ref type, blob, ref datasize);
+                        ret = Interop.Advapi32.RegQueryValueEx(_hkey, name, null, ref type, blob, ref datasize);
 
                         // make sure the string is null terminated before processing the data
                         if (blob.Length > 0 && blob[blob.Length - 1] != (char)0)
@@ -634,7 +634,7 @@ namespace Microsoft.Win32
         {
             int type = 0;
             int datasize = 0;
-            int ret = Interop.mincore.RegQueryValueEx(_hkey, name, null, ref type, (byte[])null, ref datasize);
+            int ret = Interop.Advapi32.RegQueryValueEx(_hkey, name, null, ref type, (byte[])null, ref datasize);
             if (ret != 0)
             {
                 Win32Error(ret, null);
@@ -719,8 +719,8 @@ namespace Microsoft.Win32
 
         private static bool IsWritable(int rights)
         {
-            return (rights & (Interop.mincore.RegistryOperations.KEY_SET_VALUE |
-                              Interop.mincore.RegistryOperations.KEY_CREATE_SUB_KEY |
+            return (rights & (Interop.Advapi32.RegistryOperations.KEY_SET_VALUE |
+                              Interop.Advapi32.RegistryOperations.KEY_CREATE_SUB_KEY |
                               (int)RegistryRights.Delete |
                               (int)RegistryRights.TakeOwnership |
                               (int)RegistryRights.ChangePermissions)) != 0;
diff --git a/src/System.Private.CoreLib/src/Microsoft/Win32/RegistryOptions.cs b/src/System.Private.CoreLib/src/Microsoft/Win32/RegistryOptions.cs
index 90b6a3dd7..201a6df0e 100644
--- a/src/System.Private.CoreLib/src/Microsoft/Win32/RegistryOptions.cs
+++ b/src/System.Private.CoreLib/src/Microsoft/Win32/RegistryOptions.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Win32
 #endif
     enum RegistryOptions
     {
-        None = Interop.mincore.RegistryOptions.REG_OPTION_NON_VOLATILE,       // 0x0000
-        Volatile = Interop.mincore.RegistryOptions.REG_OPTION_VOLATILE,      // 0x0001
+        None = Interop.Advapi32.RegistryOptions.REG_OPTION_NON_VOLATILE,       // 0x0000
+        Volatile = Interop.Advapi32.RegistryOptions.REG_OPTION_VOLATILE,      // 0x0001
     };
 }
diff --git a/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj b/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj
index c72d14531..88c6d2f02 100644
--- a/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj
+++ b/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj
@@ -352,36 +352,6 @@
     <Compile Include="Microsoft\Win32\RegistryOptions.cs" />
     <Compile Include="Microsoft\Win32\ThrowHelper.cs" />
     <Compile Include="System\Security\AccessControl\RegistryRights.cs" />
-    <Compile Include="..\..\Common\src\Interop\Windows\advapi32\Interop.RegDeleteValue.cs">
-      <Link>Interop\Windows\advapi32\Interop.RegDeleteValue.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Common\src\Interop\Windows\advapi32\Interop.RegSetValueEx.cs">
-      <Link>Interop\Windows\advapi32\Interop.RegSetValueEx.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Common\src\Interop\Windows\mincore\Interop.RegistryOptions.cs">
-      <Link>Interop\Windows\mincore\Interop.RegistryOptions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Common\src\Interop\Windows\mincore\Interop.RegCreateKeyEx.cs">
-      <Link>Interop\Windows\mincore\Interop.RegCreateKeyEx.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Common\src\Interop\Windows\mincore\Interop.RegEnumKeyEx.cs">
-      <Link>Interop\Windows\mincore\Interop.RegEnumKeyEx.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Common\src\Interop\Windows\mincore\Interop.RegEnumValue.cs">
-      <Link>Interop\Windows\mincore\Interop.RegEnumValue.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Common\src\Interop\Windows\mincore\Interop.RegFlushKey.cs">
-      <Link>Interop\Windows\mincore\Interop.RegFlushKey.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Common\src\Interop\Windows\mincore\Interop.RegOpenKeyEx.cs">
-      <Link>Interop\Windows\mincore\Interop.RegOpenKeyEx.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Common\src\Interop\Windows\mincore\Interop.RegQueryInfoKey.cs">
-      <Link>Interop\Windows\mincore\Interop.RegQueryInfoKey.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Common\src\Interop\Windows\mincore\Interop.RegQueryValueEx.cs">
-      <Link>Interop\Windows\mincore\Interop.RegQueryValueEx.cs</Link>
-    </Compile>
     <Compile Include="..\..\Common\src\Interop\Windows\Kernel32\Interop.ExitProcess.cs">
       <Link>Interop\Windows\mincore\Interop.ExitProcess.cs</Link>
     </Compile>
diff --git a/src/System.Private.CoreLib/src/System/Security/AccessControl/RegistryRights.cs b/src/System.Private.CoreLib/src/System/Security/AccessControl/RegistryRights.cs
index 6359122ef..729e2f6b5 100644
--- a/src/System.Private.CoreLib/src/System/Security/AccessControl/RegistryRights.cs
+++ b/src/System.Private.CoreLib/src/System/Security/AccessControl/RegistryRights.cs
@@ -18,25 +18,25 @@ namespace System.Security.AccessControl
     enum RegistryRights
     {
         // No None field - An ACE with the value 0 cannot grant nor deny.
-        QueryValues = Interop.mincore.RegistryOperations.KEY_QUERY_VALUE,          // 0x0001 query the values of a registry key
-        SetValue = Interop.mincore.RegistryOperations.KEY_SET_VALUE,            // 0x0002 create, delete, or set a registry value
-        CreateSubKey = Interop.mincore.RegistryOperations.KEY_CREATE_SUB_KEY,       // 0x0004 required to create a subkey of a specific key
-        EnumerateSubKeys = Interop.mincore.RegistryOperations.KEY_ENUMERATE_SUB_KEYS,   // 0x0008 required to enumerate sub keys of a key
-        Notify = Interop.mincore.RegistryOperations.KEY_NOTIFY,               // 0x0010 needed to request change notifications
-        CreateLink = Interop.mincore.RegistryOperations.KEY_CREATE_LINK,          // 0x0020 reserved for system use
+        QueryValues = Interop.Advapi32.RegistryOperations.KEY_QUERY_VALUE,          // 0x0001 query the values of a registry key
+        SetValue = Interop.Advapi32.RegistryOperations.KEY_SET_VALUE,            // 0x0002 create, delete, or set a registry value
+        CreateSubKey = Interop.Advapi32.RegistryOperations.KEY_CREATE_SUB_KEY,       // 0x0004 required to create a subkey of a specific key
+        EnumerateSubKeys = Interop.Advapi32.RegistryOperations.KEY_ENUMERATE_SUB_KEYS,   // 0x0008 required to enumerate sub keys of a key
+        Notify = Interop.Advapi32.RegistryOperations.KEY_NOTIFY,               // 0x0010 needed to request change notifications
+        CreateLink = Interop.Advapi32.RegistryOperations.KEY_CREATE_LINK,          // 0x0020 reserved for system use
         ///
         /// The Windows Kernel team agrees that it was a bad design to expose the WOW64_n options as permissions.
         /// in the .NET Framework these options are exposed via the RegistryView enum
         ///
-        ///        Reg64             = Interop.mincore.RegistryOptions.KEY_WOW64_64KEY,          // 0x0100 operate on the 64-bit registry view
-        ///        Reg32             = Interop.mincore.RegistryOptions.KEY_WOW64_32KEY,          // 0x0200 operate on the 32-bit registry view
+        ///        Reg64             = Interop.Advapi32.RegistryOptions.KEY_WOW64_64KEY,          // 0x0100 operate on the 64-bit registry view
+        ///        Reg32             = Interop.Advapi32.RegistryOptions.KEY_WOW64_32KEY,          // 0x0200 operate on the 32-bit registry view
         ExecuteKey = ReadKey,
-        ReadKey = Interop.mincore.RegistryOperations.STANDARD_RIGHTS_READ | QueryValues | EnumerateSubKeys | Notify,
-        WriteKey = Interop.mincore.RegistryOperations.STANDARD_RIGHTS_WRITE | SetValue | CreateSubKey,
+        ReadKey = Interop.Advapi32.RegistryOperations.STANDARD_RIGHTS_READ | QueryValues | EnumerateSubKeys | Notify,
+        WriteKey = Interop.Advapi32.RegistryOperations.STANDARD_RIGHTS_WRITE | SetValue | CreateSubKey,
         Delete = 0x10000,
         ReadPermissions = 0x20000,
         ChangePermissions = 0x40000,
         TakeOwnership = 0x80000,
-        FullControl = 0xF003F | Interop.mincore.RegistryOperations.STANDARD_RIGHTS_READ | Interop.mincore.RegistryOperations.STANDARD_RIGHTS_WRITE
+        FullControl = 0xF003F | Interop.Advapi32.RegistryOperations.STANDARD_RIGHTS_READ | Interop.Advapi32.RegistryOperations.STANDARD_RIGHTS_WRITE
     }
 }