openmod · sunnamed434 · Oct 20, 2023 · Oct 20, 2023 · Oct 20, 2023 · Oct 20, 2023
diff --git a/.editorconfig b/.editorconfig
@@ -14,6 +14,11 @@ indent_style = space
 indent_size = 2
 tab_width = 2
 
+[*.props]
+indent_style = space
+indent_size = 2
+tab_width = 2
+
 # C# files
 [*.cs]
 

diff --git a/OpenMod.sln b/OpenMod.sln
@@ -80,7 +80,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		props\UnityEngineDependentProjectProps.props = props\UnityEngineDependentProjectProps.props
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenMod.EntityFrameworkCore.MySql", "framework\OpenMod.EntityFrameworkCore.MySql\OpenMod.EntityFrameworkCore.MySql.csproj", "{2D901FA0-D969-42D4-B730-1BD073553DC4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenMod.EntityFrameworkCore.MySql", "framework\OpenMod.EntityFrameworkCore.MySql\OpenMod.EntityFrameworkCore.MySql.csproj", "{2D901FA0-D969-42D4-B730-1BD073553DC4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/...ns/OpenMod.Extensions.Economy.Abstractions/OpenMod.Extensions.Economy.Abstractions.csproj b/...ns/OpenMod.Extensions.Economy.Abstractions/OpenMod.Extensions.Economy.Abstractions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net461</TargetFrameworks>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <PackageDescription>Games abstractions for OpenMod</PackageDescription>
   </PropertyGroup>
 

diff --git a/...nsions/OpenMod.Extensions.Games.Abstractions/OpenMod.Extensions.Games.Abstractions.csproj b/...nsions/OpenMod.Extensions.Games.Abstractions/OpenMod.Extensions.Games.Abstractions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net461</TargetFrameworks>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <PackageDescription>Games abstractions for OpenMod</PackageDescription>
   </PropertyGroup>
 

diff --git a/framework/OpenMod.API/OpenMod.API.csproj b/framework/OpenMod.API/OpenMod.API.csproj
@@ -1,29 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net461</TargetFrameworks>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <PackageDescription>API abstractions for OpenMod</PackageDescription>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\..\props\SharedProjectProps.props" />
 
   <ItemGroup>
     <PackageReference Include="Autofac" Version="7.1.0" />
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.32" />
-    <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="3.1.32" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.12" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Semver" Version="2.3.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <!-- Provides the IAsyncEnumerable<T> and IAsyncDisposable interfaces and helper types for .NET Standard 2.0. -->
-    <!-- This package is not required starting with .NET Standard 2.1 and .NET Core 3.0. -->
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
-  </ItemGroup>
-
 </Project>
diff --git a/framework/OpenMod.API/Users/BanData.cs b/framework/OpenMod.API/Users/BanData.cs
@@ -19,14 +19,16 @@ public BanData()
 
         }
 
-        public BanData(string reason, IPermissionActor? instigator = null, DateTime? expireDate = null)
+        public BanData(string? reason = null, IPermissionActor? instigator = null, DateTime? expireDate = null)
         {
             ExpireDate = expireDate ?? DateTime.MaxValue;
 
             InstigatorType = instigator?.Type;
             InstigatorId = instigator?.Id;
 
-            Reason = reason;
+            Reason = !string.IsNullOrWhiteSpace(reason)
+                ? reason
+                : "None";
         }
     }
 }
diff --git a/framework/OpenMod.Analyzers/OpenMod.Analyzers.csproj b/framework/OpenMod.Analyzers/OpenMod.Analyzers.csproj
@@ -12,7 +12,7 @@
   <Import Project="$(MSBuildThisFileDirectory)..\..\props\SharedProjectProps.props" />
 
   <ItemGroup>
-    <ProjectReference Include="..\OpenMod.API\OpenMod.API.csproj" />
+    <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0" PrivateAssets="all" />
     <PackageReference Update="NETStandard.Library" PrivateAssets="all" />
   </ItemGroup>

diff --git a/framework/OpenMod.Bootstrapper/OpenMod.Bootstrapper.csproj b/framework/OpenMod.Bootstrapper/OpenMod.Bootstrapper.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net461</TargetFrameworks>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <PackageDescription>Dynamic bootstrapping support for OpenMod</PackageDescription>
   </PropertyGroup>
 

