Finalize dependencies for 6.0

lorddev · Dec 5, 2022 · 897be05 · 897be05
1 parent a8b3536
commit 897be05
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 136 deletions.
diff --git a/src/Devlord.Utilities/Devlord.Utilities.5.0.0.231.nuspec b/src/Devlord.Utilities/Devlord.Utilities.5.0.0.231.nuspec
diff --git a/src/Devlord.Utilities/Devlord.Utilities.csproj b/src/Devlord.Utilities/Devlord.Utilities.csproj
@@ -31,21 +31,12 @@
     <ProjectReference Include="..\Encryptamajig\Encryptamajig.csproj" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
-    <!--<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.0.0" />-->
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="bin\$(Configuration)\netstandard1.3\Encryptamajig.dll" Pack="true" PackagePath="lib\netstandard1.3\" />
-    <None Include="bin\$(Configuration)\netstandard1.6\Encryptamajig.dll" Pack="true" PackagePath="lib\netstandard1.6\" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
     <PackageReference Include="System.Collections" Version="4.3.0" />
     <PackageReference Include="System.Threading.Timer" Version="4.3.0" />
     <PackageReference Include="MailKit" Version="1.12.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="1.1.1" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='netstandard1.3' Or '$(TargetFramework)'=='netstandard1.6'">
-    <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
-    <PackageReference Include="System.Runtime.Serialization.Xml" Version="4.3.0" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Update="Resources\ExceptionText.Designer.cs">
       <DesignTime>True</DesignTime>
@@ -62,9 +53,4 @@
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="1.0.0" />
   </ItemGroup>
-  <ItemGroup>
-    <None Update="appsettings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
 </Project>
diff --git a/src/Devlord.Utilities/Devlord.Utilities.nuspec b/src/Devlord.Utilities/Devlord.Utilities.nuspec
@@ -9,7 +9,7 @@
         <id>Devlord.Utilities</id>
 
          <!-- The package version number that is used when resolving dependencies -->
-        <version>5.1.39</version>
+        <version>6.0.0</version>
         <title>Devlord.Utilities</title>
 
         <!-- Authors contain text that appears directly on the gallery -->
@@ -32,16 +32,16 @@
         <summary>Utilities class library so you don't have to rewrite your utilities on every project.</summary>
 
         <!-- Any details about this particular release -->
-        <releaseNotes>* Removed RssConverter class.
-
-After installing, re-open your project and verify whether a copy of "devlord.utilities.json" was automatically added. If not, make sure you add a copy to your project's root directory to set your SMTP settings. See the documentation on GitHub for more information. An upcoming release will address configuration issues more comprehensively.</releaseNotes>
+        <releaseNotes>* Upgraded .NET targets to netstandard2.1 and net6.0
+    * Refactored configuration for MailbotFactory and Throttles (see README)
+    * Fixed bugs in API querystrings</releaseNotes>
 
 	    <!-- The description can be used in package manager UI. Note that the
             nuget.org gallery uses information you add in the portal. -->
         <description>Multipurpose universal utilities library so you don't have to write your own utils for every project. Includes extensions, encapsulation of logging and encryption, basic datareader-to-POCO mapping, a mailer throttle, and strongly-typed API callers.</description>
 
         <!-- Copyright information -->
-        <copyright>Copyright © 2017 Aaron Lord</copyright>
+        <copyright>Copyright © 2022 Aaron Lord</copyright>
 
         <!-- Tags appear in the gallery and can be used for tag searches -->
         <tags>utils utilities email distance-matrix micro-orm logging encryption</tags>
@@ -53,37 +53,33 @@ After installing, re-open your project and verify whether a copy of "devlord.uti
 
 	    <!-- Dependencies are automatically installed when the package is installed -->
         <dependencies>
-            <group targetFramework=".NETStandard1.6">
-                <dependency id="MailKit" version="1.12.0" exclude="Build,Analyzers" />
-                <dependency id="Microsoft.Extensions.Configuration.Json" version="1.1.1" exclude="Build,Analyzers" />
+            <group targetFramework=".NETStandard2.1">
+                <dependency id="BCrypt.Net-Next" version="2.1.1" />
+                <dependency id="Elmah.Io.AspNetCore" version="4.2.42" exclude="Build,Analyzers" />
+                <!--<dependency id="Microsoft.Extensions.Options.ConfigurationExtensions" version="7.0.0" exclude="Build,Analyzers" />-->
+                <dependency id="Newtonsoft.Json" version="13.0" exclude="Build,Analyzers" />
+                <dependency id="System.Reflection.TypeExtensions" version="4.3.0" exclude="Build,Analyzers" />
                 <dependency id="Microsoft.Extensions.Configuration" version="1.1.1" exclude="Build,Analyzers" />
-                <dependency id="NETStandard.Library" version="1.6.1" exclude="Build,Analyzers" />
-                <dependency id="Microsoft.AspNetCore.Http" version="1.1.1" exclude="Build,Analyzers" />
-                <dependency id="System.Xml.XmlSerializer" version="4.3.0" exclude="Build,Analyzers" />
+                <dependency id="Microsoft.Extensions.Configuration.Json" version="1.1.1" exclude="Build,Analyzers" />
                 <dependency id="Microsoft.Extensions.Logging" version="1.1.1" exclude="Build,Analyzers" />
                 <dependency id="System.Collections" version="4.3.0" exclude="Build,Analyzers" />
