Updated NugetDownloader. Remove duplicate dlls by filename in addition to full path. Removed MinVer from published packages. Fixed issue with logging. Added option to use system Nuget feeds in addition to the specified feed.

mikoskinen · mikoskinen · commit ed105dd14d8f · 2021-05-19T21:06:24.000+03:00
diff --git a/samples/WebAppWithNuget/Startup.cs b/samples/WebAppWithNuget/Startup.cs
@@ -40,7 +40,6 @@ public void ConfigureServices(IServiceCollection services)
                 .AddPluginType<IOperator>();
 
             services.AddControllers();
-
         }
         
 
diff --git a/src/Weikio.PluginFramework.Abstractions/Weikio.PluginFramework.Abstractions.csproj b/src/Weikio.PluginFramework.Abstractions/Weikio.PluginFramework.Abstractions.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MinVer" Version="2.0.0" />
+    <PackageReference Include="MinVer" Version="2.0.*" PrivateAssets="all" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Weikio.PluginFramework.AspNetCore/PluginExtensions.cs b/src/Weikio.PluginFramework.AspNetCore/PluginExtensions.cs
@@ -6,14 +6,14 @@ namespace Microsoft.Extensions.DependencyInjection
 {
     public static class PluginExtensions
     {
-        public static object Create(this Plugin plugin, IServiceProvider serviceProvider)
+        public static object Create(this Plugin plugin, IServiceProvider serviceProvider, params object[] parameters)
         {
-            return ActivatorUtilities.CreateInstance(serviceProvider, plugin);
+            return ActivatorUtilities.CreateInstance(serviceProvider, plugin, parameters);
         }
         
-        public static T Create<T>(this Plugin plugin, IServiceProvider serviceProvider) where T : class
+        public static T Create<T>(this Plugin plugin, IServiceProvider serviceProvider, params object[] parameters) where T : class
         {
-            return ActivatorUtilities.CreateInstance(serviceProvider, plugin) as T;
+            return ActivatorUtilities.CreateInstance(serviceProvider, plugin, parameters) as T;
         }
     }
 }
