Skip to content

Merge dev -> master #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
t-lair merged 7 commits into from
Feb 8, 2024
+237 −372
Merged

Merge dev -> master #148

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9ceafa1
Merge branch 'master' into develop
t-lair Dec 11, 2023
0fcdc70
Updated NLog.Targets.Stackify to NLog v4.7.15
snakefoot Jan 29, 2024
be4898a
Merge pull request #144 from snakefoot/master
homiedopie Jan 31, 2024
578d726
Update NLog.Targets.Stackify and NLog.Web.Stackify version and depend…
homiedopie Jan 31, 2024
3eb3c6b
Update pipeline for all packages
homiedopie Jan 31, 2024
7ec2d42
Fix Veracode pipeline for SCA scanning job with different image (#147)
t-lair Feb 5, 2024
45d15c9
Merge branch 'develop' into dev-to-master
t-lair Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updated NLog.Targets.Stackify to NLog v4.7.15
  • Loading branch information
@snakefoot
snakefoot committed Jan 29, 2024
commit 0fcdc7057b2e536a118e4061cc816ac0de0818b7
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@ packages/
**/obj/*
BuildOutput/
*.pfx
*.snk
*.snk
/.vs
4 changes: 2 additions & 2 deletions Src/NLog.Targets.Stackify/NLog.Targets.Stackify.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<Version>2.1.8-beta</Version>
<Version>2.2.13</Version>
<PackageLicenseUrl>https://github.com/stackify/stackify-api-dotnet/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/stackify/stackify-api-dotnet</PackageProjectUrl>
<PackageIconUrl>https://stackify.com/wp-content/uploads/2017/02/stk.png</PackageIconUrl>
Expand All @@ -26,7 +26,7 @@

<ItemGroup>
<ProjectReference Include="..\StackifyLib\StackifyLib.csproj" />
<PackageReference Include="NLog" Version="4.5.11" />
<PackageReference Include="NLog" Version="4.7.15" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
Expand Down
2 changes: 1 addition & 1 deletion Src/NLog.Targets.Stackify/StackifyTarget.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ protected override void Write(AsyncLogEventInfo logEvent)
}
catch (Exception ex)
{
InternalLogger.Error("StackifyTarget: Failed to send");
InternalLogger.Error(ex, "StackifyTarget: Failed to send");
logEvent.Continuation(ex); // Signal failure to NLog
StackifyAPILogger.Log(ex.ToString());
}
Expand Down
14 changes: 7 additions & 7 deletions Src/NLog.Web.Stackify/NLog.Web.Stackify.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<Version>2.1.1</Version>
<Version>2.2.13</Version>
<PackageLicenseUrl>https://github.com/stackify/stackify-api-dotnet/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/stackify/stackify-api-dotnet</PackageProjectUrl>
<PackageIconUrl>https://stackify.com/wp-content/uploads/2017/02/stk.png</PackageIconUrl>
Expand All @@ -25,13 +25,13 @@

<ItemGroup>
<ProjectReference Include="..\StackifyLib\StackifyLib.csproj" />
<PackageReference Include="NLog" Version="4.5.11" />
<PackageReference Include="NLog" Version="4.7.15" />
</ItemGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<DefineConstants>NETCORE</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net40' OR '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net461' ">
<DefineConstants>NETFULL</DefineConstants>
</PropertyGroup>
Expand All @@ -40,10 +40,10 @@
<Reference Include="System.Web" />
<Reference Include="System.Web.Abstractions" />
<Reference Include="System.Web.Routing" />
<PackageReference Include="NLog.Web" Version="4.8.0" />
<PackageReference Include="NLog.Web" Version="4.14.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="NLog.Web.AspNetCore" Version="4.8.0" />
<PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
</ItemGroup>
</Project>
Loading