diff --git a/framework/OpenMod.Common/OpenMod.Common.csproj b/framework/OpenMod.Common/OpenMod.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net461</TargetFrameworks>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <PackageDescription>Shared code for OpenMod</PackageDescription>
   </PropertyGroup>
 

diff --git a/framework/OpenMod.Core/Commands/CommandStoreOptions.cs b/framework/OpenMod.Core/Commands/CommandStoreOptions.cs
@@ -31,7 +31,7 @@ public IReadOnlyCollection<ICommandSource> CreateCommandSources(IServiceProvider
                 throw new ArgumentNullException(nameof(serviceProvider));
             }
 
-            var lifetime = serviceProvider.GetService<ILifetimeScope>();
+            var lifetime = serviceProvider.GetRequiredService<ILifetimeScope>();
             var sources = new List<ICommandSource>();
             sources.AddRange(m_CommandSources);
 

diff --git a/framework/OpenMod.Core/Commands/OpenModCommands/CommandOpenModPlugins.cs b/framework/OpenMod.Core/Commands/OpenModCommands/CommandOpenModPlugins.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Text;
@@ -16,43 +17,77 @@ public class CommandOpenModPlugins : Command
     {
         private readonly IPluginActivator m_PluginActivator;
 
-        public CommandOpenModPlugins(IPluginActivator pluginActivator, IServiceProvider serviceProvider) : base(serviceProvider)
+        public CommandOpenModPlugins(IPluginActivator pluginActivator, IServiceProvider serviceProvider)
+            : base(serviceProvider)
         {
             m_PluginActivator = pluginActivator;
         }
 
         protected override async Task OnExecuteAsync()
         {
-            var pageNumber = Context.Parameters.Length > 0 ? await Context.Parameters.GetAsync<int>(0) : 1;
             const int itemsPerPage = 10;
 
+            var pageNumber = await GetPageNumberAsync();
             var totalCount = m_PluginActivator.ActivatedPlugins.Count;
-            var pageCount = (int) Math.Ceiling((double) totalCount / itemsPerPage);
-            var plugins = m_PluginActivator.ActivatedPlugins
+            var pageCount = CalculatePageCount(totalCount, itemsPerPage);
+
+            var plugins = GetPluginsForPage(pageNumber, itemsPerPage);
+
+            await DisplayPluginsInfoAsync(pageNumber, pageCount, plugins);
+        }
+
+        private async Task<int> GetPageNumberAsync()
+        {
+            return Context.Parameters.Length > 0
+                ? await Context.Parameters.GetAsync<int>(0)
+                : 1;
+        }
+
+        private int CalculatePageCount(int total, int perPage)
+        {
+            return (int) Math.Ceiling((double) total / perPage);
+        }
+
+        private List<IOpenModPlugin> GetPluginsForPage(int pageNumber, int itemsPerPage)
+        {
+            return m_PluginActivator.ActivatedPlugins
                 .Skip((pageNumber - 1) * itemsPerPage)
                 .Take(itemsPerPage)
                 .ToList();
+        }
+
+        private async Task DisplayPluginsInfoAsync(int pageNumber, int pageCount, List<IOpenModPlugin> plugins)
+        {
+            var sb = new StringBuilder();
+
+            sb.Append($"[{pageNumber}/{pageCount}] OpenMod Plugins");
+
+            await PrintAsync(sb.ToString(), Color.CornflowerBlue);
 
-            await PrintAsync($"[{pageNumber}/{pageCount}] OpenMod Plugins", Color.CornflowerBlue);
-
             if (plugins.Count == 0)
             {
                 await PrintAsync("No plugins found.", Color.Red);
+                return;
             }
 
-            var sb = new StringBuilder();
+            sb.Clear();
             foreach (var plugin in plugins)
             {
-                sb.Clear();
-                sb.Append($"{plugin.DisplayName} v{plugin.Version}");
+                await PrintPluginInfoAsync(plugin, sb);
+            }
+        }
 
-                if (!string.IsNullOrEmpty(plugin.Author))
-                {
-                    sb.Append($" by {plugin.Author}");
-                }
+        private Task PrintPluginInfoAsync(IOpenModPlugin plugin, StringBuilder sb)
+        {
+            sb.Clear();
+            sb.Append($"{plugin.DisplayName} v{plugin.Version}");
 
-                await PrintAsync(sb.ToString(), Color.Green);
+            if (!string.IsNullOrEmpty(plugin.Author))
+            {
+                sb.Append($" by {plugin.Author}");
             }
+
+            return PrintAsync(sb.ToString(), Color.Green);
         }
     }
 }
