Fixed tagging functionality of the Nuget catalogs

Author: mikoskinen

samples/WebAppWithNuget/Startup.cs

@@ -11,6 +11,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Weikio.PluginFramework.Catalogs;
+using Weikio.PluginFramework.Catalogs.NuGet;
 using Weikio.PluginFramework.Samples.Shared;
 
 namespace WebAppWithNuget

src/Weikio.PluginFramework.Catalogs.NuGet/NugetFeedPluginCatalog.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Weikio.PluginFramework.Abstractions;
+using Weikio.PluginFramework.Catalogs.NuGet;
 using Weikio.PluginFramework.Catalogs.NuGet.PackageManagement;
 using Weikio.PluginFramework.TypeFinding;
 
@@ -20,7 +21,6 @@ public class NugetFeedPluginCatalog : IPluginCatalog
  private readonly HashSet<string> _pluginAssemblyNames = new HashSet<string>();
 
  private List<NugetPackagePluginCatalog> _pluginCatalogs = new List<NugetPackagePluginCatalog>();
- private Dictionary<string, TypeFinderCriteria> _typeFinderCriterias;
  private readonly NugetPluginCatalogOptions _options;
 
  public string PackagesFolder { get; }
@@ -46,7 +46,6 @@ public NugetFeedPluginCatalog(NuGetFeed packageFeed, string searchTerm = null,
  criterias = new Dictionary<string, TypeFinderCriteria>();
  }
 
- _typeFinderCriterias = criterias;
  _options = options ?? new NugetPluginCatalogOptions();
 
  if (configureFinder != null)
@@ -56,8 +55,15 @@ public NugetFeedPluginCatalog(NuGetFeed packageFeed, string searchTerm = null,
 
  var criteria = builder.Build();
 
- _typeFinderCriterias.Add("", criteria);
+ _options.TypeFinderOptions.TypeFinderCriterias.Add(criteria);
  }
+ 
+ foreach (var finderCriteria in criterias)
+ {
+ finderCriteria.Value.Tags = new List<string>() { finderCriteria.Key };
+ 
+ _options.TypeFinderOptions.TypeFinderCriterias.Add(finderCriteria.Value);
+ } 
  }
 
  Plugin IPluginCatalog.Get(string name, Version version)
@@ -87,8 +93,10 @@ public async Task Initialize()
 
  foreach (var packageAndRepo in packages)
  {
+ var options = new NugetPluginCatalogOptions() { TypeFinderOptions = _options.TypeFinderOptions };
+ 
  var packageCatalog = new NugetPackagePluginCatalog(packageAndRepo.Package.Identity.Id, packageAndRepo.Package.Identity.Version.ToString(),
- _includePrereleases, _packageFeed, PackagesFolder, criterias: _typeFinderCriterias);
+ _includePrereleases, _packageFeed, PackagesFolder, options: options);
 
  await packageCatalog.Initialize();
 

src/Weikio.PluginFramework.Catalogs.NuGet/NugetPackagePluginCatalog.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Weikio.PluginFramework.Abstractions;
+using Weikio.PluginFramework.Catalogs.NuGet;
 using Weikio.PluginFramework.Catalogs.NuGet.PackageManagement;
 using Weikio.PluginFramework.TypeFinding;
 
@@ -19,13 +20,12 @@ public class NugetPackagePluginCatalog : IPluginCatalog
 
  private readonly HashSet<string> _pluginAssemblyFilePaths = new HashSet<string>();
  private readonly List<AssemblyPluginCatalog> _pluginCatalogs = new List<AssemblyPluginCatalog>();
- private readonly Dictionary<string, TypeFinderCriteria> _typeFinderCriterias;
  private readonly NugetPluginCatalogOptions _options;
 
  public string PackagesFolder { get; }
 
  public NugetPackagePluginCatalog(string packageName, string packageVersion = null, bool includePrerelease = false, NuGetFeed packageFeed = null,
- string packagesFolder = null, Action<TypeFinderCriteriaBuilder> configureFinder = null, Dictionary<string, TypeFinderCriteria> criterias = null, 
+ string packagesFolder = null, Action<TypeFinderCriteriaBuilder> configureFinder = null, Dictionary<string, TypeFinderCriteria> criterias = null,
  NugetPluginCatalogOptions options = null)
  {
  _packageName = packageName;
@@ -45,7 +45,6 @@ public NugetPackagePluginCatalog(string packageName, string packageVersion = nul
  criterias = new Dictionary<string, TypeFinderCriteria>();
  }
 
- _typeFinderCriterias = criterias;
  _options = options ?? new NugetPluginCatalogOptions();
 
  if (configureFinder != null)
@@ -55,7 +54,14 @@ public NugetPackagePluginCatalog(string packageName, string packageVersion = nul
 
  var criteria = builder.Build();
 
- _typeFinderCriterias.Add("", criteria);
+ _options.TypeFinderOptions.TypeFinderCriterias.Add(criteria);
+ }
+
+ foreach (var finderCriteria in criterias)
+ {
+ finderCriteria.Value.Tags = new List<string>() { finderCriteria.Key };
+ 
+ _options.TypeFinderOptions.TypeFinderCriterias.Add(finderCriteria.Value);
  }
  }
 
