Skip to content

Commit

Permalink
Upgrade log4net to v2.0.10
Browse files Browse the repository at this point in the history
This version includes a fix for CVE-2018-1285.
  • Loading branch information
jonorossi authored and stakx committed Feb 6, 2021
1 parent 7eecd12 commit 272da18
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 11 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -12,6 +12,7 @@ Bugfixes:
- `private protected` methods are not intercepted (@CrispyDrone, #535)
- `System.UIntPtr` unsupported (@stakx, #546)
- DynamicProxy generates two modules when proceeding from a class proxy's protected method to the target, causing an `InvalidOperationException` when saving the generated assembly to disk (@stakx, #569)
- Upgrade log4net to v2.0.10 (@jonorossi, #567)

Deprecations:
- Removed support for the .NET Framework < 4.5 and .NET Standard 1.x. (@stakx, #495, #496)
Expand Down
6 changes: 3 additions & 3 deletions src/Castle.Core.Tests/App.config
@@ -1,5 +1,8 @@
<?xml version="1.0"?>
<configuration>
<configSections>
<section name="system.diagnostics" type="System.Diagnostics.DiagnosticsConfigurationHandler" />
</configSections>
<system.diagnostics>
<trace autoflush="true"/>
<sources>
Expand All @@ -20,7 +23,4 @@
</source>
</sources>
</system.diagnostics>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
</startup>
</configuration>
2 changes: 1 addition & 1 deletion src/Castle.Core.Tests/Castle.Core.Tests.csproj
Expand Up @@ -37,7 +37,7 @@
<PackageReference Include="NUnit.Console" Version="3.11.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
<PackageReference Include="NUnitLite" Version="3.12.0" />
<PackageReference Include="log4net" Version="2.0.8" />
<PackageReference Include="log4net" Version="2.0.10" />
<PackageReference Include="NLog" Version="4.5.0" />
<PackageReference Include="Serilog" Version="2.0.0" />
<PackageReference Include="Serilog.Sinks.TextWriter" Version="2.0.0" />
Expand Down
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>

<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
</configSections>

<log4net>

<log4net>
<appender name="Console" type="log4net.Appender.ConsoleAppender">
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date [%thread] %-5level %logger [%property{NDC}] - %message%newline" />
Expand All @@ -18,7 +16,6 @@
</layout>
</appender>


<!-- Setup the root category, add the appenders and set the default level -->
<root>
<!-- ALL, DEBUG, INFO, WARN, ERROR, FATAL, OFF-->
Expand All @@ -30,7 +27,5 @@
<priority value="ALL" />
<appender-ref ref="Memory" />
</logger>

</log4net>

</configuration>
Expand Up @@ -25,7 +25,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="log4net" Version="2.0.8" />
<PackageReference Include="log4net" Version="2.0.10" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 272da18

Please sign in to comment.