diff --git a/src/ModularPipelines.Build/ReleaseNotes.md b/src/ModularPipelines.Build/ReleaseNotes.md index 7951defec1..19765bd501 100644 --- a/src/ModularPipelines.Build/ReleaseNotes.md +++ b/src/ModularPipelines.Build/ReleaseNotes.md @@ -1 +1 @@ -NULL +null diff --git a/src/ModularPipelines/Logging/ModuleLogger.cs b/src/ModularPipelines/Logging/ModuleLogger.cs index ec3958292e..b4469a6131 100644 --- a/src/ModularPipelines/Logging/ModuleLogger.cs +++ b/src/ModularPipelines/Logging/ModuleLogger.cs @@ -17,12 +17,8 @@ internal abstract class ModuleLogger : IModuleLogger public abstract bool IsEnabled(LogLevel logLevel); -#if NET6_0 - public abstract IDisposable BeginScope(TState state); -#else public abstract IDisposable? BeginScope(TState state) where TState : notnull; -#endif public abstract void Dispose(); @@ -68,18 +64,11 @@ public ModuleLogger(ILogger defaultLogger, { Dispose(); } - -#if NET6_0 - public override IDisposable BeginScope(TState state) - { - return new NoopDisposable(); - } -#else + public override IDisposable? BeginScope(TState state) { return new NoopDisposable(); } -#endif public override bool IsEnabled(LogLevel logLevel) { diff --git a/src/ModularPipelines/ModularPipelines.csproj b/src/ModularPipelines/ModularPipelines.csproj index 9ea0f8e153..62407892dc 100644 --- a/src/ModularPipelines/ModularPipelines.csproj +++ b/src/ModularPipelines/ModularPipelines.csproj @@ -31,15 +31,15 @@ - - - + + + - - - + + + @@ -56,7 +56,7 @@ - +