Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/runtime (#48323)
Browse files Browse the repository at this point in the history 
[main] Update dependencies from dotnet/runtime


 - Fix E2E tests to expect .wasm files instead of .dll files

 - Fix BootResourceCachingTest.IncrementallyUpdatesCach
  • Loading branch information
@dotnet-maestro
dotnet-maestro[bot] committed May 19, 2023
1 parent 631f523 commit b791bc4
Show file tree
Hide file tree
Showing 6 changed files with 206 additions and 207 deletions.
248 changes: 124 additions & 124 deletions eng/Version.Details.xml
View file

Large diffs are not rendered by default.

124 changes: 62 additions & 62 deletions eng/Versions.props
View file
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.5.23268.1</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCoreAppRefVersion>8.0.0-preview.5.23268.1</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-preview.5.23268.1</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>8.0.0-preview.5.23268.1</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>8.0.0-preview.5.23268.1</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>8.0.0-preview.5.23268.1</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.0-preview.5.23268.1</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsCachingAbstractionsVersion>
<MicrosoftExtensionsCachingMemoryVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationBinderVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsConfigurationBinderVersion>
<MicrosoftExtensionsConfigurationCommandLineVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsConfigurationCommandLineVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationFileExtensionsVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsConfigurationFileExtensionsVersion>
<MicrosoftExtensionsConfigurationIniVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsConfigurationIniVersion>
<MicrosoftExtensionsConfigurationJsonVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsConfigurationVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationUserSecretsVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsConfigurationUserSecretsVersion>
<MicrosoftExtensionsConfigurationXmlVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsConfigurationXmlVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsDependencyInjectionVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsFileProvidersAbstractionsVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsFileProvidersAbstractionsVersion>
<MicrosoftExtensionsFileProvidersCompositeVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsFileProvidersCompositeVersion>
<MicrosoftExtensionsFileProvidersPhysicalVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsFileProvidersPhysicalVersion>
<MicrosoftExtensionsFileSystemGlobbingVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsFileSystemGlobbingVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsHostingAbstractionsVersion>
<MicrosoftExtensionsHostingVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsHostingVersion>
<MicrosoftExtensionsHttpVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsHttpVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConfigurationVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsLoggingConfigurationVersion>
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingDebugVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsLoggingEventSourceVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsLoggingEventSourceVersion>
<MicrosoftExtensionsLoggingEventLogVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsLoggingEventLogVersion>
<MicrosoftExtensionsLoggingVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingTraceSourceVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsLoggingTraceSourceVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
<MicrosoftExtensionsOptionsDataAnnotationsVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>8.0.0-preview.5.23268.1</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<SystemConfigurationConfigurationManagerVersion>8.0.0-preview.5.23268.1</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsDiagnosticSourceVersion>8.0.0-preview.5.23268.1</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>8.0.0-preview.5.23268.1</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>8.0.0-preview.5.23268.1</SystemDirectoryServicesProtocolsVersion>
<SystemIOPipelinesVersion>8.0.0-preview.5.23268.1</SystemIOPipelinesVersion>
<SystemNetHttpJsonVersion>8.0.0-preview.5.23268.1</SystemNetHttpJsonVersion>
<SystemNetHttpWinHttpHandlerVersion>8.0.0-preview.5.23268.1</SystemNetHttpWinHttpHandlerVersion>
<SystemReflectionMetadataVersion>8.0.0-preview.5.23268.1</SystemReflectionMetadataVersion>
<SystemResourcesExtensionsVersion>8.0.0-preview.5.23268.1</SystemResourcesExtensionsVersion>
<SystemSecurityCryptographyPkcsVersion>8.0.0-preview.5.23268.1</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>8.0.0-preview.5.23268.1</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>8.0.0-preview.5.23268.1</SystemSecurityPermissionsVersion>
<SystemServiceProcessServiceControllerVersion>8.0.0-preview.5.23268.1</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingsWebVersion>8.0.0-preview.5.23268.1</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>8.0.0-preview.5.23268.1</SystemTextJsonVersion>
<SystemThreadingAccessControlVersion>8.0.0-preview.5.23268.1</SystemThreadingAccessControlVersion>
<SystemThreadingChannelsVersion>8.0.0-preview.5.23268.1</SystemThreadingChannelsVersion>
<SystemThreadingRateLimitingVersion>8.0.0-preview.5.23268.1</SystemThreadingRateLimitingVersion>
<MicrosoftExtensionsDependencyModelVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCoreAppRefVersion>8.0.0-preview.5.23268.13</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-preview.5.23268.13</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>8.0.0-preview.5.23268.13</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>8.0.0-preview.5.23268.13</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>8.0.0-preview.5.23268.13</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.0-preview.5.23268.13</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsCachingAbstractionsVersion>
<MicrosoftExtensionsCachingMemoryVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationBinderVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsConfigurationBinderVersion>
<MicrosoftExtensionsConfigurationCommandLineVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsConfigurationCommandLineVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationFileExtensionsVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsConfigurationFileExtensionsVersion>
<MicrosoftExtensionsConfigurationIniVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsConfigurationIniVersion>
<MicrosoftExtensionsConfigurationJsonVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsConfigurationVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationUserSecretsVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsConfigurationUserSecretsVersion>
<MicrosoftExtensionsConfigurationXmlVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsConfigurationXmlVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsDependencyInjectionVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsFileProvidersAbstractionsVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsFileProvidersAbstractionsVersion>
<MicrosoftExtensionsFileProvidersCompositeVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsFileProvidersCompositeVersion>
<MicrosoftExtensionsFileProvidersPhysicalVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsFileProvidersPhysicalVersion>
<MicrosoftExtensionsFileSystemGlobbingVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsFileSystemGlobbingVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsHostingAbstractionsVersion>
<MicrosoftExtensionsHostingVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsHostingVersion>
<MicrosoftExtensionsHttpVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsHttpVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConfigurationVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsLoggingConfigurationVersion>
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingDebugVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsLoggingEventSourceVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsLoggingEventSourceVersion>
<MicrosoftExtensionsLoggingEventLogVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsLoggingEventLogVersion>
<MicrosoftExtensionsLoggingVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingTraceSourceVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsLoggingTraceSourceVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
<MicrosoftExtensionsOptionsDataAnnotationsVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>8.0.0-preview.5.23268.13</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<SystemConfigurationConfigurationManagerVersion>8.0.0-preview.5.23268.13</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsDiagnosticSourceVersion>8.0.0-preview.5.23268.13</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>8.0.0-preview.5.23268.13</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>8.0.0-preview.5.23268.13</SystemDirectoryServicesProtocolsVersion>
<SystemIOPipelinesVersion>8.0.0-preview.5.23268.13</SystemIOPipelinesVersion>
<SystemNetHttpJsonVersion>8.0.0-preview.5.23268.13</SystemNetHttpJsonVersion>
<SystemNetHttpWinHttpHandlerVersion>8.0.0-preview.5.23268.13</SystemNetHttpWinHttpHandlerVersion>
<SystemReflectionMetadataVersion>8.0.0-preview.5.23268.13</SystemReflectionMetadataVersion>
<SystemResourcesExtensionsVersion>8.0.0-preview.5.23268.13</SystemResourcesExtensionsVersion>
<SystemSecurityCryptographyPkcsVersion>8.0.0-preview.5.23268.13</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>8.0.0-preview.5.23268.13</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>8.0.0-preview.5.23268.13</SystemSecurityPermissionsVersion>
<SystemServiceProcessServiceControllerVersion>8.0.0-preview.5.23268.13</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingsWebVersion>8.0.0-preview.5.23268.13</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>8.0.0-preview.5.23268.13</SystemTextJsonVersion>
<SystemThreadingAccessControlVersion>8.0.0-preview.5.23268.13</SystemThreadingAccessControlVersion>
<SystemThreadingChannelsVersion>8.0.0-preview.5.23268.13</SystemThreadingChannelsVersion>
<SystemThreadingRateLimitingVersion>8.0.0-preview.5.23268.13</SystemThreadingRateLimitingVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsVersion>8.0.0-preview.5.23268.1</MicrosoftNETCorePlatformsVersion>
<MicrosoftBclAsyncInterfacesVersion>8.0.0-preview.5.23268.1</MicrosoftBclAsyncInterfacesVersion>
<MicrosoftNETCorePlatformsVersion>8.0.0-preview.5.23268.13</MicrosoftNETCorePlatformsVersion>
<MicrosoftBclAsyncInterfacesVersion>8.0.0-preview.5.23268.13</MicrosoftBclAsyncInterfacesVersion>
<!-- Packages from dotnet/efcore -->
<dotnetefVersion>8.0.0-preview.5.23268.2</dotnetefVersion>
<MicrosoftEntityFrameworkCoreInMemoryVersion>8.0.0-preview.5.23268.2</MicrosoftEntityFrameworkCoreInMemoryVersion>
Expand Down
11 changes: 5 additions & 6 deletions src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ public void CachesResourcesAfterFirstLoad()
Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith("/blazor.boot.json", StringComparison.Ordinal)));
Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith("/dotnet.native.wasm", StringComparison.Ordinal)));
Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith(".js", StringComparison.Ordinal)));
Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith(".dll", StringComparison.Ordinal)));
Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith(".wasm", StringComparison.Ordinal)));

