Skip to content

Commit

Permalink
Merge pull request #36 from MEAT-Inc/develop
Browse files Browse the repository at this point in the history
PR for Release of newest version logging
  • Loading branch information
ZacharyWalsh57 committed Mar 23, 2022
2 parents 2c5750a + aa18f00 commit 95d8ced
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 6 deletions.
4 changes: 2 additions & 2 deletions SharpWrapper/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
[assembly: InternalsVisibleTo("SharpWrap2534Tests")]

// Version information
[assembly: AssemblyVersion("3.3.1.251")]
[assembly: AssemblyFileVersion("3.3.1.251")]
[assembly: AssemblyVersion("3.3.3.253")]
[assembly: AssemblyFileVersion("3.3.3.253")]
[assembly: NeutralResourcesLanguageAttribute( "en-US" )]

6 changes: 3 additions & 3 deletions SharpWrapper/SharpWrap2534.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.7.12\lib\net45\NLog.dll</HintPath>
<HintPath>..\packages\SharpLogger.1.8.4.123\lib\net472\NLog.dll</HintPath>
</Reference>
<Reference Include="SharpLogger, Version=1.4.9.108, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SharpLogger.1.4.9.108\lib\net472\SharpLogger.dll</HintPath>
<Reference Include="SharpLogger, Version=1.7.4.122, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SharpLogger.1.8.4.123\lib\net472\SharpLogger.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
Expand Down
2 changes: 1 addition & 1 deletion SharpWrapper/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<packages>
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
<package id="NLog" version="4.7.12" targetFramework="net472" />
<package id="SharpLogger" version="1.4.9.108" targetFramework="net472" />
<package id="SharpLogger" version="1.8.4.123" targetFramework="net472" />
</packages>
45 changes: 45 additions & 0 deletions SharpWrapperNuget/NupkgConfig/SharpWrap2534.3.3.3.253.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<package >
<metadata>
<id>SharpWrap2534</id>
<version>3.3.3.253</version>
<title>SharpWrap2534</title>
<authors>Zachary Walsh - MEAT Inc</authors>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">AGPL-3.0-or-later</license>
<projectUrl>https://github.com/MEAT-Inc/Sharp2534Wrapper</projectUrl>
<repository type="git" url="https://github.com/MEAT-Inc/Sharp2534Wrapper/"/>
<description>
## **SharpWrap2534**
- SharpWrap2534 is an approach at trying to build and deploy and easily consumable, user friendly, J2534 API wrapper in C#.
- As always, pull this version in using the Nuget PM with the command
- ` dotnet add PROJECT package SharpWrap2534 --version LATEST `
---
### Change Log For Release
- Updating SharpWrap DLL to include the new SharpWrap logging NLog suite.
- Includes the changes for Async logging now.
</description>
<releaseNotes>
- Updating SharpWrap DLL to include the new SharpWrap logging NLog suite.
- Includes the changes for Async logging now.
</releaseNotes>
<copyright>MEAT Inc (2021)</copyright>
<tags>3.3.3.253-logging</tags>
<dependencies>
<group targetFramework=".NETFramework4.7.2">
<dependency id="NLog" version="4.7.12"/>
<dependency id="SharpLogger" version="1.4.10.109"/>
</group>
</dependencies>
<references>
<group targetFramework="net472">
<reference file="NLog.dll"/>
<reference file="SharpLogger.dll" />
<reference file="SharpWrap2534.dll" />
</group>
</references>
</metadata>
<files>
<file src="lib\net472\**\*.*" target="lib\net472"/>
</files>
</package>
Binary file modified SharpWrapperNuget/lib/net472/SharpLogger.dll
Binary file not shown.
Binary file modified SharpWrapperNuget/lib/net472/SharpWrap2534.dll
Binary file not shown.

0 comments on commit 95d8ced

Please sign in to comment.