@@ -95,7 +101,7 @@ public async Task Initialize()
 
  foreach (var pluginAssemblyFilePath in _pluginAssemblyFilePaths)
  {
- var options = new AssemblyPluginCatalogOptions { TypeFinderCriterias = _typeFinderCriterias };
+ var options = new AssemblyPluginCatalogOptions { TypeFinderOptions = _options.TypeFinderOptions };
 
  var assemblyCatalog = new AssemblyPluginCatalog(pluginAssemblyFilePath, options);
  await assemblyCatalog.Initialize();

src/Weikio.PluginFramework.Catalogs.NuGet/NugetPluginCatalogOptions.cs

@@ -1,15 +1,21 @@
 using System;
 using NuGet.Common;
 using Weikio.PluginFramework.Catalogs.NuGet.PackageManagement;
+using Weikio.PluginFramework.TypeFinding;
 
-namespace Weikio.PluginFramework.Catalogs
+namespace Weikio.PluginFramework.Catalogs.NuGet
 {
  public class NugetPluginCatalogOptions
  {
  /// <summary>
  /// Gets or sets the function which is used to create the logger for Nuget activities
  /// </summary>
  public Func <ILogger> LoggerFactory { get; set; } = Defaults.LoggerFactory;
+ 
+ /// <summary>
+ /// Gets or sets the <see cref="TypeFinderOptions"/>. 
+ /// </summary>
+ public TypeFinderOptions TypeFinderOptions { get; set; } = new TypeFinderOptions();
 
  public static class Defaults
  {

tests/integration/Weikio.PluginFramework.Catalogs.NuGet.Tests/NugetFeedPluginCatalogTests.cs

@@ -4,6 +4,7 @@
 using System.Reflection;
 using System.Runtime.Versioning;
 using System.Threading.Tasks;
+using Weikio.PluginFramework.Abstractions;
 using Weikio.PluginFramework.Catalogs;
 using Xunit;
 
@@ -50,5 +51,24 @@ public async Task InstallUsingTagFilter()
  Assert.StartsWith("4.", plugins[0].Version.ToString());
  AssertAssemblyFrameWork(".NETStandard,Version=v2.0", plugins.Single().Assembly);
  }
+ 
+ [Fact]
+ public async Task CanTag()
+ {
+ // Arrange
+ var feed = new NuGetFeed("nuget.org", "https://api.nuget.org/v3/index.json");
+ var catalog = new NugetFeedPluginCatalog(feed, searchTerm: "tags:mocking", maxPackages: 1, configureFinder: configure =>
+ {
+ configure.HasName("Moq.Range")
+ .Tag("MockSolutions");
+ });
+
+ // Act
+ await catalog.Initialize();
+ var plugin = catalog.Single();
+
+ // Assert
+ Assert.Equal("MockSolutions", plugin.Tag);
+ }
  }
 }

tests/integration/Weikio.PluginFramework.Catalogs.NuGet.Tests/NugetPackagePluginCatalogTests.cs

@@ -50,6 +50,24 @@ public async Task InstallPackageWithoutDepencencies()
  Assert.StartsWith("2.9.0", plugins[0].Version.ToString());
  AssertAssemblyFrameWork(".NETStandard,Version=v2.0", catalog.Single().Assembly);
  }
+ 
+ [Fact]
+ public async Task CanTag()
+ {
+ // Arrange
+ var catalog = new NugetPackagePluginCatalog("Serilog", "2.9.0", configureFinder: configure =>
+ {
+ configure.HasName("Serilog.Core.Logger")
+ .Tag("CustomTag");
+ });
+
+ // Act
+ await catalog.Initialize();
+ var plugin = catalog.Single();
+
+ // Assert
+ Assert.Equal("CustomTag", plugin.Tag);
+ }
 
  [Fact]
  public async Task InstallPackageWithDepencencies()