Merge pull request #41180 from sharwell/rm-reflection

Use public APIs instead of reflection
dotnet · Jan 23, 2020 · 6cb854a · 6cb854a
2 parents f6d1934 + 71e7c35
commit 6cb854a
Showing 1 changed file with 3 additions and 29 deletions.
diff --git a/src/Compilers/Core/MSBuildTask/Utilities.cs b/src/Compilers/Core/MSBuildTask/Utilities.cs
@@ -152,41 +152,15 @@ internal static Exception GetLocalizedArgumentException(string errorString,
 
         internal static string TryGetAssemblyPath(Assembly assembly)
         {
-            if ((bool?)typeof(Assembly).GetTypeInfo()
-                .GetDeclaredProperty("GlobalAssemblyCache")
-                ?.GetMethod.Invoke(assembly, parameters: null) == true)
+            if (assembly.GlobalAssemblyCache)
             {
                 return null;
             }
 
-            var codebase = (string)typeof(Assembly)
-                .GetTypeInfo()
-                .GetDeclaredProperty("CodeBase")
-                ?.GetMethod.Invoke(assembly, parameters: null);
-
-            if (codebase != null)
+            if (assembly.CodeBase is { } codebase)
             {
                 var uri = new Uri(codebase);
-                if (uri.IsFile)
-                {
-                    return uri.LocalPath;
-                }
-                else
-                {
-                    var callingAssembly = (Assembly)typeof(Assembly)
-                        .GetTypeInfo()
-                        .GetDeclaredMethod("GetCallingAssembly")
-                        ?.Invoke(null, null);
-
-                    var location = (string)typeof(Assembly).GetTypeInfo()
-                        .GetDeclaredProperty("Location")
-                        ?.GetMethod.Invoke(assembly, parameters: null);
-
-                    if (location != null)
-                    {
-                        return location;
-                    }
-                }
+                return uri.IsFile ? uri.LocalPath : assembly.Location;
             }
 
             return null;