Skip to content

Commit 897be05

Browse files
lorddevlorddev
committed
Finalize dependencies for 6.0
1 parent a8b3536 commit 897be05

File tree

4 files changed

+27
-136
lines changed

4 files changed

+27
-136
lines changed

‎src/Devlord.Utilities/Devlord.Utilities.5.0.0.231.nuspec‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎src/Devlord.Utilities/Devlord.Utilities.csproj‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,12 @@
3131
<ProjectReference Include="..\Encryptamajig\Encryptamajig.csproj" />
3232
<PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.1" />
3333
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
34-
<!--<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.0.0" />-->
35-
</ItemGroup>
36-
<ItemGroup>
37-
<None Include="bin\$(Configuration)\netstandard1.3\Encryptamajig.dll" Pack="true" PackagePath="lib\netstandard1.3\" />
38-
<None Include="bin\$(Configuration)\netstandard1.6\Encryptamajig.dll" Pack="true" PackagePath="lib\netstandard1.6\" />
3934
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
4035
<PackageReference Include="System.Collections" Version="4.3.0" />
4136
<PackageReference Include="System.Threading.Timer" Version="4.3.0" />
4237
<PackageReference Include="MailKit" Version="1.12.0" />
4338
<PackageReference Include="Microsoft.AspNetCore.Http" Version="1.1.1" />
4439
</ItemGroup>
45-
<ItemGroup Condition="'$(TargetFramework)'=='netstandard1.3' Or '$(TargetFramework)'=='netstandard1.6'">
46-
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
47-
<PackageReference Include="System.Runtime.Serialization.Xml" Version="4.3.0" />
48-
</ItemGroup>
4940
<ItemGroup>
5041
<Compile Update="Resources\ExceptionText.Designer.cs">
5142
<DesignTime>True</DesignTime>
@@ -62,9 +53,4 @@
6253
<ItemGroup>
6354
<DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="1.0.0" />
6455
</ItemGroup>
65-
<ItemGroup>
66-
<None Update="appsettings.json">
67-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
68-
</None>
69-
</ItemGroup>
7056
</Project>

‎src/Devlord.Utilities/Devlord.Utilities.nuspec‎

Lines changed: 27 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<id>Devlord.Utilities</id>
1010

1111
<!-- The package version number that is used when resolving dependencies -->
12-
<version>5.1.39</version>
12+
<version>6.0.0</version>
1313
<title>Devlord.Utilities</title>
1414

1515
<!-- Authors contain text that appears directly on the gallery -->
@@ -32,16 +32,16 @@
3232
<summary>Utilities class library so you don't have to rewrite your utilities on every project.</summary>
3333

3434
<!-- Any details about this particular release -->
35-
<releaseNotes>* Removed RssConverter class.
36-
37-
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>
35+
<releaseNotes>* Upgraded .NET targets to netstandard2.1 and net6.0
36+
* Refactored configuration for MailbotFactory and Throttles (see README)
37+
* Fixed bugs in API querystrings</releaseNotes>
3838

3939
<!-- The description can be used in package manager UI. Note that the
4040
nuget.org gallery uses information you add in the portal. -->
4141
<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>
4242

4343
<!-- Copyright information -->
44-
<copyright>Copyright © 2017 Aaron Lord</copyright>
44+
<copyright>Copyright © 2022 Aaron Lord</copyright>
4545

4646
<!-- Tags appear in the gallery and can be used for tag searches -->
4747
<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
5353

