From c88aea93f24ed9c35789320ffc7cef412d215629 Mon Sep 17 00:00:00 2001
From: Scott Holodak <scottt732@gmail.com>
Date: Mon, 30 Oct 2023 16:00:13 -0400
Subject: [PATCH] Utils WiP

---
 Directory.Build.props                         | 10 ++-
 Directory.Build.targets                       |  2 +-
 Sholo.ruleset                                 |  8 +-
 Source/Directory.Build.targets                |  2 +-
 .../BaseServiceCollectionExtender.cs          | 56 +++++++-------
 .../LazyConcurrentDictionaryThing.cs          | 66 ++++++++++++++++
 Source/Sholo.Utils/EnumExtensions.cs          | 33 ++++----
 Source/Sholo.Utils/GlobalUsings.cs            |  3 +
 Source/Sholo.Utils/IMeters.cs                 | 14 ++++
 .../Logging/LoggingBuilderExtensions.cs       | 62 +++++++++++++++
 Source/Sholo.Utils/Meters.cs                  | 26 +++++++
 Source/Sholo.Utils/Sholo.Utils.csproj         | 25 +++---
 Source/Sholo.Utils/TypeExtensions.cs          | 53 +++++++------
 .../MiniValidatorValidateOptions.cs           | 77 +++++++++++++++++++
 ...OptionsBuilderDataAnnotationsExtensions.cs | 16 ++++
 Tests/Directory.Build.props                   | 11 +--
 Tests/Directory.Build.targets                 |  2 +-
 .../Sholo.Utils.Test/Sholo.Utils.Test.csproj  |  8 +-
 global.json                                   |  4 +-
 19 files changed, 374 insertions(+), 104 deletions(-)
 create mode 100644 Source/Sholo.Utils/Collections/LazyConcurrentDictionaryThing.cs
 create mode 100644 Source/Sholo.Utils/GlobalUsings.cs
 create mode 100644 Source/Sholo.Utils/IMeters.cs
 create mode 100644 Source/Sholo.Utils/Logging/LoggingBuilderExtensions.cs
 create mode 100644 Source/Sholo.Utils/Meters.cs
 create mode 100644 Source/Sholo.Utils/Validation/MiniValidatorValidateOptions.cs
 create mode 100644 Source/Sholo.Utils/Validation/OptionsBuilderDataAnnotationsExtensions.cs

diff --git a/Directory.Build.props b/Directory.Build.props
index 20bd2d1..5ba50ae 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -10,9 +10,13 @@
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <AnalysisLevel>latest</AnalysisLevel>
     <AnalysisMode>AllEnabledByDefault</AnalysisMode>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <AnalysisLevel>latest</AnalysisLevel>
+    <AnalysisMode>AllEnabledByDefault</AnalysisMode>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)Sholo.ruleset</CodeAnalysisRuleSet>
     <NoWarn>1591,CA1848</NoWarn>
+    <NoWarn>1591,CA1848</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Label="Package">
@@ -35,9 +39,9 @@
   </ItemGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" Version="2021.3.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="All" Version="16.8.55" />
-    <PackageReference Include="MinVer" PrivateAssets="All" Version="2.3.1" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" Version="2023.2.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="All" Version="17.7.30" />
+    <PackageReference Include="MinVer" PrivateAssets="All" Version="4.3.0" />
     <PackageReference Include="StyleCop.Analyzers" PrivateAssets="All" Version="1.1.118" />
   </ItemGroup>
 
diff --git a/Directory.Build.targets b/Directory.Build.targets
index e603de4..2f6a80a 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -7,7 +7,7 @@
 
   <Target Name="Versioning" BeforeTargets="MinVer">
     <PropertyGroup Label="Build">
-      <MinVerDefaultPreReleasePhase>preview</MinVerDefaultPreReleasePhase>
+      <MinVerDefaultPreReleaseIdentifiers>preview.0</MinVerDefaultPreReleaseIdentifiers>
       <!-- Tag your repository with the semantic version e.g. '1.0.0' to version all NuGet packages. If you have
            multiple NuGet packages in your solution and want to version them separately, then uncomment this line
            and tag your repository with the name of the package followed by the semantic version e.g.
