Skip to content
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

Jump to bottom

Upgrade log4net to v2.0.12 #574

Merged
merged 3 commits into from
Feb 6, 2021
Merged

Upgrade log4net to v2.0.12 #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
272da18
Upgrade log4net to v2.0.10
jonorossi Feb 3, 2021
9729043
Need separate `App.config`s for `netfx`, `netcoreapp`
stakx Feb 6, 2021
5c36a86
Update log4net to v2.0.12
stakx Feb 6, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
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.12 (@jonorossi, @stakx, #574)

Deprecations:
- Removed support for the .NET Framework < 4.5 and .NET Standard 1.x. (@stakx, #495, #496)
Expand Down
12 changes: 11 additions & 1 deletion src/Castle.Core.Tests/Castle.Core.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,16 @@
<StartupObject>Program</StartupObject>
</PropertyGroup>

<ItemGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier(&quot;$(TargetFramework)&quot;))' == '.NETFramework'">
<None Include="config\netfx\App.config" />
<None Remove="config\netcoreapp\App.config" />
</ItemGroup>

<ItemGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier(&quot;$(TargetFramework)&quot;))' == '.NETCoreApp'">
<None Remove="config\netfx\App.config" />
<None Include="config\netcoreapp\App.config" />
</ItemGroup>

<ItemGroup>
<None Update="Services.Logging.Tests\log4netIntegration\log4net.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Expand All @@ -37,7 +47,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.12" />
<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
7 changes: 1 addition & 6 deletions src/Castle.Core.Tests/Services.Logging.Tests/log4netIntegration/log4net.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
35 changes: 35 additions & 0 deletions src/Castle.Core.Tests/config/netcoreapp/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0"?>
<configuration>

<!--
Version for .NET Core.

The `<system.diagnostics>` section is not preregistered,
and must be declared in `<configSections>` before use.
-->

<configSections>
<section name="system.diagnostics" type="System.Diagnostics.DiagnosticsConfigurationHandler" />
</configSections>

<system.diagnostics>
<trace autoflush="true"/>
<sources>
<source name="Default" switchValue="All">
<listeners>
<add name="default" type="Castle.Core.Logging.Tests.TraceLoggerTests+Listener, Castle.Core.Tests" initializeData="defaultrule"/>
</listeners>
</source>
<source name="Castle.Core.Logging.Tests.TraceLoggerTests" switchValue="All">
<listeners>
<add name="tests" type="Castle.Core.Logging.Tests.TraceLoggerTests+Listener, Castle.Core.Tests" initializeData="testsrule"/>
</listeners>
</source>
<source name="Castle.Core.Configuration" switchValue="All">
<listeners>
<add name="config" type="Castle.Core.Logging.Tests.TraceLoggerTests+Listener, Castle.Core.Tests" initializeData="configrule"/>
</listeners>
</source>
</sources>
</system.diagnostics>
</configuration>
8 changes: 8 additions & 0 deletions src/Castle.Core.Tests/App.config → ...Castle.Core.Tests/config/netfx/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
<?xml version="1.0"?>
<configuration>

<!--
Version for the .NET Framework version.

The `<system.diagnostics>` section is preregistered,
and must not be redeclared in `<configSections>`.
-->

<system.diagnostics>
<trace autoflush="true"/>
<sources>
Expand Down
2 changes: 1 addition & 1 deletion ...tle.Services.Logging.log4netIntegration/Castle.Services.Logging.log4netIntegration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</ItemGroup>

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

<ItemGroup>
Expand Down