Enable nullable on ConcurrencyLimiter, SpaServices.Extensions (#29329)

Author: JamesNK

src/Middleware/ConcurrencyLimiter/src/ConcurrencyLimiterEventSource.cs

@@ -13,9 +13,9 @@ internal sealed class ConcurrencyLimiterEventSource : EventSource
         public static readonly ConcurrencyLimiterEventSource Log = new ConcurrencyLimiterEventSource();
         private static readonly QueueFrame CachedNonTimerResult = new QueueFrame(timer: null, parent: Log);
 
-        private PollingCounter _rejectedRequestsCounter;
-        private PollingCounter _queueLengthCounter;
-        private EventCounter _queueDuration;
+        private PollingCounter? _rejectedRequestsCounter;
+        private PollingCounter? _queueLengthCounter;
+        private EventCounter? _queueDuration;
 
         private long _rejectedRequests;
         private int _queueLength;
@@ -43,7 +43,7 @@ public void QueueSkipped()
         {
             if (IsEnabled())
             {
-                _queueDuration.WriteMetric(0);
+                _queueDuration!.WriteMetric(0);
             }
         }
 
@@ -78,7 +78,7 @@ public void Dispose()
                 if (_parent.IsEnabled() && _timer != null)
                 {
                     var duration = _timer.Value.GetElapsedTime().TotalMilliseconds;
-                    _parent._queueDuration.WriteMetric(duration);
+                    _parent._queueDuration!.WriteMetric(duration);
                 }
             }
         }

src/Middleware/ConcurrencyLimiter/src/ConcurrencyLimiterMiddleware.cs

