Merge branch 'release/0.3.2'

natemcmaster · Dec 15, 2019 · e5d74ec · e5d74ec
2 parents f15ce75 + c68b1c8
commit e5d74ec
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 11 deletions.
diff --git a/samples/hot-reload/run.ps1 b/samples/hot-reload/run.ps1
@@ -0,0 +1,40 @@
+$ErrorActionPreference = 'Stop'
+
+Push-Location $PSScriptRoot
+try {
+    $publish_dir = "$PSScriptRoot/bin/plugins/TimestampedPlugin/"
+
+    function log {
+        Write-Host -NoNewline -ForegroundColor Yellow "run.ps1: "
+        Write-Host $args
+    }
+
+    function publish {
+        Write-Host ""
+        dotnet publish --no-restore TimestampedPlugin/ -o $publish_dir -nologo
+        Write-Host ""
+    }
+
+    log "Compiling apps"
+
+    & dotnet build HotReloadApp -nologo -clp:NoSummary
+    & publish
+
+    log "Use CTRL+C to exit"
+
+    $bg_args = @("run", "--no-build", "--project", "HotReloadApp", "$publish_dir/TimestampedPlugin.dll")
+    $host_process = Start-Process -NoNewWindow -FilePath dotnet -ArgumentList $bg_args
+    try {
+        while ($true) {
+            Start-Sleep 5
+            log "Rebuilding plugin..."
+            publish
+        }
+    }
+    finally {
+        $host_process.Kill()
+    }
+}
+finally {
+    Pop-Location
+}
diff --git a/src/Plugins/Loader/ManagedLoadContext.cs b/src/Plugins/Loader/ManagedLoadContext.cs
@@ -105,7 +105,7 @@ public ManagedLoadContext(string mainAssemblyPath,
             var resolvedPath = _dependencyResolver.ResolveAssemblyToPath(assemblyName);
             if (!string.IsNullOrEmpty(resolvedPath) && File.Exists(resolvedPath))
             {
-                return LoadFromAssemblyPath(resolvedPath);
+                return LoadAssemblyFromFilePath(resolvedPath);
             }
 #endif
 
@@ -120,7 +120,7 @@ public ManagedLoadContext(string mainAssemblyPath,
                     var resourcePath = Path.Combine(resourceRoot, assemblyName.CultureName, assemblyName.Name + ".dll");
                     if (File.Exists(resourcePath))
                     {
-                        return LoadFromAssemblyPath(resourcePath);
+                        return LoadAssemblyFromFilePath(resourcePath);
                     }
                 }
 
@@ -131,7 +131,7 @@ public ManagedLoadContext(string mainAssemblyPath,
             {
                 if (SearchForLibrary(library, out var path) && path != null)
                 {
-                    return LoadFromAssemblyPath(path);
+                    return LoadAssemblyFromFilePath(path);
                 }
             }
             else
@@ -141,18 +141,18 @@ public ManagedLoadContext(string mainAssemblyPath,
                 var localFile = Path.Combine(_basePath, assemblyName.Name + ".dll");
                 if (File.Exists(localFile))
                 {
-                    return LoadFromAssemblyPath(localFile);
+                    return LoadAssemblyFromFilePath(localFile);
                 }
             }
 
             return null;
         }
 
-        private new Assembly LoadFromAssemblyPath(string path)
+        public Assembly LoadAssemblyFromFilePath(string path)
         {
             if (!_loadInMemory)
             {
-                return base.LoadFromAssemblyPath(path);
+                return LoadFromAssemblyPath(path);
             }
 
             using var file = File.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read);

diff --git a/src/Plugins/PluginLoader.cs b/src/Plugins/PluginLoader.cs
@@ -147,7 +147,7 @@ public static PluginLoader CreateFromAssemblyFile(string assemblyFile, Action<Pl
         }
 
         private readonly PluginConfig _config;
-        private AssemblyLoadContext _context;
+        private ManagedLoadContext _context;
         private readonly AssemblyLoadContextBuilder _contextBuilder;
         private volatile bool _disposed;
 
@@ -163,7 +163,7 @@ public PluginLoader(PluginConfig config)
         {
             _config = config ?? throw new ArgumentNullException(nameof(config));
             _contextBuilder = CreateLoadContextBuilder(config);
-            _context = _contextBuilder.Build();
+            _context = (ManagedLoadContext)_contextBuilder.Build();
 #if FEATURE_UNLOAD
             if (config.EnableHotReload)
             {
@@ -210,7 +210,7 @@ public void Reload()
             }
 
             _context.Unload();
-            _context = _contextBuilder.Build();
+            _context = (ManagedLoadContext)_contextBuilder.Build();
             GC.Collect();
             GC.WaitForPendingFinalizers();
             Reloaded?.Invoke(this, new PluginReloadedEventArgs(this));
@@ -255,7 +255,7 @@ private void OnFileChanged(object source, FileSystemEventArgs e)
         public Assembly LoadDefaultAssembly()
         {
             EnsureNotDisposed();
-            return _context.LoadFromAssemblyPath(_config.MainAssemblyPath);
+            return _context.LoadAssemblyFromFilePath(_config.MainAssemblyPath);
         }
 
         /// <summary>
@@ -275,7 +275,7 @@ public Assembly LoadAssembly(AssemblyName assemblyName)
         /// <param name="assemblyPath">The assembly path.</param>
         /// <returns>The assembly.</returns>
         public Assembly LoadAssemblyFromPath(string assemblyPath)
-            => _context.LoadFromAssemblyPath(assemblyPath);
+            => _context.LoadAssemblyFromFilePath(assemblyPath);
 
         /// <summary>
         /// Load an assembly by name.

diff --git a/src/Plugins/releasenotes.props b/src/Plugins/releasenotes.props
@@ -4,6 +4,10 @@
 Changes:
 * Add an API to enable contextual reflection in .NET Core 3+ (see https://github.com/natemcmaster/DotNetCorePlugins/blob/v1.0.0/README.md#Reflection for details)
 * Remove API that was made obsolete in 0.3.0
+    </PackageReleaseNotes>
+    <PackageReleaseNotes Condition="'$(VersionPrefix)' == '0.3.2'">
+Fixes:
+* Fix issue preventing hot reload from working on Windows (#108)
     </PackageReleaseNotes>
     <PackageReleaseNotes Condition="'$(VersionPrefix)' == '0.3.1'">
 Fixes: