Switch lock backport package to #if defs instead (#3217)

Author: SquirrelKiev

src/Discord.Net.Commands/Map/CommandMapNode.cs

@@ -12,7 +12,11 @@ internal class CommandMapNode
 
         private readonly ConcurrentDictionary<string, CommandMapNode> _nodes;
         private readonly string _name;
+#if NET9_0_OR_GREATER
         private readonly Lock _lockObj = new();
+#else
+        private readonly object _lockObj = new();
+#endif
         private ImmutableArray<CommandInfo> _commands;
 
         public bool IsEmpty => _commands.Length == 0 && _nodes.Count == 0;

src/Discord.Net.Core/Discord.Net.Core.csproj

@@ -19,9 +19,5 @@
     <PackageReference Include="IDisposableAnalyzers" Version="4.0.8">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" Include="Backport.System.Threading.Lock" Version="3.1.5">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>analyzers</IncludeAssets>
-    </PackageReference>  
   </ItemGroup>
-</Project>
+</Project>

src/Discord.Net.Rest/Entities/Interactions/CommandBase/RestCommandBase.cs

@@ -33,7 +33,11 @@ public ulong CommandId
         /// </summary>
         internal new RestCommandBaseData Data { get; private set; }
 
+#if NET9_0_OR_GREATER
         private readonly Lock _lock = new();
+#else
+        private readonly object _lock = new();
+#endif
 
         internal RestCommandBase(DiscordRestClient client, Model model)
             : base(client, model.Id)

src/Discord.Net.Rest/Entities/Interactions/MessageComponents/RestMessageComponent.cs

@@ -25,7 +25,11 @@ public class RestMessageComponent : RestInteraction, IComponentInteraction, IDis
         /// <inheritdoc cref="IComponentInteraction.Message"/>
         public RestUserMessage Message { get; private set; }
 
+#if NET9_0_OR_GREATER
         private readonly Lock _lock = new();
+#else
+        private readonly object _lock = new();
+#endif
 
         internal RestMessageComponent(BaseDiscordClient client, Model model)
             : base(client, model.Id)
@@ -457,7 +461,7 @@ public string DeferLoading(bool ephemeral = false, RequestOptions options = null
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="ephemeral"></param>
         /// <param name="options"></param>

src/Discord.Net.Rest/Entities/Interactions/Modals/RestModal.cs

@@ -42,7 +42,11 @@ internal RestModal(DiscordRestClient client, ModelBase model)
             return entity;
         }
 
+#if NET9_0_OR_GREATER
         private readonly Lock _lock = new();
+#else
+        private readonly object _lock = new();
+#endif
 
         /// <summary>
         ///     Acknowledges this interaction with the <see cref="InteractionResponseType.DeferredUpdateMessage"/> if the modal was created
@@ -139,7 +143,7 @@ public override Task<RestFollowupMessage> FollowupAsync(
             MessageComponent component = null,
             Embed embed = null,
             RequestOptions options = null,
-            PollProperties poll = null, 
+            PollProperties poll = null,
             MessageFlags flags = MessageFlags.None)
         {
             if (!IsValidToken)

src/Discord.Net.Rest/Entities/Interactions/SlashCommands/RestAutocompleteInteraction.cs

@@ -20,7 +20,11 @@ public class RestAutocompleteInteraction : RestInteraction, IAutocompleteInterac
         /// </summary>
         public new RestAutocompleteInteractionData Data { get; }
 
+#if NET9_0_OR_GREATER
         private readonly Lock _lock = new();
+#else
+        private readonly object _lock = new();
+#endif
 
         internal RestAutocompleteInteraction(DiscordRestClient client, Model model)
             : base(client, model.Id)

src/Discord.Net.Rest/Net/Queue/RequestQueueBucket.cs

@@ -17,7 +17,11 @@ internal class RequestBucket
     {
         private const int MinimumSleepTimeMs = 750;
 
+#if NET9_0_OR_GREATER
         private readonly Lock _lock;
+#else
+        private readonly object _lock;
+#endif
         private readonly RequestQueue _queue;
         private int _semaphore;
         private DateTimeOffset? _resetTick;

src/Discord.Net.WebSocket/DiscordShardedClient.cs

@@ -21,7 +21,11 @@ public partial class DiscordShardedClient : BaseSocketClient, IDiscordClient
         private ImmutableArray<StickerPack<SocketSticker>> _defaultStickers;
         private int _totalShards;
         private SemaphoreSlim[] _identifySemaphores;
+#if NET9_0_OR_GREATER
         private readonly Lock _semaphoreResetLock;
+#else
+        private readonly object _semaphoreResetLock;
+#endif
         private Task _semaphoreResetTask;
 
         private bool _isDisposed;
@@ -524,7 +528,7 @@ private void RegisterEvents(DiscordSocketClient client, bool isPrimary)
             client.AuditLogCreated += (arg1, arg2) => _auditLogCreated.InvokeAsync(arg1, arg2);
 
             client.VoiceChannelStatusUpdated += (arg1, arg2, arg3) => _voiceChannelStatusUpdated.InvokeAsync(arg1, arg2, arg3);
-            
+
             client.EntitlementCreated += (arg1) => _entitlementCreated.InvokeAsync(arg1);
             client.EntitlementUpdated += (arg1, arg2) => _entitlementUpdated.InvokeAsync(arg1, arg2);
             client.EntitlementDeleted += (arg1) => _entitlementDeleted.InvokeAsync(arg1);

src/Discord.Net.WebSocket/Entities/Channels/SocketThreadChannel.cs

@@ -111,8 +111,13 @@ public bool IsPrivateThread
 
         private bool _usersDownloaded;
 
+#if NET9_0_OR_GREATER
         private readonly Lock _downloadLock = new();
         private readonly Lock _ownerLock = new();
+#else
+        private readonly object _downloadLock = new();
+        private readonly object _ownerLock = new();
+#endif
 
         private ulong _ownerId;
 

src/Discord.Net.WebSocket/Entities/Interaction/MessageComponents/SocketMessageComponent.cs

@@ -21,11 +21,15 @@ public class SocketMessageComponent : SocketInteraction, IComponentInteraction,
         ///     Gets the data received with this interaction, contains the button that was clicked.
         /// </summary>
         public new SocketMessageComponentData Data { get; }
-        
+
         /// <inheritdoc cref="IComponentInteraction.Message"/>
         public SocketUserMessage Message { get; private set; }
 
+#if NET9_0_OR_GREATER
         private readonly Lock _lock = new();
+#else
+        private readonly object _lock = new();
+#endif
         public override bool HasResponded { get; internal set; } = false;
 
         internal SocketMessageComponent(DiscordSocketClient client, Model model, ISocketMessageChannel channel, SocketUser user)
@@ -359,7 +363,7 @@ public override Task<RestFollowupMessage> FollowupAsync(
                 flags |= MessageFlags.Ephemeral;
 
             Preconditions.ValidateMessageFlags(flags);
-                
+
 
             var args = new API.Rest.CreateWebhookMessageParams
             {