-
Notifications
You must be signed in to change notification settings - Fork 445
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
[main] Update dependencies from dotnet/sdk #16227
Merged
MichaelSimons
merged 14 commits into
main
from
darc-main-feca2a9e-354d-4091-b624-4a99385a5167
Apr 25, 2023
Merged
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
a36beac
Update dependencies from https://github.com/dotnet/sdk build 20230424.17
dotnet-maestro[bot] 825ff09
Update dependencies from https://github.com/dotnet/sdk build 20230424.21
dotnet-maestro[bot] 8734174
Dependency coherency updates
dotnet-maestro[bot] b521d33
Update dependencies from https://github.com/dotnet/sdk build 20230424.23
dotnet-maestro[bot] e382a69
Update dependencies from https://github.com/dotnet/sdk build 20230425.2
dotnet-maestro[bot] f55902a
Update dependencies from https://github.com/dotnet/sdk build 20230425.3
dotnet-maestro[bot] fd33d7f
Update dependencies from https://github.com/dotnet/sdk build 20230425.4
dotnet-maestro[bot] 855c345
Update dependencies from https://github.com/dotnet/sdk build 20230425.5
dotnet-maestro[bot] 3412930
Update dependencies from https://github.com/dotnet/sdk build 20230425.7
dotnet-maestro[bot] 2e6fd02
Update dependencies from https://github.com/dotnet/sdk build 20230425.8
dotnet-maestro[bot] 312f41d
Update dependencies from https://github.com/dotnet/sdk build 20230425.9
dotnet-maestro[bot] 6552aa2
Silence compiler warnings in sourcebuild
lewing 649cc5c
Merge branch 'main' into darc-main-feca2a9e-354d-4091-b624-4a99385a5167
lewing 9f39b52
Update src/SourceBuild/patches/aspnetcore/0002-Silence-Ambiguous-Flus…
MichaelSimons File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
src/SourceBuild/patches/aspnetcore/0002-Silence-Ambiguous-FlushAsync.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| From: Larry Ewing <lewing@microsoft.com> | ||
|
|
||
| Backport: https://github.com/dotnet/aspnetcore/pull/47879. | ||
|
|
||
| diff --git a/src/Logging.AzureAppServices/src/BlobLoggerProvider.cs b/src/Logging.AzureAppServices/src/BlobLoggerProvider.cs | ||
| index b85d798418..5fda9ca1b3 100644 | ||
| --- a/src/Logging.AzureAppServices/src/BlobLoggerProvider.cs | ||
| +++ b/src/Logging.AzureAppServices/src/BlobLoggerProvider.cs | ||
| @@ -76,7 +76,9 @@ public class BlobLoggerProvider : BatchingLoggerProvider | ||
| writer.Write(logEvent.Message); | ||
| } | ||
|
|
||
| +#pragma warning disable CA2016 | ||
| await writer.FlushAsync().ConfigureAwait(false); | ||
| +#pragma warning restore CA2016 | ||
| var tryGetBuffer = stream.TryGetBuffer(out var buffer); | ||
| System.Diagnostics.Debug.Assert(tryGetBuffer); | ||
| await blob.AppendAsync(buffer, cancellationToken).ConfigureAwait(false); | ||
| diff --git a/src/Middleware/HttpLogging/src/FileLoggerProcessor.cs b/src/Middleware/HttpLogging/src/FileLoggerProcessor.cs | ||
| index 3f9a317fd5..d99d175f83 100644 | ||
| --- a/src/Middleware/HttpLogging/src/FileLoggerProcessor.cs | ||
| +++ b/src/Middleware/HttpLogging/src/FileLoggerProcessor.cs | ||
| @@ -264,7 +264,7 @@ internal partial class FileLoggerProcessor : IAsyncDisposable | ||
| return; | ||
| } | ||
| await streamWriter.WriteLineAsync(message.AsMemory(), cancellationToken); | ||
| - await streamWriter.FlushAsync(); | ||
| + await streamWriter.FlushAsync(cancellationToken); | ||
| } | ||
|
|
||
| // Virtual for testing | ||
| diff --git a/src/Mvc/Mvc.Razor/src/RazorPageBase.cs b/src/Mvc/Mvc.Razor/src/RazorPageBase.cs | ||
| index 07a187d48f..229896cc39 100644 | ||
| --- a/src/Mvc/Mvc.Razor/src/RazorPageBase.cs | ||
| +++ b/src/Mvc/Mvc.Razor/src/RazorPageBase.cs | ||
| @@ -634,7 +634,7 @@ public abstract class RazorPageBase : IRazorPage | ||
| } | ||
|
|
||
| /// <summary> | ||
| - /// Invokes <see cref="TextWriter.FlushAsync"/> on <see cref="Output"/> and <see cref="m:Stream.FlushAsync"/> | ||
| + /// Invokes <see cref="TextWriter.FlushAsync()"/> on <see cref="Output"/> and <see cref="m:Stream.FlushAsync"/> | ||
| /// on the response stream, writing out any buffered content to the <see cref="HttpResponse.Body"/>. | ||
| /// </summary> | ||
| /// <returns>A <see cref="Task{HtmlString}"/> that represents the asynchronous flush operation and on | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note this isn't how it is getting fixed in dotnet/aspnetcore#47879. I'm not sure it matters or not.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it will be removed as soon as aspnetcore makes it here so it doesn't matter