diff --git a/Sholo.ruleset b/Sholo.ruleset
index 287f6c8..281ba3d 100644
--- a/Sholo.ruleset
+++ b/Sholo.ruleset
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <RuleSet Name="General rules" Description="Style + Rules - Laziness" ToolsVersion="16.0">
   <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp" RuleNamespace="Microsoft.CodeAnalysis.CSharp">
     <Rule Id="CS1591" Action="None" />
@@ -13,7 +13,7 @@
     <Rule Id="CA1812" Action="None" />
     <Rule Id="CA1819" Action="None" />
     <Rule Id="CA1822" Action="None" />
-    <Rule Id="CA2007" Action="Info" />
+    <Rule Id="CA2007" Action="None" />
   </Rules>
   <Rules AnalyzerId="Microsoft.NetCore.Analyzers" RuleNamespace="Microsoft.NetCore.Analyzers">
     <Rule Id="CA1303" Action="None" />
@@ -26,9 +26,11 @@
     <Rule Id="VSTHRD200" Action="Info" />
   </Rules>
   <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
+    <Rule Id="SA1000" Action="None" />
     <Rule Id="SA1009" Action="None" />
     <Rule Id="SA1101" Action="None" />
     <Rule Id="SA1111" Action="None" />
+    <Rule Id="SA1118" Action="None" />
     <Rule Id="SA1200" Action="None" />
     <Rule Id="SA1201" Action="None" />
     <Rule Id="SA1309" Action="None" />
@@ -43,4 +45,4 @@
     <Rule Id="SA1629" Action="None" />
     <Rule Id="SA1633" Action="None" />
   </Rules>
-</RuleSet>
\ No newline at end of file
+</RuleSet>
diff --git a/Source/Directory.Build.targets b/Source/Directory.Build.targets
index e603de4..2f6a80a 100644
--- a/Source/Directory.Build.targets
+++ b/Source/Directory.Build.targets
@@ -7,7 +7,7 @@
 
   <Target Name="Versioning" BeforeTargets="MinVer">
     <PropertyGroup Label="Build">
-      <MinVerDefaultPreReleasePhase>preview</MinVerDefaultPreReleasePhase>
+      <MinVerDefaultPreReleaseIdentifiers>preview.0</MinVerDefaultPreReleaseIdentifiers>
       <!-- Tag your repository with the semantic version e.g. '1.0.0' to version all NuGet packages. If you have
            multiple NuGet packages in your solution and want to version them separately, then uncomment this line
            and tag your repository with the name of the package followed by the semantic version e.g.
