Fixed JSON serialization and updated READMEs

lorddev · lorddev · commit 3e52103c6a11 · 2026-02-28T13:05:32.000-08:00
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-devlord utilities
+Devlord.Utilities
 ====================
 
 
diff --git a/src/Devlord.Utilities.Mail/Botmail.cs b/src/Devlord.Utilities.Mail/Botmail.cs
@@ -6,9 +6,7 @@
 // <author>aaron@lorddesign.net</author>
 // --------------------------------------------------------------------------------------------------------------------
 
-using System.Collections.Generic;
-
-namespace Devlord.Utilities
+namespace Devlord.Utilities.Mail
 {
     /// <summary>
     /// The botmail.
diff --git a/src/Devlord.Utilities.Mail/Devlord.Utilities.Mail.csproj b/src/Devlord.Utilities.Mail/Devlord.Utilities.Mail.csproj
@@ -10,7 +10,7 @@
     <PackageProjectUrl>https://github.com/lorddev/utilities</PackageProjectUrl>
     <Copyright>Copyright © 2026 Aaron Lord</Copyright>
     <PackageLicenseUrl>https://raw.githubusercontent.com/lorddev/utilities/master/LICENSE</PackageLicenseUrl>
-    <PackageIconUrl>https://raw.githubusercontent.com/lorddev/devlords-org/develop/Image.png</PackageIconUrl>
+    <PackageIcon>devlord-105.png</PackageIcon>
     <RepositoryUrl>https://github.com/lorddev/utilities</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <PackageTags>utils utilities email gmail mailbot</PackageTags>
@@ -19,6 +19,11 @@
 
   </PropertyGroup>
   
+  <ItemGroup>
+    <None Include="README.md" Pack="true" PackagePath="\" />
+    <None Include="..\..\images\devlord-105.png" Pack="true" PackagePath="" />
+  </ItemGroup>
+  
   <ItemGroup>
     <ProjectReference Include="..\Devlord.Utilities\Devlord.Utilities.csproj" />
     <PackageReference Include="MailKit" Version="4.15.0" />
diff --git a/src/Devlord.Utilities.Mail/DevlordSettingsExtension.cs b/src/Devlord.Utilities.Mail/DevlordSettingsExtension.cs
@@ -12,7 +12,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Devlord.Utilities
+namespace Devlord.Utilities.Mail
 {
     public static class DevlordSettingsExtension
     {
diff --git a/src/Devlord.Utilities.Mail/GmailThrottles.cs b/src/Devlord.Utilities.Mail/GmailThrottles.cs
@@ -1,8 +1,4 @@
-﻿using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Devlord.Utilities
+﻿namespace Devlord.Utilities.Mail
 {
     /// <summary>
     /// The throttles.
diff --git a/src/Devlord.Utilities.Mail/IMailbotFactory.cs b/src/Devlord.Utilities.Mail/IMailbotFactory.cs
@@ -9,7 +9,7 @@
 // <author>Aaron Lord</author>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace Devlord.Utilities
+namespace Devlord.Utilities.Mail
 {
     public interface IMailbotFactory
     {
diff --git a/src/Devlord.Utilities.Mail/MailFormat.cs b/src/Devlord.Utilities.Mail/MailFormat.cs
@@ -1,4 +1,4 @@
-namespace Devlord.Utilities
+namespace Devlord.Utilities.Mail
 {
     public enum MailFormat
     {
diff --git a/src/Devlord.Utilities.Mail/MailThrottle.cs b/src/Devlord.Utilities.Mail/MailThrottle.cs
@@ -10,11 +10,7 @@
 // <author>aaron@lorddesign.net</author>
 // --------------------------------------------------------------------------------------------------------------------
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Devlord.Utilities
+namespace Devlord.Utilities.Mail
 {
     /// <summary>
     /// The mail throttle.
diff --git a/src/Devlord.Utilities.Mail/Mailbot.cs b/src/Devlord.Utilities.Mail/Mailbot.cs
@@ -10,12 +10,11 @@
 // <author>aaron@lorddesign.net</author>
 // --------------------------------------------------------------------------------------------------------------------
 
-using System.Threading.Tasks;
 using MailKit.Net.Smtp;
 using MailKit.Security;
 using MimeKit;
 
-namespace Devlord.Utilities
+namespace Devlord.Utilities.Mail
 {
     /// <summary>
     /// Multi-threaded mailer to keep your systems running by sending messages asynchronously. If you're using it in a
diff --git a/src/Devlord.Utilities.Mail/MailbotFactory.cs b/src/Devlord.Utilities.Mail/MailbotFactory.cs
@@ -9,14 +9,12 @@
 // <author>Aaron Lord</author>
 // --------------------------------------------------------------------------------------------------------------------
 
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using Devlord.Utilities.Exceptions;
 using Microsoft.Extensions.Options;
 
 [assembly: InternalsVisibleTo("Devlord.Utilities.Tests")]
-namespace Devlord.Utilities
+namespace Devlord.Utilities.Mail
 {
     public class MailbotFactory : IMailbotFactory
     {
diff --git a/src/Devlord.Utilities.Mail/README.md b/src/Devlord.Utilities.Mail/README.md
@@ -0,0 +1,69 @@
+Devlord.Utilities.Mail
+====================
+
+
+A useful class library for universal utilities like sending emails and consuming RESTful APIs.
+
+| Master      | Develop      | NuGet      |
+| -----       | -----        | -----      |
+| [![.NET](https://github.com/lorddev/utilities/actions/workflows/dotnet.yml/badge.svg)](https://github.com/lorddev/utilities/actions/workflows/dotnet.yml) | [![Build status](https://ci.appveyor.com/api/projects/status/i0us4v5jxi6llk3e/branch/develop?svg=true)](https://ci.appveyor.com/project/lorddev/utilities/branch/develop) | [NuGet](https://www.nuget.org/packages/Devlord.Utilities/) |
+
+To install Devlord.Utilities.Mail, run the following command in the Package Manager Console:
+
+    PM> Install-Package Devlord.Utilities.Mail
+
+Or from the command-line:
+
+    dotnet add package Devlord.Utilities.Mail
+
+### Changes from Devlord.Utilities 6.0
+
+* Mail utilities have been moved to the Devlord.Utilities.Mail package.
+* `Devlord.Utilities.Mail` is the new namespace.
+
+### Feature Summary
+
+* .NET Core compatibility
+* Email throttling to help you avoid being suspended by your ISP
+
+More details below, but for even _more_ details, see the [project wiki](https://github.com/lorddev/utilities/wiki).
+
+### Mailbot
+
+A multithreaded SMTP queued mail sender, has a configurable throttle for mail frequency sent by a single account.
+
+**Configuration**
+
+```json
+{
+  "Devlord.Utilities": {
+    "MailSettings": [
+      {
+        "Name": "Gmail",
+        "SmtpServer": "mail.google.com",
+        "SmtpPort": 587,
+        "SmtpPassword": "",
+        "MaxPerMinute": 500,
+        "MaxPerHour": 500,
+        "MaxPerDay": 500
+      }
+    ]
+  }
+}
+```
+
+### Contributing
+
+Yes, please!
+
+### License
+
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published
+by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Contact [lorddev](https://github.com/lorddev) on GitHub or [@devlord@hachyderm.io](https://hachyderm.io/@devlord) on Mastodon.
diff --git a/src/Devlord.Utilities.Mail/ThrottleInterval.cs b/src/Devlord.Utilities.Mail/ThrottleInterval.cs
@@ -1,4 +1,4 @@
-namespace Devlord.Utilities
+namespace Devlord.Utilities.Mail
 {
     /// <summary>
     /// The throttle interval.
diff --git a/src/Devlord.Utilities.Mail/Throttles.cs b/src/Devlord.Utilities.Mail/Throttles.cs
@@ -1,8 +1,4 @@
-﻿using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Devlord.Utilities
+﻿namespace Devlord.Utilities.Mail
 {
     /// <summary>
     /// The throttles.
diff --git a/src/Devlord.Utilities.MapsApi/Devlord.Utilities.MapsApi.csproj b/src/Devlord.Utilities.MapsApi/Devlord.Utilities.MapsApi.csproj
@@ -10,14 +10,19 @@
     <PackageProjectUrl>https://github.com/lorddev/utilities</PackageProjectUrl>
     <Copyright>Copyright © 2026 Aaron Lord</Copyright>
     <PackageLicenseUrl>https://raw.githubusercontent.com/lorddev/utilities/master/LICENSE</PackageLicenseUrl>
-    <PackageIconUrl>https://raw.githubusercontent.com/lorddev/devlords-org/develop/Image.png</PackageIconUrl>
+    <PackageIcon>devlord-105.png</PackageIcon>
     <RepositoryUrl>https://github.com/lorddev/utilities</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <PackageTags>utils utilities distance-matrix</PackageTags>
     <PackageSummary>Utilities class library so you don't have to rewrite your utilities on every project.</PackageSummary>
     <PackageReadmeFile>README.md</PackageReadmeFile>
 
   </PropertyGroup>
+  
+  <ItemGroup>
+    <None Include="README.md" Pack="true" PackagePath="\" />
+    <None Include="..\..\images\devlord-105.png" Pack="true" PackagePath="" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Devlord.Utilities\Devlord.Utilities.csproj" />
diff --git a/src/Devlord.Utilities.MapsApi/README.md b/src/Devlord.Utilities.MapsApi/README.md
@@ -0,0 +1,67 @@
+Devlord.Utilities.MapsApi
+====================
+
+
+A useful class library for universal utilities like sending emails and consuming RESTful APIs.
+
+| Master      | Develop      | NuGet      |
+| -----       | -----        | -----      |
+| [![.NET](https://github.com/lorddev/utilities/actions/workflows/dotnet.yml/badge.svg)](https://github.com/lorddev/utilities/actions/workflows/dotnet.yml) | [![Build status](https://ci.appveyor.com/api/projects/status/i0us4v5jxi6llk3e/branch/develop?svg=true)](https://ci.appveyor.com/project/lorddev/utilities/branch/develop) | [NuGet](https://www.nuget.org/packages/Devlord.Utilities/) |
+
+To install Devlord.Utilities.MapsApi, run the following command in the Package Manager Console:
+
+    PM> Install-Package Devlord.Utilities.MapsApi
+
+Or from the command-line:
+
+    dotnet add package Devlord.Utilities.MapsApi
+
+### Changes from Devlord.Utilities 6.0
+
+* UnderscoreContractResolver has been removed in favor of System.Text.Json snake case handling.
+* ValueText.Value has been changed from string to decimal.
+
+### Distance API
+
+POCO classes for accessing the Google Maps distance API.
+
+Usage with a custom JSON contract resolver that converts the Google JSON property names to POCO object properties.
+
+```csharp
+    const string BaseUri = "https://maps.googleapis.com/maps/api/distancematrix/json";
+
+    using (IApiCall client = new ApiCall(BaseUri,
+            new JsonSerializerSettings { ContractResolver = new UnderscoreContractResolver() }))
+    {
+        client.QueryParams.Add("sensor", "false");
+        client.QueryParams.Add("origins", "95969");
+        client.QueryParams.Add("destinations", "95928");
+        IApiResult<dynamic> result = client.Execute<DistanceResults>();
+    }
+```
+
+**Configuration**
+
+```json
+{
+  "Devlord.Utilities": {
+    "GoogleMapsApiKey": "",
+  }
+}
+```
+
+### Contributing
+
+Yes, please!
+
+### License
+
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published
+by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Contact [lorddev](https://github.com/lorddev) on GitHub or [@devlord@hachyderm.io](https://hachyderm.io/@devlord) on Mastodon.
diff --git a/test/Devlord.Utilities.Tests/DevlordTestConfiguration.cs b/test/Devlord.Utilities.Tests/DevlordTestConfiguration.cs
@@ -9,6 +9,7 @@
 // <author>Aaron Lord</author>
 // --------------------------------------------------------------------------------------------------------------------
 
+using Devlord.Utilities.Mail;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
diff --git a/test/Devlord.Utilities.Tests/MailTests.cs b/test/Devlord.Utilities.Tests/MailTests.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Devlord.Utilities.Exceptions;
+using Devlord.Utilities.Mail;
 using Xunit;
 
 namespace Devlord.Utilities.Tests

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-devlord utilities`
	`1`	`+Devlord.Utilities`
`2`	`2`	`====================`
`3`	`3`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`using Microsoft.Extensions.Configuration;`
`13`	`13`	`using Microsoft.Extensions.DependencyInjection;`
`14`	`14`
`15`		`-namespace Devlord.Utilities`
	`15`	`+namespace Devlord.Utilities.Mail`
`16`	`16`	`{`
`17`	`17`	`public static class DevlordSettingsExtension`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`// <author>Aaron Lord</author>`
`10`	`10`	`// --------------------------------------------------------------------------------------------------------------------`
`11`	`11`
`12`		`-namespace Devlord.Utilities`
	`12`	`+namespace Devlord.Utilities.Mail`
`13`	`13`	`{`
`14`	`14`	`public interface IMailbotFactory`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,12 @@`
`9`	`9`	`// <author>Aaron Lord</author>`
`10`	`10`	`// --------------------------------------------------------------------------------------------------------------------`
`11`	`11`
`12`		`-using System.Collections.Generic;`
`13`		`-using System.Linq;`
`14`	`12`	`using System.Runtime.CompilerServices;`
`15`	`13`	`using Devlord.Utilities.Exceptions;`
`16`	`14`	`using Microsoft.Extensions.Options;`
`17`	`15`
`18`	`16`	`[assembly: InternalsVisibleTo("Devlord.Utilities.Tests")]`
`19`		`-namespace Devlord.Utilities`
	`17`	`+namespace Devlord.Utilities.Mail`
`20`	`18`	`{`
`21`	`19`	`public class MailbotFactory : IMailbotFactory`
`22`	`20`	`{`