bug: correct Assembly.Location usages for self-contained builds (#139)

Author: gavinbarron

msgraph-developer-proxy/CertificateDiskCache.cs

@@ -92,18 +92,7 @@ private string GetRootCertificateDirectory(bool create) {
                 rootCertificatePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), ProxyConfigurationFolderName);
             }
             else {
-                var assemblyLocation = GetType().Assembly.Location;
-
-                // dynamically loaded assemblies returns string.Empty location
-                if (assemblyLocation == string.Empty) assemblyLocation = Assembly.GetEntryAssembly()?.Location;
-
-#if NETSTANDARD2_1
-                    // single-file app returns string.Empty location
-                    if (assemblyLocation == string.Empty)
-                    {
-                        assemblyLocation = AppContext.BaseDirectory;
-                    }
-#endif
+                var assemblyLocation = AppContext.BaseDirectory;
 
                 var path = Path.GetDirectoryName(assemblyLocation);
 

msgraph-developer-proxy/PluginLoader.cs

@@ -27,12 +27,12 @@ public PluginLoaderResult LoadPlugins(IPluginEvents pluginEvents, IProxyContext
         PluginConfig config = PluginConfig;
         List<Regex> globallyWatchedUrls = PluginConfig.UrlsToWatch.Select(ConvertToRegex).ToList();
         ISet<Regex> defaultUrlsToWatch = globallyWatchedUrls.ToHashSet();
-        foreach (PluginReference h in config.Plugins) {
-            if (h.Disabled) continue;
-            // Load Handler Assembly if not disabled
-            string? root = Path.GetDirectoryName(typeof(Program).Assembly.Location);
-            if (!string.IsNullOrEmpty(root)) {
-                string pluginLocation = Path.GetFullPath(Path.Combine(root, h.PluginPath.Replace('\\', Path.DirectorySeparatorChar)));
+        string? rootDirectory = Path.GetDirectoryName(AppContext.BaseDirectory);
+        if (!string.IsNullOrEmpty(rootDirectory)) {
+            foreach (PluginReference h in config.Plugins) {
+                if (h.Disabled) continue;
+                // Load Handler Assembly if not disabled
+                string pluginLocation = Path.GetFullPath(Path.Combine(rootDirectory, h.PluginPath.Replace('\\', Path.DirectorySeparatorChar)));
                 PluginLoadContext pluginLoadContext = new PluginLoadContext(pluginLocation);
                 _logger.LogDebug($"Loading from: {pluginLocation}");
                 Assembly assembly = pluginLoadContext.LoadFromAssemblyName(new AssemblyName(Path.GetFileNameWithoutExtension(pluginLocation)));
@@ -65,7 +65,7 @@ private IProxyPlugin CreatePlugin(Assembly assembly, PluginReference h) {
 
         string availableTypes = string.Join(",", assembly.GetTypes().Select(t => t.FullName));
         throw new ApplicationException(
-            $"Can't find plugin {h.Name} which implements IProxyPlugin in {assembly} from {assembly.Location}.\n" +
+            $"Can't find plugin {h.Name} which implements IProxyPlugin in {assembly} from {AppContext.BaseDirectory}.\n" +
             $"Available types: {availableTypes}");
     }
 

msgraph-developer-proxy/ProxyEngine.cs

@@ -4,7 +4,6 @@
 using Microsoft.Graph.DeveloperProxy.Abstractions;
 using System.Diagnostics;
 using System.Net;
-using System.Reflection;
 using System.Text.RegularExpressions;
 using Titanium.Web.Proxy;
 using Titanium.Web.Proxy.EventArguments;
@@ -30,11 +29,8 @@ public class ProxyEngine {
     private static string _productVersion {
         get {
             if (__productVersion == string.Empty) {
-                var assembly = Assembly.GetExecutingAssembly();
-                if (assembly != null) {
-                    var fileVersionInfo = FileVersionInfo.GetVersionInfo(assembly.Location);
-                    __productVersion = fileVersionInfo?.ProductVersion!;
-                }
+                var fileVersionInfo = FileVersionInfo.GetVersionInfo(AppContext.BaseDirectory);
+                __productVersion = fileVersionInfo?.ProductVersion!;
             }
 
             return __productVersion;

msgraph-developer-proxy/UpdateNotification.cs

@@ -49,9 +49,8 @@ internal static class UpdateNotification {
     }
 
     private static Version GetCurrentVersion() {
-        var assembly = Assembly.GetExecutingAssembly();
-        var fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
-        var currentVersion = new Version(fvi.ProductVersion);
+        var fvi = FileVersionInfo.GetVersionInfo(AppContext.BaseDirectory);
+        var currentVersion = new Version(fvi.ProductVersion ?? "0.0.0.0");
 
         return currentVersion;
     }