Update .NET SDK to 10.0.100-preview.4.25180.3 (#61244)

github-actions[bot] · halter73 · web-flow · commit 72fd6dde3cef · 2025-04-02T00:56:28.000Z
* Update .NET SDK

Update .NET SDK to version 10.0.100-preview.4.25180.3.

---
updated-dependencies:
- dependency-name: Microsoft.NET.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: github-actions[bot] &lt;github-actions[bot]@users.noreply.github.com&gt;

* Fix IDE0031 warnings

* Fix more IDE0031 warnings

---------

Signed-off-by: github-actions[bot] &lt;github-actions[bot]@users.noreply.github.com&gt;
Co-authored-by: github-actions[bot] &lt;github-actions[bot]@users.noreply.github.com&gt;
Co-authored-by: Stephen Halter &lt;halter73@gmail.com&gt;
diff --git a/global.json b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "10.0.100-preview.4.25177.17"
+    "version": "10.0.100-preview.4.25180.3"
   },
   "tools": {
-    "dotnet": "10.0.100-preview.4.25177.17",
+    "dotnet": "10.0.100-preview.4.25180.3",
     "runtimes": {
       "dotnet/x86": [
         "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"
diff --git a/src/Components/Server/src/Circuits/CircuitHost.cs b/src/Components/Server/src/Circuits/CircuitHost.cs
@@ -828,10 +828,7 @@ await HandleInboundActivityAsync(() =>
                             operation.Descriptor.ComponentType,
                             operation.Marker.Value.Key,
                             operation.Descriptor.Parameters);
-                        if (pendingTasks != null)
-                        {
-                            pendingTasks[i] = task;
-                        }
+                        pendingTasks?[i] = task;
                         break;
                     case RootComponentOperationType.Update:
                         // We don't need to await component updates as any unhandled exception will be reported and terminate the circuit.
diff --git a/src/Hosting/Hosting/src/Http/DefaultHttpContextFactory.cs b/src/Hosting/Hosting/src/Http/DefaultHttpContextFactory.cs
@@ -58,10 +58,7 @@ internal void Initialize(DefaultHttpContext httpContext, IFeatureCollection feat
 
         httpContext.Initialize(featureCollection);
 
-        if (_httpContextAccessor != null)
-        {
-            _httpContextAccessor.HttpContext = httpContext;
-        }
+        _httpContextAccessor?.HttpContext = httpContext;
 
         httpContext.FormOptions = _formOptions;
         httpContext.ServiceScopeFactory = _serviceScopeFactory;
@@ -72,18 +69,12 @@ internal void Initialize(DefaultHttpContext httpContext, IFeatureCollection feat
     /// </summary>
     public void Dispose(HttpContext httpContext)
     {
-        if (_httpContextAccessor != null)
-        {
-            _httpContextAccessor.HttpContext = null;
-        }
+        _httpContextAccessor?.HttpContext = null;
     }
 
     internal void Dispose(DefaultHttpContext httpContext)
     {
-        if (_httpContextAccessor != null)
-        {
-            _httpContextAccessor.HttpContext = null;
-        }
+        _httpContextAccessor?.HttpContext = null;
 
         httpContext.Uninitialize();
     }
diff --git a/src/Http/Http/src/HttpContextAccessor.cs b/src/Http/Http/src/HttpContextAccessor.cs
@@ -22,12 +22,8 @@ public HttpContext? HttpContext
         }
         set
         {
-            var holder = _httpContextCurrent.Value;
-            if (holder != null)
-            {
-                // Clear current HttpContext trapped in the AsyncLocals, as its done.
-                holder.Context = null;
-            }
+            // Clear current HttpContext trapped in the AsyncLocals, as its done.
+            _httpContextCurrent.Value?.Context = null;
 
             if (value != null)
             {
diff --git a/src/Middleware/Rewrite/src/RewriteMiddleware.cs b/src/Middleware/Rewrite/src/RewriteMiddleware.cs
@@ -77,11 +77,7 @@ public Task Invoke(HttpContext context)
                 // An endpoint may have already been set. Since we're going to re-invoke the middleware pipeline we need to reset
                 // the endpoint and route values to ensure things are re-calculated.
                 context.SetEndpoint(endpoint: null);
-                var routeValuesFeature = context.Features.Get<IRouteValuesFeature>();
-                if (routeValuesFeature is not null)
-                {
-                    routeValuesFeature.RouteValues = null!;
-                }
+                context.Features.Get<IRouteValuesFeature>()?.RouteValues = null!;
                 return _options.BranchedNext(context);
             }
         }
diff --git a/src/Middleware/Rewrite/src/UrlActions/CustomResponseAction.cs b/src/Middleware/Rewrite/src/UrlActions/CustomResponseAction.cs
@@ -31,11 +31,8 @@ public override void ApplyAction(RewriteContext context, BackReferenceCollection
 
         if (!string.IsNullOrEmpty(StatusDescription))
         {
-            var feature = context.HttpContext.Features.Get<IHttpBodyControlFeature>();
-            if (feature != null)
-            {
-                feature.AllowSynchronousIO = true;
-            }
+            context.HttpContext.Features.Get<IHttpBodyControlFeature>()?.AllowSynchronousIO = true;
+
             var content = Encoding.UTF8.GetBytes(StatusDescription);
             response.ContentLength = content.Length;
             response.ContentType = "text/plain; charset=utf-8";
diff --git a/src/Middleware/StaticFiles/src/StaticFileContext.cs b/src/Middleware/StaticFiles/src/StaticFileContext.cs
@@ -407,11 +407,7 @@ private ContentRangeHeaderValue ComputeContentRange(RangeItemHeaderValue range,
     // Only called when we expect to serve the body.
     private void SetCompressionMode()
     {
-        var responseCompressionFeature = _context.Features.Get<IHttpsCompressionFeature>();
-        if (responseCompressionFeature != null)
-        {
-            responseCompressionFeature.Mode = _options.HttpsCompression;
-        }
+        _context.Features.Get<IHttpsCompressionFeature>()?.Mode = _options.HttpsCompression;
     }
 
     internal enum PreconditionState : byte
diff --git a/src/Mvc/Mvc.Core/src/ModelBinding/Validation/ValidationVisitor.cs b/src/Mvc/Mvc.Core/src/ModelBinding/Validation/ValidationVisitor.cs
@@ -248,12 +248,7 @@ protected virtual bool ValidateNode()
         {
             // If the field has an entry in ModelState, then record it as valid. Don't create
             // extra entries if they don't exist already.
-            var entry = ModelState[Key];
-            if (entry != null)
-            {
-                entry.ValidationState = ModelValidationState.Valid;
-            }
-
+            ModelState[Key]?.ValidationState = ModelValidationState.Valid;
             return true;
         }
     }
diff --git a/src/Mvc/Mvc.ViewFeatures/src/Filters/SaveTempDataFilter.cs b/src/Mvc/Mvc.ViewFeatures/src/Filters/SaveTempDataFilter.cs
@@ -83,11 +83,7 @@ public void OnResourceExecuted(ResourceExecutedContext context)
         // not be available.
         if (!context.HttpContext.Response.HasStarted && context.Exception != null)
         {
-            var saveTempDataContext = GetTempDataContext(context.HttpContext);
-            if (saveTempDataContext != null)
-            {
-                saveTempDataContext.RequestHasUnhandledException = true;
-            }
+            GetTempDataContext(context.HttpContext)?.RequestHasUnhandledException = true;
         }
     }
 
@@ -105,12 +101,7 @@ public void OnResultExecuted(ResultExecutedContext context)
         if (!context.HttpContext.Response.HasStarted)
         {
             SaveTempData(context.Result, _factory, context.Filters, context.HttpContext);
-
-            var saveTempDataContext = GetTempDataContext(context.HttpContext);
-            if (saveTempDataContext != null)
-            {
-                saveTempDataContext.TempDataSaved = true;
-            }
+            GetTempDataContext(context.HttpContext)?.TempDataSaved = true;
         }
     }
 
diff --git a/src/Mvc/Mvc.ViewFeatures/src/SkipStatusCodePagesAttribute.cs b/src/Mvc/Mvc.ViewFeatures/src/SkipStatusCodePagesAttribute.cs
@@ -23,11 +23,7 @@ public void OnResourceExecuting(ResourceExecutingContext context)
     {
         ArgumentNullException.ThrowIfNull(context);
 
-        var statusCodeFeature = context.HttpContext.Features.Get<IStatusCodePagesFeature>();
-        if (statusCodeFeature != null)
-        {
-            // Turn off the StatusCodePages feature.
-            statusCodeFeature.Enabled = false;
-        }
+        // Turn off the StatusCodePages feature.
+        context.HttpContext.Features.Get<IStatusCodePagesFeature>()?.Enabled = false;
     }
 }
diff --git a/src/Security/Authentication/Negotiate/src/NegotiateHandler.cs b/src/Security/Authentication/Negotiate/src/NegotiateHandler.cs
@@ -126,10 +126,7 @@ public async Task<bool> HandleRequestAsync()
                 Logger.Reauthenticating();
                 _negotiateState.Dispose();
                 _negotiateState = null;
-                if (persistence != null)
-                {
-                    persistence.State = null;
-                }
+                persistence?.State = null;
             }
 
             _negotiateState ??= Options.StateFactory.CreateInstance();
diff --git a/src/Servers/HttpSys/src/RequestProcessing/Request.cs b/src/Servers/HttpSys/src/RequestProcessing/Request.cs
@@ -264,10 +264,7 @@ public long? MaxRequestBodySize
         set
         {
             EnsureRequestStream();
-            if (_nativeStream != null)
-            {
-                _nativeStream.MaxSize = value;
-            }
+            _nativeStream?.MaxSize = value;
         }
     }
 
diff --git a/src/Servers/HttpSys/src/RequestProcessing/Response.cs b/src/Servers/HttpSys/src/RequestProcessing/Response.cs
@@ -186,10 +186,7 @@ public TimeSpan? CacheTtl
     // callers if they try to add them too late. E.g. after Content-Length or CompleteAsync().
     internal void MakeTrailersReadOnly()
     {
-        if (_trailers != null)
-        {
-            _trailers.IsReadOnly = true;
-        }
+        _trailers?.IsReadOnly = true;
     }
 
     internal void Abort()
diff --git a/src/Shared/HttpExtensions.cs b/src/Shared/HttpExtensions.cs
@@ -58,10 +58,6 @@ internal static void ClearEndpoint(HttpContext context)
             context.SetEndpoint(endpoint: null);
         }
 