-                <dependency id="System.Runtime.Serialization.Xml" version="4.3.0" exclude="Build,Analyzers" />
-                <dependency id="Newtonsoft.Json" version="10.0.1" exclude="Build,Analyzers" />
                 <dependency id="System.Threading.Timer" version="4.3.0" exclude="Build,Analyzers" />
-            </group>
-            <group targetFramework=".NETStandard1.3">
                 <dependency id="MailKit" version="1.12.0" exclude="Build,Analyzers" />
-                <dependency id="Microsoft.Extensions.Configuration.Json" version="1.1.1" exclude="Build,Analyzers" />
-                <dependency id="Microsoft.Extensions.Configuration" version="1.1.1" exclude="Build,Analyzers" />
-                <dependency id="NETStandard.Library" version="1.6.1" exclude="Build,Analyzers" />
                 <dependency id="Microsoft.AspNetCore.Http" version="1.1.1" exclude="Build,Analyzers" />
-                <dependency id="System.Xml.XmlSerializer" version="4.3.0" exclude="Build,Analyzers" />
+            </group>
+            <group targetFramework="net6.0">
+                <dependency id="BCrypt.Net-Next" version="2.1.1" />
+                <dependency id="Elmah.Io.AspNetCore" version="4.2.42" exclude="Build,Analyzers" />
+                <!--<dependency id="Microsoft.Extensions.Options.ConfigurationExtensions" version="7.0.0" exclude="Build,Analyzers" />-->
+                <dependency id="Newtonsoft.Json" version="13.0" exclude="Build,Analyzers" />
+                <dependency id="System.Reflection.TypeExtensions" version="4.3.0" exclude="Build,Analyzers" />
+                <dependency id="Microsoft.Extensions.Configuration" version="1.1.1" exclude="Build,Analyzers" />
+                <dependency id="Microsoft.Extensions.Configuration.Json" version="1.1.1" exclude="Build,Analyzers" />
                 <dependency id="Microsoft.Extensions.Logging" version="1.1.1" exclude="Build,Analyzers" />
                 <dependency id="System.Collections" version="4.3.0" exclude="Build,Analyzers" />
-                <dependency id="System.Runtime.Serialization.Xml" version="4.3.0" exclude="Build,Analyzers" />
-                <dependency id="Newtonsoft.Json" version="10.0.1" exclude="Build,Analyzers" />
                 <dependency id="System.Threading.Timer" version="4.3.0" exclude="Build,Analyzers" />
-            </group>
-            <group targetFramework=".NETFramework4.5.1">
-                <dependency id="Microsoft.Extensions.Configuration.Json" version="1.1.1" exclude="Build,Analyzers" />
-                <dependency id="Microsoft.Extensions.Configuration" version="1.1.1" exclude="Build,Analyzers" />
-                <dependency id="elmah" version="1.2.2" exclude="Build,Analyzers" />
-                <dependency id="Newtonsoft.Json" version="10.0.1" exclude="Build,Analyzers" />
+                <dependency id="MailKit" version="1.12.0" exclude="Build,Analyzers" />
+                <dependency id="Microsoft.AspNetCore.Http" version="1.1.1" exclude="Build,Analyzers" />
             </group>
         </dependencies>
     </metadata>
@@ -93,14 +89,10 @@ After installing, re-open your project and verify whether a copy of "devlord.uti
   	<reference file="Encryptamajig.dll"/>
   </references>
     <files>
-
-        <file src="content\devlord.utilities.json" target="contentFiles\any\any\" />
-        <file src="bin\Release\netstandard1.3\Devlord.Utilities.dll" target="lib\netstandard1.3" />
-        <file src="bin\Release\netstandard1.3\Encryptamajig.dll" target="lib\netstandard1.3" />
- 	    <file src="bin\Release\netstandard1.5\Devlord.Utilities.dll" target="lib\netstandard1.6" />
- 	    <file src="bin\Release\netstandard1.5\Encryptamajig.dll" target="lib\netstandard1.6" />
- 	    <file src="bin\Release\net451\Devlord.Utilities.dll" target="lib\net451" />
- 	    <file src="bin\Release\net451\Encryptamajig.dll" target="lib\net451" />
+        <file src="bin\Release\netstandard2.1\Devlord.Utilities.dll" target="lib\netstandard2.1" />
+        <file src="bin\Release\netstandard2.1\Encryptamajig.dll" target="lib\netstandard2.1" />
+ 	    <file src="bin\Release\net6.0\Devlord.Utilities.dll" target="lib\net6.0" />
+ 	    <file src="bin\Release\net6.0\Encryptamajig.dll" target="lib\net6.0" />
         <!-- A readme.txt will be displayed when the package is installed -->
         <file src="..\..\README.md" target="" />
     </files>

diff --git a/src/Devlord.Utilities/app.config b/src/Devlord.Utilities/app.config