diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ff9ea35071..a50346c555 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,20 +28,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      # Several .NET Core versions will be used during the test run.
-      # The lowest version gets installed first in order to prevent
-      # "a newer version is already installed" install errors.
-
-      - name: Install .NET Core 2.1
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: 2.1.x
-
-      - name: Install .NET Core 3.1
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: 3.1.x
-
       - name: Install .NET 6.0
         uses: actions/setup-dotnet@v4
         with:
@@ -68,12 +54,6 @@ jobs:
       # Test
       # ----
 
-      - name: Test on .NET Core 2.1
-        run: dotnet test -c Release -f netcoreapp2.1 --no-build --no-restore -l "console;verbosity=detailed"
-
-      - name: Test on .NET Core 3.1
-        run: dotnet test -c Release -f netcoreapp3.1 --no-build --no-restore -l "console;verbosity=detailed"
-
       - name: Test on .NET 6.0
         run: dotnet test -c Release -f net6.0 --no-build --no-restore -l "console;verbosity=detailed"
 
diff --git a/Castle.Core.sln b/Castle.Core.sln
index 5f1450a217..a3257708f5 100644
--- a/Castle.Core.sln
+++ b/Castle.Core.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30011.22
+# Visual Studio Version 17
+VisualStudioVersion = 17.11.35312.102
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Castle Build", "Castle Build", "{1B999D24-B7AB-4997-96E7-08FA05325694}"
 	ProjectSection(SolutionItems) = preProject
@@ -37,6 +37,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub Actions", "GitHub Ac
 		.github\workflows\build.yml = .github\workflows\build.yml
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Castle.Services.Logging.EventLogIntegration", "src\Castle.Services.Logging.EventLogIntegration\Castle.Services.Logging.EventLogIntegration.csproj", "{93E71739-D2F2-4CE4-8F9F-0C564CBE6B21}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -67,6 +69,10 @@ Global
 		{14D86762-CF9B-4560-80C9-10C16DBE246C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{14D86762-CF9B-4560-80C9-10C16DBE246C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{14D86762-CF9B-4560-80C9-10C16DBE246C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{93E71739-D2F2-4CE4-8F9F-0C564CBE6B21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{93E71739-D2F2-4CE4-8F9F-0C564CBE6B21}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{93E71739-D2F2-4CE4-8F9F-0C564CBE6B21}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{93E71739-D2F2-4CE4-8F9F-0C564CBE6B21}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -76,6 +82,7 @@ Global
 		{344D907D-6641-4A61-94C2-4980B5804FE2} = {A598EE9B-41CE-4BE8-BF93-2C91F919F97E}
 		{91B2A82F-63F6-46B1-8EDC-5D029BCF6A2B} = {A598EE9B-41CE-4BE8-BF93-2C91F919F97E}
 		{149DB291-CBD6-4F82-A6A6-758E328DB946} = {1B999D24-B7AB-4997-96E7-08FA05325694}
+		{93E71739-D2F2-4CE4-8F9F-0C564CBE6B21} = {A598EE9B-41CE-4BE8-BF93-2C91F919F97E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {682D4399-4863-4813-B495-5FEDD22496ED}
diff --git a/appveyor.yml b/appveyor.yml
index f4204642d9..5857c16a3c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -54,8 +54,6 @@ for:
   after_build:
   - ps: |
       $wc = New-Object System.Net.WebClient
-      $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path "NetCoreClrTestResults.xml"))
-      $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path "NetCoreClrWeakNamedTestResults.xml"))
       $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path "Net60TestResults.xml"))
       $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path "Net60WeakNamedTestResults.xml"))
       $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path "DesktopClrTestResults.xml"))
@@ -70,6 +68,7 @@ for:
           nuget push ".\build\Castle.Core-log4net.${env:APPVEYOR_BUILD_VERSION}.nupkg" -ApiKey $env:NUGET_API_KEY -Source https://api.nuget.org/v3/index.json
           nuget push ".\build\Castle.Core-NLog.${env:APPVEYOR_BUILD_VERSION}.nupkg" -ApiKey $env:NUGET_API_KEY -Source https://api.nuget.org/v3/index.json
           nuget push ".\build\Castle.Core-Serilog.${env:APPVEYOR_BUILD_VERSION}.nupkg" -ApiKey $env:NUGET_API_KEY -Source https://api.nuget.org/v3/index.json
