From e828a01cc9fb6846a9d24ecd14e3e106b40ec9a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Fri, 16 Jul 2021 09:51:25 +0200 Subject: [PATCH] Delete dead WinRT code in Activator (#55721) --- .../src/System/Activator.RuntimeType.cs | 22 +++---------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/Activator.RuntimeType.cs b/src/libraries/System.Private.CoreLib/src/System/Activator.RuntimeType.cs index 2ccdc5c741dbf1..1f1643d21fd2b3 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Activator.RuntimeType.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Activator.RuntimeType.cs @@ -102,8 +102,6 @@ public static partial class Activator [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:RequiresUnreferencedCode", Justification = "Implementation detail of Activator that linker intrinsically recognizes")] - [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2057:UnrecognizedReflectionPattern", - Justification = "Implementation detail of Activator that linker intrinsically recognizes")] [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2072:UnrecognizedReflectionPattern", Justification = "Implementation detail of Activator that linker intrinsically recognizes")] [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2096:UnrecognizedReflectionPattern", @@ -118,8 +116,7 @@ public static partial class Activator object?[]? activationAttributes, ref StackCrawlMark stackMark) { - Type? type = null; - Assembly? assembly = null; + Assembly assembly; if (assemblyString == null) { assembly = Assembly.GetExecutingAssembly(ref stackMark); @@ -127,23 +124,10 @@ public static partial class Activator else { AssemblyName assemblyName = new AssemblyName(assemblyString); - - if (assemblyName.ContentType == AssemblyContentType.WindowsRuntime) - { - // WinRT type - we have to use Type.GetType - type = Type.GetType(typeName + ", " + assemblyString, throwOnError: true, ignoreCase); - } - else - { - // Classic managed type - assembly = RuntimeAssembly.InternalLoad(assemblyName, ref stackMark, AssemblyLoadContext.CurrentContextualReflectionContext); - } + assembly = RuntimeAssembly.InternalLoad(assemblyName, ref stackMark, AssemblyLoadContext.CurrentContextualReflectionContext); } - if (type == null) - { - type = assembly!.GetType(typeName, throwOnError: true, ignoreCase); - } + Type? type = assembly.GetType(typeName, throwOnError: true, ignoreCase); object? o = CreateInstance(type!, bindingAttr, binder, args, culture, activationAttributes);