Skip to content

Commit 1b78513

Browse files
surayya-MSBrennanConroyMackinnonBuckwtgodbemitchdenny
authored
Update SDK to 8.0.100-preview.5.23226.2 (#47540)
* Update SDK; use ArgumentOutOfRangeException.ThrowIfEqual instead of new instance * Fix compiler warning. * Update SDK to 8.0.100-preview.5.23226.2 * Suppress EnableGenerateDocumentationFile error to unblock the new SDK --------- Co-authored-by: Brennan <[email protected]> Co-authored-by: Mackinnon Buck <[email protected]> Co-authored-by: William Godbe <[email protected]> Co-authored-by: Mitch Denny <[email protected]> Co-authored-by: Mitch Denny <[email protected]> Co-authored-by: Sébastien Ros <[email protected]> Co-authored-by: Eric Erhardt <[email protected]>
1 parent e233a32 commit 1b78513

File tree

7 files changed

+17
-11
lines changed

7 files changed

+17
-11
lines changed

.globalconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ dotnet_diagnostic.CA1304.severity = error
99

1010
# CA1310: Specify StringComparison for correctness
1111
dotnet_diagnostic.CA1310.severity = error
12+
13+
# TODO: remove this - https://github.com/dotnet/aspnetcore/issues/47912
14+
dotnet_diagnostic.EnableGenerateDocumentationFile.severity = none

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "8.0.100-preview.4.23176.5"
3+
"version": "8.0.100-preview.5.23226.2"
44
},
55
"tools": {
6-
"dotnet": "8.0.100-preview.4.23176.5",
6+
"dotnet": "8.0.100-preview.5.23226.2",
77
"runtimes": {
88
"dotnet/x86": [
99
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"

src/Hosting/Server.IntegrationTesting/src/Deployers/RemoteWindowsDeployer/RemoteWindowsDeployer.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public override void Dispose()
123123
}
124124
catch (Exception ex)
125125
{
126-
Logger.LogWarning(0, "Failed to stop the server.", ex);
126+
Logger.LogWarning(0, ex, "Failed to stop the server.");
127127
}
128128

129129
try
@@ -133,7 +133,7 @@ public override void Dispose()
133133
}
134134
catch (Exception ex)
135135
{
136-
Logger.LogWarning(0, $"Failed to delete the deployed folder '{_deployedFolderPathInFileShare}'.", ex);
136+
Logger.LogWarning(0, ex, $"Failed to delete the deployed folder '{_deployedFolderPathInFileShare}'.");
137137
}
138138

139139
try
@@ -143,7 +143,7 @@ public override void Dispose()
143143
}
144144
catch (Exception ex)
145145
{
146-
Logger.LogWarning(0, $"Failed to delete the locally published folder '{DeploymentParameters.PublishedApplicationRootPath}'.", ex);
146+
Logger.LogWarning(0, ex, $"Failed to delete the locally published folder '{DeploymentParameters.PublishedApplicationRootPath}'.");
147147
}
148148
}
149149
}

src/ProjectTemplates/test/Templates.Blazor.WebAssembly.Auth.Tests/BlazorWasmTemplateAuthTest.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,31 +264,37 @@ public TemplateInstance(string name, string auth, params string[] arguments)
264264

265265
[ConditionalTheory]
266266
[MemberData(nameof(TemplateDataIndividualB2C))]
267+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/47933")]
267268
public Task BlazorWasmHostedTemplate_AzureActiveDirectoryTemplate_IndividualB2C_Works(TemplateInstance instance)
268269
=> CreateBuildPublishAsync(auth: instance.Auth, args: instance.Arguments, targetFramework: "netstandard2.1");
269270

270271
[ConditionalTheory]
271272
[MemberData(nameof(TemplateDataIndividualB2C))]
273+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/47933")]
272274
public Task BlazorWasmHostedTemplate_AzureActiveDirectoryTemplate_IndividualB2C_NoHttps_Works(TemplateInstance instance)
273275
=> CreateBuildPublishAsync(auth: instance.Auth, args: instance.Arguments.Union(new[] { ArgConstants.NoHttps }).ToArray(), targetFramework: "netstandard2.1");
274276

275277
[ConditionalTheory]
276278
[MemberData(nameof(TemplateDataSingleOrg))]
279+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/47933")]
277280
public Task BlazorWasmHostedTemplate_AzureActiveDirectoryTemplate_SingleOrg_Works(TemplateInstance instance)
278281
=> CreateBuildPublishAsync(auth: instance.Auth, args: instance.Arguments, targetFramework: "netstandard2.1");
279282

280283
[ConditionalTheory]
281284
[MemberData(nameof(TemplateDataSingleOrg))]
285+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/47933")]
282286
public Task BlazorWasmHostedTemplate_AzureActiveDirectoryTemplate_SingleOrg_NoHttps_Works(TemplateInstance instance)
283287
=> CreateBuildPublishAsync(auth: instance.Auth, args: instance.Arguments.Union(new[] { ArgConstants.NoHttps }).ToArray(), targetFramework: "netstandard2.1");
284288

285289
[ConditionalTheory]
286290
[MemberData(nameof(TemplateDataSingleOrgProgramMain))]
291+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/47933")]
287292
public Task BlazorWasmHostedTemplate_AzureActiveDirectoryTemplate_SingleOrg_ProgramMain_Works(TemplateInstance instance)
288293
=> CreateBuildPublishAsync(auth: instance.Auth, args: instance.Arguments, targetFramework: "netstandard2.1");
289294

290295
[ConditionalTheory]
291296
[MemberData(nameof(TemplateDataSingleOrgProgramMain))]
297+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/47933")]
292298
public Task BlazorWasmHostedTemplate_AzureActiveDirectoryTemplate_SingleOrg_NoHttps_ProgramMain_Works(TemplateInstance instance)
293299
=> CreateBuildPublishAsync(auth: instance.Auth, args: instance.Arguments.Union(new[] { ArgConstants.NoHttps }).ToArray(), targetFramework: "netstandard2.1");
294300

src/Servers/IIS/IntegrationTesting.IIS/src/RetryHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ protected override async Task<HttpResponseMessage> SendAsync(
3434
}
3535
catch (Exception ex)
3636
{
37-
_logger.LogWarning("Error sending request", ex);
37+
_logger.LogWarning(ex, "Error sending request");
3838
if (i == MaxRetries - 1)
3939
{
4040
throw;

src/SignalR/common/Http.Connections/src/HttpConnectionDispatcherOptions.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,7 @@ public TimeSpan TransportSendTimeout
108108
get => _transportSendTimeout;
109109
set
110110
{
111-
if (value == TimeSpan.Zero)
112-
{
113-
throw new ArgumentOutOfRangeException(nameof(value));
114-
}
111+
ArgumentOutOfRangeException.ThrowIfEqual(value, TimeSpan.Zero);
115112

116113
_transportSendTimeout = value;
117114
TransportSendTimeoutTicks = value.Ticks;

src/Tools/dotnet-user-jwts/src/Commands/ListCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ private static void PrintJwtsJson(IReporter reporter, JwtStore jwtStore)
5454
{
5555
if (jwtStore.Jwts is { Count: > 0 } jwts)
5656
{
57-
reporter.Output(JsonSerializer.Serialize(jwtStore.Jwts, new JsonSerializerOptions { WriteIndented = true }));
57+
reporter.Output(JsonSerializer.Serialize(jwts, new JsonSerializerOptions { WriteIndented = true }));
5858
}
5959
else
6060
{

0 commit comments

Comments
 (0)