5454
<!-- Dependencies are automatically installed when the package is installed -->
5555
<dependencies>
56-
<group targetFramework=".NETStandard1.6">
57-
<dependency id="MailKit" version="1.12.0" exclude="Build,Analyzers" />
58-
<dependency id="Microsoft.Extensions.Configuration.Json" version="1.1.1" exclude="Build,Analyzers" />
56+
<group targetFramework=".NETStandard2.1">
57+
<dependency id="BCrypt.Net-Next" version="2.1.1" />
58+
<dependency id="Elmah.Io.AspNetCore" version="4.2.42" exclude="Build,Analyzers" />
59+
<!--<dependency id="Microsoft.Extensions.Options.ConfigurationExtensions" version="7.0.0" exclude="Build,Analyzers" />-->
60+
<dependency id="Newtonsoft.Json" version="13.0" exclude="Build,Analyzers" />
61+
<dependency id="System.Reflection.TypeExtensions" version="4.3.0" exclude="Build,Analyzers" />
5962
<dependency id="Microsoft.Extensions.Configuration" version="1.1.1" exclude="Build,Analyzers" />
60-
<dependency id="NETStandard.Library" version="1.6.1" exclude="Build,Analyzers" />
61-
<dependency id="Microsoft.AspNetCore.Http" version="1.1.1" exclude="Build,Analyzers" />
62-
<dependency id="System.Xml.XmlSerializer" version="4.3.0" exclude="Build,Analyzers" />
63+
<dependency id="Microsoft.Extensions.Configuration.Json" version="1.1.1" exclude="Build,Analyzers" />
6364
<dependency id="Microsoft.Extensions.Logging" version="1.1.1" exclude="Build,Analyzers" />
6465
<dependency id="System.Collections" version="4.3.0" exclude="Build,Analyzers" />
65-
<dependency id="System.Runtime.Serialization.Xml" version="4.3.0" exclude="Build,Analyzers" />
66-
<dependency id="Newtonsoft.Json" version="10.0.1" exclude="Build,Analyzers" />
6766
<dependency id="System.Threading.Timer" version="4.3.0" exclude="Build,Analyzers" />
68-
</group>
69-
<group targetFramework=".NETStandard1.3">
7067
<dependency id="MailKit" version="1.12.0" exclude="Build,Analyzers" />
71-
<dependency id="Microsoft.Extensions.Configuration.Json" version="1.1.1" exclude="Build,Analyzers" />
72-
<dependency id="Microsoft.Extensions.Configuration" version="1.1.1" exclude="Build,Analyzers" />
73-
<dependency id="NETStandard.Library" version="1.6.1" exclude="Build,Analyzers" />
7468
<dependency id="Microsoft.AspNetCore.Http" version="1.1.1" exclude="Build,Analyzers" />
75-
<dependency id="System.Xml.XmlSerializer" version="4.3.0" exclude="Build,Analyzers" />
69+
</group>
70+
<group targetFramework="net6.0">
71+
<dependency id="BCrypt.Net-Next" version="2.1.1" />
72+
<dependency id="Elmah.Io.AspNetCore" version="4.2.42" exclude="Build,Analyzers" />
73+
<!--<dependency id="Microsoft.Extensions.Options.ConfigurationExtensions" version="7.0.0" exclude="Build,Analyzers" />-->
74+
<dependency id="Newtonsoft.Json" version="13.0" exclude="Build,Analyzers" />
75+
<dependency id="System.Reflection.TypeExtensions" version="4.3.0" exclude="Build,Analyzers" />
76+
<dependency id="Microsoft.Extensions.Configuration" version="1.1.1" exclude="Build,Analyzers" />
77+
<dependency id="Microsoft.Extensions.Configuration.Json" version="1.1.1" exclude="Build,Analyzers" />
7678
<dependency id="Microsoft.Extensions.Logging" version="1.1.1" exclude="Build,Analyzers" />
7779
<dependency id="System.Collections" version="4.3.0" exclude="Build,Analyzers" />
78-
<dependency id="System.Runtime.Serialization.Xml" version="4.3.0" exclude="Build,Analyzers" />
79-
<dependency id="Newtonsoft.Json" version="10.0.1" exclude="Build,Analyzers" />
8080
<dependency id="System.Threading.Timer" version="4.3.0" exclude="Build,Analyzers" />
81-
</group>
82-
<group targetFramework=".NETFramework4.5.1">
83-
<dependency id="Microsoft.Extensions.Configuration.Json" version="1.1.1" exclude="Build,Analyzers" />
84-
<dependency id="Microsoft.Extensions.Configuration" version="1.1.1" exclude="Build,Analyzers" />
85-
<dependency id="elmah" version="1.2.2" exclude="Build,Analyzers" />
86-
<dependency id="Newtonsoft.Json" version="10.0.1" exclude="Build,Analyzers" />
81+
<dependency id="MailKit" version="1.12.0" exclude="Build,Analyzers" />
82+
<dependency id="Microsoft.AspNetCore.Http" version="1.1.1" exclude="Build,Analyzers" />
8783
</group>
8884
</dependencies>
8985
</metadata>
@@ -93,14 +89,10 @@ After installing, re-open your project and verify whether a copy of "devlord.uti
9389
<reference file="Encryptamajig.dll"/>
9490
</references>
9591
<files>
96-
97-
<file src="content\devlord.utilities.json" target="contentFiles\any\any\" />
98-
<file src="bin\Release\netstandard1.3\Devlord.Utilities.dll" target="lib\netstandard1.3" />
99-
<file src="bin\Release\netstandard1.3\Encryptamajig.dll" target="lib\netstandard1.3" />
100-
<file src="bin\Release\netstandard1.5\Devlord.Utilities.dll" target="lib\netstandard1.6" />
101-
<file src="bin\Release\netstandard1.5\Encryptamajig.dll" target="lib\netstandard1.6" />
102-
<file src="bin\Release\net451\Devlord.Utilities.dll" target="lib\net451" />
103-
<file src="bin\Release\net451\Encryptamajig.dll" target="lib\net451" />
92+
<file src="bin\Release\netstandard2.1\Devlord.Utilities.dll" target="lib\netstandard2.1" />
93+
<file src="bin\Release\netstandard2.1\Encryptamajig.dll" target="lib\netstandard2.1" />
94+
<file src="bin\Release\net6.0\Devlord.Utilities.dll" target="lib\net6.0" />
95+
<file src="bin\Release\net6.0\Encryptamajig.dll" target="lib\net6.0" />
10496
<!-- A readme.txt will be displayed when the package is installed -->
10597
<file src="..\..\README.md" target="" />
10698
</files>

‎src/Devlord.Utilities/app.config‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)