@@ -86,16 +86,16 @@ public async Task Invoke(HttpContext context)
 
         private static class ConcurrencyLimiterLog
         {
-            private static readonly Action<ILogger, int, Exception> _requestEnqueued =
+            private static readonly Action<ILogger, int, Exception?> _requestEnqueued =
                 LoggerMessage.Define<int>(LogLevel.Debug, new EventId(1, "RequestEnqueued"), "MaxConcurrentRequests limit reached, request has been queued. Current active requests: {ActiveRequests}.");
 
-            private static readonly Action<ILogger, int, Exception> _requestDequeued =
+            private static readonly Action<ILogger, int, Exception?> _requestDequeued =
                 LoggerMessage.Define<int>(LogLevel.Debug, new EventId(2, "RequestDequeued"), "Request dequeued. Current active requests: {ActiveRequests}.");
 
-            private static readonly Action<ILogger, int, Exception> _requestRunImmediately =
+            private static readonly Action<ILogger, int, Exception?> _requestRunImmediately =
                 LoggerMessage.Define<int>(LogLevel.Debug, new EventId(3, "RequestRunImmediately"), "Below MaxConcurrentRequests limit, running request immediately. Current active requests: {ActiveRequests}");
 
-            private static readonly Action<ILogger, Exception> _requestRejectedQueueFull =
+            private static readonly Action<ILogger, Exception?> _requestRejectedQueueFull =
                 LoggerMessage.Define(LogLevel.Debug, new EventId(4, "RequestRejectedQueueFull"), "Currently at the 'RequestQueueLimit', rejecting this request with a '503 server not available' error");
 
             internal static void RequestEnqueued(ILogger logger, int activeRequests)

src/Middleware/ConcurrencyLimiter/src/Microsoft.AspNetCore.ConcurrencyLimiter.csproj

@@ -5,6 +5,7 @@
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;queue;queuing</PackageTags>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

src/Middleware/ConcurrencyLimiter/src/PublicAPI.Shipped.txt

@@ -13,10 +13,10 @@ Microsoft.AspNetCore.ConcurrencyLimiter.QueuePolicyOptions.QueuePolicyOptions()
 Microsoft.AspNetCore.ConcurrencyLimiter.QueuePolicyOptions.RequestQueueLimit.get -> int
 Microsoft.AspNetCore.ConcurrencyLimiter.QueuePolicyOptions.RequestQueueLimit.set -> void
 Microsoft.Extensions.DependencyInjection.QueuePolicyServiceCollectionExtensions
-~Microsoft.AspNetCore.ConcurrencyLimiter.ConcurrencyLimiterMiddleware.ConcurrencyLimiterMiddleware(Microsoft.AspNetCore.Http.RequestDelegate next, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.ConcurrencyLimiter.IQueuePolicy queue, Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.ConcurrencyLimiter.ConcurrencyLimiterOptions> options) -> void
-~Microsoft.AspNetCore.ConcurrencyLimiter.ConcurrencyLimiterMiddleware.Invoke(Microsoft.AspNetCore.Http.HttpContext context) -> System.Threading.Tasks.Task
-~Microsoft.AspNetCore.ConcurrencyLimiter.ConcurrencyLimiterOptions.OnRejected.get -> Microsoft.AspNetCore.Http.RequestDelegate
-~Microsoft.AspNetCore.ConcurrencyLimiter.ConcurrencyLimiterOptions.OnRejected.set -> void
-~static Microsoft.AspNetCore.Builder.ConcurrencyLimiterExtensions.UseConcurrencyLimiter(this Microsoft.AspNetCore.Builder.IApplicationBuilder app) -> Microsoft.AspNetCore.Builder.IApplicationBuilder
-~static Microsoft.Extensions.DependencyInjection.QueuePolicyServiceCollectionExtensions.AddQueuePolicy(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action<Microsoft.AspNetCore.ConcurrencyLimiter.QueuePolicyOptions> configure) -> Microsoft.Extensions.DependencyInjection.IServiceCollection
-~static Microsoft.Extensions.DependencyInjection.QueuePolicyServiceCollectionExtensions.AddStackPolicy(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action<Microsoft.AspNetCore.ConcurrencyLimiter.QueuePolicyOptions> configure) -> Microsoft.Extensions.DependencyInjection.IServiceCollection
+~Microsoft.AspNetCore.ConcurrencyLimiter.ConcurrencyLimiterMiddleware.ConcurrencyLimiterMiddleware(Microsoft.AspNetCore.Http.RequestDelegate! next, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory, Microsoft.AspNetCore.ConcurrencyLimiter.IQueuePolicy! queue, Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.ConcurrencyLimiter.ConcurrencyLimiterOptions!>! options) -> void
+Microsoft.AspNetCore.ConcurrencyLimiter.ConcurrencyLimiterMiddleware.Invoke(Microsoft.AspNetCore.Http.HttpContext! context) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.ConcurrencyLimiter.ConcurrencyLimiterOptions.OnRejected.get -> Microsoft.AspNetCore.Http.RequestDelegate!
+Microsoft.AspNetCore.ConcurrencyLimiter.ConcurrencyLimiterOptions.OnRejected.set -> void
+static Microsoft.AspNetCore.Builder.ConcurrencyLimiterExtensions.UseConcurrencyLimiter(this Microsoft.AspNetCore.Builder.IApplicationBuilder! app) -> Microsoft.AspNetCore.Builder.IApplicationBuilder!
+static Microsoft.Extensions.DependencyInjection.QueuePolicyServiceCollectionExtensions.AddQueuePolicy(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.AspNetCore.ConcurrencyLimiter.QueuePolicyOptions!>! configure) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
+static Microsoft.Extensions.DependencyInjection.QueuePolicyServiceCollectionExtensions.AddStackPolicy(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.AspNetCore.ConcurrencyLimiter.QueuePolicyOptions!>! configure) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!

src/Middleware/ConcurrencyLimiter/src/QueuePolicies/ResettableBooleanCompletionSource.cs

@@ -50,7 +50,7 @@ public ValueTaskSourceStatus GetStatus(short token)
             return _valueTaskSource.GetStatus(token);
         }
 
