Skip to content

Commit

Permalink
Prep package for Nuget update
Browse files Browse the repository at this point in the history
  • Loading branch information
lorddev committed Apr 3, 2017
1 parent 935597c commit 20438e1
Show file tree
Hide file tree
Showing 7 changed files with 70 additions and 47 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ devlord utilities
A useful class library for universal utilities such as error logging, email sending, and web service wrappers.

| Master | Develop | Nuget |
| ----- | ----- | ----- |
| ----- | ----- | ----- |
| [![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/) |

### 5.0 Release notes
Expand Down
40 changes: 22 additions & 18 deletions src/Devlord.Utilities/Devlord.Utilities.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,48 +4,52 @@
<TargetFrameworks>netstandard1.5;net462;net451;</TargetFrameworks>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<Version>5.0.0.215</Version>
<Version>5.0.0.232</Version>
<Company>Devlords Cooperative</Company>
<Authors>lorddev</Authors>
<PackageProjectUrl>https://github.com/lorddev/utilities</PackageProjectUrl>
<Copyright>Copyright © 2017 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>
<RepositoryUrl>https://github.com/lorddev/utilities</RepositoryUrl>
<RepositoryType>Git</RepositoryType>
<PackageTags>utils utilities email distance-matrix micro-orm logging encryption</PackageTags>
<PackageSummary>Utilities class library so you don't have to rewrite your utilities on ever project.</PackageSummary>
<PackageReleaseNotes>ph</PackageReleaseNotes>
</PropertyGroup>
<PropertyGroup>
<!-- Makes the TypeScript compilation task a no-op -->
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
<!--
<!--
<PostBuildEvent>cd ../../..
powershell.exe -NoProfile -File $(ProjectDir)vers-inc.ps1 Devlord.Utilities.csproj</PostBuildEvent>
powershell.exe -NoProfile -File $(ProjectDir)vers-inc.ps1 Devlord.Utilities.csproj</PostBuildEvent>
-->
<PreBuildEvent></PreBuildEvent>
<!--
powershell.exe -File $(ProjectDir)\vers-inc.ps1 $(ProjectPath)
-->
</PropertyGroup>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
<ProjectReference Include="..\Encryptamajig\Encryptamajig.csproj" />
<ProjectReference Include="..\Encryptamajig\Encryptamajig.csproj" Version="1.1.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='netstandard1.5'">
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
<ItemGroup Condition="'$(TargetFramework)'=='netstandard1.5'">
<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="Elmah.Io.AspNetCore" Version="3.2.39-pre" />
<PackageReference Include="Microsoft.AspNetCore.Http" Version="1.1.1" />

<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Xml" Version="4.3.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'!='netstandard1.5'">
<PackageReference Include="elmah" Version="1.2.2" />

<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Net" />
Expand All @@ -59,7 +63,7 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net35'">
<Reference Include="System.Web.Extensions" />
</ItemGroup>
Expand All @@ -71,15 +75,15 @@
<DependentUpon>ExceptionText.resx</DependentUpon>
</Compile>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="Resources\ExceptionText.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>ExceptionText.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>

<ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="dotnet-bump" Version="1.0.1" />
</ItemGroup>

Expand Down
57 changes: 35 additions & 22 deletions src/Devlord.Utilities/Devlord.Utilities.nuspec
Original file line number Diff line number Diff line change
@@ -1,22 +1,35 @@
<?xml version="1.0"?>
<package >
<metadata>
<id>$id$</id>
<version>5.0</version>
<title>$title$</title>
<authors>$author$</authors>
<owners>$author$</owners>
<licenseUrl>https://raw.githubusercontent.com/lorddev/utilities/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/lorddev/utilities</projectUrl>
<iconUrl>https://raw.githubusercontent.com/lorddev/devlords-org/develop/Image.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<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>
<releaseNotes>New IDataReader mapper for dynamic ORM.</releaseNotes>
<copyright>Copyright © 2017 Aaron Lord</copyright>
<tags>utils utilities email distance-matrix micro-orm logging encryption</tags>
</metadata>
<files>
<!-- Add a readme -->
<file src="../../README.md" target="" />
</files>
</package>
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<!-- how to pack:
1. Use Visual Studio "Pack" tool.
2. Navigate to bin\Release
3. Open the package in Nuget Package Explorer
4. Add devlord.utilities.json to each folder via drag-and-drop
5. Delete Encryptamajig Nuget dependency from netstandard1.5
5. Add Encryptamajig.dll for netstandard1.5 via drag-and-drop
6. Verify release notes
-->
<metadata>
<id>Devlord.Utilities</id>
<version>5.0.0</version>
<title>Devlord.Utilities</title>
<authors>lorddev</authors>
<owners>Devlords Cooperative</owners>
<licenseUrl>https://raw.githubusercontent.com/lorddev/utilities/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/lorddev/utilities</projectUrl>
<iconUrl>https://raw.githubusercontent.com/lorddev/devlords-org/develop/Image.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<summary>Utilities class library so you don't have to rewrite your utilities on ever project.</summary>
<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>
<releaseNotes>New IDataReader mapper for dynamic ORM.</releaseNotes>
<copyright>Copyright © 2017 Aaron Lord</copyright>
<tags>utils utilities email distance-matrix micro-orm logging encryption</tags>
</metadata>
<files>
<file src="bin\Release\netstandard1.5\devlord.utilities.json" target="lib\netstandard1.5\devlord.utilities.json" />
<file src="bin\Release\netstandard1.5\Encryptamajig.dll" target="lib\netstandard1.5\Encryptamajig.dll" />
<file src="bin\Release\net462\devlord.utilities.json" target="net451\devlord.utilities.json" />
<file src="bin\Release\net462\devlord.utilities.json" target="net462\devlord.utilities.json" />
<file src="..\..\README.md" target="Devlord.Utilities.md" />
</files>
</package>
2 changes: 1 addition & 1 deletion src/Devlord.Utilities/Logger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#if NETSTANDARD1_5
using Microsoft.Extensions.Logging;
using Microsoft.AspNetCore.Http;
using Elmah.Io;
//using Elmah.Io;
#endif

namespace Devlord.Utilities
Expand Down
3 changes: 1 addition & 2 deletions src/Devlord.Utilities/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Devlord.Utilities")]
[assembly: AssemblyDescription("")]
[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.")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCopyright("Copyright © 2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
7 changes: 7 additions & 0 deletions src/Encryptamajig/Encryptamajig.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<Version>1.1.0</Version>
<PackageReleaseNotes>Supports .NET Core netstandard 1.5</PackageReleaseNotes>
<PackageProjectUrl>https://github.com/jbubriski/Encryptamajig</PackageProjectUrl>
<Authors>John Bubriski</Authors>
<RepositoryUrl>https://github.com/jbubriski/Encryptamajig</RepositoryUrl>
<RepositoryType>Git</RepositoryType>
<PackageTags>Encryption</PackageTags>
</PropertyGroup>


Expand Down
6 changes: 3 additions & 3 deletions src/Encryptamajig/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[assembly: AssemblyTitle("Encryptamajig")]
[assembly: AssemblyDescription("A simple wrapper to the .NET AES encryption algorithm functionality.")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyCompany("John Bubriski")]
[assembly: AssemblyProduct("Encryptamajig")]
[assembly: AssemblyCopyright("Copyright © John Bubriski 2013")]
[assembly: AssemblyTrademark("")]
Expand All @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0")]
[assembly: AssemblyFileVersion("2.0.0.0")]
[assembly: AssemblyVersion("1.1")]
[assembly: AssemblyFileVersion("1.0.0.0")]

0 comments on commit 20438e1

Please sign in to comment.