// On subsequent loads, we skip the items referenced from blazor.boot.json
// which includes .dll files and dotnet.native.wasm
// which includes .wasm (original .dll) files and dotnet.native.wasm
Navigate("about:blank");
Browser.Equal(string.Empty, () => Browser.Title);
Navigate("/");
Expand All @@ -57,7 +57,7 @@ public void CachesResourcesAfterFirstLoad()
Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith("/blazor.boot.json", StringComparison.Ordinal)));
Assert.Empty(subsequentResourcesRequested.Where(path => path.EndsWith("/dotnet.native.wasm", StringComparison.Ordinal)));
Assert.NotEmpty(subsequentResourcesRequested.Where(path => path.EndsWith(".js", StringComparison.Ordinal)));
Assert.Empty(subsequentResourcesRequested.Where(path => path.EndsWith(".dll", StringComparison.Ordinal)));
Assert.Empty(subsequentResourcesRequested.Where(path => path.EndsWith(".wasm", StringComparison.Ordinal) && !path.EndsWith("/dotnet.native.wasm", StringComparison.Ordinal)));
}

[Fact]
Expand All @@ -67,7 +67,7 @@ public void IncrementallyUpdatesCache()
Navigate("/");
WaitUntilLoaded();
var cacheEntryUrls1 = GetCacheEntryUrls();
var cacheEntryForComponentsDll = cacheEntryUrls1.Single(url => url.Contains("/Microsoft.AspNetCore.Components.dll"));
var cacheEntryForComponentsDll = cacheEntryUrls1.Single(url => url.Contains("/Microsoft.AspNetCore.Components.wasm"));
var cacheEntryForDotNetWasm = cacheEntryUrls1.Single(url => url.Contains("/dotnet.native.wasm"));
var cacheEntryForDotNetWasmWithChangedHash = cacheEntryForDotNetWasm.Replace(".sha256-", ".sha256-different");

Expand All @@ -87,9 +87,8 @@ public void IncrementallyUpdatesCache()
Navigate("/");
WaitUntilLoaded();
var subsequentResourcesRequested = GetAndClearRequestedPaths();
Assert.Collection(subsequentResourcesRequested.Where(url => url.Contains(".dll")),
requestedDll => Assert.Contains("/Microsoft.AspNetCore.Components.dll", requestedDll));
Assert.Collection(subsequentResourcesRequested.Where(url => url.Contains(".wasm")),
requestedDll => Assert.Contains("/Microsoft.AspNetCore.Components.wasm", requestedDll),
requestedDll => Assert.Contains("/dotnet.native.wasm", requestedDll));

// We also update the cache (add new items, remove unnecessary items)
Expand Down
Loading

0 comments on commit b791bc4

Please sign in to comment.