From 27b24950567ca52b933e99ab9c7aef5ed3895d01 Mon Sep 17 00:00:00 2001 From: Rolf Kristensen Date: Wed, 29 Jan 2025 21:33:32 +0100 Subject: [PATCH 1/4] Castle.Services.Logging.EventLogIntegration for Windows EventLog --- Castle.Core.sln | 11 +++++- .../Castle.Core.Tests.WeakNamed.csproj | 3 +- .../Castle.Core.Tests.csproj | 2 + src/Castle.Core.Tests/PublicApiTestCase.cs | 1 + .../DiagnosticsLoggerTestCase.cs | 2 +- src/Castle.Core/Castle.Core.csproj | 7 ++-- ...ervices.Logging.EventLogIntegration.csproj | 39 +++++++++++++++++++ .../DiagnosticsLogger.cs | 5 ++- .../DiagnosticsLoggerFactory.cs | 5 ++- 9 files changed, 63 insertions(+), 12 deletions(-) rename src/Castle.Core.Tests/{Core.Tests/Logging => Services.Logging.Tests/DiagnosticLogger}/DiagnosticsLoggerTestCase.cs (98%) create mode 100644 src/Castle.Services.Logging.EventLogIntegration/Castle.Services.Logging.EventLogIntegration.csproj rename src/{Castle.Core/Core/Logging => Castle.Services.Logging.EventLogIntegration}/DiagnosticsLogger.cs (96%) rename src/{Castle.Core/Core/Logging => Castle.Services.Logging.EventLogIntegration}/DiagnosticsLoggerFactory.cs (89%) 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/src/Castle.Core.Tests.WeakNamed/Castle.Core.Tests.WeakNamed.csproj b/src/Castle.Core.Tests.WeakNamed/Castle.Core.Tests.WeakNamed.csproj index 6b4a9f71c4..855b51b825 100644 --- a/src/Castle.Core.Tests.WeakNamed/Castle.Core.Tests.WeakNamed.csproj +++ b/src/Castle.Core.Tests.WeakNamed/Castle.Core.Tests.WeakNamed.csproj @@ -1,4 +1,4 @@ - + @@ -25,6 +25,7 @@ + diff --git a/src/Castle.Core.Tests/Castle.Core.Tests.csproj b/src/Castle.Core.Tests/Castle.Core.Tests.csproj index 7fbc5856ad..7598a504b4 100644 --- a/src/Castle.Core.Tests/Castle.Core.Tests.csproj +++ b/src/Castle.Core.Tests/Castle.Core.Tests.csproj @@ -50,12 +50,14 @@ + + diff --git a/src/Castle.Core.Tests/PublicApiTestCase.cs b/src/Castle.Core.Tests/PublicApiTestCase.cs index bc64f412b9..96536c43c6 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 98% rename from src/Castle.Core.Tests/Core.Tests/Logging/DiagnosticsLoggerTestCase.cs rename to src/Castle.Core.Tests/Services.Logging.Tests/DiagnosticLogger/DiagnosticsLoggerTestCase.cs index 029c901be2..9189367e42 100644 --- a/src/Castle.Core.Tests/Core.Tests/Logging/DiagnosticsLoggerTestCase.cs +++ b/src/Castle.Core.Tests/Services.Logging.Tests/DiagnosticLogger/DiagnosticsLoggerTestCase.cs @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -namespace Castle.Core.Logging.Tests +namespace Castle.Services.Logging.Tests { using System; using System.Diagnostics; diff --git a/src/Castle.Core/Castle.Core.csproj b/src/Castle.Core/Castle.Core.csproj index fa705deaff..84ffbf541c 100644 --- a/src/Castle.Core/Castle.Core.csproj +++ b/src/Castle.Core/Castle.Core.csproj @@ -34,11 +34,10 @@ - - - - + + + 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..3e99ea3c7e --- /dev/null +++ b/src/Castle.Services.Logging.EventLogIntegration/Castle.Services.Logging.EventLogIntegration.csproj @@ -0,0 +1,39 @@ + + + + + + net462;netstandard2.0;netstandard2.1;net6.0 + + + + Castle.Core-DiagnosticsLogger + True + ../../build/ + Castle.Services.Logging.EventLogIntegration + Castle.Services.Logging + Castle.Services.Logging.EventLogIntegration + Castle Services DiagnosticsLogger for Windows EventLog + ..\..\buildscripts\CastleKey.snk + True + true + castle logging eventlog + + + + + + + + + + + + + + + + + + + \ 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 96% rename from src/Castle.Core/Core/Logging/DiagnosticsLogger.cs rename to src/Castle.Services.Logging.EventLogIntegration/DiagnosticsLogger.cs index bf591efc33..5c14d5eeae 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. @@ -12,11 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -namespace Castle.Core.Logging +namespace Castle.Services.Logging { using System; using System.Diagnostics; using System.Globalization; + using Castle.Core.Logging; /// /// The Logger using standard Diagnostics namespace. diff --git a/src/Castle.Core/Core/Logging/DiagnosticsLoggerFactory.cs b/src/Castle.Services.Logging.EventLogIntegration/DiagnosticsLoggerFactory.cs similarity index 89% rename from src/Castle.Core/Core/Logging/DiagnosticsLoggerFactory.cs rename to src/Castle.Services.Logging.EventLogIntegration/DiagnosticsLoggerFactory.cs index 97ee575e03..af103c57ce 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. @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -namespace Castle.Core.Logging +namespace Castle.Services.Logging { using System; + using Castle.Core.Logging; #if FEATURE_SERIALIZATION [Serializable] From 71a512a038b52922dd5d8f70e077435d87802aa8 Mon Sep 17 00:00:00 2001 From: Rolf Kristensen Date: Sun, 16 Feb 2025 02:51:18 +0100 Subject: [PATCH 2/4] Public API updates --- ref/Castle.Core-net462.cs | 19 --------------- ref/Castle.Core-net8.0.cs | 19 --------------- ref/Castle.Core-netstandard2.0.cs | 17 ------------- ...ices.Logging.EventLogIntegration-net462.cs | 24 +++++++++++++++++++ ...ices.Logging.EventLogIntegration-net6.0.cs | 24 +++++++++++++++++++ ...ging.EventLogIntegration-netstandard2.0.cs | 22 +++++++++++++++++ ...ging.EventLogIntegration-netstandard2.1.cs | 22 +++++++++++++++++ ...ices.Logging.EventlogIntegration-net462.cs | 24 +++++++++++++++++++ ...ices.Logging.EventlogIntegration-net6.0.cs | 24 +++++++++++++++++++ ...ging.EventlogIntegration-netstandard2.0.cs | 22 +++++++++++++++++ ...ging.EventlogIntegration-netstandard2.1.cs | 22 +++++++++++++++++ 11 files changed, 184 insertions(+), 55 deletions(-) create mode 100644 ref/Castle.Services.Logging.EventLogIntegration-net462.cs create mode 100644 ref/Castle.Services.Logging.EventLogIntegration-net6.0.cs create mode 100644 ref/Castle.Services.Logging.EventLogIntegration-netstandard2.0.cs create mode 100644 ref/Castle.Services.Logging.EventLogIntegration-netstandard2.1.cs create mode 100644 ref/Castle.Services.Logging.EventlogIntegration-net462.cs create mode 100644 ref/Castle.Services.Logging.EventlogIntegration-net6.0.cs create mode 100644 ref/Castle.Services.Logging.EventlogIntegration-netstandard2.0.cs create mode 100644 ref/Castle.Services.Logging.EventlogIntegration-netstandard2.1.cs diff --git a/ref/Castle.Core-net462.cs b/ref/Castle.Core-net462.cs index e488f8387b..72fadd5455 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-net8.0.cs b/ref/Castle.Core-net8.0.cs index afdf46b837..a54cd9e4ee 100644 --- a/ref/Castle.Core-net8.0.cs +++ b/ref/Castle.Core-net8.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 f47626cc6a..7deef20e0c 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.Services.Logging.EventLogIntegration-net462.cs b/ref/Castle.Services.Logging.EventLogIntegration-net462.cs new file mode 100644 index 0000000000..c5409d6edf --- /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.Services.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..1e7c505c10 --- /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.Services.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..83c895a426 --- /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.Services.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..a8d9a8db53 --- /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.Services.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-net462.cs b/ref/Castle.Services.Logging.EventlogIntegration-net462.cs new file mode 100644 index 0000000000..c5409d6edf --- /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.Services.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..1e7c505c10 --- /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.Services.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..83c895a426 --- /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.Services.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..a8d9a8db53 --- /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.Services.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 From 0b1ac810323ab8e5348ddd23148516cfcca2a019 Mon Sep 17 00:00:00 2001 From: Rolf Kristensen Date: Sun, 16 Feb 2025 02:51:43 +0100 Subject: [PATCH 3/4] Removed obsolete netcoreapp2.1 + netcoreapp3.1 --- appveyor.yml | 1 + build.sh | 0 .../Castle.Core.Tests.WeakNamed.csproj | 1 + src/Castle.Core.Tests/Castle.Core.Tests.csproj | 1 + 4 files changed, 3 insertions(+) mode change 100755 => 100644 build.sh diff --git a/appveyor.yml b/appveyor.yml index b34b33082b..35f9178392 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -68,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 old mode 100755 new mode 100644 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 855b51b825..27d5602845 100644 --- a/src/Castle.Core.Tests.WeakNamed/Castle.Core.Tests.WeakNamed.csproj +++ b/src/Castle.Core.Tests.WeakNamed/Castle.Core.Tests.WeakNamed.csproj @@ -16,6 +16,7 @@ False false Program + true diff --git a/src/Castle.Core.Tests/Castle.Core.Tests.csproj b/src/Castle.Core.Tests/Castle.Core.Tests.csproj index 7598a504b4..5ac73af2f0 100644 --- a/src/Castle.Core.Tests/Castle.Core.Tests.csproj +++ b/src/Castle.Core.Tests/Castle.Core.Tests.csproj @@ -17,6 +17,7 @@ ..\..\buildscripts\CastleKey.snk true Program + true From 8d7dd1506c88396ee6469ecc9739397ad0f158c9 Mon Sep 17 00:00:00 2001 From: Rolf Kristensen Date: Sun, 30 Nov 2025 15:26:44 +0100 Subject: [PATCH 4/4] EventLogIntegration - Move to NET8 --- ...ices.Logging.EventlogIntegration-net6.0.cs | 24 ------------------- ...ces.Logging.EventlogIntegration-net8.0.cs} | 2 +- src/Castle.Core/Castle.Core.csproj | 4 ---- ...ervices.Logging.EventLogIntegration.csproj | 10 +++----- ...le.Services.Logging.NLogIntegration.csproj | 2 +- 5 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 ref/Castle.Services.Logging.EventlogIntegration-net6.0.cs rename ref/{Castle.Services.Logging.EventLogIntegration-net6.0.cs => Castle.Services.Logging.EventlogIntegration-net8.0.cs} (96%) diff --git a/ref/Castle.Services.Logging.EventlogIntegration-net6.0.cs b/ref/Castle.Services.Logging.EventlogIntegration-net6.0.cs deleted file mode 100644 index 1e7c505c10..0000000000 --- a/ref/Castle.Services.Logging.EventlogIntegration-net6.0.cs +++ /dev/null @@ -1,24 +0,0 @@ -[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.Services.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-net6.0.cs b/ref/Castle.Services.Logging.EventlogIntegration-net8.0.cs similarity index 96% rename from ref/Castle.Services.Logging.EventLogIntegration-net6.0.cs rename to ref/Castle.Services.Logging.EventlogIntegration-net8.0.cs index 1e7c505c10..33a7553fdf 100644 --- a/ref/Castle.Services.Logging.EventLogIntegration-net6.0.cs +++ b/ref/Castle.Services.Logging.EventlogIntegration-net8.0.cs @@ -1,5 +1,5 @@ [assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/castleproject/Core")] -[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v6.0", FrameworkDisplayName=".NET 6.0")] +[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v8.0", FrameworkDisplayName=".NET 8.0")] namespace Castle.Services.Logging { [System.Runtime.Versioning.SupportedOSPlatform("windows")] diff --git a/src/Castle.Core/Castle.Core.csproj b/src/Castle.Core/Castle.Core.csproj index 84ffbf541c..da2b196473 100644 --- a/src/Castle.Core/Castle.Core.csproj +++ b/src/Castle.Core/Castle.Core.csproj @@ -36,10 +36,6 @@ - - - - diff --git a/src/Castle.Services.Logging.EventLogIntegration/Castle.Services.Logging.EventLogIntegration.csproj b/src/Castle.Services.Logging.EventLogIntegration/Castle.Services.Logging.EventLogIntegration.csproj index 3e99ea3c7e..4a00f7359c 100644 --- a/src/Castle.Services.Logging.EventLogIntegration/Castle.Services.Logging.EventLogIntegration.csproj +++ b/src/Castle.Services.Logging.EventLogIntegration/Castle.Services.Logging.EventLogIntegration.csproj @@ -3,7 +3,7 @@ - net462;netstandard2.0;netstandard2.1;net6.0 + net8.0;net462;netstandard2.0 @@ -24,12 +24,8 @@ - - - - - - + + diff --git a/src/Castle.Services.Logging.NLogIntegration/Castle.Services.Logging.NLogIntegration.csproj b/src/Castle.Services.Logging.NLogIntegration/Castle.Services.Logging.NLogIntegration.csproj index 6f900d028d..da998b58f9 100644 --- a/src/Castle.Services.Logging.NLogIntegration/Castle.Services.Logging.NLogIntegration.csproj +++ b/src/Castle.Services.Logging.NLogIntegration/Castle.Services.Logging.NLogIntegration.csproj @@ -25,7 +25,7 @@ - +