+          nuget push ".\build\Castle.Core-DiagnosticsLogger.${env:APPVEYOR_BUILD_VERSION}.nupkg" -ApiKey $env:NUGET_API_KEY -Source https://api.nuget.org/v3/index.json
       }
 
   # upload packages to AppVeyor
diff --git a/build.sh b/build.sh
index de988294da..fc76c1a4ba 100755
--- a/build.sh
+++ b/build.sh
@@ -47,13 +47,6 @@ echo --------------------
 mono ./src/Castle.Core.Tests/bin/Release/net462/Castle.Core.Tests.exe --result=DesktopClrTestResults.xml;format=nunit3
 mono ./src/Castle.Core.Tests.WeakNamed/bin/Release/net462/Castle.Core.Tests.WeakNamed.exe --result=DesktopClrWeakNamedTestResults.xml;format=nunit3
 
-echo ---------------------------
-echo Running NETCOREAPP3.1 Tests
-echo ---------------------------
-
-dotnet ./src/Castle.Core.Tests/bin/Release/netcoreapp3.1/Castle.Core.Tests.dll --result=NetCoreClrTestResults.xml;format=nunit3
-dotnet ./src/Castle.Core.Tests.WeakNamed/bin/Release/netcoreapp3.1/Castle.Core.Tests.WeakNamed.dll --result=NetCoreClrWeakNamedTestResults.xml;format=nunit3
-
 echo ---------------------------
 echo Running NET6.0 Tests
 echo ---------------------------
@@ -62,9 +55,7 @@ dotnet ./src/Castle.Core.Tests/bin/Release/net6.0/Castle.Core.Tests.dll --result
 dotnet ./src/Castle.Core.Tests.WeakNamed/bin/Release/net6.0/Castle.Core.Tests.WeakNamed.dll --result=Net60WeakNamedTestResults.xml;format=nunit3
 
 # Ensure that all test runs produced a protocol file:
