Skip to content

Commit 20438e1

Browse files
committed
Prep package for Nuget update
1 parent 935597c commit 20438e1

File tree

7 files changed

+70
-47
lines changed

7 files changed

+70
-47
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ devlord utilities
33
A useful class library for universal utilities such as error logging, email sending, and web service wrappers.
44

55
| Master | Develop | Nuget |
6-
| ----- | ----- | ----- |
6+
| ----- | ----- | ----- |
77
| [![Build status](https://ci.appveyor.com/api/projects/status/i0us4v5jxi6llk3e/branch/master?svg=true)](https://ci.appveyor.com/project/lorddev/utilities/branch/master) | [![Build status](https://ci.appveyor.com/api/projects/status/i0us4v5jxi6llk3e/branch/develop?svg=true)](https://ci.appveyor.com/project/lorddev/utilities/branch/develop) | [![NuGet Badge](https://buildstats.info/nuget/Devlord.Utilities)](https://www.nuget.org/packages/Devlord.Utilities/) |
88

99
### 5.0 Release notes

src/Devlord.Utilities/Devlord.Utilities.csproj

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,48 +4,52 @@
44
<TargetFrameworks>netstandard1.5;net462;net451;</TargetFrameworks>
55
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
66
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
7-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
7+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
88
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
9-
<Version>5.0.0.215</Version>
9+
<Version>5.0.0.232</Version>
1010
<Company>Devlords Cooperative</Company>
1111
<Authors>lorddev</Authors>
1212
<PackageProjectUrl>https://github.com/lorddev/utilities</PackageProjectUrl>
13+
<Copyright>Copyright © 2017 Aaron Lord</Copyright>
14+
<PackageLicenseUrl>https://raw.githubusercontent.com/lorddev/utilities/master/LICENSE</PackageLicenseUrl>
15+
<PackageIconUrl>https://raw.githubusercontent.com/lorddev/devlords-org/develop/Image.png</PackageIconUrl>
16+
<RepositoryUrl>https://github.com/lorddev/utilities</RepositoryUrl>
17+
<RepositoryType>Git</RepositoryType>
18+
<PackageTags>utils utilities email distance-matrix micro-orm logging encryption</PackageTags>
19+
<PackageSummary>Utilities class library so you don't have to rewrite your utilities on ever project.</PackageSummary>
20+
<PackageReleaseNotes>ph</PackageReleaseNotes>
1321
</PropertyGroup>
1422
<PropertyGroup>
1523
<!-- Makes the TypeScript compilation task a no-op -->
1624
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
17-
<!--
25+
<!--
1826
<PostBuildEvent>cd ../../..
19-
powershell.exe -NoProfile -File $(ProjectDir)vers-inc.ps1 Devlord.Utilities.csproj</PostBuildEvent>
27+
powershell.exe -NoProfile -File $(ProjectDir)vers-inc.ps1 Devlord.Utilities.csproj</PostBuildEvent>
2028
-->
2129
<PreBuildEvent></PreBuildEvent>
22-
<!--
23-
powershell.exe -File $(ProjectDir)\vers-inc.ps1 $(ProjectPath)
24-
-->
25-
</PropertyGroup>
30+
</PropertyGroup>
2631

2732
<ItemGroup>
2833
<PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
29-
<ProjectReference Include="..\Encryptamajig\Encryptamajig.csproj" />
34+
<ProjectReference Include="..\Encryptamajig\Encryptamajig.csproj" Version="1.1.0" />
3035
<PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.1" />
3136
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
3237
</ItemGroup>
3338

34-
<ItemGroup Condition="'$(TargetFramework)'=='netstandard1.5'">
35-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
39+
<ItemGroup Condition="'$(TargetFramework)'=='netstandard1.5'">
40+
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
3641
<PackageReference Include="System.Collections" Version="4.3.0" />
3742
<PackageReference Include="System.Threading.Timer" Version="4.3.0" />
3843
<PackageReference Include="MailKit" Version="1.12.0" />
39-
<PackageReference Include="Elmah.Io.AspNetCore" Version="3.2.39-pre" />
4044
<PackageReference Include="Microsoft.AspNetCore.Http" Version="1.1.1" />
41-
45+
4246
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
4347
<PackageReference Include="System.Runtime.Serialization.Xml" Version="4.3.0" />
4448
</ItemGroup>
45-
49+
4650
<ItemGroup Condition="'$(TargetFramework)'!='netstandard1.5'">
4751
<PackageReference Include="elmah" Version="1.2.2" />
48-
52+
4953
<Reference Include="System" />
5054
<Reference Include="System.Core" />
5155
<Reference Include="System.Net" />
@@ -59,7 +63,7 @@
5963
<Reference Include="System.Data" />
6064
<Reference Include="System.Xml" />
6165
</ItemGroup>
62-
66+
6367
<ItemGroup Condition="'$(TargetFramework)'=='net35'">
6468
<Reference Include="System.Web.Extensions" />
6569
</ItemGroup>
@@ -71,15 +75,15 @@
7175
<DependentUpon>ExceptionText.resx</DependentUpon>
7276
</Compile>
7377
</ItemGroup>
74-
78+
7579
<ItemGroup>
7680
<EmbeddedResource Update="Resources\ExceptionText.resx">
7781
<Generator>ResXFileCodeGenerator</Generator>
7882
<LastGenOutput>ExceptionText.Designer.cs</LastGenOutput>
7983
</EmbeddedResource>
8084
</ItemGroup>
8185

82-
<ItemGroup>
86+
<ItemGroup>
8387
<DotNetCliToolReference Include="dotnet-bump" Version="1.0.1" />
8488
</ItemGroup>
8589

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,35 @@
1-
<?xml version="1.0"?>
2-
<package >
3-
<metadata>
4-
<id>$id$</id>
5-
<version>5.0</version>
6-
<title>$title$</title>
7-
<authors>$author$</authors>
8-
<owners>$author$</owners>
9-
<licenseUrl>https://raw.githubusercontent.com/lorddev/utilities/master/LICENSE</licenseUrl>
10-
<projectUrl>https://github.com/lorddev/utilities</projectUrl>
11-
<iconUrl>https://raw.githubusercontent.com/lorddev/devlords-org/develop/Image.png</iconUrl>
12-
<requireLicenseAcceptance>false</requireLicenseAcceptance>
13-
<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, DataReader-to-POCO mapping, a mailer throttle, and strongly-typed API callers. Also includes a .NET Core-compatible build of Encryptamajig.</description>
14-
<releaseNotes>New IDataReader mapper for dynamic ORM.</releaseNotes>
15-
<copyright>Copyright © 2017 Aaron Lord</copyright>
16-
<tags>utils utilities email distance-matrix micro-orm logging encryption</tags>
17-
</metadata>
18-
<files>
19-
<!-- Add a readme -->
20-
<file src="../../README.md" target="" />
21-
</files>
22-
</package>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
3+
<!-- how to pack:
4+
1. Use Visual Studio "Pack" tool.
5+
2. Navigate to bin\Release
6+
3. Open the package in Nuget Package Explorer
7+
4. Add devlord.utilities.json to each folder via drag-and-drop
8+
5. Delete Encryptamajig Nuget dependency from netstandard1.5
9+
5. Add Encryptamajig.dll for netstandard1.5 via drag-and-drop
10+
6. Verify release notes
11+
-->
12+
<metadata>
13+
<id>Devlord.Utilities</id>
14+
<version>5.0.0</version>
15+
<title>Devlord.Utilities</title>
16+
<authors>lorddev</authors>
17+
<owners>Devlords Cooperative</owners>
18+
<licenseUrl>https://raw.githubusercontent.com/lorddev/utilities/master/LICENSE</licenseUrl>
19+
<projectUrl>https://github.com/lorddev/utilities</projectUrl>
20+
<iconUrl>https://raw.githubusercontent.com/lorddev/devlords-org/develop/Image.png</iconUrl>
21+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
22+
<summary>Utilities class library so you don't have to rewrite your utilities on ever project.</summary>
23+
<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, DataReader-to-POCO mapping, a mailer throttle, and strongly-typed API callers. Also includes a .NET Core-compatible build of Encryptamajig.</description>
24+
<releaseNotes>New IDataReader mapper for dynamic ORM.</releaseNotes>
25+
<copyright>Copyright © 2017 Aaron Lord</copyright>
26+
<tags>utils utilities email distance-matrix micro-orm logging encryption</tags>
27+
</metadata>
28+
<files>
29+
<file src="bin\Release\netstandard1.5\devlord.utilities.json" target="lib\netstandard1.5\devlord.utilities.json" />
30+
<file src="bin\Release\netstandard1.5\Encryptamajig.dll" target="lib\netstandard1.5\Encryptamajig.dll" />
31+
<file src="bin\Release\net462\devlord.utilities.json" target="net451\devlord.utilities.json" />
32+
<file src="bin\Release\net462\devlord.utilities.json" target="net462\devlord.utilities.json" />
33+
<file src="..\..\README.md" target="Devlord.Utilities.md" />
34+
</files>
35+
</package>

src/Devlord.Utilities/Logger.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#if NETSTANDARD1_5
88
using Microsoft.Extensions.Logging;
99
using Microsoft.AspNetCore.Http;
10-
using Elmah.Io;
10+
//using Elmah.Io;
1111
#endif
1212

1313
namespace Devlord.Utilities

src/Devlord.Utilities/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
88
[assembly: AssemblyTitle("Devlord.Utilities")]
9-
[assembly: AssemblyDescription("")]
9+
[assembly: AssemblyDescription("Multipurpose universal utilities library so you don't have to write your own utils for every project. Includes extensions, encapsulation of logging and encryption, DataReader-to-POCO mapping, a mailer throttle, and strongly-typed API callers. Also includes a .NET Core-compatible build of Encryptamajig.")]
1010
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCopyright("Copyright © 2017")]
1211
[assembly: AssemblyTrademark("")]
1312
[assembly: AssemblyCulture("")]
1413

src/Encryptamajig/Encryptamajig.csproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@
99
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
1010
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
1111
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
12+
<Version>1.1.0</Version>
13+
<PackageReleaseNotes>Supports .NET Core netstandard 1.5</PackageReleaseNotes>
14+
<PackageProjectUrl>https://github.com/jbubriski/Encryptamajig</PackageProjectUrl>
15+
<Authors>John Bubriski</Authors>
16+
<RepositoryUrl>https://github.com/jbubriski/Encryptamajig</RepositoryUrl>
17+
<RepositoryType>Git</RepositoryType>
18+
<PackageTags>Encryption</PackageTags>
1219
</PropertyGroup>
1320

1421

src/Encryptamajig/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[assembly: AssemblyTitle("Encryptamajig")]
99
[assembly: AssemblyDescription("A simple wrapper to the .NET AES encryption algorithm functionality.")]
1010
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("")]
11+
[assembly: AssemblyCompany("John Bubriski")]
1212
[assembly: AssemblyProduct("Encryptamajig")]
1313
[assembly: AssemblyCopyright("Copyright © John Bubriski 2013")]
1414
[assembly: AssemblyTrademark("")]
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("2.0")]
36-
[assembly: AssemblyFileVersion("2.0.0.0")]
35+
[assembly: AssemblyVersion("1.1")]
36+
[assembly: AssemblyFileVersion("1.0.0.0")]

0 commit comments

Comments
 (0)