1 files changed, 3 insertions, 97 deletions

diff --git a/src/mscorlib/src/System/Runtime/InteropServices/WindowsRuntime/WindowsRuntimeMetadata.cs b/src/mscorlib/src/System/Runtime/InteropServices/WindowsRuntime/WindowsRuntimeMetadata.cs
index 9ca959c528..f097c6a0db 100644
--- a/src/mscorlib/src/System/Runtime/InteropServices/WindowsRuntime/WindowsRuntimeMetadata.cs
+++ b/src/mscorlib/src/System/Runtime/InteropServices/WindowsRuntime/WindowsRuntimeMetadata.cs
@@ -16,94 +16,10 @@ namespace System.Runtime.InteropServices.WindowsRuntime
     using System.Runtime.InteropServices;
     using System.Security;
     
-    public static class WindowsRuntimeMetadata
+    internal static class WindowsRuntimeMetadata
     {
-        // Wrapper for Win8 API RoResolveNamespace with default Windows SDK path as installed .winmd files in %WINDIR%\system32\WinMetadata.
-        public static IEnumerable<string> ResolveNamespace(string namespaceName, IEnumerable<string> packageGraphFilePaths)
-        {
-            return ResolveNamespace(namespaceName, null, packageGraphFilePaths);
-        }
-
-        // Wrapper for Win8 API RoResolveNamespace.
-        public static IEnumerable<string> ResolveNamespace(string namespaceName, string windowsSdkFilePath, IEnumerable<string> packageGraphFilePaths)
-        {
-            if (namespaceName == null)
-                throw new ArgumentNullException(nameof(namespaceName));
-            Contract.EndContractBlock();
-
-            string[] packageGraphFilePathsArray = null;
-            if (packageGraphFilePaths != null)
-            {
-                List<string> packageGraphFilePathsList = new List<string>(packageGraphFilePaths);
-                packageGraphFilePathsArray = new string[packageGraphFilePathsList.Count];
-                
-                int index = 0;
-                foreach (string packageGraphFilePath in packageGraphFilePathsList)
-                {
-                    packageGraphFilePathsArray[index] = packageGraphFilePath;
-                    index++;
-                }
-            }
-            
-            string[] retFileNames = null;
-            nResolveNamespace(
-                namespaceName, 
-                windowsSdkFilePath, 
-                packageGraphFilePathsArray,
-                ((packageGraphFilePathsArray == null) ? 0 : packageGraphFilePathsArray.Length), 
-                JitHelpers.GetObjectHandleOnStack(ref retFileNames));
-            
-            return retFileNames;
-        }
-        
-        [DllImport(JitHelpers.QCall, CharSet = CharSet.Unicode)]
-        [SuppressUnmanagedCodeSecurity]
-        private extern static void nResolveNamespace(
-            string namespaceName, 
-            string windowsSdkFilePath, 
-            string[] packageGraphFilePaths, 
-            int cPackageGraphFilePaths, 
-            ObjectHandleOnStack retFileNames);
+        private static EventHandler<DesignerNamespaceResolveEventArgs> DesignerNamespaceResolve;
         
-#if FEATURE_REFLECTION_ONLY_LOAD
-        [method: System.Security.SecurityCritical]
-        public static event EventHandler<NamespaceResolveEventArgs> ReflectionOnlyNamespaceResolve;
-
-        internal static RuntimeAssembly[] OnReflectionOnlyNamespaceResolveEvent(AppDomain appDomain, RuntimeAssembly assembly, string namespaceName)
-        {
-            EventHandler<NamespaceResolveEventArgs> eventHandler = ReflectionOnlyNamespaceResolve;
-            if (eventHandler != null)
-            {
-                Delegate[] ds = eventHandler.GetInvocationList();
-                int len = ds.Length;
-                for (int i = 0; i < len; i++)
-                {
-                    NamespaceResolveEventArgs eventArgs = new NamespaceResolveEventArgs(namespaceName, assembly);
-                    
-                    ((EventHandler<NamespaceResolveEventArgs>)ds[i])(appDomain, eventArgs);
-                    
-                    Collection<Assembly> assembliesCollection = eventArgs.ResolvedAssemblies;
-                    if (assembliesCollection.Count > 0)
-                    {
-                        RuntimeAssembly[] retAssemblies = new RuntimeAssembly[assembliesCollection.Count];
-                        int retIndex = 0;
-                        foreach (Assembly asm in assembliesCollection)
-                        {
-                            retAssemblies[retIndex] = AppDomain.GetRuntimeAssembly(asm);
-                            retIndex++;
-                        }
-                        return retAssemblies;
-                    }
-                }
-            }
-            
-            return null;
-        }
-#endif //FEATURE_REFLECTION_ONLY
-
-        [method: System.Security.SecurityCritical]
-        public static event EventHandler<DesignerNamespaceResolveEventArgs> DesignerNamespaceResolve;
-
         internal static string[] OnDesignerNamespaceResolveEvent(AppDomain appDomain, string namespaceName)
         {
             EventHandler<DesignerNamespaceResolveEventArgs> eventHandler = DesignerNamespaceResolve;
@@ -142,7 +58,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime
     }
     
 #if FEATURE_REFLECTION_ONLY_LOAD
-    [ComVisible(false)]
     public class NamespaceResolveEventArgs : EventArgs
     {
         private string _NamespaceName;
@@ -182,20 +97,11 @@ namespace System.Runtime.InteropServices.WindowsRuntime
     }
 #endif //FEATURE_REFLECTION_ONLY
 
-    [ComVisible(false)]
-    public class DesignerNamespaceResolveEventArgs : EventArgs
+    internal class DesignerNamespaceResolveEventArgs : EventArgs
     {
         private string _NamespaceName;
         private Collection<string> _ResolvedAssemblyFiles;
 
-        public string NamespaceName
-        {
-            get
-            {
-                return _NamespaceName;
-            }
-        }
-
         public Collection<string> ResolvedAssemblyFiles
         {
             get