diff --git a/.globalconfig b/.globalconfig index 467b330e45a1..202ab97159d2 100644 --- a/.globalconfig +++ b/.globalconfig @@ -9,3 +9,6 @@ dotnet_diagnostic.CA1304.severity = error # CA1310: Specify StringComparison for correctness dotnet_diagnostic.CA1310.severity = error + +# TODO: remove this - https://github.com/dotnet/aspnetcore/issues/47912 +dotnet_diagnostic.EnableGenerateDocumentationFile.severity = none diff --git a/global.json b/global.json index bebcb1eecd02..0f32289aa98c 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "8.0.100-preview.4.23176.5" + "version": "8.0.100-preview.5.23226.2" }, "tools": { - "dotnet": "8.0.100-preview.4.23176.5", + "dotnet": "8.0.100-preview.5.23226.2", "runtimes": { "dotnet/x86": [ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" diff --git a/src/Hosting/Server.IntegrationTesting/src/Deployers/RemoteWindowsDeployer/RemoteWindowsDeployer.cs b/src/Hosting/Server.IntegrationTesting/src/Deployers/RemoteWindowsDeployer/RemoteWindowsDeployer.cs index f72a881fb886..6e3ff38e3d76 100644 --- a/src/Hosting/Server.IntegrationTesting/src/Deployers/RemoteWindowsDeployer/RemoteWindowsDeployer.cs +++ b/src/Hosting/Server.IntegrationTesting/src/Deployers/RemoteWindowsDeployer/RemoteWindowsDeployer.cs @@ -123,7 +123,7 @@ public override void Dispose() } catch (Exception ex) { - Logger.LogWarning(0, "Failed to stop the server.", ex); + Logger.LogWarning(0, ex, "Failed to stop the server."); } try @@ -133,7 +133,7 @@ public override void Dispose() } catch (Exception ex) { - Logger.LogWarning(0, $"Failed to delete the deployed folder '{_deployedFolderPathInFileShare}'.", ex); + Logger.LogWarning(0, ex, $"Failed to delete the deployed folder '{_deployedFolderPathInFileShare}'."); } try @@ -143,7 +143,7 @@ public override void Dispose() } catch (Exception ex) { - Logger.LogWarning(0, $"Failed to delete the locally published folder '{DeploymentParameters.PublishedApplicationRootPath}'.", ex); + Logger.LogWarning(0, ex, $"Failed to delete the locally published folder '{DeploymentParameters.PublishedApplicationRootPath}'."); } } } diff --git a/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/BlazorWasmTemplateAuthTest.cs b/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/BlazorWasmTemplateAuthTest.cs index 818b7b38fd4a..a160b6c6c0e7 100644 --- a/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/BlazorWasmTemplateAuthTest.cs +++ b/src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/BlazorWasmTemplateAuthTest.cs @@ -263,31 +263,37 @@ public TemplateInstance(string name, string auth, params string[] arguments) [ConditionalTheory] [MemberData(nameof(TemplateDataIndividualB2C))] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/47933")] public Task BlazorWasmHostedTemplate_AzureActiveDirectoryTemplate_IndividualB2C_Works(TemplateInstance instance) => CreateBuildPublishAsync(auth: instance.Auth, args: instance.Arguments, targetFramework: "netstandard2.1"); [ConditionalTheory] [MemberData(nameof(TemplateDataIndividualB2C))] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/47933")] public Task BlazorWasmHostedTemplate_AzureActiveDirectoryTemplate_IndividualB2C_NoHttps_Works(TemplateInstance instance) => CreateBuildPublishAsync(auth: instance.Auth, args: instance.Arguments.Union(new[] { ArgConstants.NoHttps }).ToArray(), targetFramework: "netstandard2.1"); [ConditionalTheory] [MemberData(nameof(TemplateDataSingleOrg))] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/47933")] public Task BlazorWasmHostedTemplate_AzureActiveDirectoryTemplate_SingleOrg_Works(TemplateInstance instance) => CreateBuildPublishAsync(auth: instance.Auth, args: instance.Arguments, targetFramework: "netstandard2.1"); [ConditionalTheory] [MemberData(nameof(TemplateDataSingleOrg))] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/47933")] public Task BlazorWasmHostedTemplate_AzureActiveDirectoryTemplate_SingleOrg_NoHttps_Works(TemplateInstance instance) => CreateBuildPublishAsync(auth: instance.Auth, args: instance.Arguments.Union(new[] { ArgConstants.NoHttps }).ToArray(), targetFramework: "netstandard2.1"); [ConditionalTheory] [MemberData(nameof(TemplateDataSingleOrgProgramMain))] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/47933")] public Task BlazorWasmHostedTemplate_AzureActiveDirectoryTemplate_SingleOrg_ProgramMain_Works(TemplateInstance instance) => CreateBuildPublishAsync(auth: instance.Auth, args: instance.Arguments, targetFramework: "netstandard2.1"); [ConditionalTheory] [MemberData(nameof(TemplateDataSingleOrgProgramMain))] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/47933")] public Task BlazorWasmHostedTemplate_AzureActiveDirectoryTemplate_SingleOrg_NoHttps_ProgramMain_Works(TemplateInstance instance) => CreateBuildPublishAsync(auth: instance.Auth, args: instance.Arguments.Union(new[] { ArgConstants.NoHttps }).ToArray(), targetFramework: "netstandard2.1"); diff --git a/src/Servers/IIS/IntegrationTesting.IIS/src/RetryHandler.cs b/src/Servers/IIS/IntegrationTesting.IIS/src/RetryHandler.cs index 08fe05814e1f..d73bb843279e 100644 --- a/src/Servers/IIS/IntegrationTesting.IIS/src/RetryHandler.cs +++ b/src/Servers/IIS/IntegrationTesting.IIS/src/RetryHandler.cs @@ -34,7 +34,7 @@ protected override async Task SendAsync( } catch (Exception ex) { - _logger.LogWarning("Error sending request", ex); + _logger.LogWarning(ex, "Error sending request"); if (i == MaxRetries - 1) { throw; diff --git a/src/SignalR/common/Http.Connections/src/HttpConnectionDispatcherOptions.cs b/src/SignalR/common/Http.Connections/src/HttpConnectionDispatcherOptions.cs index 9622425f7877..8d923f018b7a 100644 --- a/src/SignalR/common/Http.Connections/src/HttpConnectionDispatcherOptions.cs +++ b/src/SignalR/common/Http.Connections/src/HttpConnectionDispatcherOptions.cs @@ -108,10 +108,7 @@ public TimeSpan TransportSendTimeout get => _transportSendTimeout; set { - if (value == TimeSpan.Zero) - { - throw new ArgumentOutOfRangeException(nameof(value)); - } + ArgumentOutOfRangeException.ThrowIfEqual(value, TimeSpan.Zero); _transportSendTimeout = value; TransportSendTimeoutTicks = value.Ticks; diff --git a/src/Tools/dotnet-user-jwts/src/Commands/ListCommand.cs b/src/Tools/dotnet-user-jwts/src/Commands/ListCommand.cs index 36bbd39cebe2..44259d81f869 100644 --- a/src/Tools/dotnet-user-jwts/src/Commands/ListCommand.cs +++ b/src/Tools/dotnet-user-jwts/src/Commands/ListCommand.cs @@ -54,7 +54,7 @@ private static void PrintJwtsJson(IReporter reporter, JwtStore jwtStore) { if (jwtStore.Jwts is { Count: > 0 } jwts) { - reporter.Output(JsonSerializer.Serialize(jwtStore.Jwts, new JsonSerializerOptions { WriteIndented = true })); + reporter.Output(JsonSerializer.Serialize(jwts, new JsonSerializerOptions { WriteIndented = true })); } else {