-        void IValueTaskSource<bool>.OnCompleted(Action<object> continuation, object state, short token, ValueTaskSourceOnCompletedFlags flags)
+        void IValueTaskSource<bool>.OnCompleted(Action<object?> continuation, object? state, short token, ValueTaskSourceOnCompletedFlags flags)
         {
             _valueTaskSource.OnCompleted(continuation, state, token, flags);
         }

src/Middleware/ConcurrencyLimiter/src/QueuePolicies/StackPolicy.cs

@@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.ConcurrencyLimiter
     internal class StackPolicy : IQueuePolicy
     {
         private readonly List<ResettableBooleanCompletionSource> _buffer;
-        public ResettableBooleanCompletionSource _cachedResettableTCS;
+        public ResettableBooleanCompletionSource? _cachedResettableTCS;
 
         private readonly int _maxQueueCapacity;
         private readonly int _maxConcurrentRequests;

src/Middleware/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <Description>Helpers for building single-page applications on ASP.NET MVC Core.</Description>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

src/Middleware/SpaServices.Extensions/src/Npm/NodeScriptRunner.cs

@@ -18,13 +18,13 @@ namespace Microsoft.AspNetCore.NodeServices.Npm
     /// </summary>
     internal class NodeScriptRunner : IDisposable
     {
-        private Process _npmProcess;
+        private Process? _npmProcess;
         public EventedStreamReader StdOut { get; }
         public EventedStreamReader StdErr { get; }
 
         private static Regex AnsiColorRegex = new Regex("\x001b\\[[0-9;]*m", RegexOptions.None, TimeSpan.FromSeconds(1));
 
-        public NodeScriptRunner(string workingDirectory, string scriptName, string arguments, IDictionary<string, string> envVars, string pkgManagerCommand, DiagnosticSource diagnosticSource, CancellationToken applicationStoppingToken)
+        public NodeScriptRunner(string workingDirectory, string scriptName, string? arguments, IDictionary<string, string>? envVars, string pkgManagerCommand, DiagnosticSource diagnosticSource, CancellationToken applicationStoppingToken)
         {
             if (string.IsNullOrEmpty(workingDirectory))
             {
@@ -113,6 +113,8 @@ public void AttachToLogger(ILogger logger)
             // hence just pass it through to StdOut regardless of logger config.
             StdErr.OnReceivedChunk += chunk =>
             {
+                Debug.Assert(chunk.Array != null);
+
                 var containsNewline = Array.IndexOf(
                     chunk.Array, '\n', chunk.Offset, chunk.Count) >= 0;
                 if (!containsNewline)
@@ -129,7 +131,7 @@ private static Process LaunchNodeProcess(ProcessStartInfo startInfo, string comm
         {
             try
             {
-                var process = Process.Start(startInfo);
+                var process = Process.Start(startInfo)!;
 
                 // See equivalent comment in OutOfProcessNodeInstance.cs for why
                 process.EnableRaisingEvents = true;

src/Middleware/SpaServices.Extensions/src/Prerendering/SpaPrerenderingOptions.cs

@@ -6,6 +6,8 @@
 using System;
 using System.Collections.Generic;
 
+#nullable disable
+
 namespace Microsoft.AspNetCore.Builder
 {
     /// <summary>

src/Middleware/SpaServices.Extensions/src/Proxying/SpaProxy.cs

@@ -300,7 +300,7 @@ private static async Task PumpWebSocket(WebSocket source, WebSocket destination,
                 {
                     if (destination.State == WebSocketState.Open || destination.State == WebSocketState.CloseReceived)
                     {
-                        await destination.CloseOutputAsync(source.CloseStatus.Value, source.CloseStatusDescription, cancellationToken);
+                        await destination.CloseOutputAsync(source.CloseStatus!.Value, source.CloseStatusDescription, cancellationToken);
                     }
 
                     return;