From 272da18c2bd954752b7a8818ea435060168e3b0e Mon Sep 17 00:00:00 2001
From: Jonathon Rossi <jono@jonorossi.com>
Date: Wed, 3 Feb 2021 23:23:45 +1000
Subject: [PATCH 1/3] Upgrade log4net to v2.0.10

This version includes a fix for CVE-2018-1285.
---
 CHANGELOG.md                                               | 1 +
 src/Castle.Core.Tests/App.config                           | 6 +++---
 src/Castle.Core.Tests/Castle.Core.Tests.csproj             | 2 +-
 .../Services.Logging.Tests/log4netIntegration/log4net.xml  | 7 +------
 .../Castle.Services.Logging.log4netIntegration.csproj      | 2 +-
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37f52d171d..06a2829e89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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)
diff --git a/src/Castle.Core.Tests/App.config b/src/Castle.Core.Tests/App.config
index ae46bc7d6c..b685206bfd 100644
--- a/src/Castle.Core.Tests/App.config
+++ b/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>
@@ -20,7 +23,4 @@
 			</source>
 		</sources>
 	</system.diagnostics>
-	<startup>
-		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
-	</startup>
 </configuration>
\ No newline at end of file
diff --git a/src/Castle.Core.Tests/Castle.Core.Tests.csproj b/src/Castle.Core.Tests/Castle.Core.Tests.csproj
index a6b73851b1..d267ef7272 100644
--- a/src/Castle.Core.Tests/Castle.Core.Tests.csproj
+++ b/src/Castle.Core.Tests/Castle.Core.Tests.csproj
@@ -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" />
diff --git a/src/Castle.Core.Tests/Services.Logging.Tests/log4netIntegration/log4net.xml b/src/Castle.Core.Tests/Services.Logging.Tests/log4netIntegration/log4net.xml
index 6131049fe2..425e187406 100644
--- a/src/Castle.Core.Tests/Services.Logging.Tests/log4netIntegration/log4net.xml
+++ b/src/Castle.Core.Tests/Services.Logging.Tests/log4netIntegration/log4net.xml
@@ -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" />
@@ -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-->
@@ -30,7 +27,5 @@
 			<priority value="ALL" />
 			<appender-ref ref="Memory" />
 		</logger>
-
 	</log4net>
-
 </configuration>
\ No newline at end of file
diff --git a/src/Castle.Services.Logging.log4netIntegration/Castle.Services.Logging.log4netIntegration.csproj b/src/Castle.Services.Logging.log4netIntegration/Castle.Services.Logging.log4netIntegration.csproj
index 28f06b615a..290a152bef 100644
--- a/src/Castle.Services.Logging.log4netIntegration/Castle.Services.Logging.log4netIntegration.csproj
+++ b/src/Castle.Services.Logging.log4netIntegration/Castle.Services.Logging.log4netIntegration.csproj
@@ -25,7 +25,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="log4net" Version="2.0.8" />
+		<PackageReference Include="log4net" Version="2.0.10" />
 	</ItemGroup>
 
 	<ItemGroup>

From 97290431bca0434233fa40fe6aa769bb8728d9f3 Mon Sep 17 00:00:00 2001
From: Dominique Schuppli <stakx@eml.cc>
Date: Sat, 6 Feb 2021 11:03:48 +0100
Subject: [PATCH 2/3] Need separate `App.config`s for `netfx`, `netcoreapp`

---
 CHANGELOG.md                                  |  2 +-
 .../Castle.Core.Tests.csproj                  | 10 ++++++
 .../{ => config/netcoreapp}/App.config        |  9 +++++
 src/Castle.Core.Tests/config/netfx/App.config | 34 +++++++++++++++++++
 4 files changed, 54 insertions(+), 1 deletion(-)
 rename src/Castle.Core.Tests/{ => config/netcoreapp}/App.config (85%)
 create mode 100644 src/Castle.Core.Tests/config/netfx/App.config

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06a2829e89..65177c6231 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +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)
+- Upgrade log4net to v2.0.10 (@jonorossi, @stakx, #574)
 
 Deprecations:
  - Removed support for the .NET Framework < 4.5 and .NET Standard 1.x. (@stakx, #495, #496)
diff --git a/src/Castle.Core.Tests/Castle.Core.Tests.csproj b/src/Castle.Core.Tests/Castle.Core.Tests.csproj
index d267ef7272..d665045465 100644
--- a/src/Castle.Core.Tests/Castle.Core.Tests.csproj
+++ b/src/Castle.Core.Tests/Castle.Core.Tests.csproj
@@ -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>
diff --git a/src/Castle.Core.Tests/App.config b/src/Castle.Core.Tests/config/netcoreapp/App.config
similarity index 85%
rename from src/Castle.Core.Tests/App.config
rename to src/Castle.Core.Tests/config/netcoreapp/App.config
index b685206bfd..4ae491166f 100644
--- a/src/Castle.Core.Tests/App.config
+++ b/src/Castle.Core.Tests/config/netcoreapp/App.config
@@ -1,8 +1,17 @@
 <?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>
diff --git a/src/Castle.Core.Tests/config/netfx/App.config b/src/Castle.Core.Tests/config/netfx/App.config
new file mode 100644
index 0000000000..9db1320536
--- /dev/null
+++ b/src/Castle.Core.Tests/config/netfx/App.config
@@ -0,0 +1,34 @@
+<?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>
+			<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>
+	<startup>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+	</startup>
+</configuration>
\ No newline at end of file

From 5c36a8631130fb13fcb8417e2af7ccb5d808ad71 Mon Sep 17 00:00:00 2001
From: Dominique Schuppli <stakx@eml.cc>
Date: Sat, 6 Feb 2021 13:16:33 +0100
Subject: [PATCH 3/3] Update log4net to v2.0.12

Versions 2.0.10 and 2.0.11 appear to be affected by an issue in `Memory-
Appender` which breaks two of our unit tests.

See https://issues.apache.org/jira/projects/LOG4NET/issues/LOG4NET-649.
---
 CHANGELOG.md                                                    | 2 +-
 src/Castle.Core.Tests/Castle.Core.Tests.csproj                  | 2 +-
 .../Castle.Services.Logging.log4netIntegration.csproj           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65177c6231..68dfe004c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +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, @stakx, #574)
+- 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)
diff --git a/src/Castle.Core.Tests/Castle.Core.Tests.csproj b/src/Castle.Core.Tests/Castle.Core.Tests.csproj
index d665045465..844af8852e 100644
--- a/src/Castle.Core.Tests/Castle.Core.Tests.csproj
+++ b/src/Castle.Core.Tests/Castle.Core.Tests.csproj
@@ -47,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.10" />
+		<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" />
diff --git a/src/Castle.Services.Logging.log4netIntegration/Castle.Services.Logging.log4netIntegration.csproj b/src/Castle.Services.Logging.log4netIntegration/Castle.Services.Logging.log4netIntegration.csproj
index 290a152bef..51846bac8d 100644
--- a/src/Castle.Services.Logging.log4netIntegration/Castle.Services.Logging.log4netIntegration.csproj
+++ b/src/Castle.Services.Logging.log4netIntegration/Castle.Services.Logging.log4netIntegration.csproj
@@ -25,7 +25,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="log4net" Version="2.0.10" />
+		<PackageReference Include="log4net" Version="2.0.12" />
 	</ItemGroup>
 
 	<ItemGroup>