diff --git a/framework/OpenMod.Core/Localization/ConfigurationBasedStringLocalizer.cs b/framework/OpenMod.Core/Localization/ConfigurationBasedStringLocalizer.cs
@@ -42,11 +42,6 @@ private void GetAllStrings(IConfiguration configuration, List<LocalizedString> l
             }
         }
 
-        public IStringLocalizer WithCulture(CultureInfo culture)
-        {
-            return this; // no culture support
-        }
-
         public LocalizedString this[string name]
         {
             get
@@ -66,7 +61,7 @@ public LocalizedString this[string name]
                 var formatter = m_Options.Value.GetSmartFormatter();
 
                 var found = configValue.Exists() && !string.IsNullOrEmpty(configValue.Value);
-                var value = formatter.Format(found ? configValue.Value : name, arguments);
+                var value = formatter.Format(found ? configValue.Value! : name, arguments);
 
                 return new LocalizedString(name, value, resourceNotFound: !found);
             }

diff --git a/framework/OpenMod.Core/Localization/NullStringLocalizer.cs b/framework/OpenMod.Core/Localization/NullStringLocalizer.cs
@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
 using Microsoft.Extensions.Localization;
@@ -24,11 +26,6 @@ public IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures)
             return Enumerable.Empty<LocalizedString>();
         }
 
-        public IStringLocalizer WithCulture(CultureInfo culture)
-        {
-            return this;
-        }
-
         public LocalizedString this[string name]
         {
             get { return new(name, name, true); }

diff --git a/framework/OpenMod.Core/Localization/ProxyStringLocalizer.cs b/framework/OpenMod.Core/Localization/ProxyStringLocalizer.cs
@@ -2,6 +2,7 @@
 using OpenMod.API;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 
 namespace OpenMod.Core.Localization
@@ -21,13 +22,6 @@ public IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures)
             return m_StringLocalizer.GetAllStrings(includeParentCultures);
         }
 
-#pragma warning disable 618 // disable obsolete warning
-        public IStringLocalizer WithCulture(CultureInfo culture)
-        {
-            return m_StringLocalizer.WithCulture(culture);
-        }
-#pragma warning restore 618
-
         public LocalizedString this[string name]
         {
             get { return m_StringLocalizer[name]; }

diff --git a/framework/OpenMod.Core/OpenMod.Core.csproj b/framework/OpenMod.Core/OpenMod.Core.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net461</TargetFrameworks>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <PackageDescription>Core service implementations for OpenMod</PackageDescription>
   </PropertyGroup>
 
@@ -26,35 +26,31 @@
   	<PackageReference Include="Fody" Version="6.8.0">
       <PrivateAssets>all</PrivateAssets>
   	</PackageReference>
-  	<PackageReference Include="Lib.Harmony" Version="2.2.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.32" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.32" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.32" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.32" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.32" />
+    <PackageReference Include="Lib.Harmony" Version="2.3.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.12" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="morelinq" Version="3.4.2" />
     <PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="3.1.32" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.32" />
     <PackageReference Include="Nito.AsyncEx.Context" Version="5.1.2" />
     <PackageReference Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
     <PackageReference Include="RuntimeNullables.Fody" Version="1.0.6">
-	  <PrivateAssets>all</PrivateAssets>
-	</PackageReference>
+	    <PrivateAssets>all</PrivateAssets>
+	  </PackageReference>
     <PackageReference Include="Serilog" Version="3.0.1" />
     <PackageReference Include="ReadLine" Version="2.0.1" />
     <PackageReference Include="SmartFormat" Version="3.3.0" />
     <PackageReference Include="SmartFormat.Extensions.Time" Version="3.3.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net461'">
-  	<PackageReference Include="Contrib.Bcl.Ranges" Version="1.0.0" />
-  </ItemGroup>
-
   <ItemGroup>
 	  <ProjectReference Include="..\OpenMod.Analyzers\OpenMod.Analyzers.csproj">
 		  <PrivateAssets>all</PrivateAssets>