Skip to content

[main] Update dependencies from dotnet/runtime #47879

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

Merged
merged 5 commits into from
Apr 25, 2023
Merged

[main] Update dependencies from dotnet/runtime #47879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
41afbc6
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Apr 25, 2023
071b265
Resolve Abiguity in TextWriter.FlushAsync calls
lewing Apr 25, 2023
c23815f
disable the warning in the multitargetted case
lewing Apr 25, 2023
f41994f
Use Flush() instead of FlushAsync() on StreamWriter over MemoryStream.
eerhardt Apr 25, 2023
436aa14
Fix test HtmlLocalizer to allow for extra error information in the ex…
eerhardt Apr 25, 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
248 changes: 124 additions & 124 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

124 changes: 62 additions & 62 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,69 +63,69 @@
-->
<PropertyGroup Label="Automated">
<!-- Packages from dotnet/runtime -->
<MicrosoftExtensionsDependencyModelVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCoreAppRefVersion>8.0.0-preview.4.23221.1</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-preview.4.23221.1</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>8.0.0-preview.4.23221.1</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>8.0.0-preview.4.23221.1</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>8.0.0-preview.4.23221.1</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.0-preview.4.23221.1</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsCachingAbstractionsVersion>
<MicrosoftExtensionsCachingMemoryVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationBinderVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsConfigurationBinderVersion>
<MicrosoftExtensionsConfigurationCommandLineVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsConfigurationCommandLineVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationFileExtensionsVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsConfigurationFileExtensionsVersion>
<MicrosoftExtensionsConfigurationIniVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsConfigurationIniVersion>
<MicrosoftExtensionsConfigurationJsonVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsConfigurationVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationUserSecretsVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsConfigurationUserSecretsVersion>
<MicrosoftExtensionsConfigurationXmlVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsConfigurationXmlVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsDependencyInjectionVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsFileProvidersAbstractionsVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsFileProvidersAbstractionsVersion>
<MicrosoftExtensionsFileProvidersCompositeVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsFileProvidersCompositeVersion>
<MicrosoftExtensionsFileProvidersPhysicalVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsFileProvidersPhysicalVersion>
<MicrosoftExtensionsFileSystemGlobbingVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsFileSystemGlobbingVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsHostingAbstractionsVersion>
<MicrosoftExtensionsHostingVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsHostingVersion>
<MicrosoftExtensionsHttpVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsHttpVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConfigurationVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsLoggingConfigurationVersion>
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingDebugVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsLoggingEventSourceVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsLoggingEventSourceVersion>
<MicrosoftExtensionsLoggingEventLogVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsLoggingEventLogVersion>
<MicrosoftExtensionsLoggingVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingTraceSourceVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsLoggingTraceSourceVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
<MicrosoftExtensionsOptionsDataAnnotationsVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>8.0.0-preview.4.23221.1</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>8.0.0-preview.4.23221.1</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<SystemConfigurationConfigurationManagerVersion>8.0.0-preview.4.23221.1</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsDiagnosticSourceVersion>8.0.0-preview.4.23221.1</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>8.0.0-preview.4.23221.1</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>8.0.0-preview.4.23221.1</SystemDirectoryServicesProtocolsVersion>
<SystemIOPipelinesVersion>8.0.0-preview.4.23221.1</SystemIOPipelinesVersion>
<SystemNetHttpJsonVersion>8.0.0-preview.4.23221.1</SystemNetHttpJsonVersion>
<SystemNetHttpWinHttpHandlerVersion>8.0.0-preview.4.23221.1</SystemNetHttpWinHttpHandlerVersion>
<SystemReflectionMetadataVersion>8.0.0-preview.4.23221.1</SystemReflectionMetadataVersion>
<SystemResourcesExtensionsVersion>8.0.0-preview.4.23221.1</SystemResourcesExtensionsVersion>
<SystemSecurityCryptographyPkcsVersion>8.0.0-preview.4.23221.1</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>8.0.0-preview.4.23221.1</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>8.0.0-preview.4.23221.1</SystemSecurityPermissionsVersion>
<SystemServiceProcessServiceControllerVersion>8.0.0-preview.4.23221.1</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingsWebVersion>8.0.0-preview.4.23221.1</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>8.0.0-preview.4.23221.1</SystemTextJsonVersion>
<SystemThreadingAccessControlVersion>8.0.0-preview.4.23221.1</SystemThreadingAccessControlVersion>
<SystemThreadingChannelsVersion>8.0.0-preview.4.23221.1</SystemThreadingChannelsVersion>
<SystemThreadingRateLimitingVersion>8.0.0-preview.4.23221.1</SystemThreadingRateLimitingVersion>
<MicrosoftExtensionsDependencyModelVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCoreAppRefVersion>8.0.0-preview.4.23224.17</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-preview.4.23224.17</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>8.0.0-preview.4.23224.17</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>8.0.0-preview.4.23224.17</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>8.0.0-preview.4.23224.17</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.0-preview.4.23224.17</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsCachingAbstractionsVersion>
<MicrosoftExtensionsCachingMemoryVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationBinderVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsConfigurationBinderVersion>
<MicrosoftExtensionsConfigurationCommandLineVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsConfigurationCommandLineVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationFileExtensionsVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsConfigurationFileExtensionsVersion>
<MicrosoftExtensionsConfigurationIniVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsConfigurationIniVersion>
<MicrosoftExtensionsConfigurationJsonVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsConfigurationVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationUserSecretsVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsConfigurationUserSecretsVersion>
<MicrosoftExtensionsConfigurationXmlVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsConfigurationXmlVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsDependencyInjectionVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsFileProvidersAbstractionsVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsFileProvidersAbstractionsVersion>
<MicrosoftExtensionsFileProvidersCompositeVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsFileProvidersCompositeVersion>
<MicrosoftExtensionsFileProvidersPhysicalVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsFileProvidersPhysicalVersion>
<MicrosoftExtensionsFileSystemGlobbingVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsFileSystemGlobbingVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsHostingAbstractionsVersion>
<MicrosoftExtensionsHostingVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsHostingVersion>
<MicrosoftExtensionsHttpVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsHttpVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConfigurationVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsLoggingConfigurationVersion>
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingDebugVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsLoggingEventSourceVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsLoggingEventSourceVersion>
<MicrosoftExtensionsLoggingEventLogVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsLoggingEventLogVersion>
<MicrosoftExtensionsLoggingVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingTraceSourceVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsLoggingTraceSourceVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
<MicrosoftExtensionsOptionsDataAnnotationsVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>8.0.0-preview.4.23224.17</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>8.0.0-preview.4.23224.17</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<SystemConfigurationConfigurationManagerVersion>8.0.0-preview.4.23224.17</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsDiagnosticSourceVersion>8.0.0-preview.4.23224.17</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>8.0.0-preview.4.23224.17</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>8.0.0-preview.4.23224.17</SystemDirectoryServicesProtocolsVersion>
<SystemIOPipelinesVersion>8.0.0-preview.4.23224.17</SystemIOPipelinesVersion>
<SystemNetHttpJsonVersion>8.0.0-preview.4.23224.17</SystemNetHttpJsonVersion>
<SystemNetHttpWinHttpHandlerVersion>8.0.0-preview.4.23224.17</SystemNetHttpWinHttpHandlerVersion>
<SystemReflectionMetadataVersion>8.0.0-preview.4.23224.17</SystemReflectionMetadataVersion>
<SystemResourcesExtensionsVersion>8.0.0-preview.4.23224.17</SystemResourcesExtensionsVersion>
<SystemSecurityCryptographyPkcsVersion>8.0.0-preview.4.23224.17</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>8.0.0-preview.4.23224.17</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>8.0.0-preview.4.23224.17</SystemSecurityPermissionsVersion>
<SystemServiceProcessServiceControllerVersion>8.0.0-preview.4.23224.17</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingsWebVersion>8.0.0-preview.4.23224.17</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>8.0.0-preview.4.23224.17</SystemTextJsonVersion>
<SystemThreadingAccessControlVersion>8.0.0-preview.4.23224.17</SystemThreadingAccessControlVersion>
<SystemThreadingChannelsVersion>8.0.0-preview.4.23224.17</SystemThreadingChannelsVersion>
<SystemThreadingRateLimitingVersion>8.0.0-preview.4.23224.17</SystemThreadingRateLimitingVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsVersion>8.0.0-preview.4.23221.1</MicrosoftNETCorePlatformsVersion>
<MicrosoftBclAsyncInterfacesVersion>8.0.0-preview.4.23221.1</MicrosoftBclAsyncInterfacesVersion>
<MicrosoftNETCorePlatformsVersion>8.0.0-preview.4.23224.17</MicrosoftNETCorePlatformsVersion>
<MicrosoftBclAsyncInterfacesVersion>8.0.0-preview.4.23224.17</MicrosoftBclAsyncInterfacesVersion>
<!-- Packages from dotnet/efcore -->
<dotnetefVersion>8.0.0-preview.4.23212.3</dotnetefVersion>
<MicrosoftEntityFrameworkCoreInMemoryVersion>8.0.0-preview.4.23212.3</MicrosoftEntityFrameworkCoreInMemoryVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/Logging.AzureAppServices/src/BlobLoggerProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ internal override async Task WriteMessagesAsync(IEnumerable<LogMessage> messages
{
writer.Write(logEvent.Message);
}
writer.Flush();

await writer.FlushAsync().ConfigureAwait(false);
var tryGetBuffer = stream.TryGetBuffer(out var buffer);
System.Diagnostics.Debug.Assert(tryGetBuffer);
await blob.AppendAsync(buffer, cancellationToken).ConfigureAwait(false);
Expand Down
2 changes: 1 addition & 1 deletion src/Middleware/HttpLogging/src/FileLoggerProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ internal virtual async Task WriteMessageAsync(string message, StreamWriter strea
return;
}
await streamWriter.WriteLineAsync(message.AsMemory(), cancellationToken);
await streamWriter.FlushAsync();
await streamWriter.FlushAsync(cancellationToken);
}

// Virtual for testing
Expand Down
2 changes: 1 addition & 1 deletion src/Mvc/Mvc.Localization/test/HtmlLocalizerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public void HtmlLocalizer_HtmlWithInvalidResourceString_ContentThrowsException(s

// Assert
Assert.NotNull(exception);
Assert.Equal("Input string was not in a correct format.", exception.Message);
Assert.StartsWith("Input string was not in a correct format.", exception.Message);
}

[Fact]
Expand Down
2 changes: 1 addition & 1 deletion src/Mvc/Mvc.Razor/src/RazorPageBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ public void EndAddHtmlAttributeValues(TagHelperExecutionContext executionContext
}

/// <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
Expand Down