Skip to content

Update SDK #47540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Apr 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .globalconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -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)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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}'.");
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ protected override async Task<HttpResponseMessage> SendAsync(
}
catch (Exception ex)
{
_logger.LogWarning("Error sending request", ex);
_logger.LogWarning(ex, "Error sending request");
if (i == MaxRetries - 1)
{
throw;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Tools/dotnet-user-jwts/src/Commands/ListCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down