diff --git a/Source/Sholo.Utils/BaseServiceCollectionExtender.cs b/Source/Sholo.Utils/BaseServiceCollectionExtender.cs
index 646cf9f..5cc702d 100644
--- a/Source/Sholo.Utils/BaseServiceCollectionExtender.cs
+++ b/Source/Sholo.Utils/BaseServiceCollectionExtender.cs
@@ -1,36 +1,36 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Sholo.Utils
-{
-    public abstract class BaseServiceCollectionExtender : IServiceCollection
-    {
-        public int Count => Target.Count;
-        public bool IsReadOnly => Target.IsReadOnly;
+namespace Sholo.Utils;
 
-        public ServiceDescriptor this[int index]
-        {
-            get => Target[index];
-            set => Target[index] = value;
-        }
+[PublicAPI]
+public abstract class BaseServiceCollectionExtender : IServiceCollection
+{
+    public int Count => Target.Count;
+    public bool IsReadOnly => Target.IsReadOnly;
 
-        protected IServiceCollection Target { get; }
+    public ServiceDescriptor this[int index]
+    {
+        get => Target[index];
+        set => Target[index] = value;
+    }
 
-        protected BaseServiceCollectionExtender(IServiceCollection target)
-        {
-            Target = target;
-        }
+    protected IServiceCollection Target { get; }
 
-        public IEnumerator<ServiceDescriptor> GetEnumerator() => Target.GetEnumerator();
-        IEnumerator IEnumerable.GetEnumerator() => Target.GetEnumerator();
-        public void Add(ServiceDescriptor item) => Target.Add(item);
-        public void Clear() => Target.Clear();
-        public bool Contains(ServiceDescriptor item) => Target.Contains(item);
-        public void CopyTo(ServiceDescriptor[] array, int arrayIndex) => Target.CopyTo(array, arrayIndex);
-        public bool Remove(ServiceDescriptor item) => Target.Remove(item);
-        public int IndexOf(ServiceDescriptor item) => Target.IndexOf(item);
-        public void Insert(int index, ServiceDescriptor item) => Target.Insert(index, item);
-        public void RemoveAt(int index) => Target.RemoveAt(index);
+    protected BaseServiceCollectionExtender(IServiceCollection target)
+    {
+        Target = target;
     }
-}
\ No newline at end of file
+
+    public IEnumerator<ServiceDescriptor> GetEnumerator() => Target.GetEnumerator();
+    IEnumerator IEnumerable.GetEnumerator() => Target.GetEnumerator();
+    public void Add(ServiceDescriptor item) => Target.Add(item);
+    public void Clear() => Target.Clear();
+    public bool Contains(ServiceDescriptor item) => Target.Contains(item);
+    public void CopyTo(ServiceDescriptor[] array, int arrayIndex) => Target.CopyTo(array, arrayIndex);
+    public bool Remove(ServiceDescriptor item) => Target.Remove(item);
+    public int IndexOf(ServiceDescriptor item) => Target.IndexOf(item);
+    public void Insert(int index, ServiceDescriptor item) => Target.Insert(index, item);
+    public void RemoveAt(int index) => Target.RemoveAt(index);
+}
diff --git a/Source/Sholo.Utils/Collections/LazyConcurrentDictionaryThing.cs b/Source/Sholo.Utils/Collections/LazyConcurrentDictionaryThing.cs
new file mode 100644
index 0000000..4e05fff
--- /dev/null
+++ b/Source/Sholo.Utils/Collections/LazyConcurrentDictionaryThing.cs
@@ -0,0 +1,66 @@
+using System;
+using System.Collections;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+
+namespace Sholo.Utils.Collections;
+
+[PublicAPI]
+public class LazyConcurrentDictionaryThing<TKey, TValue> : IEnumerable<KeyValuePair<TKey, TValue>>
+    where TKey : notnull
+{
+    private ConcurrentDictionary<TKey, Lazy<TValue>> Dictionary { get; } = new();
+
+    public TValue GetOrAdd(TKey key, Func<TValue> valueFactory) => Dictionary.GetOrAdd(key, _ => new Lazy<TValue>(valueFactory, LazyThreadSafetyMode.ExecutionAndPublication)).Value;
+
+    public TValue this[TKey key] => Dictionary[key].Value;
+    public bool ContainsKey(TKey key) => Dictionary.ContainsKey(key);
+
+    public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator() => Dictionary.Select(x => new KeyValuePair<TKey, TValue>(x.Key, x.Value.Value)).GetEnumerator();
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+    public bool Remove(TKey key, out TValue value)
+    {
+        var result = Dictionary.Remove(key, out var val);
+
+        if (result)
+        {
+            value = val.Value;
+            return true;
+        }
+        else
+        {
+            value = default!;
+            return false;
+        }
+    }
+
+    public bool IsFixedSize => false;
+    public bool IsReadOnly => false;
+
+    public void Clear()
+    {
+        Dictionary.Clear();
+    }
+
+    public int Count => Dictionary.Count;
+
+    public bool TryGetValue(TKey key, out TValue value)
+    {
+        if (Dictionary.TryGetValue(key, out var lazyValue))
+        {
+            value = lazyValue.Value;
+            return true;
+        }
+        else
+        {
+            value = default;
+            return false;
+        }
+    }
+
+    public ICollection<TKey> Keys => Dictionary.Keys;
+    public ICollection<TValue> Values => Dictionary.Values.Select(x => x.Value).ToArray();
+}
diff --git a/Source/Sholo.Utils/EnumExtensions.cs b/Source/Sholo.Utils/EnumExtensions.cs
index 5a6d29c..c980722 100644
--- a/Source/Sholo.Utils/EnumExtensions.cs
+++ b/Source/Sholo.Utils/EnumExtensions.cs
@@ -2,24 +2,23 @@
 using System.ComponentModel;
 using System.Linq;
 
-namespace Sholo.Utils
+namespace Sholo.Utils;
+
+public static class EnumExtensions
 {
-    public static class EnumExtensions
-    {
-        public static string GetDescription(this Enum value)
-            => value.GetAttributeValue<DescriptionAttribute, string>(d => d.Description);
+    public static string GetDescription(this Enum value)
+        => value.GetAttributeValue<DescriptionAttribute, string>(d => d.Description);
 
-        public static TAttribute GetAttribute<TAttribute>(this Enum value)
-            where TAttribute : Attribute
-            => value.GetAttributeValue<TAttribute, TAttribute>(t => t);
+    public static TAttribute GetAttribute<TAttribute>(this Enum value)
+        where TAttribute : Attribute
+        => value.GetAttributeValue<TAttribute, TAttribute>(t => t);
 
-        public static TValue GetAttributeValue<TAttribute, TValue>(this Enum value, Func<TAttribute, TValue> attributeValueSelector)
-            where TAttribute : Attribute
-            => value.GetType()
-                .GetMember(value.ToString())
-                .SelectMany(x => x.GetCustomAttributes(typeof(TAttribute), false))
-                .Cast<TAttribute>()
-                .Select(attributeValueSelector)
-                .FirstOrDefault();
-    }
+    public static TValue GetAttributeValue<TAttribute, TValue>(this Enum value, Func<TAttribute, TValue> attributeValueSelector)
+        where TAttribute : Attribute
+        => value.GetType()
+            .GetMember(value.ToString())
+            .SelectMany(x => x.GetCustomAttributes(typeof(TAttribute), false))
+            .Cast<TAttribute>()
+            .Select(attributeValueSelector)
+            .FirstOrDefault();
 }
diff --git a/Source/Sholo.Utils/GlobalUsings.cs b/Source/Sholo.Utils/GlobalUsings.cs
new file mode 100644
index 0000000..f3b5eaa
--- /dev/null
+++ b/Source/Sholo.Utils/GlobalUsings.cs
@@ -0,0 +1,3 @@
+// Global using directives
+
+global using JetBrains.Annotations;
\ No newline at end of file
diff --git a/Source/Sholo.Utils/IMeters.cs b/Source/Sholo.Utils/IMeters.cs
new file mode 100644
index 0000000..da411d1
--- /dev/null
+++ b/Source/Sholo.Utils/IMeters.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Diagnostics.Metrics;
+using System.Runtime.CompilerServices;
+
+namespace Sholo.Utils;
+
+public interface IMeters
+{
+    Meter Meter { get; }
+
+    TInstrument GetOrAddInstrument<TInstrument, T>(Func<Instrument<T>> valueFactory, [CallerMemberName] string name = null)
+        where TInstrument : Instrument<T>
+        where T : struct;
+}
diff --git a/Source/Sholo.Utils/Logging/LoggingBuilderExtensions.cs b/Source/Sholo.Utils/Logging/LoggingBuilderExtensions.cs
new file mode 100644
index 0000000..63edf5c
--- /dev/null
+++ b/Source/Sholo.Utils/Logging/LoggingBuilderExtensions.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Linq;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Serilog;
+using Serilog.Core;
+using Serilog.Events;
+using Serilog.Sinks.SystemConsole.Themes;
+
+namespace Sholo.Utils.Logging;
+
+public static class LoggingBuilderExtensions
+{
+    public static ILoggingBuilder AddSerilogConsole(this ILoggingBuilder loggingBuilder, HostBuilderContext hostBuilderContext)
+    {
+        var configuration = hostBuilderContext.Configuration;
+        return AddSerilogConsole(loggingBuilder, configuration);
+    }
+
+    public static ILoggingBuilder AddSerilogConsole(this ILoggingBuilder loggingBuilder, IConfiguration configuration)
+    {
+        Logger logger;
+        var serilogKeys = configuration.GetSection("Serilog").AsEnumerable().ToArray();
+        if (serilogKeys.Any(x => x.Key != "Serilog"))
+        {
+            logger = new LoggerConfiguration()
+                .ReadFrom.Configuration(configuration)
+                .Filter.ByExcluding(DefaultFilters)
+                .CreateLogger();
+
+            loggingBuilder.AddSerilog(logger, true);
+        }
+        else
+        {
+            logger = new LoggerConfiguration()
+                .Filter.ByExcluding(DefaultFilters)
+                .WriteTo.Console(
+                    LogEventLevel.Debug,
+                    "[{Level:u3}] {Message:lj}{NewLine}{Exception}",
+                    standardErrorFromLevel: LogEventLevel.Warning,
+                    theme: AnsiConsoleTheme.Literate)
+                .CreateLogger();
+
+            loggingBuilder.AddSerilog(logger, true);
+        }
+
+        return loggingBuilder;
+    }
+
+    private static bool DefaultFilters(LogEvent le)
+    {
+        var sourceContext = le.Properties["SourceContext"]?.ToString() ?? string.Empty;
+
+        if (sourceContext.Contains("Microsoft.AspNetCore.DataProtection.KeyManagement.XmlKeyManager", StringComparison.Ordinal) && le.Level < LogEventLevel.Warning)
+        {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/Source/Sholo.Utils/Meters.cs b/Source/Sholo.Utils/Meters.cs
new file mode 100644
index 0000000..e9a8f09
--- /dev/null
+++ b/Source/Sholo.Utils/Meters.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Diagnostics.Metrics;
+using System.Runtime.CompilerServices;
+using Sholo.Utils.Collections;
+
+namespace Sholo.Utils;
+
+[PublicAPI]
+public class Meters : IMeters
+{
+    public Meter Meter { get; }
+    private LazyConcurrentDictionaryThing<string, Instrument> Instruments { get; } = new();
+
+    public TInstrument GetOrAddInstrument<TInstrument, T>(Func<Instrument<T>> valueFactory, [CallerMemberName] string name = null)
+        where TInstrument : Instrument<T>
+        where T : struct
+    {
+        var result = Instruments.GetOrAdd(name, valueFactory);
+        return (TInstrument)result;
+    }
+
+    public Meters(string applicationName, [CanBeNull] string version)
+    {
+        Meter = new(applicationName, version);
+    }
+}
diff --git a/Source/Sholo.Utils/Sholo.Utils.csproj b/Source/Sholo.Utils/Sholo.Utils.csproj
index 164b50f..dec3d7d 100644
--- a/Source/Sholo.Utils/Sholo.Utils.csproj
+++ b/Source/Sholo.Utils/Sholo.Utils.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Label="Build">
-    <TargetFrameworks>netstandard2.0;net5.0;net6.0</TargetFrameworks>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Label="Package">
@@ -9,16 +9,17 @@
     <Description>Misc utility functions</Description>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' " >
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[2.1.0,)" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="[7.0.0,)" />
+    <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="[7.0.0,)" />
+    <PackageReference Include="MiniValidation" Version="0.9.0" />
+    <PackageReference Include="NetEscapades.Configuration.Yaml" Version="[3.1.0,4.0.0)" />
+    <PackageReference Include="Serilog.Expressions" Version="[3.4.1,)" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="[3.1.0,)" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="[7.0.1,)" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="[4.1.0,)" />
+    <PackageReference Include="YamlDotNet" Version="[13.4.0,14.0.0)" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
   </ItemGroup>
-  
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[5.0.0,)" />
-  </ItemGroup>
-  
-  <ItemGroup  Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[6.0.0,)" />
-  </ItemGroup>
-  
+
 </Project>
diff --git a/Source/Sholo.Utils/TypeExtensions.cs b/Source/Sholo.Utils/TypeExtensions.cs
index 9f5df16..67be95f 100644
--- a/Source/Sholo.Utils/TypeExtensions.cs
+++ b/Source/Sholo.Utils/TypeExtensions.cs
@@ -1,38 +1,37 @@
-using System;
+using System;
 
-namespace Sholo.Utils
+namespace Sholo.Utils;
+
+public static class TypeExtensions
 {
-    public static class TypeExtensions
+    // https://stackoverflow.com/a/8142597/179223
+    public static bool IsTypeOf<T>(this Type type)
     {
-        // https://stackoverflow.com/a/8142597/179223
-        public static bool IsTypeOf<T>(this Type type)
-        {
-            return typeof(T).IsAssignableFrom(type);
-        }
-
-        public static bool IsTypeOf(this Type type, Type otherType)
-        {
-            return otherType.IsAssignableFrom(type);
-        }
+        return typeof(T).IsAssignableFrom(type);
+    }
 
-        // https://stackoverflow.com/a/5461399/179223 -> https://stackoverflow.com/a/1075059/1968
-        public static bool IsAssignableToGenericType(this Type type, Type genericType)
-        {
-            var interfaceTypes = type.GetInterfaces();
+    public static bool IsTypeOf(this Type type, Type otherType)
+    {
+        return otherType.IsAssignableFrom(type);
+    }
 
-            foreach (var it in interfaceTypes)
-            {
-                if (it.IsGenericType && it.GetGenericTypeDefinition() == genericType)
-                    return true;
-            }
+    // https://stackoverflow.com/a/5461399/179223 -> https://stackoverflow.com/a/1075059/1968
+    public static bool IsAssignableToGenericType(this Type type, Type genericType)
+    {
+        var interfaceTypes = type.GetInterfaces();
 
-            if (type.IsGenericType && type.GetGenericTypeDefinition() == genericType)
+        foreach (var it in interfaceTypes)
+        {
+            if (it.IsGenericType && it.GetGenericTypeDefinition() == genericType)
                 return true;
+        }
 
-            Type baseType = type.BaseType;
-            if (baseType == null) return false;
+        if (type.IsGenericType && type.GetGenericTypeDefinition() == genericType)
+            return true;
 
-            return IsAssignableToGenericType(baseType, genericType);
-        }
+        Type baseType = type.BaseType;
+        if (baseType == null) return false;
+
+        return IsAssignableToGenericType(baseType, genericType);
     }
 }
diff --git a/Source/Sholo.Utils/Validation/MiniValidatorValidateOptions.cs b/Source/Sholo.Utils/Validation/MiniValidatorValidateOptions.cs
new file mode 100644
index 0000000..e649b23
--- /dev/null
+++ b/Source/Sholo.Utils/Validation/MiniValidatorValidateOptions.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using Microsoft.Extensions.Options;
+using MiniValidation;
+
+namespace Sholo.Utils.Validation;
+
+public class MiniValidatorValidateOptions<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.NonPublicProperties)] TOptions>
+    : IValidateOptions<TOptions>
+        where TOptions : class
+{
+    private IServiceProvider ServiceProvider { get; }
+
+    /// <summary>
+    /// Gets the options name.
+    /// </summary>
+    private string Name { get; }
+
+    /// <summary>
+    /// Gets a value indicating whether the object graph should be recursively enumerated
+    /// </summary>
+    private bool Recurse { get; }
+
+    /// <summary>
+    /// Gets a value indicating whether asynchronous validation is allowed
+    /// </summary>
+    private bool AllowAsync { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MiniValidatorValidateOptions{TOptions}"/> class.
+    /// </summary>
+    /// <param name="serviceProvider">The <see cref="IServiceProvider" /> used by the validator</param>
+    /// <param name="name">The name of the option.</param>
+    /// <param name="recurse">Indicates whether or not to recurse object graph during validation</param>
+    /// <param name="allowAsync">Allow asynchronous validation</param>
+    public MiniValidatorValidateOptions(IServiceProvider serviceProvider, string name, bool recurse, bool allowAsync)
+    {
+        ServiceProvider = serviceProvider;
+        Name = name;
+        Recurse = recurse;
+        AllowAsync = allowAsync;
+    }
+
+    /// <summary>
+    /// Validates a specific named options instance (or all when <paramref name="name"/> is null).
+    /// </summary>
+    /// <param name="name">The name of the options instance being validated.</param>
+    /// <param name="options">The options instance.</param>
+    /// <returns>The <see cref="ValidateOptionsResult"/> result.</returns>
+    public ValidateOptionsResult Validate(string name, TOptions options)
+    {
+        // Null name is used to configure all named options.
+        if (Name != null && Name != name)
+        {
+            // Ignored if not validating this instance.
+            return ValidateOptionsResult.Skip;
+        }
+
+        // Ensure options are provided to validate against
+        ArgumentNullException.ThrowIfNull(options);
+
+        if (MiniValidator.TryValidate(options, ServiceProvider, Recurse, AllowAsync, out var validationResults))
+        {
+            return ValidateOptionsResult.Success;
+        }
+
+        var allErrors = new List<string>();
+        foreach (var (key, errors) in validationResults)
+        {
+            allErrors.AddRange(errors.Select(error => $"{key}: {error}"));
+        }
+
+        return ValidateOptionsResult.Fail(allErrors);
+    }
+}
diff --git a/Source/Sholo.Utils/Validation/OptionsBuilderDataAnnotationsExtensions.cs b/Source/Sholo.Utils/Validation/OptionsBuilderDataAnnotationsExtensions.cs
new file mode 100644
index 0000000..c2579a1
--- /dev/null
+++ b/Source/Sholo.Utils/Validation/OptionsBuilderDataAnnotationsExtensions.cs
@@ -0,0 +1,16 @@
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+
+namespace Sholo.Utils.Validation;
+
+[PublicAPI]
+public static class OptionsBuilderDataAnnotationsExtensions
+{
+    public static OptionsBuilder<TOptions> ValidateDataAnnotations<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.NonPublicProperties)] TOptions>(this OptionsBuilder<TOptions> optionsBuilder, bool recurse, bool allowAsync = true)
+        where TOptions : class
+    {
+        optionsBuilder.Services.AddSingleton<IValidateOptions<TOptions>>(sp => new MiniValidatorValidateOptions<TOptions>(sp, optionsBuilder.Name, recurse, allowAsync));
+        return optionsBuilder;
+    }
+}
diff --git a/Tests/Directory.Build.props b/Tests/Directory.Build.props
index 041a0a3..893680b 100644
--- a/Tests/Directory.Build.props
+++ b/Tests/Directory.Build.props
@@ -7,13 +7,14 @@
   </PropertyGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="coverlet.collector" PrivateAssets="All" Version="1.3.0">
+    <PackageReference Update="coverlet.collector" Version="6.0.0">
+      <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
-    <PackageReference Include="Moq" Version="4.14.5" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Moq" Version="4.20.69" />
+    <PackageReference Include="xunit" Version="2.5.1" />
+    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" Version="2.5.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
diff --git a/Tests/Directory.Build.targets b/Tests/Directory.Build.targets
index e603de4..2f6a80a 100644
--- a/Tests/Directory.Build.targets
+++ b/Tests/Directory.Build.targets
@@ -7,7 +7,7 @@
 
   <Target Name="Versioning" BeforeTargets="MinVer">
     <PropertyGroup Label="Build">
-      <MinVerDefaultPreReleasePhase>preview</MinVerDefaultPreReleasePhase>
+      <MinVerDefaultPreReleaseIdentifiers>preview.0</MinVerDefaultPreReleaseIdentifiers>
       <!-- Tag your repository with the semantic version e.g. '1.0.0' to version all NuGet packages. If you have
            multiple NuGet packages in your solution and want to version them separately, then uncomment this line
            and tag your repository with the name of the package followed by the semantic version e.g.
diff --git a/Tests/Sholo.Utils.Test/Sholo.Utils.Test.csproj b/Tests/Sholo.Utils.Test/Sholo.Utils.Test.csproj
index 70a2c41..a6e3f5b 100644
--- a/Tests/Sholo.Utils.Test/Sholo.Utils.Test.csproj
+++ b/Tests/Sholo.Utils.Test/Sholo.Utils.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Label="Build">
-    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup Label="Project References">
@@ -9,12 +9,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="coverlet.collector" Version="3.1.0">
+    <PackageReference Update="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Update="Moq" Version="4.16.1" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Update="Moq" Version="4.20.69" />
   </ItemGroup>
 
 </Project>
diff --git a/global.json b/global.json
index 933e1a9..b889cc9 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "rollForward": "latestMajor",
-    "version": "5.0.101"
+    "rollForward": "latestMinor",
+    "version": "7.0.401"
   }
 }