Remove compiler directives (#14739)

OrchardCMS · Nov 24, 2023 · 95efba0 · 95efba0
1 parent 61ec4cf
commit 95efba0
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 50 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.GitHub/Configuration/GithubHandler.cs b/src/OrchardCore.Modules/OrchardCore.GitHub/Configuration/GithubHandler.cs
@@ -16,16 +16,10 @@ namespace OrchardCore.GitHub.Configuration
 {
     public class GitHubHandler : OAuthHandler<GitHubOptions>
     {
-
-#if !NET8_0_OR_GREATER
-        public GitHubHandler(IOptionsMonitor<GitHubOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock)
-            : base(options, logger, encoder, clock)
-        { }
-#else
         public GitHubHandler(IOptionsMonitor<GitHubOptions> options, ILoggerFactory logger, UrlEncoder encoder)
             : base(options, logger, encoder)
-        { }
-#endif
+        {
+        }
 
         protected override async Task<AuthenticationTicket> CreateTicketAsync(ClaimsIdentity identity, AuthenticationProperties properties, OAuthTokenResponse tokens)
         {

diff --git a/...chardCore.Abstractions/Modules/Overrides/Configuration/TenantJsonConfigurationProvider.cs b/...chardCore.Abstractions/Modules/Overrides/Configuration/TenantJsonConfigurationProvider.cs
@@ -1,4 +1,3 @@
-using System;
 using System.IO;
 using OrchardCore.Environment.Shell.Configuration.Internal;
 
@@ -20,17 +19,5 @@ public TenantJsonConfigurationProvider(TenantJsonConfigurationSource source) : b
         /// </summary>
         /// <param name="stream">The stream to read.</param>
         public override void Load(Stream stream) => Data = JsonConfigurationParser.Parse(stream);
-
-#if !NET8_0_OR_GREATER
-        /// <summary>
-        /// Dispose the provider.
-        /// </summary>
-        /// <param name="disposing"><c>true</c> if invoked from <see cref="IDisposable.Dispose"/>.</param>
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(true);
-            (Source.FileProvider as IDisposable)?.Dispose();
-        }
-#endif
     }
 }
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Security/ApiAuthenticationHandler.cs b/src/OrchardCore/OrchardCore.Infrastructure/Security/ApiAuthenticationHandler.cs
@@ -15,18 +15,6 @@ public class ApiAuthenticationHandler : AuthenticationHandler<ApiAuthorizationOp
     {
         private readonly IOptions<AuthenticationOptions> _authenticationOptions;
 
-#if !NET8_0_OR_GREATER
-        public ApiAuthenticationHandler(
-            IOptions<AuthenticationOptions> authenticationOptions,
-            IOptionsMonitor<ApiAuthorizationOptions> options,
-            ILoggerFactory logger,
-            UrlEncoder encoder,
-            ISystemClock clock)
-            : base(options, logger, encoder, clock)
-        {
-            _authenticationOptions = authenticationOptions;
-        }
-#else
         public ApiAuthenticationHandler(
             IOptions<AuthenticationOptions> authenticationOptions,
             IOptionsMonitor<ApiAuthorizationOptions> options,
@@ -36,7 +24,6 @@ public ApiAuthenticationHandler(
         {
             _authenticationOptions = authenticationOptions;
         }
-#endif
 
         protected override Task<AuthenticateResult> HandleAuthenticateAsync()
         {

diff --git a/src/OrchardCore/OrchardCore/Modules/Extensions/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore/Modules/Extensions/ServiceCollectionExtensions.cs
@@ -64,7 +64,6 @@ public static class ServiceCollectionExtensions
                 .Select(sd => sd.GetImplementationType()))
             .ToArray();
 
-#if NET8_0_OR_GREATER
         /// <summary>
         /// Metrics singletons used to isolate tenants from the host.
         /// </summary>
@@ -73,7 +72,6 @@ public static class ServiceCollectionExtensions
             .Where(sd => sd.Lifetime == ServiceLifetime.Singleton)
             .Select(sd => sd.GetImplementationType())
             .ToArray();
-#endif
 
         /// <summary>
         /// Adds OrchardCore services to the host service collection.
@@ -101,9 +99,7 @@ public static OrchardCoreBuilder AddOrchardCore(this IServiceCollection services
                 AddExtensionServices(builder);
                 AddStaticFiles(builder);
 
-#if NET8_0_OR_GREATER
                 AddMetrics(builder);
-#endif
                 AddRouting(builder);
                 IsolateHttpClient(builder);
                 AddEndpointsApiExplorer(builder);
@@ -285,7 +281,6 @@ private static void AddStaticFiles(OrchardCoreBuilder builder)
             });
         }
 
-#if NET8_0_OR_GREATER
         /// <summary>
         /// Adds isolated tenant level metrics services.
         /// </summary>
@@ -313,7 +308,6 @@ sd is ClonedSingletonDescriptor &&
             },
             order: int.MinValue + 100);
         }
-#endif
 
         /// <summary>
         /// Adds isolated tenant level routing services.

diff --git a/src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/ValueStopwatch.cs b/src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/ValueStopwatch.cs
@@ -8,10 +8,6 @@ namespace Microsoft.Extensions.Internal;
 
 internal readonly struct ValueStopwatch
 {
-#if !NET7_0_OR_GREATER
-    private static readonly double TimestampToTicks = TimeSpan.TicksPerSecond / (double)Stopwatch.Frequency;
-#endif
-
     private readonly long _startTimestamp;
 
     public readonly bool IsActive => _startTimestamp != 0;
@@ -34,12 +30,6 @@ public TimeSpan GetElapsedTime()
 
         var end = Stopwatch.GetTimestamp();
 
-#if !NET7_0_OR_GREATER
-        var timestampDelta = end - _startTimestamp;
-        var ticks = (long)(TimestampToTicks * timestampDelta);
-        return new TimeSpan(ticks);
-#else
         return Stopwatch.GetElapsedTime(_startTimestamp, end);
-#endif
     }
 }