Removed ProviderOptions as it had no use and created an unnecessary dependency

tekgator · tekgator · commit c944a06f8738 · 2023-06-03T12:58:05.000+10:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [1.4.2] - 2023-06-03
+
+### Removed
+- Removed ProviderOptions as it had no use and created an unnecessary dependency
+
+### Added
+- Added MinecraftJarOptions so the optional IHttpClientFactory can be provided
+
+### Fixed
+- Removed unnecessary dependency of MinecraftJars.Core causing Nuget installation to fail
+
+
 ## [1.4.1] - 2023-06-03
 
 ### Changed
diff --git a/MinecraftJars.Core/Providers/IMinecraftProvider.cs b/MinecraftJars.Core/Providers/IMinecraftProvider.cs
@@ -5,11 +5,6 @@ namespace MinecraftJars.Core.Providers;
 
 public interface IMinecraftProvider
 {
-    /// <summary>
-    /// The options the provider manager has been provided with 
-    /// </summary>        
-    ProviderOptions ProviderOptions { get; }
-
     /// <summary>
     /// Name of the provider e.g. Mojang, PaperMC, etc. 
     /// </summary>        
diff --git a/MinecraftJars.Extension/MinecraftJars.Extension.DependencyInjection/MinecraftJars.Extension.DependencyInjection.csproj b/MinecraftJars.Extension/MinecraftJars.Extension.DependencyInjection/MinecraftJars.Extension.DependencyInjection.csproj
@@ -24,7 +24,6 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\MinecraftJars.Core\MinecraftJars.Core.csproj" />
       <ProjectReference Include="..\..\MinecraftJars\MinecraftJars.csproj" />
     </ItemGroup>
 
diff --git a/MinecraftJars.Extension/MinecraftJars.Extension.DependencyInjection/ServiceCollectionExtensions.cs b/MinecraftJars.Extension/MinecraftJars.Extension.DependencyInjection/ServiceCollectionExtensions.cs
@@ -1,5 +1,4 @@
 ﻿using Microsoft.Extensions.DependencyInjection;
-using MinecraftJars.Core.Providers;
 
 namespace MinecraftJars.Extension.DependencyInjection;
 
@@ -8,7 +7,7 @@ public static class ServiceCollectionExtensions
     public static IServiceCollection AddMinecraftJar(this IServiceCollection services)
     {
         services.AddHttpClient();
-        services.AddScoped<IMinecraftJar, MinecraftJar>(sp => new MinecraftJar(new ProviderOptions
+        services.AddScoped<IMinecraftJar, MinecraftJar>(sp => new MinecraftJar(new MinecraftJarOptions()
         {
             HttpClientFactory = sp.GetRequiredService<IHttpClientFactory>()
         }));
diff --git a/MinecraftJars.Plugin/MinecraftJars.Plugin.Fabric/FabricProvider.cs b/MinecraftJars.Plugin/MinecraftJars.Plugin.Fabric/FabricProvider.cs
@@ -10,15 +10,11 @@ namespace MinecraftJars.Plugin.Fabric;
 public class FabricProvider : IMinecraftProvider
 {
     [ImportingConstructor]
-    public FabricProvider(
-        PluginHttpClientFactory httpClientFactory, 
-        ProviderOptions? options)
+    public FabricProvider(PluginHttpClientFactory httpClientFactory)
     {
         FabricVersionFactory.HttpClientFactory = httpClientFactory;
-        ProviderOptions = options ?? new ProviderOptions();
     }
 
-    public ProviderOptions ProviderOptions { get; }
     public string Name => "Fabric";
     public byte[] Logo => Properties.Resources.Fabric;
     public IEnumerable<IMinecraftProject> Projects => FabricProjectFactory.Projects;
diff --git a/MinecraftJars.Plugin/MinecraftJars.Plugin.Mohist/MohistProvider.cs b/MinecraftJars.Plugin/MinecraftJars.Plugin.Mohist/MohistProvider.cs
@@ -10,15 +10,11 @@ namespace MinecraftJars.Plugin.Mohist;
 public class MohistProvider : IMinecraftProvider
 {
     [ImportingConstructor]
-    public MohistProvider(
-        PluginHttpClientFactory httpClientFactory, 
-        ProviderOptions? options)
+    public MohistProvider(PluginHttpClientFactory httpClientFactory)
     {
         MohistVersionFactory.HttpClientFactory = httpClientFactory;
-        ProviderOptions = options ?? new ProviderOptions();
     }
 
-    public ProviderOptions ProviderOptions { get; }
     public string Name => "Mohist";
     public byte[] Logo => Properties.Resources.Mohist;
     public IEnumerable<IMinecraftProject> Projects => MohistProjectFactory.Projects;
diff --git a/MinecraftJars.Plugin/MinecraftJars.Plugin.Mojang/MojangProvider.cs b/MinecraftJars.Plugin/MinecraftJars.Plugin.Mojang/MojangProvider.cs
@@ -10,15 +10,11 @@ namespace MinecraftJars.Plugin.Mojang;
 public class MojangProvider : IMinecraftProvider
 {
     [ImportingConstructor]
-    public MojangProvider(
-        PluginHttpClientFactory httpClientFactory, 
-        ProviderOptions? options)
+    public MojangProvider(PluginHttpClientFactory httpClientFactory)
     {
         MojangVersionFactory.HttpClientFactory = httpClientFactory;
-        ProviderOptions = options ?? new ProviderOptions();
     }
 
-    public ProviderOptions ProviderOptions { get; }
     public string Name => "Mojang";
     public byte[] Logo => Properties.Resources.Mojang;
     public IEnumerable<IMinecraftProject> Projects => MojangProjectFactory.Projects;
diff --git a/MinecraftJars.Plugin/MinecraftJars.Plugin.Paper/PaperProvider.cs b/MinecraftJars.Plugin/MinecraftJars.Plugin.Paper/PaperProvider.cs
@@ -10,15 +10,11 @@ namespace MinecraftJars.Plugin.Paper;
 public class PaperProvider : IMinecraftProvider
 {
     [ImportingConstructor]
-    public PaperProvider(
-        PluginHttpClientFactory httpClientFactory, 
-        ProviderOptions? options)
+    public PaperProvider(PluginHttpClientFactory httpClientFactory)
     {
         PaperVersionFactory.HttpClientFactory = httpClientFactory;
-        ProviderOptions = options ?? new ProviderOptions();
     }
 
-    public ProviderOptions ProviderOptions { get; }
     public string Name => "Paper";
     public byte[] Logo => Properties.Resources.Paper;
     public IEnumerable<IMinecraftProject> Projects => PaperProjectFactory.Projects;
diff --git a/MinecraftJars.Plugin/MinecraftJars.Plugin.Pocketmine/PocketmineProvider.cs b/MinecraftJars.Plugin/MinecraftJars.Plugin.Pocketmine/PocketmineProvider.cs
@@ -10,15 +10,11 @@ namespace MinecraftJars.Plugin.Pocketmine;
 public class PocketmineProvider : IMinecraftProvider
 {
     [ImportingConstructor]
-    public PocketmineProvider(
-        PluginHttpClientFactory httpClientFactory, 
-        ProviderOptions? options)
+    public PocketmineProvider(PluginHttpClientFactory httpClientFactory)
     {
         PocketmineVersionFactory.HttpClientFactory = httpClientFactory;
-        ProviderOptions = options ?? new ProviderOptions();
     }
     
-    public ProviderOptions ProviderOptions { get; }
     public string Name => "Pocketmine";
     public byte[] Logo => Properties.Resources.Pocketmine;
     public IEnumerable<IMinecraftProject> Projects => PocketmineProjectFactory.Projects;
diff --git a/MinecraftJars.Plugin/MinecraftJars.Plugin.Purpur/PurpurProvider.cs b/MinecraftJars.Plugin/MinecraftJars.Plugin.Purpur/PurpurProvider.cs
@@ -10,15 +10,11 @@ namespace MinecraftJars.Plugin.Purpur;
 public class PurpurProvider : IMinecraftProvider
 {
     [ImportingConstructor]
-    public PurpurProvider(
-        PluginHttpClientFactory httpClientFactory, 
-        ProviderOptions? options)
+    public PurpurProvider(PluginHttpClientFactory httpClientFactory)
     {
         PurpurVersionFactory.HttpClientFactory = httpClientFactory;
-        ProviderOptions = options ?? new ProviderOptions();
     }
     
-    public ProviderOptions ProviderOptions { get; }
     public string Name => "Purpur";
     public byte[] Logo => Properties.Resources.Purpur;
     public IEnumerable<IMinecraftProject> Projects => PurpurProjectFactory.Projects;
diff --git a/MinecraftJars.Plugin/MinecraftJars.Plugin.Spigot/SpigotProvider.cs b/MinecraftJars.Plugin/MinecraftJars.Plugin.Spigot/SpigotProvider.cs
@@ -10,15 +10,11 @@ namespace MinecraftJars.Plugin.Spigot;
 public class SpigotProvider : IMinecraftProvider
 {
     [ImportingConstructor]
-    public SpigotProvider(
-        PluginHttpClientFactory httpClientFactory, 
-        ProviderOptions? options)
+    public SpigotProvider(PluginHttpClientFactory httpClientFactory)
     {
         SpigotVersionFactory.HttpClientFactory = httpClientFactory;
-        ProviderOptions = options ?? new ProviderOptions();
     }
     
-    public ProviderOptions ProviderOptions { get; }
     public string Name => "Spigot";
     public byte[] Logo => Properties.Resources.Spigot;
     public IEnumerable<IMinecraftProject> Projects => SpigotProjectFactory.Projects;
diff --git a/MinecraftJars/MinecraftJar.cs b/MinecraftJars/MinecraftJar.cs
@@ -12,16 +12,12 @@ public class MinecraftJar : IMinecraftJar
     [ImportMany(typeof(IMinecraftProvider))]
     private IEnumerable<IMinecraftProvider> _providers;
 
-    [Export]
-    private ProviderOptions ProviderOptions { get; }
-    
     [Export]
     private PluginHttpClientFactory HttpClientFactory { get; }
-    
-    public MinecraftJar(ProviderOptions? options = null)
+
+    public MinecraftJar(MinecraftJarOptions? options = null)
     {
-        ProviderOptions = options ?? new ProviderOptions();
-        HttpClientFactory = new PluginHttpClientFactory(ProviderOptions.HttpClientFactory);
+        HttpClientFactory = new PluginHttpClientFactory(options?.HttpClientFactory);
         
         var path = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? ".";
         var catalog = new AggregateCatalog();
diff --git a/MinecraftJars/MinecraftJarOptions.cs b/MinecraftJars/MinecraftJarOptions.cs
@@ -1,10 +1,10 @@
-﻿namespace MinecraftJars.Core.Providers;
+namespace MinecraftJars;
 
-public class ProviderOptions
+public class MinecraftJarOptions
 {
     /// <summary>
     /// If provided the CreateClient Method is utilized to create a HttpClient
     /// otherwise a new HttpClient is instantiated by the MinecraftJarManager
     /// </summary>     
-    public IHttpClientFactory? HttpClientFactory { get; init; }
+    public IHttpClientFactory? HttpClientFactory { get; init; }    
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using Microsoft.Extensions.DependencyInjection;`
`2`		`-using MinecraftJars.Core.Providers;`
`3`	`2`
`4`	`3`	`namespace MinecraftJars.Extension.DependencyInjection;`
`5`	`4`
`@@ -8,7 +7,7 @@ public static class ServiceCollectionExtensions`
`8`	`7`	`public static IServiceCollection AddMinecraftJar(this IServiceCollection services)`
`9`	`8`	`{`
`10`	`9`	`services.AddHttpClient();`
`11`		`- services.AddScoped<IMinecraftJar, MinecraftJar>(sp => new MinecraftJar(new ProviderOptions`
	`10`	`+ services.AddScoped<IMinecraftJar, MinecraftJar>(sp => new MinecraftJar(new MinecraftJarOptions()`
`12`	`11`	`{`
`13`	`12`	`HttpClientFactory = sp.GetRequiredService<IHttpClientFactory>()`
`14`	`13`	`}));`
Original file line number	Diff line number	Diff line change
`@@ -10,15 +10,11 @@ namespace MinecraftJars.Plugin.Fabric;`
`10`	`10`	`public class FabricProvider : IMinecraftProvider`
`11`	`11`	`{`
`12`	`12`	`[ImportingConstructor]`
`13`		`- public FabricProvider(`
`14`		`- PluginHttpClientFactory httpClientFactory,`
`15`		`- ProviderOptions? options)`
	`13`	`+ public FabricProvider(PluginHttpClientFactory httpClientFactory)`
`16`	`14`	`{`
`17`	`15`	`FabricVersionFactory.HttpClientFactory = httpClientFactory;`
`18`		`- ProviderOptions = options ?? new ProviderOptions();`
`19`	`16`	`}`
`20`	`17`
`21`		`- public ProviderOptions ProviderOptions { get; }`
`22`	`18`	`public string Name => "Fabric";`
`23`	`19`	`public byte[] Logo => Properties.Resources.Fabric;`
`24`	`20`	`public IEnumerable<IMinecraftProject> Projects => FabricProjectFactory.Projects;`