Skip to content
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.

Sign up for GitHub

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

Update SDK #47540

Merged
merged 19 commits into from
Apr 27, 2023
Merged

Update SDK #47540

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
23a34b6
Update SDK; use ArgumentOutOfRangeException.ThrowIfEqual instead of n…
surayya-MS Apr 3, 2023
7a28ea2
suppress CA1512
surayya-MS Apr 4, 2023
5c7771b
suppress CA1512 with pragma
surayya-MS Apr 4, 2023
9407844
Update global.json
BrennanConroy Apr 4, 2023
f7efa2e
Merge branch 'dotnet:main' into main
surayya-MS Apr 4, 2023
2aa4b1a
remove suppression of CA1512; suppress CA2017
surayya-MS Apr 4, 2023
84dfd5e
removed CA2017 suppression; fixed Logger.LogWarning
surayya-MS Apr 4, 2023
eae6ddd
Update SDK to 8.0.100-preview.4.23210.1
MackinnonBuck Apr 10, 2023
6219d14
Suppress CA1512 (again)
MackinnonBuck Apr 10, 2023
f66844b
Merge remote-tracking branch 'upstream/main'
MackinnonBuck Apr 10, 2023
8213e6b
Use ArgumentOutOfRangeException.ThrowIfEqual
MackinnonBuck Apr 10, 2023
05bcdd8
Update global.json
wtgodbe Apr 18, 2023
5af7362
Update global.json
mitchdenny Apr 21, 2023
c11574b
Fix compiler warning.
mitchdenny Apr 21, 2023
f7591da
Update global.json
sebastienros Apr 25, 2023
b308696
Update to 8.0.100-preview.4.23225.1
mitchdenny Apr 25, 2023
60b928d
Update SDK to 8.0.100-preview.5.23226.2
eerhardt Apr 26, 2023
20f1745
Suppress EnableGenerateDocumentationFile error to unblock the new SDK
eerhardt Apr 26, 2023
01b5bf6
Quarantine BlazorWasmHostedTemplate_AzureActiveDirectoryTemplate_*
amcasey Apr 27, 2023
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
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
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.4.23210.1"
},
"tools": {
"dotnet": "8.0.100-preview.4.23176.5",
"dotnet": "8.0.100-preview.4.23210.1",
"runtimes": {
"dotnet/x86": [
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
Expand Down
6 changes: 3 additions & 3 deletions ...ng/Server.IntegrationTesting/src/Deployers/RemoteWindowsDeployer/RemoteWindowsDeployer.cs
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/Servers/IIS/IntegrationTesting.IIS/src/RetryHandler.cs
View file
Open in desktop
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
2 changes: 2 additions & 0 deletions src/SignalR/common/Http.Connections/src/HttpConnectionDispatcherOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,12 @@ public TimeSpan TransportSendTimeout
get => _transportSendTimeout;
set
{
#pragma warning disable CA1512 // Use ArgumentOutOfRangeException throw helper
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be fixable now since the APIs exist?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried this but it looks like they still haven't been added?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh that's annoying, you probably need an updated runtime as well. The APIs have definitely been added. (added 5 days ago)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something's up with maestro, we haven't had a dependency PR opened here in 4 days. I'll post in FR (CC @dotnet/dnceng)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They're investigating (it's a timeout in darc), in the meantime I manually triggered the subscriptions.

if (value == TimeSpan.Zero)
{
throw new ArgumentOutOfRangeException(nameof(value));
}
#pragma warning restore CA1512 // Use ArgumentOutOfRangeException throw helper

_transportSendTimeout = value;
TransportSendTimeoutTicks = value.Ticks;
Expand Down