#508: Improved plugin handling for netstandard2.0

danielpalme · Apr 26, 2022 · c7a5c6f · c7a5c6f
1 parent 3655bd3
commit c7a5c6f
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 6 deletions.
diff --git a/src/Deployment/nuget/ReportGenerator.Core.nuspec b/src/Deployment/nuget/ReportGenerator.Core.nuspec
@@ -30,6 +30,7 @@ https://github.com/danielpalme/ReportGenerator/wiki/Custom-history-storage</desc
         <dependency id="Microsoft.Extensions.Configuration.Json" version="5.0.0" />
         <dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0-beta14" />
         <dependency id="DotNetConfig" version="1.0.6" />
+        <dependency id="McMaster.NETCore.Plugins" version="1.4.0" />
       </group>
 
       <group targetFramework="netcoreapp">

diff --git a/src/Readme.txt b/src/Readme.txt
@@ -67,6 +67,10 @@ For further details take a look at LICENSE.txt.
 
 CHANGELOG
 
+5.1.5.0
+
+    * Fix: #508: Improved plugin handling for netstandard2.0
+
 5.1.4.0
 
     * Fix: #408: Improved support for generic classes for 'dotnet-coverage'

diff --git a/src/ReportGenerator.Core/Plugin/ReflectionPluginLoader.cs b/src/ReportGenerator.Core/Plugin/ReflectionPluginLoader.cs
@@ -63,7 +63,7 @@ public IReadOnlyCollection<T> LoadInstancesOfType<T>()
                 }
             }
 
-            if (this.plugins.Count == 0)
+            if (this.plugins.Count == 0 || this.assemblyLoader == null)
             {
                 return result;
             }
@@ -114,11 +114,24 @@ private IAssemblyLoader CreateAssemblyLoader()
                 var directory = new FileInfo(typeof(ReflectionPluginLoader).Assembly.Location).Directory.FullName;
                 string path = Path.Combine(directory, "ReportGenerator.DotnetCorePluginLoader.dll");
 
-                var dotnetCorePluginLoaderAssembly = Assembly.LoadFrom(path);
-                var assemblyLoaderType = dotnetCorePluginLoaderAssembly.GetExportedTypes()
-                        .Where(t => t.FullName == "ReportGenerator.DotnetCorePluginLoader.DotNetCoreAssemblyLoader" && t.IsClass && !t.IsAbstract)
-                        .Single();
-                return new ReflectionWrapperAssemblyLoader(Activator.CreateInstance(assemblyLoaderType));
+                if (!File.Exists(path))
+                {
+                    return null;
+                }
+
+                try
+                {
+                    var dotnetCorePluginLoaderAssembly = Assembly.LoadFrom(path);
+                    var assemblyLoaderType = dotnetCorePluginLoaderAssembly.GetExportedTypes()
+                            .Where(t => t.FullName == "ReportGenerator.DotnetCorePluginLoader.DotNetCoreAssemblyLoader" && t.IsClass && !t.IsAbstract)
+                            .Single();
+                    return new ReflectionWrapperAssemblyLoader(Activator.CreateInstance(assemblyLoaderType));
+                }
+                catch (Exception ex)
+                {
+                    Logger.Error(string.Format(Resources.FailedToLoadPluginLoader, ex.Message));
+                    return null;
+                }
             }
 
             return new DefaultAssemblyLoader();

diff --git a/src/ReportGenerator.Core/Properties/Resources.Designer.cs b/src/ReportGenerator.Core/Properties/Resources.Designer.cs
diff --git a/src/ReportGenerator.Core/Properties/Resources.resx b/src/ReportGenerator.Core/Properties/Resources.resx
@@ -207,6 +207,9 @@
   <data name="FailedToInstantiatePlugin" xml:space="preserve">
     <value>Failed to instantiate plugin class '{0}'.</value>
   </data>
+  <data name="FailedToLoadPluginLoader" xml:space="preserve">
+    <value>Failed to load plugin loader (Error: '{0}').</value>
+  </data>
   <data name="FailedToLoadPlugins" xml:space="preserve">
     <value>Failed to load plugins from '{0}'. Make sure plugin has a strong name.</value>
   </data>