-        var routeValuesFeature = context.Features.Get<IRouteValuesFeature>();
-        if (routeValuesFeature != null)
-        {
-            routeValuesFeature.RouteValues = null!;
-        }
+        context.Features.Get<IRouteValuesFeature>()?.RouteValues = null!;
     }
 }
diff --git a/src/Tools/dotnet-user-jwts/src/Helpers/JwtStore.cs b/src/Tools/dotnet-user-jwts/src/Helpers/JwtStore.cs
@@ -18,10 +18,7 @@ public JwtStore(string userSecretsId, Program program = null)
         Load();
 
         // For testing.
-        if (program is not null)
-        {
-            program.UserJwtsFilePath = _filePath;
-        }
+        program?.UserJwtsFilePath = _filePath;
     }
 
     public IDictionary<string, Jwt> Jwts { get; private set; } = new Dictionary<string, Jwt>();

Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,8 @@ public HttpContext? HttpContext`
`22`	`22`	`}`
`23`	`23`	`set`
`24`	`24`	`{`
`25`		`- var holder = _httpContextCurrent.Value;`
`26`		`- if (holder != null)`
`27`		`- {`
`28`		`- // Clear current HttpContext trapped in the AsyncLocals, as its done.`
`29`		`- holder.Context = null;`
`30`		`- }`
	`25`	`+ // Clear current HttpContext trapped in the AsyncLocals, as its done.`
	`26`	`+ _httpContextCurrent.Value?.Context = null;`
`31`	`27`
`32`	`28`	`if (value != null)`
`33`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -77,11 +77,7 @@ public Task Invoke(HttpContext context)`
`77`	`77`	`// An endpoint may have already been set. Since we're going to re-invoke the middleware pipeline we need to reset`
`78`	`78`	`// the endpoint and route values to ensure things are re-calculated.`
`79`	`79`	`context.SetEndpoint(endpoint: null);`
`80`		`- var routeValuesFeature = context.Features.Get<IRouteValuesFeature>();`
`81`		`- if (routeValuesFeature is not null)`
`82`		`- {`
`83`		`- routeValuesFeature.RouteValues = null!;`
`84`		`- }`
	`80`	`+ context.Features.Get<IRouteValuesFeature>()?.RouteValues = null!;`
`85`	`81`	`return _options.BranchedNext(context);`
`86`	`82`	`}`
`87`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -407,11 +407,7 @@ private ContentRangeHeaderValue ComputeContentRange(RangeItemHeaderValue range,`
`407`	`407`	`// Only called when we expect to serve the body.`
`408`	`408`	`private void SetCompressionMode()`
`409`	`409`	`{`
`410`		`- var responseCompressionFeature = _context.Features.Get<IHttpsCompressionFeature>();`
`411`		`- if (responseCompressionFeature != null)`
`412`		`- {`
`413`		`- responseCompressionFeature.Mode = _options.HttpsCompression;`
`414`		`- }`
	`410`	`+ _context.Features.Get<IHttpsCompressionFeature>()?.Mode = _options.HttpsCompression;`
`415`	`411`	`}`
`416`	`412`
`417`	`413`	`internal enum PreconditionState : byte`
Original file line number	Diff line number	Diff line change
`@@ -248,12 +248,7 @@ protected virtual bool ValidateNode()`
`248`	`248`	`{`
`249`	`249`	`// If the field has an entry in ModelState, then record it as valid. Don't create`
`250`	`250`	`// extra entries if they don't exist already.`
`251`		`- var entry = ModelState[Key];`
`252`		`- if (entry != null)`
`253`		`- {`
`254`		`- entry.ValidationState = ModelValidationState.Valid;`
`255`		`- }`
`256`		`-`
	`251`	`+ ModelState[Key]?.ValidationState = ModelValidationState.Valid;`
`257`	`252`	`return true;`
`258`	`253`	`}`
`259`	`254`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,11 +83,7 @@ public void OnResourceExecuted(ResourceExecutedContext context)`
`83`	`83`	`// not be available.`
`84`	`84`	`if (!context.HttpContext.Response.HasStarted && context.Exception != null)`
`85`	`85`	`{`
`86`		`- var saveTempDataContext = GetTempDataContext(context.HttpContext);`
`87`		`- if (saveTempDataContext != null)`
`88`		`- {`
`89`		`- saveTempDataContext.RequestHasUnhandledException = true;`
`90`		`- }`
	`86`	`+ GetTempDataContext(context.HttpContext)?.RequestHasUnhandledException = true;`
`91`	`87`	`}`
`92`	`88`	`}`
`93`	`89`
`@@ -105,12 +101,7 @@ public void OnResultExecuted(ResultExecutedContext context)`
`105`	`101`	`if (!context.HttpContext.Response.HasStarted)`
`106`	`102`	`{`
`107`	`103`	`SaveTempData(context.Result, _factory, context.Filters, context.HttpContext);`
`108`		`-`
`109`		`- var saveTempDataContext = GetTempDataContext(context.HttpContext);`
`110`		`- if (saveTempDataContext != null)`
`111`		`- {`
`112`		`- saveTempDataContext.TempDataSaved = true;`
`113`		`- }`
	`104`	`+ GetTempDataContext(context.HttpContext)?.TempDataSaved = true;`
`114`	`105`	`}`
`115`	`106`	`}`
`116`	`107`
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,7 @@ public void OnResourceExecuting(ResourceExecutingContext context)`
`23`	`23`	`{`
`24`	`24`	`ArgumentNullException.ThrowIfNull(context);`
`25`	`25`
`26`		`- var statusCodeFeature = context.HttpContext.Features.Get<IStatusCodePagesFeature>();`
`27`		`- if (statusCodeFeature != null)`
`28`		`- {`
`29`		`- // Turn off the StatusCodePages feature.`
`30`		`- statusCodeFeature.Enabled = false;`
`31`		`- }`
	`26`	`+ // Turn off the StatusCodePages feature.`
	`27`	`+ context.HttpContext.Features.Get<IStatusCodePagesFeature>()?.Enabled = false;`
`32`	`28`	`}`
`33`	`29`	`}`