-if [[ !( -f NetCoreClrTestResults.xml &&
-         -f NetCoreClrWeakNamedTestResults.xml &&
-         -f Net60TestResults.xml &&
+if [[ !( -f Net60TestResults.xml &&
          -f Net60WeakNamedTestResults.xml &&
          -f DesktopClrTestResults.xml &&
          -f DesktopClrWeakNamedTestResults.xml ) ]]; then
@@ -73,12 +64,6 @@ if [[ !( -f NetCoreClrTestResults.xml &&
 fi
 
 # Unit test failure
-NETCORE_FAILCOUNT=$(grep -F "One or more child tests had errors" NetCoreClrTestResults.xml NetCoreClrWeakNamedTestResults.xml | wc -l)
-if [ $NETCORE_FAILCOUNT -ne 0 ]
-then
-    echo "NetCore Tests have failed, failing the build"
-    exit 1
-fi
 
 NET60_FAILCOUNT=$(grep -F "One or more child tests had errors" Net60TestResults.xml Net60WeakNamedTestResults.xml | wc -l)
 if [ $NET60_FAILCOUNT -ne 0 ]
diff --git a/buildscripts/build.cmd b/buildscripts/build.cmd
index e3efe0333e..54cfd719d1 100644
--- a/buildscripts/build.cmd
+++ b/buildscripts/build.cmd
@@ -40,14 +40,6 @@ echo --------------------
 %UserProfile%\.nuget\packages\nunit.consolerunner\3.11.1\tools\nunit3-console.exe src/Castle.Core.Tests/bin/%Configuration%/net462/Castle.Core.Tests.exe --result=DesktopClrTestResults.xml;format=nunit3 || exit /b 1
 %UserProfile%\.nuget\packages\nunit.consolerunner\3.11.1\tools\nunit3-console.exe src/Castle.Core.Tests.WeakNamed/bin/%Configuration%/net462/Castle.Core.Tests.WeakNamed.exe --result=DesktopClrWeakNamedTestResults.xml;format=nunit3 || exit /b 1
 
-echo ---------------------------
-echo Running NETCOREAPP3.1 Tests
-echo ---------------------------
-
-dotnet .\src\Castle.Core.Tests\bin\%Configuration%\netcoreapp3.1\Castle.Core.Tests.dll --result=NetCoreClrTestResults.xml;format=nunit3 || exit /b 1
-dotnet .\src\Castle.Core.Tests.WeakNamed\bin\%Configuration%\netcoreapp3.1/Castle.Core.Tests.WeakNamed.dll --result=NetCoreClrWeakNamedTestResults.xml;format=nunit3 || exit /b 1
-
-
 echo ---------------------------
 echo Running NET6.0 Tests
 echo ---------------------------
diff --git a/ref/Castle.Core-net462.cs b/ref/Castle.Core-net462.cs
index a463161bc5..246d7ae0c0 100644
--- a/ref/Castle.Core-net462.cs
+++ b/ref/Castle.Core-net462.cs
@@ -1993,25 +1993,6 @@ public ConsoleLogger(string name, Castle.Core.Logging.LoggerLevel logLevel) { }
         public override Castle.Core.Logging.ILogger CreateChildLogger(string loggerName) { }
         protected override void Log(Castle.Core.Logging.LoggerLevel loggerLevel, string loggerName, string message, System.Exception exception) { }
     }
-    [System.Serializable]
-    public class DiagnosticsLogger : Castle.Core.Logging.LevelFilteredLogger, System.IDisposable
-    {
-        public DiagnosticsLogger(string logName) { }
-        public DiagnosticsLogger(string logName, string source) { }
-        public DiagnosticsLogger(string logName, string machineName, string source) { }
-        public override Castle.Core.Logging.ILogger CreateChildLogger(string loggerName) { }
-        public void Dispose() { }
-        protected virtual void Dispose(bool disposing) { }
-        protected override void Finalize() { }
-        protected override void Log(Castle.Core.Logging.LoggerLevel loggerLevel, string loggerName, string message, System.Exception exception) { }
-    }
-    [System.Serializable]
-    public class DiagnosticsLoggerFactory : Castle.Core.Logging.AbstractLoggerFactory
-    {
-        public DiagnosticsLoggerFactory() { }
-        public override Castle.Core.Logging.ILogger Create(string name) { }
-        public override Castle.Core.Logging.ILogger Create(string name, Castle.Core.Logging.LoggerLevel level) { }
-    }
     public interface IContextProperties
     {
         object this[string key] { get; set; }
diff --git a/ref/Castle.Core-net6.0.cs b/ref/Castle.Core-net6.0.cs
index dd8a8652a4..d53d469970 100644
--- a/ref/Castle.Core-net6.0.cs
+++ b/ref/Castle.Core-net6.0.cs
@@ -1984,25 +1984,6 @@ public ConsoleLogger(string name, Castle.Core.Logging.LoggerLevel logLevel) { }
         public override Castle.Core.Logging.ILogger CreateChildLogger(string loggerName) { }
         protected override void Log(Castle.Core.Logging.LoggerLevel loggerLevel, string loggerName, string message, System.Exception exception) { }
     }
-    [System.Runtime.Versioning.SupportedOSPlatform("windows")]
-    public class DiagnosticsLogger : Castle.Core.Logging.LevelFilteredLogger, System.IDisposable
-    {
-        public DiagnosticsLogger(string logName) { }
-        public DiagnosticsLogger(string logName, string source) { }
-        public DiagnosticsLogger(string logName, string machineName, string source) { }
-        public override Castle.Core.Logging.ILogger CreateChildLogger(string loggerName) { }
-        public void Dispose() { }
-        protected virtual void Dispose(bool disposing) { }
-        protected override void Finalize() { }
-        protected override void Log(Castle.Core.Logging.LoggerLevel loggerLevel, string loggerName, string message, System.Exception exception) { }
-    }
-    [System.Runtime.Versioning.SupportedOSPlatform("windows")]
-    public class DiagnosticsLoggerFactory : Castle.Core.Logging.AbstractLoggerFactory
-    {
-        public DiagnosticsLoggerFactory() { }
-        public override Castle.Core.Logging.ILogger Create(string name) { }
-        public override Castle.Core.Logging.ILogger Create(string name, Castle.Core.Logging.LoggerLevel level) { }
-    }
     public interface IContextProperties
     {
         object this[string key] { get; set; }
diff --git a/ref/Castle.Core-netstandard2.0.cs b/ref/Castle.Core-netstandard2.0.cs
index 53928d09b0..b4b91468e2 100644
--- a/ref/Castle.Core-netstandard2.0.cs
+++ b/ref/Castle.Core-netstandard2.0.cs
@@ -1984,23 +1984,6 @@ public ConsoleLogger(string name, Castle.Core.Logging.LoggerLevel logLevel) { }
         public override Castle.Core.Logging.ILogger CreateChildLogger(string loggerName) { }
         protected override void Log(Castle.Core.Logging.LoggerLevel loggerLevel, string loggerName, string message, System.Exception exception) { }
     }
-    public class DiagnosticsLogger : Castle.Core.Logging.LevelFilteredLogger, System.IDisposable
-    {
-        public DiagnosticsLogger(string logName) { }
-        public DiagnosticsLogger(string logName, string source) { }
-        public DiagnosticsLogger(string logName, string machineName, string source) { }
-        public override Castle.Core.Logging.ILogger CreateChildLogger(string loggerName) { }
-        public void Dispose() { }
-        protected virtual void Dispose(bool disposing) { }
-        protected override void Finalize() { }
-        protected override void Log(Castle.Core.Logging.LoggerLevel loggerLevel, string loggerName, string message, System.Exception exception) { }
-    }
-    public class DiagnosticsLoggerFactory : Castle.Core.Logging.AbstractLoggerFactory
-    {
-        public DiagnosticsLoggerFactory() { }
-        public override Castle.Core.Logging.ILogger Create(string name) { }
-        public override Castle.Core.Logging.ILogger Create(string name, Castle.Core.Logging.LoggerLevel level) { }
-    }
     public interface IContextProperties
     {
         object this[string key] { get; set; }
diff --git a/ref/Castle.Core-netstandard2.1.cs b/ref/Castle.Core-netstandard2.1.cs
index 40b01b56be..887dc559c1 100644
--- a/ref/Castle.Core-netstandard2.1.cs
+++ b/ref/Castle.Core-netstandard2.1.cs
@@ -1984,23 +1984,6 @@ public ConsoleLogger(string name, Castle.Core.Logging.LoggerLevel logLevel) { }
         public override Castle.Core.Logging.ILogger CreateChildLogger(string loggerName) { }
         protected override void Log(Castle.Core.Logging.LoggerLevel loggerLevel, string loggerName, string message, System.Exception exception) { }
     }
-    public class DiagnosticsLogger : Castle.Core.Logging.LevelFilteredLogger, System.IDisposable
-    {
-        public DiagnosticsLogger(string logName) { }
-        public DiagnosticsLogger(string logName, string source) { }
-        public DiagnosticsLogger(string logName, string machineName, string source) { }
-        public override Castle.Core.Logging.ILogger CreateChildLogger(string loggerName) { }
-        public void Dispose() { }
-        protected virtual void Dispose(bool disposing) { }
-        protected override void Finalize() { }
-        protected override void Log(Castle.Core.Logging.LoggerLevel loggerLevel, string loggerName, string message, System.Exception exception) { }
-    }
-    public class DiagnosticsLoggerFactory : Castle.Core.Logging.AbstractLoggerFactory
-    {
-        public DiagnosticsLoggerFactory() { }
-        public override Castle.Core.Logging.ILogger Create(string name) { }
-        public override Castle.Core.Logging.ILogger Create(string name, Castle.Core.Logging.LoggerLevel level) { }
-    }
     public interface IContextProperties
     {
         object this[string key] { get; set; }
diff --git a/ref/Castle.Services.Logging.EventlogIntegration-net462.cs b/ref/Castle.Services.Logging.EventlogIntegration-net462.cs
new file mode 100644
index 0000000000..0ec6e79cbd
--- /dev/null
+++ b/ref/Castle.Services.Logging.EventlogIntegration-net462.cs
@@ -0,0 +1,24 @@
+[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/castleproject/Core")]
+[assembly: System.Runtime.Versioning.TargetFramework(".NETFramework,Version=v4.6.2", FrameworkDisplayName=".NET Framework 4.6.2")]
+namespace Castle.Core.Logging
+{
+    [System.Serializable]
+    public class DiagnosticsLogger : Castle.Core.Logging.LevelFilteredLogger, System.IDisposable
+    {
+        public DiagnosticsLogger(string logName) { }
+        public DiagnosticsLogger(string logName, string source) { }
+        public DiagnosticsLogger(string logName, string machineName, string source) { }
+        public override Castle.Core.Logging.ILogger CreateChildLogger(string loggerName) { }
+        public void Dispose() { }
+        protected virtual void Dispose(bool disposing) { }
+        protected override void Finalize() { }
+        protected override void Log(Castle.Core.Logging.LoggerLevel loggerLevel, string loggerName, string message, System.Exception exception) { }
+    }
+    [System.Serializable]
+    public class DiagnosticsLoggerFactory : Castle.Core.Logging.AbstractLoggerFactory
+    {
+        public DiagnosticsLoggerFactory() { }
+        public override Castle.Core.Logging.ILogger Create(string name) { }
+        public override Castle.Core.Logging.ILogger Create(string name, Castle.Core.Logging.LoggerLevel level) { }
+    }
+}
\ No newline at end of file
diff --git a/ref/Castle.Services.Logging.EventlogIntegration-net6.0.cs b/ref/Castle.Services.Logging.EventlogIntegration-net6.0.cs
new file mode 100644
index 0000000000..9186928dff
--- /dev/null
+++ b/ref/Castle.Services.Logging.EventlogIntegration-net6.0.cs
@@ -0,0 +1,24 @@
+[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/castleproject/Core")]
+[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v6.0", FrameworkDisplayName=".NET 6.0")]
+namespace Castle.Core.Logging
+{
+    [System.Runtime.Versioning.SupportedOSPlatform("windows")]
+    public class DiagnosticsLogger : Castle.Core.Logging.LevelFilteredLogger, System.IDisposable
+    {
+        public DiagnosticsLogger(string logName) { }
+        public DiagnosticsLogger(string logName, string source) { }
+        public DiagnosticsLogger(string logName, string machineName, string source) { }
+        public override Castle.Core.Logging.ILogger CreateChildLogger(string loggerName) { }
+        public void Dispose() { }
+        protected virtual void Dispose(bool disposing) { }
+        protected override void Finalize() { }
+        protected override void Log(Castle.Core.Logging.LoggerLevel loggerLevel, string loggerName, string message, System.Exception exception) { }
+    }
+    [System.Runtime.Versioning.SupportedOSPlatform("windows")]
+    public class DiagnosticsLoggerFactory : Castle.Core.Logging.AbstractLoggerFactory
+    {
+        public DiagnosticsLoggerFactory() { }
+        public override Castle.Core.Logging.ILogger Create(string name) { }
+        public override Castle.Core.Logging.ILogger Create(string name, Castle.Core.Logging.LoggerLevel level) { }
+    }
+}
\ No newline at end of file
diff --git a/ref/Castle.Services.Logging.EventlogIntegration-netstandard2.0.cs b/ref/Castle.Services.Logging.EventlogIntegration-netstandard2.0.cs
new file mode 100644
index 0000000000..0cab70a234
--- /dev/null
+++ b/ref/Castle.Services.Logging.EventlogIntegration-netstandard2.0.cs
@@ -0,0 +1,22 @@
+[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/castleproject/Core")]
+[assembly: System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v2.0", FrameworkDisplayName=".NET Standard 2.0")]
+namespace Castle.Core.Logging
+{
+    public class DiagnosticsLogger : Castle.Core.Logging.LevelFilteredLogger, System.IDisposable
+    {
+        public DiagnosticsLogger(string logName) { }
+        public DiagnosticsLogger(string logName, string source) { }
+        public DiagnosticsLogger(string logName, string machineName, string source) { }
+        public override Castle.Core.Logging.ILogger CreateChildLogger(string loggerName) { }
+        public void Dispose() { }
+        protected virtual void Dispose(bool disposing) { }
+        protected override void Finalize() { }
+        protected override void Log(Castle.Core.Logging.LoggerLevel loggerLevel, string loggerName, string message, System.Exception exception) { }
+    }
+    public class DiagnosticsLoggerFactory : Castle.Core.Logging.AbstractLoggerFactory
+    {
+        public DiagnosticsLoggerFactory() { }
+        public override Castle.Core.Logging.ILogger Create(string name) { }
+        public override Castle.Core.Logging.ILogger Create(string name, Castle.Core.Logging.LoggerLevel level) { }
+    }
+}
\ No newline at end of file
diff --git a/ref/Castle.Services.Logging.EventlogIntegration-netstandard2.1.cs b/ref/Castle.Services.Logging.EventlogIntegration-netstandard2.1.cs
new file mode 100644
index 0000000000..52be24fcac
--- /dev/null
+++ b/ref/Castle.Services.Logging.EventlogIntegration-netstandard2.1.cs
@@ -0,0 +1,22 @@
+[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/castleproject/Core")]
+[assembly: System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v2.1", FrameworkDisplayName=".NET Standard 2.1")]
+namespace Castle.Core.Logging
+{
+    public class DiagnosticsLogger : Castle.Core.Logging.LevelFilteredLogger, System.IDisposable
+    {
+        public DiagnosticsLogger(string logName) { }
+        public DiagnosticsLogger(string logName, string source) { }
+        public DiagnosticsLogger(string logName, string machineName, string source) { }
+        public override Castle.Core.Logging.ILogger CreateChildLogger(string loggerName) { }
+        public void Dispose() { }
+        protected virtual void Dispose(bool disposing) { }
+        protected override void Finalize() { }
+        protected override void Log(Castle.Core.Logging.LoggerLevel loggerLevel, string loggerName, string message, System.Exception exception) { }
+    }
+    public class DiagnosticsLoggerFactory : Castle.Core.Logging.AbstractLoggerFactory
+    {
+        public DiagnosticsLoggerFactory() { }
+        public override Castle.Core.Logging.ILogger Create(string name) { }
+        public override Castle.Core.Logging.ILogger Create(string name, Castle.Core.Logging.LoggerLevel level) { }
+    }
+}
\ No newline at end of file
diff --git a/src/Castle.Core.Tests.WeakNamed/Castle.Core.Tests.WeakNamed.csproj b/src/Castle.Core.Tests.WeakNamed/Castle.Core.Tests.WeakNamed.csproj
index 36e49b7ceb..d38c7879b6 100644
--- a/src/Castle.Core.Tests.WeakNamed/Castle.Core.Tests.WeakNamed.csproj
+++ b/src/Castle.Core.Tests.WeakNamed/Castle.Core.Tests.WeakNamed.csproj
@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<Import Project="..\..\buildscripts\common.props"></Import>
 
 	<PropertyGroup>
-		<TargetFrameworks>net462;netcoreapp2.1;netcoreapp3.1;net6.0</TargetFrameworks>
+		<TargetFrameworks>net462;net6.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -16,6 +16,7 @@
 		<SignAssembly>False</SignAssembly>
 		<PublicSign Condition="'$(OS)'=='Unix'">false</PublicSign>
 		<StartupObject>Program</StartupObject>
+		<InvariantGlobalization>true</InvariantGlobalization>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -29,6 +30,7 @@
 		<PackageReference Include="NUnitLite" Version="3.13.3" />
 		<ProjectReference Include="..\Castle.Core\Castle.Core.csproj" />
 		<ProjectReference Include="..\Castle.Core.Tests\Castle.Core.Tests.csproj" />
+		<ProjectReference Include="..\Castle.Services.Logging.EventLogIntegration\Castle.Services.Logging.EventLogIntegration.csproj" />
 		<ProjectReference Include="..\Castle.Services.Logging.log4netIntegration\Castle.Services.Logging.log4netIntegration.csproj" />
 		<ProjectReference Include="..\Castle.Services.Logging.NLogIntegration\Castle.Services.Logging.NLogIntegration.csproj" />
 		<ProjectReference Include="..\Castle.Services.Logging.SerilogIntegration\Castle.Services.Logging.SerilogIntegration.csproj" />
diff --git a/src/Castle.Core.Tests/Castle.Core.Tests.csproj b/src/Castle.Core.Tests/Castle.Core.Tests.csproj
index 24bd42eda0..e4e3dfe4fd 100644
--- a/src/Castle.Core.Tests/Castle.Core.Tests.csproj
+++ b/src/Castle.Core.Tests/Castle.Core.Tests.csproj
@@ -3,7 +3,7 @@
 	<Import Project="..\..\buildscripts\common.props"></Import>
 
 	<PropertyGroup>
-		<TargetFrameworks>net462;netcoreapp2.1;netcoreapp3.1;net6.0</TargetFrameworks>
+		<TargetFrameworks>net462;net6.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -17,6 +17,7 @@
 		<AssemblyOriginatorKeyFile>..\..\buildscripts\CastleKey.snk</AssemblyOriginatorKeyFile>
 		<PublicSign Condition="'$(OS)'=='Unix'">true</PublicSign>
 		<StartupObject>Program</StartupObject>
+		<InvariantGlobalization>true</InvariantGlobalization>
 	</PropertyGroup>
 
 	<ItemGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier(&quot;$(TargetFramework)&quot;))' == '.NETFramework'">
@@ -47,19 +48,22 @@
 		<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
 		<PackageReference Include="NUnitLite" Version="3.13.3" />
 		<PackageReference Include="log4net" Version="2.0.13" />
-		<PackageReference Include="NLog" Version="4.5.0" />
+		<PackageReference Include="NLog" Version="4.7.15" />
 		<PackageReference Include="Serilog" Version="2.0.0" />
 		<PackageReference Include="Serilog.Sinks.TextWriter" Version="2.0.0" />
 		<ProjectReference Include="..\Castle.Core\Castle.Core.csproj" />
+		<ProjectReference Include="..\Castle.Services.Logging.EventLogIntegration\Castle.Services.Logging.EventLogIntegration.csproj" />
 		<ProjectReference Include="..\Castle.Services.Logging.log4netIntegration\Castle.Services.Logging.log4netIntegration.csproj" />
 		<ProjectReference Include="..\Castle.Services.Logging.NLogIntegration\Castle.Services.Logging.NLogIntegration.csproj" />
 		<ProjectReference Include="..\Castle.Services.Logging.SerilogIntegration\Castle.Services.Logging.SerilogIntegration.csproj" />
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'OR'$(TargetFramework)'=='netcoreapp3.1'">
 		<PackageReference Include="System.Security.Permissions" Version="4.7.0" />
+		<PackageReference Include="System.Diagnostics.EventLog" Version="4.7.0" />
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
 		<PackageReference Include="System.Security.Permissions" Version="6.0.0" />
+		<PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0" />
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
 		<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
diff --git a/src/Castle.Core.Tests/PublicApiTestCase.cs b/src/Castle.Core.Tests/PublicApiTestCase.cs
index ef8d15808b..b511485a4a 100644
--- a/src/Castle.Core.Tests/PublicApiTestCase.cs
+++ b/src/Castle.Core.Tests/PublicApiTestCase.cs
@@ -40,6 +40,7 @@ public class PublicApiTestCase
 			"Castle.Services.Logging.log4netIntegration",
 			"Castle.Services.Logging.NLogIntegration",
 			"Castle.Services.Logging.SerilogIntegration",
+			"Castle.Services.Logging.EventLogIntegration",
 		};
 
 		[Test]
diff --git a/src/Castle.Core.Tests/Core.Tests/Logging/DiagnosticsLoggerTestCase.cs b/src/Castle.Core.Tests/Services.Logging.Tests/DiagnosticLogger/DiagnosticsLoggerTestCase.cs
similarity index 100%
rename from src/Castle.Core.Tests/Core.Tests/Logging/DiagnosticsLoggerTestCase.cs
rename to src/Castle.Core.Tests/Services.Logging.Tests/DiagnosticLogger/DiagnosticsLoggerTestCase.cs
diff --git a/src/Castle.Core/Castle.Core.csproj b/src/Castle.Core/Castle.Core.csproj
index 679bf7e168..ce727102f5 100644
--- a/src/Castle.Core/Castle.Core.csproj
+++ b/src/Castle.Core/Castle.Core.csproj
@@ -36,14 +36,6 @@
 		<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0' OR '$(TargetFramework)'=='netstandard2.1'">
-		<PackageReference Include="System.Diagnostics.EventLog" Version="4.7.0" />
-	</ItemGroup>
-
-	<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-		<PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<Folder Include="Properties\" />
 	</ItemGroup>
diff --git a/src/Castle.Services.Logging.EventLogIntegration/Castle.Services.Logging.EventLogIntegration.csproj b/src/Castle.Services.Logging.EventLogIntegration/Castle.Services.Logging.EventLogIntegration.csproj
new file mode 100644
index 0000000000..1aff857625
--- /dev/null
+++ b/src/Castle.Services.Logging.EventLogIntegration/Castle.Services.Logging.EventLogIntegration.csproj
@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<Import Project="..\..\buildscripts\common.props"></Import>
+
+	<PropertyGroup>
+		<TargetFrameworks>net462;netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<PackageId>Castle.Core-DiagnosticsLogger</PackageId>
+		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+		<PackageOutputPath>../../build/</PackageOutputPath>
+		<AssemblyName>Castle.Services.Logging.EventLogIntegration</AssemblyName>
+		<RootNamespace>Castle.Services.Logging.EventLogIntegration</RootNamespace>
+		<AssemblyTitle>Castle.Services.Logging.EventLogIntegration</AssemblyTitle>
+		<Description>Castle Services DiagnosticsLogger for Windows EventLog</Description>
+		<AssemblyOriginatorKeyFile>..\..\buildscripts\CastleKey.snk</AssemblyOriginatorKeyFile>
+		<SignAssembly>True</SignAssembly>
+		<PublicSign Condition="'$(OS)'=='Unix'">true</PublicSign>
+		<PackageTags>castle logging eventlog</PackageTags>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<Folder Include="Properties\" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0' OR '$(TargetFramework)'=='netstandard2.1'">
+		<PackageReference Include="System.Diagnostics.EventLog" Version="4.7.0" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
+		<PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\Castle.Core\Castle.Core.csproj" />
+	</ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Castle.Core/Core/Logging/DiagnosticsLogger.cs b/src/Castle.Services.Logging.EventLogIntegration/DiagnosticsLogger.cs
similarity index 98%
rename from src/Castle.Core/Core/Logging/DiagnosticsLogger.cs
rename to src/Castle.Services.Logging.EventLogIntegration/DiagnosticsLogger.cs
index bf591efc33..c9f77f10b3 100644
--- a/src/Castle.Core/Core/Logging/DiagnosticsLogger.cs
+++ b/src/Castle.Services.Logging.EventLogIntegration/DiagnosticsLogger.cs
@@ -1,4 +1,4 @@
-// Copyright 2004-2022 Castle Project - http://www.castleproject.org/
+// Copyright 2004-2022 Castle Project - http://www.castleproject.org/
 // 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Castle.Core/Core/Logging/DiagnosticsLoggerFactory.cs b/src/Castle.Services.Logging.EventLogIntegration/DiagnosticsLoggerFactory.cs
similarity index 94%
rename from src/Castle.Core/Core/Logging/DiagnosticsLoggerFactory.cs
rename to src/Castle.Services.Logging.EventLogIntegration/DiagnosticsLoggerFactory.cs
index 97ee575e03..2d8c32edd1 100644
--- a/src/Castle.Core/Core/Logging/DiagnosticsLoggerFactory.cs
+++ b/src/Castle.Services.Logging.EventLogIntegration/DiagnosticsLoggerFactory.cs
@@ -1,4 +1,4 @@
-// Copyright 2004-2022 Castle Project - http://www.castleproject.org/
+// Copyright 2004-2022 Castle Project - http://www.castleproject.org/
 // 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.