From 639db22e730d09837705837634f229facf532f68 Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sun, 16 Mar 2025 11:33:36 -0400 Subject: [PATCH 1/3] Update log4net to 3.0.4 This requires a switch from Log4Net.Async and Log4Net.Async.AsyncForwardingAppender to Easy.Logger and Easy.Logger.AsyncBufferingForwardingAppender as the former has been depreciated and no longer works with log4net 3.0.0+ --- Source/ACE.DatLoader/ACE.DatLoader.csproj | 2 +- Source/ACE.Database/ACE.Database.csproj | 2 +- Source/ACE.Server/ACE.Server.csproj | 4 ++-- Source/ACE.Server/log4net.config.docker | 6 +++++- Source/ACE.Server/log4net.config.example | 8 ++++++-- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Source/ACE.DatLoader/ACE.DatLoader.csproj b/Source/ACE.DatLoader/ACE.DatLoader.csproj index 096165aedd..22681af551 100644 --- a/Source/ACE.DatLoader/ACE.DatLoader.csproj +++ b/Source/ACE.DatLoader/ACE.DatLoader.csproj @@ -15,7 +15,7 @@ - + diff --git a/Source/ACE.Database/ACE.Database.csproj b/Source/ACE.Database/ACE.Database.csproj index 36f00018b1..e1c7a8286d 100644 --- a/Source/ACE.Database/ACE.Database.csproj +++ b/Source/ACE.Database/ACE.Database.csproj @@ -17,7 +17,7 @@ - + diff --git a/Source/ACE.Server/ACE.Server.csproj b/Source/ACE.Server/ACE.Server.csproj index f45361692a..208e599bc1 100644 --- a/Source/ACE.Server/ACE.Server.csproj +++ b/Source/ACE.Server/ACE.Server.csproj @@ -234,9 +234,9 @@ + - - + diff --git a/Source/ACE.Server/log4net.config.docker b/Source/ACE.Server/log4net.config.docker index 8a725e1345..f2c1217f0d 100644 --- a/Source/ACE.Server/log4net.config.docker +++ b/Source/ACE.Server/log4net.config.docker @@ -40,7 +40,11 @@ - + + + + + diff --git a/Source/ACE.Server/log4net.config.example b/Source/ACE.Server/log4net.config.example index e391214087..29b98bd696 100644 --- a/Source/ACE.Server/log4net.config.example +++ b/Source/ACE.Server/log4net.config.example @@ -38,9 +38,13 @@ - + - + + + + + From 602c2c6d1b20cbd5464d52b8760c6fe5b5946564 Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sun, 22 Jun 2025 17:57:49 -0400 Subject: [PATCH 2/3] Update ACE.Server.csproj --- Source/ACE.Server/ACE.Server.csproj | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Source/ACE.Server/ACE.Server.csproj b/Source/ACE.Server/ACE.Server.csproj index 51924f6cad..f49a5ff568 100644 --- a/Source/ACE.Server/ACE.Server.csproj +++ b/Source/ACE.Server/ACE.Server.csproj @@ -235,11 +235,8 @@ - - - - + From 4d5fe9ad6e3af96c2c5784aa1aaadfde5c6f3da0 Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sun, 22 Jun 2025 18:02:03 -0400 Subject: [PATCH 3/3] update to log4net 3.1.0 --- Source/ACE.DatLoader/ACE.DatLoader.csproj | 2 +- Source/ACE.Database/ACE.Database.csproj | 2 +- Source/ACE.Server/ACE.Server.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/ACE.DatLoader/ACE.DatLoader.csproj b/Source/ACE.DatLoader/ACE.DatLoader.csproj index 22681af551..bea9492621 100644 --- a/Source/ACE.DatLoader/ACE.DatLoader.csproj +++ b/Source/ACE.DatLoader/ACE.DatLoader.csproj @@ -15,7 +15,7 @@ - + diff --git a/Source/ACE.Database/ACE.Database.csproj b/Source/ACE.Database/ACE.Database.csproj index e1c7a8286d..52b32e9070 100644 --- a/Source/ACE.Database/ACE.Database.csproj +++ b/Source/ACE.Database/ACE.Database.csproj @@ -17,7 +17,7 @@ - + diff --git a/Source/ACE.Server/ACE.Server.csproj b/Source/ACE.Server/ACE.Server.csproj index f49a5ff568..cb0bdec192 100644 --- a/Source/ACE.Server/ACE.Server.csproj +++ b/Source/ACE.Server/ACE.Server.csproj @@ -236,7 +236,7 @@ - +