diff --git a/global.json b/global.json index 8d7c8457dbf1..3bc118dbf269 100644 --- 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 index 66c636ba01f5..3a9bea6bd82b 100644 --- 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 index a5b6541b0f91..d087dc54d943 100644 --- 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 /// 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 index f71a6ef7c00e..d306a8dbeb8b 100644 --- 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 index d76ea33d21f5..7dcd2ca11b05 100644 --- 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(); - if (routeValuesFeature is not null) - { - routeValuesFeature.RouteValues = null!; - } + context.Features.Get()?.RouteValues = null!; return _options.BranchedNext(context); } } diff --git a/src/Middleware/Rewrite/src/UrlActions/CustomResponseAction.cs b/src/Middleware/Rewrite/src/UrlActions/CustomResponseAction.cs index 4c29d034aee4..3954db7a7053 100644 --- 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(); - if (feature != null) - { - feature.AllowSynchronousIO = true; - } + context.HttpContext.Features.Get()?.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 index 69e8d8c59576..48bd8692496f 100644 --- 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(); - if (responseCompressionFeature != null) - { - responseCompressionFeature.Mode = _options.HttpsCompression; - } + _context.Features.Get()?.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 index 68c71a5e4807..48e1580609c6 100644 --- 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 index 2da398ae0e8f..20e78949b675 100644 --- 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 index c0abec8fa222..ebf3a237b96f 100644 --- 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(); - if (statusCodeFeature != null) - { - // Turn off the StatusCodePages feature. - statusCodeFeature.Enabled = false; - } + // Turn off the StatusCodePages feature. + context.HttpContext.Features.Get()?.Enabled = false; } } diff --git a/src/Security/Authentication/Negotiate/src/NegotiateHandler.cs b/src/Security/Authentication/Negotiate/src/NegotiateHandler.cs index b1909d52ccfb..ace68994281e 100644 --- a/src/Security/Authentication/Negotiate/src/NegotiateHandler.cs +++ b/src/Security/Authentication/Negotiate/src/NegotiateHandler.cs @@ -126,10 +126,7 @@ public async Task 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 index b32a973a5fb5..8e4babf7ca21 100644 --- 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 index f2f550544ead..541199729a49 100644 --- 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 index 4a0d50de25fd..3e2bde30e848 100644 --- 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(); - if (routeValuesFeature != null) - { - routeValuesFeature.RouteValues = null!; - } + context.Features.Get()?.RouteValues = null!; } } diff --git a/src/Tools/dotnet-user-jwts/src/Helpers/JwtStore.cs b/src/Tools/dotnet-user-jwts/src/Helpers/JwtStore.cs index 79ca7f05c935..d32affe119a5 100644 --- 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 Jwts { get; private set; } = new Dictionary();