Browse Source

Arguments incorrectly ordered in `ArgumentException` constructors (and two other minor analyzer message removals) (#29857)

ProductiveRage 5 years ago
parent
commit
d3fc8f11c3

+ 5 - 2
src/Middleware/ConcurrencyLimiter/src/ConcurrencyLimiterEventSource.cs

@@ -13,8 +13,11 @@ namespace Microsoft.AspNetCore.ConcurrencyLimiter
         public static readonly ConcurrencyLimiterEventSource Log = new ConcurrencyLimiterEventSource();
         private static readonly QueueFrame CachedNonTimerResult = new QueueFrame(timer: null, parent: Log);
 
+#pragma warning disable IDE0052 // Remove unread private members (2021-02-02: These ARE set in OnEventCommand - the the IDE0052 analyzer is incorrect at this time)
         private PollingCounter? _rejectedRequestsCounter;
         private PollingCounter? _queueLengthCounter;
+#pragma warning restore IDE0052 // Remove unread private members
+
         private EventCounter? _queueDuration;
 
         private long _rejectedRequests;
@@ -62,8 +65,8 @@ namespace Microsoft.AspNetCore.ConcurrencyLimiter
 
         internal struct QueueFrame : IDisposable
         {
-            private ValueStopwatch? _timer;
-            private ConcurrencyLimiterEventSource _parent;
+            private readonly ValueStopwatch? _timer;
+            private readonly ConcurrencyLimiterEventSource _parent;
 
             public QueueFrame(ValueStopwatch? timer, ConcurrencyLimiterEventSource parent)
             {

+ 2 - 2
src/Middleware/ConcurrencyLimiter/src/QueuePolicies/QueuePolicy.cs

@@ -24,13 +24,13 @@ namespace Microsoft.AspNetCore.ConcurrencyLimiter
             var maxConcurrentRequests = queuePolicyOptions.MaxConcurrentRequests;
             if (maxConcurrentRequests <= 0)
             {
-                throw new ArgumentException(nameof(maxConcurrentRequests), "MaxConcurrentRequests must be a positive integer.");
+                throw new ArgumentException("MaxConcurrentRequests must be a positive integer.", nameof(maxConcurrentRequests));
             }
 
             var requestQueueLimit = queuePolicyOptions.RequestQueueLimit;
             if (requestQueueLimit < 0)
             {
-                throw new ArgumentException(nameof(requestQueueLimit), "The RequestQueueLimit cannot be a negative number.");
+                throw new ArgumentException("The RequestQueueLimit cannot be a negative number.", nameof(requestQueueLimit));
             }
 
             _serverSemaphore = new SemaphoreSlim(maxConcurrentRequests);