diff --git a/src/Weikio.PluginFramework.AspNetCore/Weikio.PluginFramework.AspNetCore.csproj b/src/Weikio.PluginFramework.AspNetCore/Weikio.PluginFramework.AspNetCore.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MinVer" Version="2.0.0" />
+    <PackageReference Include="MinVer" Version="2.0.*" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Weikio.PluginFramework.Catalogs.NuGet/NugetFeedPluginCatalog.cs b/src/Weikio.PluginFramework.Catalogs.NuGet/NugetFeedPluginCatalog.cs
@@ -27,7 +27,8 @@ public class NugetFeedPluginCatalog : IPluginCatalog
 
         public NugetFeedPluginCatalog(NuGetFeed packageFeed, string searchTerm = null,
             bool includePrereleases = false, int maxPackages = 128,
-            string packagesFolder = null, Action<TypeFinderCriteriaBuilder> configureFinder = null, Dictionary<string, TypeFinderCriteria> criterias = null, NugetFeedPluginCatalogOptions options = null)
+            string packagesFolder = null, Action<TypeFinderCriteriaBuilder> configureFinder = null, Dictionary<string, TypeFinderCriteria> criterias = null, 
+            NugetFeedPluginCatalogOptions options = null)
         {
             _packageFeed = packageFeed;
             _searchTerm = searchTerm;
diff --git a/src/Weikio.PluginFramework.Catalogs.NuGet/NugetPackagePluginCatalog.cs b/src/Weikio.PluginFramework.Catalogs.NuGet/NugetPackagePluginCatalog.cs
@@ -92,7 +92,7 @@ public Plugin Get(string name, Version version)
         public async Task Initialize()
         {
             var nuGetDownloader = new NuGetDownloader(_options.LoggerFactory());
-            var pluginAssemblyFileNames = await nuGetDownloader.DownloadAsync(PackagesFolder, _packageName, _packageVersion, _includePrerelease, _packageFeed);
+            var pluginAssemblyFileNames = await nuGetDownloader.DownloadAsync(PackagesFolder, _packageName, _packageVersion, _includePrerelease, _packageFeed, includeSecondaryRepositories: _options.IncludeSystemFeedsAsSecondary);
 
             foreach (var f in pluginAssemblyFileNames)
             {
diff --git a/src/Weikio.PluginFramework.Catalogs.NuGet/NugetPluginCatalogOptions.cs b/src/Weikio.PluginFramework.Catalogs.NuGet/NugetPluginCatalogOptions.cs
@@ -23,6 +23,11 @@ public class NugetPluginCatalogOptions
         /// Gets or sets how the plugin names and version should be defined. <seealso cref="PluginNameOptions"/>.
         /// </summary>
         public PluginNameOptions PluginNameOptions { get; set; } = Defaults.PluginNameOptions;
+
+        /// <summary>
+        /// Gets or sets if system feeds should be used as secondary feeds for finding packages when feed url is defined.
+        /// </summary>
+        public bool IncludeSystemFeedsAsSecondary { get; set; } = false;
         
         public static class Defaults
         {
diff --git a/src/Weikio.PluginFramework.Catalogs.NuGet/Weikio.PluginFramework.Catalogs.NuGet.csproj b/src/Weikio.PluginFramework.Catalogs.NuGet/Weikio.PluginFramework.Catalogs.NuGet.csproj
@@ -15,14 +15,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NuGet.PackageManagement.NetStandard" Version="4.9.2" />
-    <PackageReference Include="NuGet.Packaging.Core" Version="5.6.0" />
-    <PackageReference Include="NuGet.ProjectModel" Version="5.6.0" />
-    <PackageReference Include="NuGet.Protocol" Version="5.6.0" />
-    <PackageReference Include="NuGet.Resolver" Version="5.6.0" />
-    <PackageReference Include="MinVer" Version="2.0.*" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.5" />
-    <PackageReference Include="Weikio.NugetDownloader" Version="1.0.0" />
+    <PackageReference Include="MinVer" Version="2.0.*" PrivateAssets="all" />
+    <PackageReference Include="Weikio.NugetDownloader" Version="1.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Weikio.PluginFramework.Catalogs.Roslyn/Weikio.PluginFramework.Catalogs.Roslyn.csproj b/src/Weikio.PluginFramework.Catalogs.Roslyn/Weikio.PluginFramework.Catalogs.Roslyn.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MinVer" Version="2.0.*" />
+    <PackageReference Include="MinVer" Version="2.0.*" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="3.6.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.6.0" />
     <PackageReference Include="Weikio.TypeGenerator" Version="1.2.4" />
diff --git a/src/Weikio.PluginFramework.Configuration/Weikio.PluginFramework.Configuration.csproj b/src/Weikio.PluginFramework.Configuration/Weikio.PluginFramework.Configuration.csproj
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MinVer" Version="2.0.*" />
+    <PackageReference Include="MinVer" Version="2.0.*" PrivateAssets="all" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Weikio.PluginFramework/Catalogs/FolderPluginCatalog.cs b/src/Weikio.PluginFramework/Catalogs/FolderPluginCatalog.cs
@@ -7,7 +7,6 @@
 using System.Runtime.InteropServices;
 using System.Runtime.Loader;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis;
 using Weikio.PluginFramework.Abstractions;
 using Weikio.PluginFramework.Context;
 using Weikio.PluginFramework.TypeFinding;
@@ -235,6 +234,26 @@ private bool IsPluginAssembly(string assemblyPath)
 
                 paths = paths.Distinct().ToList();
 
+                // Also make sure to include only one dll of each. If same dll is found from multiple locations, use the first found dll and remove the others.
+                var duplicateDlls = paths.Select(x => new {FullPath = x, FileName = Path.GetFileName(x)}).GroupBy(x => x.FileName)
+                    .Where(x => x.Count() > 1)
+                    .ToList();
+
+                var removed = new List<string>();
+
+                foreach (var duplicateDll in duplicateDlls)
+                {
+                    foreach (var duplicateDllPath in duplicateDll.Skip(1))
+                    {
+                        removed.Add(duplicateDllPath.FullPath);
+                    }
+                }
+
+                foreach (var re in removed)
+                {
+                    paths.Remove(re);
+                }
+
                 var resolver = new PathAssemblyResolver(paths);
 
                 // We use the metadata (readonly) versions of the assemblies before loading them
diff --git a/src/Weikio.PluginFramework/Context/PluginAssemblyLoadContext.cs b/src/Weikio.PluginFramework/Context/PluginAssemblyLoadContext.cs
@@ -146,7 +146,7 @@ private void Log(LogLevel logLevel, string message, Exception ex = null, params
         {
             var logger = GetLogger();
 
-            logger.Log(logLevel, message, ex, args);
+            logger.Log(logLevel, ex, message, args);
         }
 
         private static string loggerLock = "lock";
diff --git a/src/Weikio.PluginFramework/Weikio.PluginFramework.csproj b/src/Weikio.PluginFramework/Weikio.PluginFramework.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MinVer" Version="2.0.0" />
+    <PackageReference Include="MinVer" Version="2.0.*" PrivateAssets="all" />
     <PackageReference Include="System.Reflection.MetadataLoadContext" Version="4.7.1" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.3.1" />
diff --git a/tests/integration/Weikio.PluginFramework.AspNetCore.IntegrationTests/DefaultPluginTypeTests.cs b/tests/integration/Weikio.PluginFramework.AspNetCore.IntegrationTests/DefaultPluginTypeTests.cs
@@ -12,7 +12,6 @@ namespace Weikio.PluginFramework.AspNetCore.IntegrationTests
 {
     public class DefaultPluginTypeTests : TestBase
     {
-        
         public DefaultPluginTypeTests(WebApplicationFactory<Startup> factory, ITestOutputHelper output) : base(factory, output)
         {
         }

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ public void ConfigureServices(IServiceCollection services)`
`40`	`40`	`.AddPluginType<IOperator>();`
`41`	`41`
`42`	`42`	`services.AddControllers();`
`43`		`-`
`44`	`43`	`}`
`45`	`44`
`46`	`45`
Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,14 @@ namespace Microsoft.Extensions.DependencyInjection`
`6`	`6`	`{`
`7`	`7`	`public static class PluginExtensions`
`8`	`8`	`{`
`9`		`- public static object Create(this Plugin plugin, IServiceProvider serviceProvider)`
	`9`	`+ public static object Create(this Plugin plugin, IServiceProvider serviceProvider, params object[] parameters)`
`10`	`10`	`{`
`11`		`- return ActivatorUtilities.CreateInstance(serviceProvider, plugin);`
	`11`	`+ return ActivatorUtilities.CreateInstance(serviceProvider, plugin, parameters);`
`12`	`12`	`}`
`13`	`13`
`14`		`- public static T Create<T>(this Plugin plugin, IServiceProvider serviceProvider) where T : class`
	`14`	`+ public static T Create<T>(this Plugin plugin, IServiceProvider serviceProvider, params object[] parameters) where T : class`
`15`	`15`	`{`
`16`		`- return ActivatorUtilities.CreateInstance(serviceProvider, plugin) as T;`
	`16`	`+ return ActivatorUtilities.CreateInstance(serviceProvider, plugin, parameters) as T;`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ public class NugetFeedPluginCatalog : IPluginCatalog`
`27`	`27`
`28`	`28`	`public NugetFeedPluginCatalog(NuGetFeed packageFeed, string searchTerm = null,`
`29`	`29`	`bool includePrereleases = false, int maxPackages = 128,`
`30`		`- string packagesFolder = null, Action<TypeFinderCriteriaBuilder> configureFinder = null, Dictionary<string, TypeFinderCriteria> criterias = null, NugetFeedPluginCatalogOptions options = null)`
	`30`	`+ string packagesFolder = null, Action<TypeFinderCriteriaBuilder> configureFinder = null, Dictionary<string, TypeFinderCriteria> criterias = null,`
	`31`	`+ NugetFeedPluginCatalogOptions options = null)`
`31`	`32`	`{`
`32`	`33`	`_packageFeed = packageFeed;`
`33`	`34`	`_searchTerm = searchTerm;`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public Plugin Get(string name, Version version)`
`92`	`92`	`public async Task Initialize()`
`93`	`93`	`{`
`94`	`94`	`var nuGetDownloader = new NuGetDownloader(_options.LoggerFactory());`
`95`		`- var pluginAssemblyFileNames = await nuGetDownloader.DownloadAsync(PackagesFolder, _packageName, _packageVersion, _includePrerelease, _packageFeed);`
	`95`	`+ var pluginAssemblyFileNames = await nuGetDownloader.DownloadAsync(PackagesFolder, _packageName, _packageVersion, _includePrerelease, _packageFeed, includeSecondaryRepositories: _options.IncludeSystemFeedsAsSecondary);`
`96`	`96`
`97`	`97`	`foreach (var f in pluginAssemblyFileNames)`
`98`	`98`	`{`