Define FEATURE_ASYNCDISPOSABLE and use

Author: agehrke

src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLoggerProvider.cs

@@ -15,7 +15,7 @@ namespace Serilog.Extensions.Logging;
 /// </summary>
 [ProviderAlias("Serilog")]
 public class SerilogLoggerProvider : ILoggerProvider, ILogEventEnricher, ISupportExternalScope
-#if NET6_0_OR_GREATER
+#if FEATURE_ASYNCDISPOSABLE
     , IAsyncDisposable
 #endif
 {
@@ -25,7 +25,7 @@ public class SerilogLoggerProvider : ILoggerProvider, ILogEventEnricher, ISuppor
     // May be null; if it is, Log.Logger will be lazily used
     readonly ILogger? _logger;
     readonly Action? _dispose;
-#if NET6_0_OR_GREATER
+#if FEATURE_ASYNCDISPOSABLE
     readonly Func<ValueTask>? _disposeAsync;
 #endif
     private IExternalScopeProvider? _externalScopeProvider;
@@ -45,7 +45,7 @@ public SerilogLoggerProvider(ILogger? logger = null, bool dispose = false)
             if (logger != null)
             {
                 _dispose = () => (logger as IDisposable)?.Dispose();
-#if NET6_0_OR_GREATER
+#if FEATURE_ASYNCDISPOSABLE
                 _disposeAsync = () =>
                 {
                     // Dispose via IAsyncDisposable if possible, otherwise fall back to IDisposable
@@ -58,7 +58,7 @@ public SerilogLoggerProvider(ILogger? logger = null, bool dispose = false)
             else
             {
                 _dispose = Log.CloseAndFlush;
-#if NET6_0_OR_GREATER
+#if FEATURE_ASYNCDISPOSABLE
                 _disposeAsync = Log.CloseAndFlushAsync;
 #endif
             }
@@ -137,7 +137,7 @@ public void Dispose()
         _dispose?.Invoke();
     }
 
-#if NET6_0_OR_GREATER
+#if FEATURE_ASYNCDISPOSABLE
     /// <inheritdoc />
     public ValueTask DisposeAsync()
     {

src/Serilog.Extensions.Logging/Serilog.Extensions.Logging.csproj

@@ -36,18 +36,18 @@
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
-    <DefineConstants>$(DefineConstants);FEATURE_ITUPLE</DefineConstants>
+    <DefineConstants>$(DefineConstants);FEATURE_ITUPLE;FEATURE_ASYNCDISPOSABLE</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <DefineConstants>$(DefineConstants);FEATURE_ITUPLE</DefineConstants>
+    <DefineConstants>$(DefineConstants);FEATURE_ITUPLE;FEATURE_ASYNCDISPOSABLE</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
-    <DefineConstants>$(DefineConstants);FEATURE_ITUPLE</DefineConstants>
+    <DefineConstants>$(DefineConstants);FEATURE_ITUPLE;FEATURE_ASYNCDISPOSABLE</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-    <DefineConstants>$(DefineConstants);FEATURE_ITUPLE</DefineConstants>
+    <DefineConstants>$(DefineConstants);FEATURE_ITUPLE;FEATURE_ASYNCDISPOSABLE</DefineConstants>
   </PropertyGroup>
 </Project>