From 95b7f82243e5ba1be91332139f5af804cf308f88 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 31 Jul 2026 11:33:54 +0000 Subject: [PATCH 1/6] feat: migrate deprecated System.CommandLine packages to stable 2.0.2 --- .../Diamond.Core.CommandLine.Model.csproj | 2 +- .../Models/ModelCommand.cs | 61 ++++++++++++------- .../Models/OptionDescriptor.cs | 6 ++ .../Diamond.Core.CommandLine.Model.xml | 13 ++-- .../Diamond.Core.CommandLine.csproj | 2 +- .../Hosted Services/RootCommandService.cs | 12 ++-- .../Diamond.Core.Example.BasicConsole.csproj | 1 - .../Commands/Direct/GetCommandDirect.cs | 2 +- .../Commands/DbCommand.cs | 4 +- 9 files changed, 58 insertions(+), 45 deletions(-) diff --git a/Src/Command Line/Diamond.Core.CommandLine.Model/Diamond.Core.CommandLine.Model.csproj b/Src/Command Line/Diamond.Core.CommandLine.Model/Diamond.Core.CommandLine.Model.csproj index 8dece9d4..f4c3bce4 100755 --- a/Src/Command Line/Diamond.Core.CommandLine.Model/Diamond.Core.CommandLine.Model.csproj +++ b/Src/Command Line/Diamond.Core.CommandLine.Model/Diamond.Core.CommandLine.Model.csproj @@ -52,7 +52,7 @@ - + diff --git a/Src/Command Line/Diamond.Core.CommandLine.Model/Models/ModelCommand.cs b/Src/Command Line/Diamond.Core.CommandLine.Model/Models/ModelCommand.cs index fc033394..3bc2b39a 100755 --- a/Src/Command Line/Diamond.Core.CommandLine.Model/Models/ModelCommand.cs +++ b/Src/Command Line/Diamond.Core.CommandLine.Model/Models/ModelCommand.cs @@ -17,11 +17,11 @@ using System; using System.Collections.Generic; using System.CommandLine; -using System.CommandLine.Invocation; -using System.CommandLine.NamingConventionBinder; +using System.CommandLine.Parsing; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Reflection; +using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; @@ -33,6 +33,16 @@ namespace Diamond.Core.CommandLine.Model /// public class ModelCommand : Command, ICommand { + private static readonly MethodInfo s_getValueByName = + typeof(ParseResult) + .GetMethods(BindingFlags.Public | BindingFlags.Instance) + .First(m => m.Name == "GetValue" + && m.IsGenericMethod + && m.GetParameters().Length == 1 + && m.GetParameters()[0].ParameterType == typeof(string)); + + private readonly List<(PropertyInfo Property, Option Option)> _optionBindings = new(); + /// /// /// @@ -42,11 +52,7 @@ public ModelCommand(string name, string description = null) : base(name, description) { this.BuildOptions(); - - this.Handler = CommandHandler.Create(async (p) => - { - return await this.OnHandleCommand(p); - }); + this.RegisterAction(); } /// @@ -60,11 +66,7 @@ public ModelCommand(ILogger> logger, string name, string de { this.Logger = logger; this.BuildOptions(); - - this.Handler = CommandHandler.Create(async (p) => - { - return await this.OnHandleCommand(p); - }); + this.RegisterAction(); } /// @@ -72,6 +74,24 @@ public ModelCommand(ILogger> logger, string name, string de /// protected ILogger> Logger { get; set; } = new NullLogger>(); + private void RegisterAction() + { + this.SetAction(async (ParseResult parseResult, CancellationToken cancellationToken) => + { + TModel model = Activator.CreateInstance(); + + foreach ((PropertyInfo property, Option option) in this._optionBindings) + { + object value = s_getValueByName + .MakeGenericMethod(property.PropertyType) + .Invoke(parseResult, new object[] { option.Name }); + property.SetValue(model, value); + } + + return await this.OnHandleCommand(model); + }); + } + /// /// /// @@ -130,7 +150,8 @@ protected void BuildOptions() Description = (display?.Description) ?? property.Name, Order = (display?.Order) ?? 0, IsRequired = isRequired, - PropertyType = property.PropertyType + PropertyType = property.PropertyType, + ModelProperty = property }; // @@ -149,9 +170,11 @@ protected void BuildOptions() Type[] typeArgs = { item.PropertyType }; Type makeme = typeof(Option<>).MakeGenericType(typeArgs); - object option = Activator.CreateInstance(makeme, new string[] { $"{item.Name}", $"{item.Alias}" }, item.Description); + Option option = (Option)Activator.CreateInstance(makeme, item.Name, new string[] { item.Alias }); + option.Description = item.Description; - this.AddOption(option as Option); + this.Add(option); + this._optionBindings.Add((item.ModelProperty, option)); } } @@ -164,13 +187,5 @@ protected virtual Task OnHandleCommand(TModel item) { return Task.FromResult(0); } - - /// - /// - /// - /// - /// - /// - protected ICommandHandler CreateCommandHandler(Action action) => HandlerDescriptor.FromDelegate(action).GetCommandHandler(); } } diff --git a/Src/Command Line/Diamond.Core.CommandLine.Model/Models/OptionDescriptor.cs b/Src/Command Line/Diamond.Core.CommandLine.Model/Models/OptionDescriptor.cs index 8248a68a..1a42781f 100755 --- a/Src/Command Line/Diamond.Core.CommandLine.Model/Models/OptionDescriptor.cs +++ b/Src/Command Line/Diamond.Core.CommandLine.Model/Models/OptionDescriptor.cs @@ -15,6 +15,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // using System; +using System.Reflection; namespace Diamond.Core.CommandLine.Model { @@ -52,5 +53,10 @@ public class OptionDescriptor /// /// public Type PropertyType { get; set; } + + /// + /// + /// + public PropertyInfo ModelProperty { get; set; } } } diff --git a/Src/Command Line/Diamond.Core.CommandLine.Model/XmlDocs/Diamond.Core.CommandLine.Model.xml b/Src/Command Line/Diamond.Core.CommandLine.Model/XmlDocs/Diamond.Core.CommandLine.Model.xml index 43a9de9e..81c1ef72 100644 --- a/Src/Command Line/Diamond.Core.CommandLine.Model/XmlDocs/Diamond.Core.CommandLine.Model.xml +++ b/Src/Command Line/Diamond.Core.CommandLine.Model/XmlDocs/Diamond.Core.CommandLine.Model.xml @@ -41,14 +41,6 @@ - - - - - - - - @@ -87,6 +79,11 @@ + + + + + diff --git a/Src/Command Line/Diamond.Core.CommandLine/Diamond.Core.CommandLine.csproj b/Src/Command Line/Diamond.Core.CommandLine/Diamond.Core.CommandLine.csproj index 56d3daf3..4011a02e 100755 --- a/Src/Command Line/Diamond.Core.CommandLine/Diamond.Core.CommandLine.csproj +++ b/Src/Command Line/Diamond.Core.CommandLine/Diamond.Core.CommandLine.csproj @@ -53,7 +53,7 @@ - + diff --git a/Src/Command Line/Diamond.Core.CommandLine/Hosted Services/RootCommandService.cs b/Src/Command Line/Diamond.Core.CommandLine/Hosted Services/RootCommandService.cs index 640781a7..c1fbc8cb 100755 --- a/Src/Command Line/Diamond.Core.CommandLine/Hosted Services/RootCommandService.cs +++ b/Src/Command Line/Diamond.Core.CommandLine/Hosted Services/RootCommandService.cs @@ -17,9 +17,7 @@ using System; using System.Collections.Generic; using System.CommandLine; -using System.CommandLine.Builder; using System.CommandLine.Parsing; -using System.CommandLine.Rendering; using System.Linq; using System.Threading; using System.Threading.Tasks; @@ -104,7 +102,7 @@ public virtual Task StartAsync(CancellationToken cancellationToken) if (cmd is Command c) { this.Logger.LogDebug("Adding '{name}' command to Root Command.", c.Name); - ((RootCommand)this.RootCommand).AddCommand(c); + ((RootCommand)this.RootCommand).Add(c); } } } @@ -146,11 +144,9 @@ private void OnStarted() this.Logger.LogDebug("OnStarted has been called on Root Command Service."); this.Logger.LogDebug("Executing InvokeAsync on Root Command."); - int result = await new CommandLineBuilder((RootCommand)this.RootCommand) - .UseDefaults() - .UseAnsiTerminalWhenAvailable() - .Build() - .InvokeAsync(this.RootCommand.Args); + int result = await CommandLineParser + .Parse((RootCommand)this.RootCommand, this.RootCommand.Args) + .InvokeAsync(); this.Logger.LogDebug("Root Command returned integer value of {result}.", result); this.Logger.LogDebug("Setting Environment.ExitCode to {result}.", result); diff --git a/Src/Examples/Diamond.Core.Example.BasicConsole/Diamond.Core.Example.BasicConsole.csproj b/Src/Examples/Diamond.Core.Example.BasicConsole/Diamond.Core.Example.BasicConsole.csproj index b20210cf..7c098f3a 100755 --- a/Src/Examples/Diamond.Core.Example.BasicConsole/Diamond.Core.Example.BasicConsole.csproj +++ b/Src/Examples/Diamond.Core.Example.BasicConsole/Diamond.Core.Example.BasicConsole.csproj @@ -32,7 +32,6 @@ - diff --git a/Src/Examples/Diamond.Core.Example.ConsoleCommand/Commands/Direct/GetCommandDirect.cs b/Src/Examples/Diamond.Core.Example.ConsoleCommand/Commands/Direct/GetCommandDirect.cs index 159377f3..064b39cd 100755 --- a/Src/Examples/Diamond.Core.Example.ConsoleCommand/Commands/Direct/GetCommandDirect.cs +++ b/Src/Examples/Diamond.Core.Example.ConsoleCommand/Commands/Direct/GetCommandDirect.cs @@ -47,7 +47,7 @@ public GetCommandDirect(ILogger logger, IRepositoryFactory rep /// /// /// - protected IMeasureAction Action { get; set; } + protected new IMeasureAction Action { get; set; } /// /// diff --git a/Src/Examples/Diamond.Core.Example.DbContext/Commands/DbCommand.cs b/Src/Examples/Diamond.Core.Example.DbContext/Commands/DbCommand.cs index da614ca3..ac73cdb7 100644 --- a/Src/Examples/Diamond.Core.Example.DbContext/Commands/DbCommand.cs +++ b/Src/Examples/Diamond.Core.Example.DbContext/Commands/DbCommand.cs @@ -42,10 +42,10 @@ protected override Task OnHandleCommand(CommandOptions options) switch (options.Action) { - case Action.Create: + case Diamond.Core.Example.Action.Create: this.Context.Database.EnsureCreated(); break; - case Action.Drop: + case Diamond.Core.Example.Action.Drop: this.Context.Database.EnsureDeleted(); break; } From 1658ba813b85a3253cdcace89953d6ff2513b227 Mon Sep 17 00:00:00 2001 From: Daniel Porrey Date: Fri, 31 Jul 2026 07:03:38 -0500 Subject: [PATCH 2/6] Use target-typed new() and reformat closing braces Refactored the instantiation of DiamondServiceProviderFactory to use target-typed `new()` for improved code clarity. Also adjusted closing brace formatting at the end of HostBuilderExtensions.cs for consistency. --- .../Models/HostBuilderExtensions.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Models/HostBuilderExtensions.cs b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Models/HostBuilderExtensions.cs index c63ffe4f..5b52e77a 100755 --- a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Models/HostBuilderExtensions.cs +++ b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Models/HostBuilderExtensions.cs @@ -14,7 +14,6 @@ // You should have received a copy of the GNU Lesser General Public License // along with this program. If not, see http://www.gnu.org/licenses/. // -using System; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Hosting; @@ -35,7 +34,7 @@ public static class HostBuilderExtensions /// /// This instance is used to provide a shared, thread-safe factory for creating service /// providers. - static readonly DiamondServiceProviderFactory _factory = new DiamondServiceProviderFactory(); + static readonly DiamondServiceProviderFactory _factory = new(); /// /// Configures the specified to use the Diamond dependency injection model. @@ -55,4 +54,4 @@ public static IHostBuilder UseDiamondDependencyInterfaceInjection(this IHostBuil }); } } -} +} \ No newline at end of file From 859e0400c9ec6bd2a512f99421964554942a74b0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 31 Jul 2026 12:14:23 +0000 Subject: [PATCH 3/6] test: add Diamond.Core.CommandLine and CommandLine.Model test projects --- ...iamond.Core.CommandLine.Model.Tests.csproj | 36 ++ .../ModelCommandTests.cs | 366 ++++++++++++++++++ .../Diamond.Core.CommandLine.Tests.csproj | 38 ++ .../RootCommandServiceTests.cs | 268 +++++++++++++ 4 files changed, 708 insertions(+) create mode 100644 Src/Tests/Diamond.Core.CommandLine.Model.Tests/Diamond.Core.CommandLine.Model.Tests.csproj create mode 100644 Src/Tests/Diamond.Core.CommandLine.Model.Tests/ModelCommandTests.cs create mode 100644 Src/Tests/Diamond.Core.CommandLine.Tests/Diamond.Core.CommandLine.Tests.csproj create mode 100644 Src/Tests/Diamond.Core.CommandLine.Tests/RootCommandServiceTests.cs diff --git a/Src/Tests/Diamond.Core.CommandLine.Model.Tests/Diamond.Core.CommandLine.Model.Tests.csproj b/Src/Tests/Diamond.Core.CommandLine.Model.Tests/Diamond.Core.CommandLine.Model.Tests.csproj new file mode 100644 index 00000000..33cec139 --- /dev/null +++ b/Src/Tests/Diamond.Core.CommandLine.Model.Tests/Diamond.Core.CommandLine.Model.Tests.csproj @@ -0,0 +1,36 @@ + + + + net10.0 + latest + enable + disable + false + 10.1.4 + 10.1.4 + 10.1.4 + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + diff --git a/Src/Tests/Diamond.Core.CommandLine.Model.Tests/ModelCommandTests.cs b/Src/Tests/Diamond.Core.CommandLine.Model.Tests/ModelCommandTests.cs new file mode 100644 index 00000000..880e7c42 --- /dev/null +++ b/Src/Tests/Diamond.Core.CommandLine.Model.Tests/ModelCommandTests.cs @@ -0,0 +1,366 @@ +using System.Collections.Generic; +using System.CommandLine; +using System.CommandLine.Parsing; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using Diamond.Core.CommandLine.Model; + +namespace Diamond.Core.CommandLine.Model.Tests +{ + // ─── Test Models ────────────────────────────────────────────────────────────── + + /// + /// Minimal model with no attributes — property names drive option names. + /// + public class SimpleModel + { + public string Name { get; set; } + public int Count { get; set; } + } + + /// + /// Model that uses [Display] and [Required] attributes, matching the + /// shape of the Invoice model used in the ConsoleCommand example. + /// + public class AnnotatedModel + { + [Display(Name = "--number", ShortName = "-n", Description = "The invoice number.", Order = 1)] + [Required] + public string Number { get; set; } + + [Display(Name = "--description", ShortName = "-d", Description = "A description.", Order = 2)] + public string Description { get; set; } + + [Display(Name = "--total", ShortName = "-t", Description = "The total amount.", Order = 3)] + public decimal Total { get; set; } + } + + /// + /// Model where Order values are intentionally reversed so we can verify sorting. + /// + public class OrderedModel + { + [Display(Name = "--first", ShortName = "-f", Order = 10)] + public string First { get; set; } + + [Display(Name = "--second", ShortName = "-s", Order = 1)] + public string Second { get; set; } + } + + // ─── Concrete command helpers ───────────────────────────────────────────────── + + /// + /// Concrete command over SimpleModel that captures the parsed model. + /// + public class SimpleModelCommand : ModelCommand + { + public SimpleModel LastModel { get; private set; } + public int HandleCallCount { get; private set; } + + public SimpleModelCommand() : base("simple", "A simple command.") { } + + protected override Task OnHandleCommand(SimpleModel item) + { + LastModel = item; + HandleCallCount++; + return Task.FromResult(0); + } + } + + /// + /// Concrete command over AnnotatedModel that captures the parsed model. + /// + public class AnnotatedModelCommand : ModelCommand + { + public AnnotatedModel LastModel { get; private set; } + + public AnnotatedModelCommand() : base("create", "Create an invoice.") { } + + protected override Task OnHandleCommand(AnnotatedModel item) + { + LastModel = item; + return Task.FromResult(0); + } + } + + /// + /// Concrete command over AnnotatedModel that returns a non-zero exit code. + /// + public class FailingModelCommand : ModelCommand + { + public FailingModelCommand() : base("fail", "Always returns 2.") { } + + protected override Task OnHandleCommand(AnnotatedModel item) + { + return Task.FromResult(2); + } + } + + // ─── ModelCommand Construction Tests ───────────────────────────────────────── + + [TestFixture] + public class ModelCommandConstructionTests + { + [Test] + public void Constructor_NoLogger_SetsCommandName() + { + var cmd = new SimpleModelCommand(); + Assert.That(cmd.Name, Is.EqualTo("simple")); + } + + [Test] + public void Constructor_SetsCommandDescription() + { + var cmd = new SimpleModelCommand(); + Assert.That(cmd.Description, Is.EqualTo("A simple command.")); + } + + [Test] + public void Constructor_SimpleModel_RegistersTwoOptions() + { + var cmd = new SimpleModelCommand(); + // SimpleModel has Name and Count + Assert.That(cmd.Options.Count, Is.EqualTo(2)); + } + + [Test] + public void Constructor_AnnotatedModel_RegistersThreeOptions() + { + var cmd = new AnnotatedModelCommand(); + Assert.That(cmd.Options.Count, Is.EqualTo(3)); + } + } + + // ─── BuildOptions: option name/alias/description ───────────────────────────── + + [TestFixture] + public class ModelCommandBuildOptionsTests + { + private AnnotatedModelCommand _cmd; + private IList /// This method allows additional configuration of the host builder within the web application builder, /// enabling customization of the hosting environment. - public static class WebbApplicationBuilderDecorator + public static class WebApplicationBuilderDecorator { /// /// Configures the host builder for the specified . diff --git a/Src/AspNetCore/Diamond.Core.AspNetCore.Hosting/Diamond.Core.AspNetCore.Hosting.csproj b/Src/AspNetCore/Diamond.Core.AspNetCore.Hosting/Diamond.Core.AspNetCore.Hosting.csproj index 7259578e..fd2f25ab 100644 --- a/Src/AspNetCore/Diamond.Core.AspNetCore.Hosting/Diamond.Core.AspNetCore.Hosting.csproj +++ b/Src/AspNetCore/Diamond.Core.AspNetCore.Hosting/Diamond.Core.AspNetCore.Hosting.csproj @@ -7,9 +7,9 @@ Diamond.Core Patterns Library true true - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 https://github.com/porrey/Diamond.Core-Patterns LGPL-3.0-or-later https://github.com/porrey/Diamond.Core-Patterns diff --git a/Src/AspNetCore/Diamond.Core.AspNetCore.Rfc7807/Diamond.Core.AspNetCore.Rfc7807.csproj b/Src/AspNetCore/Diamond.Core.AspNetCore.Rfc7807/Diamond.Core.AspNetCore.Rfc7807.csproj index 04c7344b..826aa595 100755 --- a/Src/AspNetCore/Diamond.Core.AspNetCore.Rfc7807/Diamond.Core.AspNetCore.Rfc7807.csproj +++ b/Src/AspNetCore/Diamond.Core.AspNetCore.Rfc7807/Diamond.Core.AspNetCore.Rfc7807.csproj @@ -4,9 +4,9 @@ Diamond.Core Patterns Library true true - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 https://github.com/porrey/Diamond.Core-Patterns LGPL-3.0-or-later https://github.com/porrey/Diamond.Core-Patterns diff --git a/Src/AspNetCore/Diamond.Core.AspNetCore.Swagger/Diamond.Core.AspNetCore.Swagger.csproj b/Src/AspNetCore/Diamond.Core.AspNetCore.Swagger/Diamond.Core.AspNetCore.Swagger.csproj index 850e797c..d4e0dd44 100755 --- a/Src/AspNetCore/Diamond.Core.AspNetCore.Swagger/Diamond.Core.AspNetCore.Swagger.csproj +++ b/Src/AspNetCore/Diamond.Core.AspNetCore.Swagger/Diamond.Core.AspNetCore.Swagger.csproj @@ -4,9 +4,9 @@ Diamond.Core Patterns Library true true - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 https://github.com/porrey/Diamond.Core-Patterns LGPL-3.0-or-later https://github.com/porrey/Diamond.Core-Patterns diff --git a/Src/AutoMapper/Diamond.Core.AutoMapperExtensions/Diamond.Core.AutoMapperExtensions.csproj b/Src/AutoMapper/Diamond.Core.AutoMapperExtensions/Diamond.Core.AutoMapperExtensions.csproj index 2cd271d4..79b8c1bd 100644 --- a/Src/AutoMapper/Diamond.Core.AutoMapperExtensions/Diamond.Core.AutoMapperExtensions.csproj +++ b/Src/AutoMapper/Diamond.Core.AutoMapperExtensions/Diamond.Core.AutoMapperExtensions.csproj @@ -7,7 +7,7 @@ Diamond.Core Patterns Library true true - 10.1.4 + 10.1.5 Daniel M Porrey This library provides the Diamond dependency injection extensions for AutoMapper. Copyright © Daniel Porrey 2019-2026 @@ -15,8 +15,8 @@ https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns git - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 Diamond.Core.128x128.png en-US diff --git a/Src/Clonable/Diamond.Core.Clonable.Abstractions/Diamond.Core.Clonable.Abstractions.csproj b/Src/Clonable/Diamond.Core.Clonable.Abstractions/Diamond.Core.Clonable.Abstractions.csproj index 80786b73..a5cc1829 100755 --- a/Src/Clonable/Diamond.Core.Clonable.Abstractions/Diamond.Core.Clonable.Abstractions.csproj +++ b/Src/Clonable/Diamond.Core.Clonable.Abstractions/Diamond.Core.Clonable.Abstractions.csproj @@ -10,9 +10,9 @@ Diamond.Core Patterns Library Copyright © Daniel Porrey 2019-2026 This library provides abstractions for object cloning. - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 LGPL-3.0-or-later https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns diff --git a/Src/Clonable/Diamond.Core.Clonable.Microsoft/Diamond.Core.Clonable.Microsoft.csproj b/Src/Clonable/Diamond.Core.Clonable.Microsoft/Diamond.Core.Clonable.Microsoft.csproj index a1fd01f0..e12a176a 100755 --- a/Src/Clonable/Diamond.Core.Clonable.Microsoft/Diamond.Core.Clonable.Microsoft.csproj +++ b/Src/Clonable/Diamond.Core.Clonable.Microsoft/Diamond.Core.Clonable.Microsoft.csproj @@ -10,9 +10,9 @@ Diamond.Core Patterns Library Copyright © Daniel Porrey 2019-2026 This library provides object cloning using System.Text.Json. - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 LGPL-3.0-or-later https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns diff --git a/Src/Clonable/Diamond.Core.Clonable.Newtonsoft/Diamond.Core.Clonable.Newtonsoft.csproj b/Src/Clonable/Diamond.Core.Clonable.Newtonsoft/Diamond.Core.Clonable.Newtonsoft.csproj index 520d0111..af63de4d 100755 --- a/Src/Clonable/Diamond.Core.Clonable.Newtonsoft/Diamond.Core.Clonable.Newtonsoft.csproj +++ b/Src/Clonable/Diamond.Core.Clonable.Newtonsoft/Diamond.Core.Clonable.Newtonsoft.csproj @@ -10,9 +10,9 @@ Diamond.Core Patterns Library Copyright © Daniel Porrey 2019-2026 This library provides object cloning using Newtonsoft JSON.Net. - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 LGPL-3.0-or-later https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns diff --git a/Src/Clonable/Diamond.Core.Clonable/Diamond.Core.Clonable.csproj b/Src/Clonable/Diamond.Core.Clonable/Diamond.Core.Clonable.csproj index f9092ac4..a064842f 100755 --- a/Src/Clonable/Diamond.Core.Clonable/Diamond.Core.Clonable.csproj +++ b/Src/Clonable/Diamond.Core.Clonable/Diamond.Core.Clonable.csproj @@ -10,9 +10,9 @@ Diamond.Core Patterns Library Copyright © Daniel Porrey 2019-2026 This library provides object cloning. - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 LGPL-3.0-or-later https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns diff --git a/Src/Command Line/Diamond.Core.CommandLine.Abstractions/Diamond.Core.CommandLine.Abstractions.csproj b/Src/Command Line/Diamond.Core.CommandLine.Abstractions/Diamond.Core.CommandLine.Abstractions.csproj index 5d579e95..2492869b 100755 --- a/Src/Command Line/Diamond.Core.CommandLine.Abstractions/Diamond.Core.CommandLine.Abstractions.csproj +++ b/Src/Command Line/Diamond.Core.CommandLine.Abstractions/Diamond.Core.CommandLine.Abstractions.csproj @@ -4,7 +4,7 @@ Diamond.Core Patterns Library true true - 10.1.4 + 10.1.5 Daniel M Porrey This library provides abstractions for the command line and command pattern. Copyright © Daniel Porrey 2019-2026 @@ -12,8 +12,8 @@ https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns git - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 Diamond.Core.128x128.png en-US diff --git a/Src/Command Line/Diamond.Core.CommandLine.Model/Diamond.Core.CommandLine.Model.csproj b/Src/Command Line/Diamond.Core.CommandLine.Model/Diamond.Core.CommandLine.Model.csproj index f4c3bce4..21ef528f 100755 --- a/Src/Command Line/Diamond.Core.CommandLine.Model/Diamond.Core.CommandLine.Model.csproj +++ b/Src/Command Line/Diamond.Core.CommandLine.Model/Diamond.Core.CommandLine.Model.csproj @@ -4,9 +4,9 @@ Diamond.Core Patterns Library true true - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 Daniel M Porrey This library provides support for creating a command from a model. Copyright © Daniel Porrey 2019-2026 @@ -52,7 +52,7 @@ - + diff --git a/Src/Command Line/Diamond.Core.CommandLine/Diamond.Core.CommandLine.csproj b/Src/Command Line/Diamond.Core.CommandLine/Diamond.Core.CommandLine.csproj index 4011a02e..3006a673 100755 --- a/Src/Command Line/Diamond.Core.CommandLine/Diamond.Core.CommandLine.csproj +++ b/Src/Command Line/Diamond.Core.CommandLine/Diamond.Core.CommandLine.csproj @@ -4,9 +4,9 @@ Diamond.Core Patterns Library true true - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 Daniel M Porrey This library provides support for command line parsing and the command pattern. Copyright © Daniel Porrey 2019-2026 @@ -53,7 +53,7 @@ - + diff --git a/Src/Decorator/Diamond.Core.Decorator.Abstractions/Diamond.Core.Decorator.Abstractions.csproj b/Src/Decorator/Diamond.Core.Decorator.Abstractions/Diamond.Core.Decorator.Abstractions.csproj index e7e34430..32407076 100755 --- a/Src/Decorator/Diamond.Core.Decorator.Abstractions/Diamond.Core.Decorator.Abstractions.csproj +++ b/Src/Decorator/Diamond.Core.Decorator.Abstractions/Diamond.Core.Decorator.Abstractions.csproj @@ -8,9 +8,9 @@ Diamond.Core Patterns Library Copyright © Daniel Porrey 2019-2026 This library provides abstractions for the decorator factory. - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 Daniel M. Porrey LGPL-3.0-or-later https://github.com/porrey/Diamond.Core-Patterns diff --git a/Src/Decorator/Diamond.Core.Decorator/Diamond.Core.Decorator.csproj b/Src/Decorator/Diamond.Core.Decorator/Diamond.Core.Decorator.csproj index 209b6516..9ddd1b80 100755 --- a/Src/Decorator/Diamond.Core.Decorator/Diamond.Core.Decorator.csproj +++ b/Src/Decorator/Diamond.Core.Decorator/Diamond.Core.Decorator.csproj @@ -8,9 +8,9 @@ Diamond.Core Patterns Library Copyright © Daniel Porrey 2019-2026 This library provides a basic implementation of the decorator factory. - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 Daniel M. Porrey LGPL-3.0-or-later https://github.com/porrey/Diamond.Core-Patterns diff --git a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.Abstractions/Diamond.Core.Extensions.DependencyInjection.Abstractions.csproj b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.Abstractions/Diamond.Core.Extensions.DependencyInjection.Abstractions.csproj index 588d5916..c7e27fee 100755 --- a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.Abstractions/Diamond.Core.Extensions.DependencyInjection.Abstractions.csproj +++ b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.Abstractions/Diamond.Core.Extensions.DependencyInjection.Abstractions.csproj @@ -4,7 +4,7 @@ Diamond.Core Patterns Library true true - 10.1.4 + 10.1.5 Daniel M Porrey This library provides abstractions for the Diamond dependency injection extensions. Copyright © Daniel Porrey 2019-2026 @@ -12,8 +12,8 @@ https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns git - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 Diamond.Core.128x128.png en-US diff --git a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.Cosmos/Diamond.Core.Extensions.DependencyInjection.Cosmos.csproj b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.Cosmos/Diamond.Core.Extensions.DependencyInjection.Cosmos.csproj index dac4c25a..41587eea 100755 --- a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.Cosmos/Diamond.Core.Extensions.DependencyInjection.Cosmos.csproj +++ b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.Cosmos/Diamond.Core.Extensions.DependencyInjection.Cosmos.csproj @@ -4,7 +4,7 @@ Diamond.Core Patterns Library true true - 10.1.4 + 10.1.5 Daniel M Porrey This library provides JSON file based dependency injection for Azure Cosmo DB DbContext. Copyright © Daniel Porrey 2019-2026 @@ -12,8 +12,8 @@ https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns git - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 Diamond.Core.128x128.png en-US diff --git a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.EntityFrameworkCore/Diamond.Core.Extensions.DependencyInjection.EntityFrameworkCore.csproj b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.EntityFrameworkCore/Diamond.Core.Extensions.DependencyInjection.EntityFrameworkCore.csproj index ef215bb5..873446ff 100755 --- a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.EntityFrameworkCore/Diamond.Core.Extensions.DependencyInjection.EntityFrameworkCore.csproj +++ b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.EntityFrameworkCore/Diamond.Core.Extensions.DependencyInjection.EntityFrameworkCore.csproj @@ -4,7 +4,7 @@ Diamond.Core Patterns Library true true - 10.1.4 + 10.1.5 Daniel M Porrey This library provides JSON file based dependency injection for Entity Framework Core DbContext. Copyright © Daniel Porrey 2019-2026 @@ -12,8 +12,8 @@ https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns git - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 Diamond.Core.128x128.png en-US diff --git a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.InMemory/Diamond.Core.Extensions.DependencyInjection.InMemory.csproj b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.InMemory/Diamond.Core.Extensions.DependencyInjection.InMemory.csproj index 5d88a226..64d8b585 100755 --- a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.InMemory/Diamond.Core.Extensions.DependencyInjection.InMemory.csproj +++ b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.InMemory/Diamond.Core.Extensions.DependencyInjection.InMemory.csproj @@ -4,7 +4,7 @@ Diamond.Core Patterns Library true true - 10.1.4 + 10.1.5 Daniel M Porrey This library provides JSON file based dependency injection for In Memory DbContext. Copyright © Daniel Porrey 2019-2026 @@ -12,8 +12,8 @@ https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns git - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 Diamond.Core.128x128.png en-US diff --git a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.MySql/Diamond.Core.Extensions.DependencyInjection.MySql.csproj b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.MySql/Diamond.Core.Extensions.DependencyInjection.MySql.csproj index a551cec0..7114e6c7 100755 --- a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.MySql/Diamond.Core.Extensions.DependencyInjection.MySql.csproj +++ b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.MySql/Diamond.Core.Extensions.DependencyInjection.MySql.csproj @@ -4,7 +4,7 @@ Diamond.Core Patterns Library true true - 10.1.4 + 10.1.5 Daniel M Porrey This library provides JSON file based dependency injection for MySql DbContext. Copyright © Daniel Porrey 2019-2026 @@ -12,8 +12,8 @@ https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns git - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 Diamond.Core.128x128.png en-US diff --git a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.Oracle/Diamond.Core.Extensions.DependencyInjection.Oracle.csproj b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.Oracle/Diamond.Core.Extensions.DependencyInjection.Oracle.csproj index 2d7b93c2..68823099 100755 --- a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.Oracle/Diamond.Core.Extensions.DependencyInjection.Oracle.csproj +++ b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.Oracle/Diamond.Core.Extensions.DependencyInjection.Oracle.csproj @@ -4,7 +4,7 @@ Diamond.Core Patterns Library true true - 10.1.4 + 10.1.5 Daniel M Porrey This library provides JSON file based dependency injection for Azure Cosmo DB DbContext. Copyright © Daniel Porrey 2019-2026 @@ -12,8 +12,8 @@ https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns git - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 Diamond.Core.128x128.png en-US @@ -40,7 +40,7 @@ - + diff --git a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.PostgreSQL/Diamond.Core.Extensions.DependencyInjection.PostgreSQL.csproj b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.PostgreSQL/Diamond.Core.Extensions.DependencyInjection.PostgreSQL.csproj index 7600ca81..290103d3 100755 --- a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.PostgreSQL/Diamond.Core.Extensions.DependencyInjection.PostgreSQL.csproj +++ b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.PostgreSQL/Diamond.Core.Extensions.DependencyInjection.PostgreSQL.csproj @@ -4,7 +4,7 @@ Diamond.Core Patterns Library true true - 10.1.4 + 10.1.5 Daniel M Porrey This library provides JSON file based dependency injection for PostgreSQL DbContext. Copyright © Daniel Porrey 2019-2026 @@ -12,8 +12,8 @@ https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns git - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 Diamond.Core.128x128.png en-US diff --git a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.SqlServer/Diamond.Core.Extensions.DependencyInjection.SqlServer.csproj b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.SqlServer/Diamond.Core.Extensions.DependencyInjection.SqlServer.csproj index d709e583..69b6a89f 100755 --- a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.SqlServer/Diamond.Core.Extensions.DependencyInjection.SqlServer.csproj +++ b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.SqlServer/Diamond.Core.Extensions.DependencyInjection.SqlServer.csproj @@ -4,7 +4,7 @@ Diamond.Core Patterns Library true true - 10.1.4 + 10.1.5 Daniel M Porrey This library provides JSON file based dependency injection for SQL Server DbContext. Copyright © Daniel Porrey 2019-2026 @@ -12,8 +12,8 @@ https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns git - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 Diamond.Core.128x128.png en-US diff --git a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.Sqlite/Diamond.Core.Extensions.DependencyInjection.Sqlite.csproj b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.Sqlite/Diamond.Core.Extensions.DependencyInjection.Sqlite.csproj index aefe5423..e6b3e943 100755 --- a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.Sqlite/Diamond.Core.Extensions.DependencyInjection.Sqlite.csproj +++ b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection.Sqlite/Diamond.Core.Extensions.DependencyInjection.Sqlite.csproj @@ -4,7 +4,7 @@ Diamond.Core Patterns Library true true - 10.1.4 + 10.1.5 Daniel M Porrey This library provides JSON file based dependency injection for SQLite DbContext. Copyright © Daniel Porrey 2019-2026 @@ -12,8 +12,8 @@ https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns git - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 Diamond.Core.128x128.png en-US @@ -41,7 +41,7 @@ - + diff --git a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Diamond.Core.Extensions.DependencyInjection.csproj b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Diamond.Core.Extensions.DependencyInjection.csproj index fa68bee9..ab70aa50 100755 --- a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Diamond.Core.Extensions.DependencyInjection.csproj +++ b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Diamond.Core.Extensions.DependencyInjection.csproj @@ -4,7 +4,7 @@ Diamond.Core Patterns Library true true - 10.1.4 + 10.1.5 Daniel M Porrey This library provides the Diamond dependency injection extensions. Copyright © Daniel Porrey 2019-2026 @@ -12,8 +12,8 @@ https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns git - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 Diamond.Core.128x128.png en-US diff --git a/Src/Examples/Diamond.Core.Example.AutoMapperDependency.Profiles/Diamond.Core.Example.AutoMapperDependency.Profiles.csproj b/Src/Examples/Diamond.Core.Example.AutoMapperDependency.Profiles/Diamond.Core.Example.AutoMapperDependency.Profiles.csproj index ecfc7fc8..a6890e28 100644 --- a/Src/Examples/Diamond.Core.Example.AutoMapperDependency.Profiles/Diamond.Core.Example.AutoMapperDependency.Profiles.csproj +++ b/Src/Examples/Diamond.Core.Example.AutoMapperDependency.Profiles/Diamond.Core.Example.AutoMapperDependency.Profiles.csproj @@ -4,9 +4,9 @@ net10.0 enable disable - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 diff --git a/Src/Examples/Diamond.Core.Example.AutoMapperDependency/Diamond.Core.Example.AutoMapperDependency.csproj b/Src/Examples/Diamond.Core.Example.AutoMapperDependency/Diamond.Core.Example.AutoMapperDependency.csproj index cfef5841..968bcc74 100644 --- a/Src/Examples/Diamond.Core.Example.AutoMapperDependency/Diamond.Core.Example.AutoMapperDependency.csproj +++ b/Src/Examples/Diamond.Core.Example.AutoMapperDependency/Diamond.Core.Example.AutoMapperDependency.csproj @@ -6,9 +6,9 @@ enable disable AutoMapperCmd - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 diff --git a/Src/Examples/Diamond.Core.Example.BasicConsole/Diamond.Core.Example.BasicConsole.csproj b/Src/Examples/Diamond.Core.Example.BasicConsole/Diamond.Core.Example.BasicConsole.csproj index 7c098f3a..609f6bf8 100755 --- a/Src/Examples/Diamond.Core.Example.BasicConsole/Diamond.Core.Example.BasicConsole.csproj +++ b/Src/Examples/Diamond.Core.Example.BasicConsole/Diamond.Core.Example.BasicConsole.csproj @@ -2,9 +2,9 @@ Exe net10.0 - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 ConsoleExample @@ -31,7 +31,7 @@ - + diff --git a/Src/Examples/Diamond.Core.Example.ConsoleCommand/Diamond.Core.Example.ConsoleCommand.csproj b/Src/Examples/Diamond.Core.Example.ConsoleCommand/Diamond.Core.Example.ConsoleCommand.csproj index f09727a9..999b4019 100755 --- a/Src/Examples/Diamond.Core.Example.ConsoleCommand/Diamond.Core.Example.ConsoleCommand.csproj +++ b/Src/Examples/Diamond.Core.Example.ConsoleCommand/Diamond.Core.Example.ConsoleCommand.csproj @@ -3,9 +3,9 @@ Exe net10.0 CommandConsoleExample - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 diff --git a/Src/Examples/Diamond.Core.Example.DbContext/Diamond.Core.Example.DbContext.csproj b/Src/Examples/Diamond.Core.Example.DbContext/Diamond.Core.Example.DbContext.csproj index 558fca64..40d259b7 100644 --- a/Src/Examples/Diamond.Core.Example.DbContext/Diamond.Core.Example.DbContext.csproj +++ b/Src/Examples/Diamond.Core.Example.DbContext/Diamond.Core.Example.DbContext.csproj @@ -5,9 +5,9 @@ net10.0 enable disable - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 diff --git a/Src/Examples/Diamond.Core.Example.KeyedServices/Diamond.Core.Example.KeyedServices.csproj b/Src/Examples/Diamond.Core.Example.KeyedServices/Diamond.Core.Example.KeyedServices.csproj index daf24ca5..7fc9f04e 100644 --- a/Src/Examples/Diamond.Core.Example.KeyedServices/Diamond.Core.Example.KeyedServices.csproj +++ b/Src/Examples/Diamond.Core.Example.KeyedServices/Diamond.Core.Example.KeyedServices.csproj @@ -4,9 +4,9 @@ Exe net10.0 KeyedServices - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 diff --git a/Src/Examples/Diamond.Core.Example.LoadServices/Diamond.Core.Example.LoadServices.csproj b/Src/Examples/Diamond.Core.Example.LoadServices/Diamond.Core.Example.LoadServices.csproj index a0b936de..e5ba7098 100644 --- a/Src/Examples/Diamond.Core.Example.LoadServices/Diamond.Core.Example.LoadServices.csproj +++ b/Src/Examples/Diamond.Core.Example.LoadServices/Diamond.Core.Example.LoadServices.csproj @@ -4,9 +4,9 @@ Exe net10.0 LoadServices - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 diff --git a/Src/Examples/Diamond.Core.Example.Shared/Diamond.Core.Example.Shared.csproj b/Src/Examples/Diamond.Core.Example.Shared/Diamond.Core.Example.Shared.csproj index d891f1d5..e6cf8356 100755 --- a/Src/Examples/Diamond.Core.Example.Shared/Diamond.Core.Example.Shared.csproj +++ b/Src/Examples/Diamond.Core.Example.Shared/Diamond.Core.Example.Shared.csproj @@ -1,9 +1,9 @@  net10.0 - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 diff --git a/Src/Examples/Diamond.Core.Example.Unity/Diamond.Core.Example.Unity.csproj b/Src/Examples/Diamond.Core.Example.Unity/Diamond.Core.Example.Unity.csproj index a29a689b..5fd35f3e 100755 --- a/Src/Examples/Diamond.Core.Example.Unity/Diamond.Core.Example.Unity.csproj +++ b/Src/Examples/Diamond.Core.Example.Unity/Diamond.Core.Example.Unity.csproj @@ -2,9 +2,9 @@ Exe net10.0 - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 diff --git a/Src/Examples/Diamond.Core.Example.Web/Diamond.Core.Example.Web.csproj b/Src/Examples/Diamond.Core.Example.Web/Diamond.Core.Example.Web.csproj index d953c18a..490cef21 100755 --- a/Src/Examples/Diamond.Core.Example.Web/Diamond.Core.Example.Web.csproj +++ b/Src/Examples/Diamond.Core.Example.Web/Diamond.Core.Example.Web.csproj @@ -1,9 +1,9 @@  net10.0 - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 WebExample @@ -20,7 +20,7 @@ - + diff --git a/Src/Examples/Diamond.Core.Example.Wpf/Diamond.Core.Example.Wpf.csproj b/Src/Examples/Diamond.Core.Example.Wpf/Diamond.Core.Example.Wpf.csproj index d389f264..29f71b1c 100755 --- a/Src/Examples/Diamond.Core.Example.Wpf/Diamond.Core.Example.Wpf.csproj +++ b/Src/Examples/Diamond.Core.Example.Wpf/Diamond.Core.Example.Wpf.csproj @@ -4,9 +4,9 @@ net10.0-windows true Broadcast.ico - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 1701;1702;MC3074 diff --git a/Src/Hosting/Diamond.Core.Extensions.Hosting.Abstractions/Diamond.Core.Extensions.Hosting.Abstractions.csproj b/Src/Hosting/Diamond.Core.Extensions.Hosting.Abstractions/Diamond.Core.Extensions.Hosting.Abstractions.csproj index f1e458be..1c40ad6d 100755 --- a/Src/Hosting/Diamond.Core.Extensions.Hosting.Abstractions/Diamond.Core.Extensions.Hosting.Abstractions.csproj +++ b/Src/Hosting/Diamond.Core.Extensions.Hosting.Abstractions/Diamond.Core.Extensions.Hosting.Abstractions.csproj @@ -4,9 +4,9 @@ Diamond.Core Patterns Library true true - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 Daniel M Porrey This library provides abstractions for the Diamond hosting extensions. Copyright © Daniel Porrey 2019-2026 diff --git a/Src/Hosting/Diamond.Core.Extensions.Hosting/Diamond.Core.Extensions.Hosting.csproj b/Src/Hosting/Diamond.Core.Extensions.Hosting/Diamond.Core.Extensions.Hosting.csproj index 341ece28..38b91873 100755 --- a/Src/Hosting/Diamond.Core.Extensions.Hosting/Diamond.Core.Extensions.Hosting.csproj +++ b/Src/Hosting/Diamond.Core.Extensions.Hosting/Diamond.Core.Extensions.Hosting.csproj @@ -4,9 +4,9 @@ Diamond.Core Patterns Library true true - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 Daniel M Porrey This library provides the Diamond hosting extensions. Copyright © Daniel Porrey 2019-2026 diff --git a/Src/Repository/Diamond.Core.Repository.Abstractions/Diamond.Core.Repository.Abstractions.csproj b/Src/Repository/Diamond.Core.Repository.Abstractions/Diamond.Core.Repository.Abstractions.csproj index f79e0d3a..45a54c51 100755 --- a/Src/Repository/Diamond.Core.Repository.Abstractions/Diamond.Core.Repository.Abstractions.csproj +++ b/Src/Repository/Diamond.Core.Repository.Abstractions/Diamond.Core.Repository.Abstractions.csproj @@ -9,9 +9,9 @@ https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns git - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 Copyright © Daniel Porrey 2019-2026 This library provides abstractions for the repository pattern. Diamond.Core.128x128.png diff --git a/Src/Repository/Diamond.Core.Repository.DateTimeModel/Diamond.Core.Repository.DateTimeModel.csproj b/Src/Repository/Diamond.Core.Repository.DateTimeModel/Diamond.Core.Repository.DateTimeModel.csproj index 723f7de2..dbd860e1 100644 --- a/Src/Repository/Diamond.Core.Repository.DateTimeModel/Diamond.Core.Repository.DateTimeModel.csproj +++ b/Src/Repository/Diamond.Core.Repository.DateTimeModel/Diamond.Core.Repository.DateTimeModel.csproj @@ -9,9 +9,9 @@ https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns git - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 Copyright © Daniel Porrey 2019-2026 This library provides basic implementations of the repository pattern. Diamond.Core.128x128.png diff --git a/Src/Repository/Diamond.Core.Repository.EntityFrameworkCore/Diamond.Core.Repository.EntityFrameworkCore.csproj b/Src/Repository/Diamond.Core.Repository.EntityFrameworkCore/Diamond.Core.Repository.EntityFrameworkCore.csproj index 092df752..a3426bf3 100755 --- a/Src/Repository/Diamond.Core.Repository.EntityFrameworkCore/Diamond.Core.Repository.EntityFrameworkCore.csproj +++ b/Src/Repository/Diamond.Core.Repository.EntityFrameworkCore/Diamond.Core.Repository.EntityFrameworkCore.csproj @@ -8,9 +8,9 @@ Copyright © Daniel Porrey 2019-2026 This library provides an implementation of the repository that can be used with Entity Framework Core. - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 Daniel M. Porrey LGPL-3.0-or-later https://github.com/porrey/Diamond.Core-Patterns diff --git a/Src/Repository/Diamond.Core.Repository/Diamond.Core.Repository.csproj b/Src/Repository/Diamond.Core.Repository/Diamond.Core.Repository.csproj index 6b75fd53..75b7d9d0 100755 --- a/Src/Repository/Diamond.Core.Repository/Diamond.Core.Repository.csproj +++ b/Src/Repository/Diamond.Core.Repository/Diamond.Core.Repository.csproj @@ -9,9 +9,9 @@ https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns git - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 Copyright © Daniel Porrey 2019-2026 This library provides basic implementations of the repository pattern. Diamond.Core.128x128.png diff --git a/Src/Rules/Diamond.Core.Rules.Abstractions/Diamond.Core.Rules.Abstractions.csproj b/Src/Rules/Diamond.Core.Rules.Abstractions/Diamond.Core.Rules.Abstractions.csproj index f26f1000..2f739622 100755 --- a/Src/Rules/Diamond.Core.Rules.Abstractions/Diamond.Core.Rules.Abstractions.csproj +++ b/Src/Rules/Diamond.Core.Rules.Abstractions/Diamond.Core.Rules.Abstractions.csproj @@ -1,9 +1,9 @@ net10.0 - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 Daniel M. Porrey, Harshit Gindra Diamond Pattern Library - Rules Pattern This library provides abstractions for the Rules pattern. diff --git a/Src/Rules/Diamond.Core.Rules/Diamond.Core.Rules.csproj b/Src/Rules/Diamond.Core.Rules/Diamond.Core.Rules.csproj index 4a9d5521..aee6df3c 100755 --- a/Src/Rules/Diamond.Core.Rules/Diamond.Core.Rules.csproj +++ b/Src/Rules/Diamond.Core.Rules/Diamond.Core.Rules.csproj @@ -1,9 +1,9 @@ net10.0 - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 Daniel M. Porrey, Harshit Gindra Diamond Pattern Library - Rules Pattern This library provides a basic implementation of the Rules pattern. diff --git a/Src/Shared/Diamond.Core.Abstractions/Diamond.Core.Abstractions.csproj b/Src/Shared/Diamond.Core.Abstractions/Diamond.Core.Abstractions.csproj index 5900bc1a..a1b1d92c 100755 --- a/Src/Shared/Diamond.Core.Abstractions/Diamond.Core.Abstractions.csproj +++ b/Src/Shared/Diamond.Core.Abstractions/Diamond.Core.Abstractions.csproj @@ -2,9 +2,9 @@ net10.0 Diamond.Core Patterns Library - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 Daniel M. Porrey, Harshit Gindra git https://github.com/porrey/Diamond.Core-Patterns diff --git a/Src/Specification/Diamond.Core.Specification.Abstractions/Diamond.Core.Specification.Abstractions.csproj b/Src/Specification/Diamond.Core.Specification.Abstractions/Diamond.Core.Specification.Abstractions.csproj index ea853ae3..09d2fa10 100755 --- a/Src/Specification/Diamond.Core.Specification.Abstractions/Diamond.Core.Specification.Abstractions.csproj +++ b/Src/Specification/Diamond.Core.Specification.Abstractions/Diamond.Core.Specification.Abstractions.csproj @@ -11,10 +11,10 @@ https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns git - 10.1.4 + 10.1.5 This library provides abstractions for the specification pattern. - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 Diamond.Core.128x128.png en-US diff --git a/Src/Specification/Diamond.Core.Specification/Diamond.Core.Specification.csproj b/Src/Specification/Diamond.Core.Specification/Diamond.Core.Specification.csproj index ae0ba58c..2b6846b9 100755 --- a/Src/Specification/Diamond.Core.Specification/Diamond.Core.Specification.csproj +++ b/Src/Specification/Diamond.Core.Specification/Diamond.Core.Specification.csproj @@ -11,10 +11,10 @@ https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns git - 10.1.4 + 10.1.5 This library provides a default Specification factory. - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 Diamond.Core.128x128.png en-US https://raw.githubusercontent.com/porrey/Diamond.Core/master/Images/Diamond.Core.128x128.png diff --git a/Src/System/Diamond.Core.Performance/Diamond.Core.Performance.csproj b/Src/System/Diamond.Core.Performance/Diamond.Core.Performance.csproj index 3253db1d..b5a5b8a8 100644 --- a/Src/System/Diamond.Core.Performance/Diamond.Core.Performance.csproj +++ b/Src/System/Diamond.Core.Performance/Diamond.Core.Performance.csproj @@ -34,9 +34,9 @@ Diamond.Core Patterns Library Copyright © Daniel Porrey 2019-2026 This library provides code performance tools. - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 LGPL-3.0-or-later https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns diff --git a/Src/System/Diamond.Core.System.Base36/Diamond.Core.System.Base36.csproj b/Src/System/Diamond.Core.System.Base36/Diamond.Core.System.Base36.csproj index ee474bdd..0d8e2b57 100644 --- a/Src/System/Diamond.Core.System.Base36/Diamond.Core.System.Base36.csproj +++ b/Src/System/Diamond.Core.System.Base36/Diamond.Core.System.Base36.csproj @@ -33,9 +33,9 @@ Diamond.Core Patterns Library Copyright © Daniel Porrey 2019-2026 This library provides Base36 data type. - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 LGPL-3.0-or-later https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns diff --git a/Src/System/Diamond.Core.System.TemporaryFolder/Diamond.Core.System.TemporaryFolder.csproj b/Src/System/Diamond.Core.System.TemporaryFolder/Diamond.Core.System.TemporaryFolder.csproj index 05e0e252..3dd51ff6 100755 --- a/Src/System/Diamond.Core.System.TemporaryFolder/Diamond.Core.System.TemporaryFolder.csproj +++ b/Src/System/Diamond.Core.System.TemporaryFolder/Diamond.Core.System.TemporaryFolder.csproj @@ -10,9 +10,9 @@ Diamond.Core Patterns Library Copyright © Daniel Porrey 2019-2026 This library provides code performance tools. - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 LGPL-3.0-or-later https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns diff --git a/Src/System/Diamond.Core.System.Text/Diamond.Core.System.Text.csproj b/Src/System/Diamond.Core.System.Text/Diamond.Core.System.Text.csproj index 88242f01..3e9bda62 100755 --- a/Src/System/Diamond.Core.System.Text/Diamond.Core.System.Text.csproj +++ b/Src/System/Diamond.Core.System.Text/Diamond.Core.System.Text.csproj @@ -10,9 +10,9 @@ Diamond.Core Patterns Library Copyright © Daniel Porrey 2019-2026 This library provides string extensions. - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 LGPL-3.0-or-later https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns diff --git a/Src/Tests/Diamond.Core.Clonable.Tests/Diamond.Core.Clonable.Tests.csproj b/Src/Tests/Diamond.Core.Clonable.Tests/Diamond.Core.Clonable.Tests.csproj index db21df8c..e1f838fc 100644 --- a/Src/Tests/Diamond.Core.Clonable.Tests/Diamond.Core.Clonable.Tests.csproj +++ b/Src/Tests/Diamond.Core.Clonable.Tests/Diamond.Core.Clonable.Tests.csproj @@ -6,9 +6,9 @@ enable disable false - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 diff --git a/Src/Tests/Diamond.Core.Decorator.Tests/Diamond.Core.Decorator.Tests.csproj b/Src/Tests/Diamond.Core.Decorator.Tests/Diamond.Core.Decorator.Tests.csproj index 1409a380..f717b46c 100644 --- a/Src/Tests/Diamond.Core.Decorator.Tests/Diamond.Core.Decorator.Tests.csproj +++ b/Src/Tests/Diamond.Core.Decorator.Tests/Diamond.Core.Decorator.Tests.csproj @@ -6,9 +6,9 @@ enable disable false - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 diff --git a/Src/Tests/Diamond.Core.Rules.Tests/Diamond.Core.Rules.Tests.csproj b/Src/Tests/Diamond.Core.Rules.Tests/Diamond.Core.Rules.Tests.csproj index 884f69ce..6b3e4d9f 100644 --- a/Src/Tests/Diamond.Core.Rules.Tests/Diamond.Core.Rules.Tests.csproj +++ b/Src/Tests/Diamond.Core.Rules.Tests/Diamond.Core.Rules.Tests.csproj @@ -6,9 +6,9 @@ enable disable false - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 diff --git a/Src/Tests/Diamond.Core.Specification.Tests/Diamond.Core.Specification.Tests.csproj b/Src/Tests/Diamond.Core.Specification.Tests/Diamond.Core.Specification.Tests.csproj index 86dcfa87..8e6120e8 100644 --- a/Src/Tests/Diamond.Core.Specification.Tests/Diamond.Core.Specification.Tests.csproj +++ b/Src/Tests/Diamond.Core.Specification.Tests/Diamond.Core.Specification.Tests.csproj @@ -6,9 +6,9 @@ enable disable false - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 diff --git a/Src/Tests/Diamond.Core.System.Tests/Diamond.Core.System.Tests.csproj b/Src/Tests/Diamond.Core.System.Tests/Diamond.Core.System.Tests.csproj index 2c4118b6..c541af0b 100644 --- a/Src/Tests/Diamond.Core.System.Tests/Diamond.Core.System.Tests.csproj +++ b/Src/Tests/Diamond.Core.System.Tests/Diamond.Core.System.Tests.csproj @@ -6,9 +6,9 @@ enable disable false - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 diff --git a/Src/Unit of Work/Diamond.Core.UnitOfWork.Abstractions/Diamond.Core.UnitOfWork.Abstractions.csproj b/Src/Unit of Work/Diamond.Core.UnitOfWork.Abstractions/Diamond.Core.UnitOfWork.Abstractions.csproj index b8b26c52..daf2c672 100755 --- a/Src/Unit of Work/Diamond.Core.UnitOfWork.Abstractions/Diamond.Core.UnitOfWork.Abstractions.csproj +++ b/Src/Unit of Work/Diamond.Core.UnitOfWork.Abstractions/Diamond.Core.UnitOfWork.Abstractions.csproj @@ -8,9 +8,9 @@ Diamond.Core Patterns Library Copyright © Daniel Porrey 2019-2026 This library provides abstractions for the Unit of Work factory. - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 Daniel M. Porrey LGPL-3.0-or-later https://github.com/porrey/Diamond.Core-Patterns diff --git a/Src/Unit of Work/Diamond.Core.UnitOfWork/Diamond.Core.UnitOfWork.csproj b/Src/Unit of Work/Diamond.Core.UnitOfWork/Diamond.Core.UnitOfWork.csproj index 2ac26cb3..c3a74d3c 100755 --- a/Src/Unit of Work/Diamond.Core.UnitOfWork/Diamond.Core.UnitOfWork.csproj +++ b/Src/Unit of Work/Diamond.Core.UnitOfWork/Diamond.Core.UnitOfWork.csproj @@ -8,9 +8,9 @@ Diamond.Core Patterns Library Copyright © Daniel Porrey 2019-2026 This library provides a basic implementation of the Unit of Work factory. - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 Daniel M. Porrey LGPL-3.0-or-later https://github.com/porrey/Diamond.Core-Patterns diff --git a/Src/Workflow/Diamond.Core.Workflow.Abstractions/Diamond.Core.Workflow.Abstractions.csproj b/Src/Workflow/Diamond.Core.Workflow.Abstractions/Diamond.Core.Workflow.Abstractions.csproj index e6a6db00..bc8488ac 100644 --- a/Src/Workflow/Diamond.Core.Workflow.Abstractions/Diamond.Core.Workflow.Abstractions.csproj +++ b/Src/Workflow/Diamond.Core.Workflow.Abstractions/Diamond.Core.Workflow.Abstractions.csproj @@ -8,9 +8,9 @@ Diamond.Core Patterns Library Copyright © Daniel Porrey 2019-2026 This library provides abstractions for the workflow pattern. - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 LGPL-3.0-or-later Daniel M. Porrey https://github.com/porrey/Diamond.Core-Patterns diff --git a/Src/Workflow/Diamond.Core.Workflow.State.Abstractions/Diamond.Core.Workflow.State.Abstractions.csproj b/Src/Workflow/Diamond.Core.Workflow.State.Abstractions/Diamond.Core.Workflow.State.Abstractions.csproj index 90bf3aca..a07b4333 100644 --- a/Src/Workflow/Diamond.Core.Workflow.State.Abstractions/Diamond.Core.Workflow.State.Abstractions.csproj +++ b/Src/Workflow/Diamond.Core.Workflow.State.Abstractions/Diamond.Core.Workflow.State.Abstractions.csproj @@ -4,8 +4,8 @@ Diamond.Core Patterns Library true true - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 LGPL-3.0-or-later Copyright © Daniel Porrey 2019-2026 Daniel M. Porrey @@ -14,7 +14,7 @@ https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns git - 10.1.4 + 10.1.5 Diamond.Core.128x128.png en-US diff --git a/Src/Workflow/Diamond.Core.Workflow.State/Diamond.Core.Workflow.State.csproj b/Src/Workflow/Diamond.Core.Workflow.State/Diamond.Core.Workflow.State.csproj index bf5c465d..42f1bc5d 100644 --- a/Src/Workflow/Diamond.Core.Workflow.State/Diamond.Core.Workflow.State.csproj +++ b/Src/Workflow/Diamond.Core.Workflow.State/Diamond.Core.Workflow.State.csproj @@ -4,8 +4,8 @@ Diamond.Core Patterns Library true true - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 LGPL-3.0-or-later Copyright © Daniel Porrey 2019-2026 Daniel M. Porrey @@ -14,7 +14,7 @@ https://github.com/porrey/Diamond.Core-Patterns https://github.com/porrey/Diamond.Core-Patterns git - 10.1.4 + 10.1.5 Diamond.Core.128x128.png en-US https://raw.githubusercontent.com/porrey/Diamond.Core/master/Images/Diamond.Core.128x128.png diff --git a/Src/Workflow/Diamond.Core.Workflow.Steps/Diamond.Core.WorkFlow.Steps.csproj b/Src/Workflow/Diamond.Core.Workflow.Steps/Diamond.Core.WorkFlow.Steps.csproj index 29da8ce2..22cdcd17 100644 --- a/Src/Workflow/Diamond.Core.Workflow.Steps/Diamond.Core.WorkFlow.Steps.csproj +++ b/Src/Workflow/Diamond.Core.Workflow.Steps/Diamond.Core.WorkFlow.Steps.csproj @@ -8,9 +8,9 @@ Diamond.Core Patterns Library Copyright © Daniel Porrey 2019-2026 This library provides common workflow steps. - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 LGPL-3.0-or-later Daniel M. Porrey https://github.com/porrey/Diamond.Core-Patterns diff --git a/Src/Workflow/Diamond.Core.Workflow/Diamond.Core.Workflow.csproj b/Src/Workflow/Diamond.Core.Workflow/Diamond.Core.Workflow.csproj index 23160fc1..652ea3b3 100644 --- a/Src/Workflow/Diamond.Core.Workflow/Diamond.Core.Workflow.csproj +++ b/Src/Workflow/Diamond.Core.Workflow/Diamond.Core.Workflow.csproj @@ -8,9 +8,9 @@ Diamond.Core Patterns Library Copyright © Daniel Porrey 2019-2026 This library provides workflow interfaces and abstract or default implementations for common patterns. - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 LGPL-3.0-or-later Daniel M. Porrey https://github.com/porrey/Diamond.Core-Patterns diff --git a/Src/Wpf/Diamond.Core.Wpf.Abstractions/Diamond.Core.Wpf.Abstractions.csproj b/Src/Wpf/Diamond.Core.Wpf.Abstractions/Diamond.Core.Wpf.Abstractions.csproj index d0f40b41..275a91b3 100755 --- a/Src/Wpf/Diamond.Core.Wpf.Abstractions/Diamond.Core.Wpf.Abstractions.csproj +++ b/Src/Wpf/Diamond.Core.Wpf.Abstractions/Diamond.Core.Wpf.Abstractions.csproj @@ -5,9 +5,9 @@ Diamond.Core Patterns Library true true - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 LGPL-3.0-or-later Copyright © Daniel Porrey 2019-2026 Daniel M. Porrey diff --git a/Src/Wpf/Diamond.Core.Wpf/Diamond.Core.Wpf.csproj b/Src/Wpf/Diamond.Core.Wpf/Diamond.Core.Wpf.csproj index 421fc4b9..78943a7b 100755 --- a/Src/Wpf/Diamond.Core.Wpf/Diamond.Core.Wpf.csproj +++ b/Src/Wpf/Diamond.Core.Wpf/Diamond.Core.Wpf.csproj @@ -5,9 +5,9 @@ Diamond.Core Patterns Library true true - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5 LGPL-3.0-or-later Copyright © Daniel Porrey 2019-2026 Daniel M. Porrey From cbc34323f851dfba89f8cf1661ac65a198b93a78 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 31 Jul 2026 12:50:07 +0000 Subject: [PATCH 5/6] Fix multi-folder service loading: use AppContext.BaseDirectory and add ConfigureServicesFolders Co-authored-by: porrey <12475115+porrey@users.noreply.github.com> --- .../ServicesConfigurationFolderExtensions.cs | 54 +++++++++ .../ServicesHostBuilderExtensions.cs | 39 ++++++ .../ServicesConfigurationFolderProvider.cs | 112 ++++++++++-------- .../ServicesConfigurationFolderSource.cs | 9 ++ ...nd.Core.Extensions.DependencyInjection.xml | 85 ++++++++++++- 5 files changed, 244 insertions(+), 55 deletions(-) diff --git a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Decorators/ServicesConfigurationFolderExtensions.cs b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Decorators/ServicesConfigurationFolderExtensions.cs index 0079ec0b..f4c32061 100644 --- a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Decorators/ServicesConfigurationFolderExtensions.cs +++ b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Decorators/ServicesConfigurationFolderExtensions.cs @@ -118,5 +118,59 @@ public static IConfigurationBuilder AddServicesConfigurationFolder(this IConfigu /// An delegate used to configure the . /// The with the added configuration source. public static IConfigurationBuilder AddServicesConfigurationFolder(this IConfigurationBuilder builder, Action configureSource) => builder.Add(configureSource); + + /// + /// Adds multiple configuration folders to the as a single source, + /// ensuring array indices remain contiguous across all folders. + /// + /// Use this overload instead of chaining multiple + /// calls when you need services from more than one folder. Because all folders are loaded by a single + /// provider, array indices are kept contiguous and do not collide in the merged configuration. + /// The to which the configuration folders will be added. + /// The relative or absolute paths to the configuration folders. At least one path must be supplied. + /// The with the added configuration source. + /// Thrown if is or if is + /// or empty. + public static IConfigurationBuilder AddServicesConfigurationFolders(this IConfigurationBuilder builder, params string[] folderPaths) + { + return AddServicesConfigurationFolders(builder, provider: null, folderPaths: folderPaths, optional: true, reloadOnChange: false); + } + + /// + /// Adds multiple configuration folders to the as a single source, + /// ensuring array indices remain contiguous across all folders. + /// + /// The to which the configuration folders will be added. Cannot be . + /// The used to access the configuration files. Can be to use the + /// default file provider. + /// The relative or absolute paths to the configuration folders. At least one path must be supplied. + /// A value indicating whether the configuration folders are optional. If , the method will not + /// throw an exception if a folder does not exist. + /// A value indicating whether the configuration should automatically reload if the files in a folder change. + /// The instance with the configuration folders added. + /// Thrown if is or if is + /// or empty. + public static IConfigurationBuilder AddServicesConfigurationFolders(this IConfigurationBuilder builder, IFileProvider provider, IEnumerable folderPaths, bool optional, bool reloadOnChange) + { + ArgumentNullException.ThrowIfNull(builder); + + string[] paths = folderPaths?.ToArray() ?? []; + + if (paths.Length == 0) + { + throw new ArgumentNullException(nameof(folderPaths)); + } + + return builder.AddServicesConfigurationFolder(s => + { + s.FileProvider = provider; + s.Path = paths[0]; + s.AdditionalPaths = paths.Skip(1).ToList(); + s.Optional = optional; + s.ReloadOnChange = reloadOnChange; + s.ResolveFileProvider(); + }); + } } } diff --git a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Decorators/ServicesHostBuilderExtensions.cs b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Decorators/ServicesHostBuilderExtensions.cs index 102346ae..30cc1830 100755 --- a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Decorators/ServicesHostBuilderExtensions.cs +++ b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Decorators/ServicesHostBuilderExtensions.cs @@ -72,5 +72,44 @@ public static IHostBuilder ConfigureServicesFile(this IHostBuilder hostBuilder, config.AddServicesConfigurationFile(filePath: filePath, provider: provider, optional: optional, reloadOnChange: reloadOnChange); }); } + + /// + /// Configures the application to load configuration settings from multiple specified folders using a + /// single provider, ensuring array indices are contiguous across all folders. + /// + /// Use this method instead of chaining multiple calls when + /// loading from more than one folder. Because all folders are handled by a single provider, the array + /// indices used to store service descriptors remain contiguous and do not collide in the merged + /// configuration—preventing the "last folder wins" key-shadowing that would otherwise occur. + /// The instance to configure. + /// The paths to the folders containing configuration files. Paths can be relative or absolute. + /// The instance with the configuration applied. + public static IHostBuilder ConfigureServicesFolders(this IHostBuilder hostBuilder, params string[] folderPaths) + { + return hostBuilder.ConfigureAppConfiguration(config => + { + config.AddServicesConfigurationFolders(folderPaths); + }); + } + + /// + /// Configures the application to load configuration settings from multiple specified folders using a + /// single provider, ensuring array indices are contiguous across all folders. + /// + /// The instance to configure. + /// The paths to the folders containing configuration files. Paths can be relative or absolute. + /// An optional to use for accessing the configuration files. If not provided, the default file provider will be used. + /// to treat the folders as optional, meaning that if a folder does not exist, no error will + /// be thrown; otherwise, . The default value is . + /// to enable automatic reloading of configuration when files in any folder change; + /// otherwise, . The default value is . + /// The instance with the configuration applied. + public static IHostBuilder ConfigureServicesFolders(this IHostBuilder hostBuilder, IEnumerable folderPaths, IFileProvider provider = null, bool optional = true, bool reloadOnChange = false) + { + return hostBuilder.ConfigureAppConfiguration(config => + { + config.AddServicesConfigurationFolders(provider: provider, folderPaths: folderPaths, optional: optional, reloadOnChange: reloadOnChange); + }); + } } } diff --git a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Models/ServicesConfigurationFolderProvider.cs b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Models/ServicesConfigurationFolderProvider.cs index aa9e1d4a..eb367cc7 100644 --- a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Models/ServicesConfigurationFolderProvider.cs +++ b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Models/ServicesConfigurationFolderProvider.cs @@ -14,7 +14,6 @@ // You should have received a copy of the GNU Lesser General Public License // along with this program. If not, see http://www.gnu.org/licenses/. // -using System.Reflection; using Microsoft.Extensions.Configuration; namespace Diamond.Core.Extensions.DependencyInjection @@ -43,81 +42,96 @@ public ServicesConfigurationFolderProvider(ServicesConfigurationFolderSource sou { } + /// + /// Gets the typed configuration source for this provider. + /// + protected new ServicesConfigurationFolderSource Source => (ServicesConfigurationFolderSource)base.Source; + /// /// Loads configuration data from JSON files located in the specified directory and its subdirectories. /// - /// This method reads all JSON files in the directory specified by the - /// property, parses their contents into key-value pairs, and adds them to the services collection. If the - /// directory does not exist and the property is set to , a is thrown. The method ensures that indices across multiple files are - /// contiguous when parsing arrays. - /// Thrown if the directory specified by does not exist and is + /// This method reads all JSON files in the directory (or directories) specified by the + /// and properties, parses their contents into + /// key-value pairs, and adds them to the services collection. Array indices are kept contiguous across all + /// folders so that entries from different folders do not collide in the merged configuration. If a directory + /// does not exist and the property is set to , a is thrown. + /// Thrown if any directory does not exist and is /// . public override void Load() { // - // Get a DirectoryInfo object to convert relative paths to full paths. + // Build the ordered list of folder paths to process: primary path first, then any additional paths. // - string fullPath = $"{Path.GetDirectoryName(Assembly.GetEntryAssembly().Location)}/{this.Source.Path}"; - DirectoryInfo dir = new(fullPath); + IEnumerable allPaths = new[] { this.Source.Path } + .Concat(this.Source.AdditionalPaths ?? []) + .Where(p => !string.IsNullOrWhiteSpace(p)); // - // Ensure the directory exists. + // When reading arrays from multiple files/folders the index needs to be + // contiguous across all of them to avoid key collisions in the merged + // configuration. This index tracks the running offset. // - if (dir.Exists) - { - // - // Get all of the files. - // - FileInfo[] files = dir.GetFiles("*.json", SearchOption.AllDirectories); + int baseIndex = 0; + foreach (string folderPath in allPaths) + { // - // When reading the arrays from multiple files, the index needs to - // to be contiguous across the multiple files. This index will keep track. + // Use AppContext.BaseDirectory so that relative paths resolve correctly + // in all deployment models (including single-file executables). // - int baseIndex = 0; + string fullPath = Path.Combine(AppContext.BaseDirectory, folderPath); + DirectoryInfo dir = new(fullPath); - // - // Load each file. - // - foreach (FileInfo file in files) + if (dir.Exists) { // - // Read the JSON. - // - string json = File.ReadAllText(file.FullName); - - // - // Parse the data into a flattened dictionary. + // Get all of the files. // - IDictionary result = ServicesConfigurationFileParser.Parse(baseIndex, json); + FileInfo[] files = dir.GetFiles("*.json", SearchOption.AllDirectories); // - // Add the results to the current list. This list collects all values - // across the multiple files. + // Load each file, keeping the base index contiguous across files and folders. // - foreach (KeyValuePair item in result) + foreach (FileInfo file in files) { - if (item.Value != null) + // + // Read the JSON. + // + string json = File.ReadAllText(file.FullName); + + // + // Parse the data into a flattened dictionary. + // + IDictionary result = ServicesConfigurationFileParser.Parse(baseIndex, json); + + // + // Add the results to the current list. This list collects all values + // across the multiple files and folders. + // + foreach (KeyValuePair item in result) { - this.Data.Add(item); + if (item.Value != null) + { + this.Data.Add(item); + } } - } - // - // Update the base index for the next file. - // - baseIndex = this.Data.Count; + // + // Update the base index for the next file. + // + baseIndex = this.Data.Count; + } } - } - else - { - if (!this.Source.Optional) + else { - // - // The folder was not optional so throw an exception. - // - throw new DirectoryNotFoundException($"The configuration services path '{dir.FullName}' was not found."); + if (!this.Source.Optional) + { + // + // The folder was not optional so throw an exception. + // + throw new DirectoryNotFoundException($"The configuration services path '{dir.FullName}' was not found."); + } } } } diff --git a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Models/ServicesConfigurationFolderSource.cs b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Models/ServicesConfigurationFolderSource.cs index d616dd09..2de999bd 100644 --- a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Models/ServicesConfigurationFolderSource.cs +++ b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/Models/ServicesConfigurationFolderSource.cs @@ -26,6 +26,15 @@ namespace Diamond.Core.Extensions.DependencyInjection /// dependencies. public class ServicesConfigurationFolderSource : FileConfigurationSource { + /// + /// Gets or sets additional folder paths to include when loading service configuration files. + /// + /// When set, the provider will load JSON files from each path in this list (in order) in + /// addition to the primary . Array indices are kept + /// contiguous across all folders so that entries from different folders do not collide in the merged + /// configuration. + public IList AdditionalPaths { get; set; } = []; + /// /// Builds the for this source. /// diff --git a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/XmlDocs/Diamond.Core.Extensions.DependencyInjection.xml b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/XmlDocs/Diamond.Core.Extensions.DependencyInjection.xml index 93e59bad..9e957c20 100644 --- a/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/XmlDocs/Diamond.Core.Extensions.DependencyInjection.xml +++ b/Src/Dependency-Injection/Diamond.Core.Extensions.DependencyInjection/XmlDocs/Diamond.Core.Extensions.DependencyInjection.xml @@ -404,6 +404,37 @@ An delegate used to configure the . The with the added configuration source. + + + Adds multiple configuration folders to the as a single source, + ensuring array indices remain contiguous across all folders. + + Use this overload instead of chaining multiple + calls when you need services from more than one folder. Because all folders are loaded by a single + provider, array indices are kept contiguous and do not collide in the merged configuration. + The to which the configuration folders will be added. + The relative or absolute paths to the configuration folders. At least one path must be supplied. + The with the added configuration source. + Thrown if is or if is + or empty. + + + + Adds multiple configuration folders to the as a single source, + ensuring array indices remain contiguous across all folders. + + The to which the configuration folders will be added. Cannot be . + The used to access the configuration files. Can be to use the + default file provider. + The relative or absolute paths to the configuration folders. At least one path must be supplied. + A value indicating whether the configuration folders are optional. If , the method will not + throw an exception if a folder does not exist. + A value indicating whether the configuration should automatically reload if the files in a folder change. + The instance with the configuration folders added. + Thrown if is or if is + or empty. + Configures the application to load configuration settings from a specified folder. @@ -445,6 +476,33 @@ langword="false"/>. The host builder instance configured to use the specified services configuration file. + + + Configures the application to load configuration settings from multiple specified folders using a + single provider, ensuring array indices are contiguous across all folders. + + Use this method instead of chaining multiple calls when + loading from more than one folder. Because all folders are handled by a single provider, the array + indices used to store service descriptors remain contiguous and do not collide in the merged + configuration—preventing the "last folder wins" key-shadowing that would otherwise occur. + The instance to configure. + The paths to the folders containing configuration files. Paths can be relative or absolute. + The instance with the configuration applied. + + + + Configures the application to load configuration settings from multiple specified folders using a + single provider, ensuring array indices are contiguous across all folders. + + The instance to configure. + The paths to the folders containing configuration files. Paths can be relative or absolute. + An optional to use for accessing the configuration files. If not provided, the default file provider will be used. + to treat the folders as optional, meaning that if a folder does not exist, no error will + be thrown; otherwise, . The default value is . + to enable automatic reloading of configuration when files in any folder change; + otherwise, . The default value is . + The instance with the configuration applied. + Represents an exception that is thrown when a type alias with the specified key cannot be found. @@ -925,16 +983,22 @@ The configuration source that provides the service-based configuration data. This parameter cannot be . + + + Gets the typed configuration source for this provider. + + Loads configuration data from JSON files located in the specified directory and its subdirectories. - This method reads all JSON files in the directory specified by the - property, parses their contents into key-value pairs, and adds them to the services collection. If the - directory does not exist and the property is set to , a is thrown. The method ensures that indices across multiple files are - contiguous when parsing arrays. - Thrown if the directory specified by does not exist and is + This method reads all JSON files in the directory (or directories) specified by the + and properties, parses their contents into + key-value pairs, and adds them to the services collection. Array indices are kept contiguous across all + folders so that entries from different folders do not collide in the merged configuration. If a directory + does not exist and the property is set to , a is thrown. + Thrown if any directory does not exist and is . @@ -952,6 +1016,15 @@ from services. It is typically used in scenarios where configuration settings are dynamically provided by service dependencies. + + + Gets or sets additional folder paths to include when loading service configuration files. + + When set, the provider will load JSON files from each path in this list (in order) in + addition to the primary . Array indices are kept + contiguous across all folders so that entries from different folders do not collide in the merged + configuration. + Builds the for this source. From 1020b7f084129f15da33796a5f03002fd88ebbb7 Mon Sep 17 00:00:00 2001 From: Daniel Porrey Date: Fri, 31 Jul 2026 08:58:32 -0500 Subject: [PATCH 6/6] Fix typo in decorator name, add CommandLine test project Corrected XML doc/member typo to WebApplicationBuilderDecorator. Added Diamond.Core.CommandLine.Tests to solution and folder. Bumped test project version to 10.1.5. --- .../XmlDocs/Diamond.Core.AspNetCore.Hosting.xml | 6 +++--- Src/Diamond.Core Patterns Solution.sln | 7 +++++++ .../Diamond.Core.CommandLine.Tests.csproj | 6 +++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Src/AspNetCore/Diamond.Core.AspNetCore.Hosting/XmlDocs/Diamond.Core.AspNetCore.Hosting.xml b/Src/AspNetCore/Diamond.Core.AspNetCore.Hosting/XmlDocs/Diamond.Core.AspNetCore.Hosting.xml index b9de59b2..9e9a5215 100644 --- a/Src/AspNetCore/Diamond.Core.AspNetCore.Hosting/XmlDocs/Diamond.Core.AspNetCore.Hosting.xml +++ b/Src/AspNetCore/Diamond.Core.AspNetCore.Hosting/XmlDocs/Diamond.Core.AspNetCore.Hosting.xml @@ -4,7 +4,7 @@ Diamond.Core.AspNetCore.Hosting - + Configures the of the specified using the provided configuration action. @@ -12,7 +12,7 @@ This method allows additional configuration of the host builder within the web application builder, enabling customization of the hosting environment. - + Configures the host builder for the specified . @@ -23,7 +23,7 @@ An that configures the . The configured . - + Configures the specified using the provided configuration action. diff --git a/Src/Diamond.Core Patterns Solution.sln b/Src/Diamond.Core Patterns Solution.sln index bbd67aef..68e25918 100644 --- a/Src/Diamond.Core Patterns Solution.sln +++ b/Src/Diamond.Core Patterns Solution.sln @@ -167,6 +167,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Diamond.Core.Clonable.Tests EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{A1B2C3D4-E5F6-7890-ABCD-EF1234567806}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diamond.Core.CommandLine.Tests", "Tests\Diamond.Core.CommandLine.Tests\Diamond.Core.CommandLine.Tests.csproj", "{E399A0A7-ADB6-B968-C259-F696547F4910}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -437,6 +439,10 @@ Global {A1B2C3D4-E5F6-7890-ABCD-EF1234567805}.Debug|Any CPU.Build.0 = Debug|Any CPU {A1B2C3D4-E5F6-7890-ABCD-EF1234567805}.Release|Any CPU.ActiveCfg = Release|Any CPU {A1B2C3D4-E5F6-7890-ABCD-EF1234567805}.Release|Any CPU.Build.0 = Release|Any CPU + {E399A0A7-ADB6-B968-C259-F696547F4910}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E399A0A7-ADB6-B968-C259-F696547F4910}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E399A0A7-ADB6-B968-C259-F696547F4910}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E399A0A7-ADB6-B968-C259-F696547F4910}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -507,6 +513,7 @@ Global {A1B2C3D4-E5F6-7890-ABCD-EF1234567803} = {A1B2C3D4-E5F6-7890-ABCD-EF1234567806} {A1B2C3D4-E5F6-7890-ABCD-EF1234567804} = {A1B2C3D4-E5F6-7890-ABCD-EF1234567806} {A1B2C3D4-E5F6-7890-ABCD-EF1234567805} = {A1B2C3D4-E5F6-7890-ABCD-EF1234567806} + {E399A0A7-ADB6-B968-C259-F696547F4910} = {A1B2C3D4-E5F6-7890-ABCD-EF1234567806} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C3E8A73B-316C-4089-B281-E5E2E4109A3C} diff --git a/Src/Tests/Diamond.Core.CommandLine.Tests/Diamond.Core.CommandLine.Tests.csproj b/Src/Tests/Diamond.Core.CommandLine.Tests/Diamond.Core.CommandLine.Tests.csproj index ebe19741..cb7c23c1 100644 --- a/Src/Tests/Diamond.Core.CommandLine.Tests/Diamond.Core.CommandLine.Tests.csproj +++ b/Src/Tests/Diamond.Core.CommandLine.Tests/Diamond.Core.CommandLine.Tests.csproj @@ -6,9 +6,9 @@ enable disable false - 10.1.4 - 10.1.4 - 10.1.4 + 10.1.5 + 10.1.5 + 10.1.5