Skip to content

Commit b791bc4

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/runtime (#48323)
[main] Update dependencies from dotnet/runtime - Fix E2E tests to expect .wasm files instead of .dll files - Fix BootResourceCachingTest.IncrementallyUpdatesCach
1 parent 631f523 commit b791bc4

File tree

6 files changed

+206
-207
lines changed

6 files changed

+206
-207
lines changed

‎eng/Version.Details.xml

Lines changed: 124 additions & 124 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -63,69 +63,69 @@
6363
-->
6464
<PropertyGroup Label="Automated">
6565
<!-- Packages from dotnet/runtime -->
66-
<MicrosoftExtensionsDependencyModelVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsDependencyModelVersion>
67-
<MicrosoftNETCoreAppRefVersion>8.0.0-preview.5.23268.1</MicrosoftNETCoreAppRefVersion>
68-
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-preview.5.23268.1</MicrosoftNETCoreAppRuntimewinx64Version>
69-
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>8.0.0-preview.5.23268.1</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
70-
<MicrosoftNETRuntimeWebAssemblySdkVersion>8.0.0-preview.5.23268.1</MicrosoftNETRuntimeWebAssemblySdkVersion>
71-
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>8.0.0-preview.5.23268.1</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
72-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.0-preview.5.23268.1</MicrosoftNETCoreBrowserDebugHostTransportVersion>
73-
<MicrosoftExtensionsCachingAbstractionsVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsCachingAbstractionsVersion>
74-
<MicrosoftExtensionsCachingMemoryVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsCachingMemoryVersion>
75-
<MicrosoftExtensionsConfigurationAbstractionsVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsConfigurationAbstractionsVersion>
76-
<MicrosoftExtensionsConfigurationBinderVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsConfigurationBinderVersion>
77-
<MicrosoftExtensionsConfigurationCommandLineVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsConfigurationCommandLineVersion>
78-
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
79-
<MicrosoftExtensionsConfigurationFileExtensionsVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsConfigurationFileExtensionsVersion>
80-
<MicrosoftExtensionsConfigurationIniVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsConfigurationIniVersion>
81-
<MicrosoftExtensionsConfigurationJsonVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsConfigurationJsonVersion>
82-
<MicrosoftExtensionsConfigurationVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsConfigurationVersion>
83-
<MicrosoftExtensionsConfigurationUserSecretsVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsConfigurationUserSecretsVersion>
84-
<MicrosoftExtensionsConfigurationXmlVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsConfigurationXmlVersion>
85-
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
86-
<MicrosoftExtensionsDependencyInjectionVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsDependencyInjectionVersion>
87-
<MicrosoftExtensionsFileProvidersAbstractionsVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsFileProvidersAbstractionsVersion>
88-
<MicrosoftExtensionsFileProvidersCompositeVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsFileProvidersCompositeVersion>
89-
<MicrosoftExtensionsFileProvidersPhysicalVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsFileProvidersPhysicalVersion>
90-
<MicrosoftExtensionsFileSystemGlobbingVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsFileSystemGlobbingVersion>
91-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
92-
<MicrosoftExtensionsHostingAbstractionsVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsHostingAbstractionsVersion>
93-
<MicrosoftExtensionsHostingVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsHostingVersion>
94-
<MicrosoftExtensionsHttpVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsHttpVersion>
95-
<MicrosoftExtensionsLoggingAbstractionsVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsLoggingAbstractionsVersion>
96-
<MicrosoftExtensionsLoggingConfigurationVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsLoggingConfigurationVersion>
97-
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsLoggingConsoleVersion>
98-
<MicrosoftExtensionsLoggingDebugVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsLoggingDebugVersion>
99-
<MicrosoftExtensionsLoggingEventSourceVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsLoggingEventSourceVersion>
100-
<MicrosoftExtensionsLoggingEventLogVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsLoggingEventLogVersion>
101-
<MicrosoftExtensionsLoggingVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsLoggingVersion>
102-
<MicrosoftExtensionsLoggingTraceSourceVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsLoggingTraceSourceVersion>
103-
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
104-
<MicrosoftExtensionsOptionsDataAnnotationsVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsOptionsDataAnnotationsVersion>
105-
<MicrosoftExtensionsOptionsVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsOptionsVersion>
106-
<MicrosoftExtensionsPrimitivesVersion>8.0.0-preview.5.23268.1</MicrosoftExtensionsPrimitivesVersion>
107-
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>8.0.0-preview.5.23268.1</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
108-
<SystemConfigurationConfigurationManagerVersion>8.0.0-preview.5.23268.1</SystemConfigurationConfigurationManagerVersion>
109-
<SystemDiagnosticsDiagnosticSourceVersion>8.0.0-preview.5.23268.1</SystemDiagnosticsDiagnosticSourceVersion>
110-
<SystemDiagnosticsEventLogVersion>8.0.0-preview.5.23268.1</SystemDiagnosticsEventLogVersion>
111-
<SystemDirectoryServicesProtocolsVersion>8.0.0-preview.5.23268.1</SystemDirectoryServicesProtocolsVersion>
112-
<SystemIOPipelinesVersion>8.0.0-preview.5.23268.1</SystemIOPipelinesVersion>
113-
<SystemNetHttpJsonVersion>8.0.0-preview.5.23268.1</SystemNetHttpJsonVersion>
114-
<SystemNetHttpWinHttpHandlerVersion>8.0.0-preview.5.23268.1</SystemNetHttpWinHttpHandlerVersion>
115-
<SystemReflectionMetadataVersion>8.0.0-preview.5.23268.1</SystemReflectionMetadataVersion>
116-
<SystemResourcesExtensionsVersion>8.0.0-preview.5.23268.1</SystemResourcesExtensionsVersion>
117-
<SystemSecurityCryptographyPkcsVersion>8.0.0-preview.5.23268.1</SystemSecurityCryptographyPkcsVersion>
118-
<SystemSecurityCryptographyXmlVersion>8.0.0-preview.5.23268.1</SystemSecurityCryptographyXmlVersion>
119-
<SystemSecurityPermissionsVersion>8.0.0-preview.5.23268.1</SystemSecurityPermissionsVersion>
120-
<SystemServiceProcessServiceControllerVersion>8.0.0-preview.5.23268.1</SystemServiceProcessServiceControllerVersion>
121-
<SystemTextEncodingsWebVersion>8.0.0-preview.5.23268.1</SystemTextEncodingsWebVersion>
122-
<SystemTextJsonVersion>8.0.0-preview.5.23268.1</SystemTextJsonVersion>
123-
<SystemThreadingAccessControlVersion>8.0.0-preview.5.23268.1</SystemThreadingAccessControlVersion>
124-
<SystemThreadingChannelsVersion>8.0.0-preview.5.23268.1</SystemThreadingChannelsVersion>
125-
<SystemThreadingRateLimitingVersion>8.0.0-preview.5.23268.1</SystemThreadingRateLimitingVersion>
66+
<MicrosoftExtensionsDependencyModelVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsDependencyModelVersion>
67+
<MicrosoftNETCoreAppRefVersion>8.0.0-preview.5.23268.13</MicrosoftNETCoreAppRefVersion>
68+
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-preview.5.23268.13</MicrosoftNETCoreAppRuntimewinx64Version>
69+
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>8.0.0-preview.5.23268.13</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
70+
<MicrosoftNETRuntimeWebAssemblySdkVersion>8.0.0-preview.5.23268.13</MicrosoftNETRuntimeWebAssemblySdkVersion>
71+
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>8.0.0-preview.5.23268.13</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
72+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.0-preview.5.23268.13</MicrosoftNETCoreBrowserDebugHostTransportVersion>
73+
<MicrosoftExtensionsCachingAbstractionsVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsCachingAbstractionsVersion>
74+
<MicrosoftExtensionsCachingMemoryVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsCachingMemoryVersion>
75+
<MicrosoftExtensionsConfigurationAbstractionsVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsConfigurationAbstractionsVersion>
76+
<MicrosoftExtensionsConfigurationBinderVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsConfigurationBinderVersion>
77+
<MicrosoftExtensionsConfigurationCommandLineVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsConfigurationCommandLineVersion>
78+
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
79+
<MicrosoftExtensionsConfigurationFileExtensionsVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsConfigurationFileExtensionsVersion>
80+
<MicrosoftExtensionsConfigurationIniVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsConfigurationIniVersion>
81+
<MicrosoftExtensionsConfigurationJsonVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsConfigurationJsonVersion>
82+
<MicrosoftExtensionsConfigurationVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsConfigurationVersion>
83+
<MicrosoftExtensionsConfigurationUserSecretsVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsConfigurationUserSecretsVersion>
84+
<MicrosoftExtensionsConfigurationXmlVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsConfigurationXmlVersion>
85+
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
86+
<MicrosoftExtensionsDependencyInjectionVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsDependencyInjectionVersion>
87+
<MicrosoftExtensionsFileProvidersAbstractionsVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsFileProvidersAbstractionsVersion>
88+
<MicrosoftExtensionsFileProvidersCompositeVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsFileProvidersCompositeVersion>
89+
<MicrosoftExtensionsFileProvidersPhysicalVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsFileProvidersPhysicalVersion>
90+
<MicrosoftExtensionsFileSystemGlobbingVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsFileSystemGlobbingVersion>
91+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
92+
<MicrosoftExtensionsHostingAbstractionsVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsHostingAbstractionsVersion>
93+
<MicrosoftExtensionsHostingVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsHostingVersion>
94+
<MicrosoftExtensionsHttpVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsHttpVersion>
95+
<MicrosoftExtensionsLoggingAbstractionsVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsLoggingAbstractionsVersion>
96+
<MicrosoftExtensionsLoggingConfigurationVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsLoggingConfigurationVersion>
97+
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsLoggingConsoleVersion>
98+
<MicrosoftExtensionsLoggingDebugVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsLoggingDebugVersion>
99+
<MicrosoftExtensionsLoggingEventSourceVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsLoggingEventSourceVersion>
100+
<MicrosoftExtensionsLoggingEventLogVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsLoggingEventLogVersion>
101+
<MicrosoftExtensionsLoggingVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsLoggingVersion>
102+
<MicrosoftExtensionsLoggingTraceSourceVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsLoggingTraceSourceVersion>
103+
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
104+
<MicrosoftExtensionsOptionsDataAnnotationsVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsOptionsDataAnnotationsVersion>
105+
<MicrosoftExtensionsOptionsVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsOptionsVersion>
106+
<MicrosoftExtensionsPrimitivesVersion>8.0.0-preview.5.23268.13</MicrosoftExtensionsPrimitivesVersion>
107+
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>8.0.0-preview.5.23268.13</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
108+
<SystemConfigurationConfigurationManagerVersion>8.0.0-preview.5.23268.13</SystemConfigurationConfigurationManagerVersion>
109+
<SystemDiagnosticsDiagnosticSourceVersion>8.0.0-preview.5.23268.13</SystemDiagnosticsDiagnosticSourceVersion>
110+
<SystemDiagnosticsEventLogVersion>8.0.0-preview.5.23268.13</SystemDiagnosticsEventLogVersion>
111+
<SystemDirectoryServicesProtocolsVersion>8.0.0-preview.5.23268.13</SystemDirectoryServicesProtocolsVersion>
112+
<SystemIOPipelinesVersion>8.0.0-preview.5.23268.13</SystemIOPipelinesVersion>
113+
<SystemNetHttpJsonVersion>8.0.0-preview.5.23268.13</SystemNetHttpJsonVersion>
114+
<SystemNetHttpWinHttpHandlerVersion>8.0.0-preview.5.23268.13</SystemNetHttpWinHttpHandlerVersion>
115+
<SystemReflectionMetadataVersion>8.0.0-preview.5.23268.13</SystemReflectionMetadataVersion>
116+
<SystemResourcesExtensionsVersion>8.0.0-preview.5.23268.13</SystemResourcesExtensionsVersion>
117+
<SystemSecurityCryptographyPkcsVersion>8.0.0-preview.5.23268.13</SystemSecurityCryptographyPkcsVersion>
118+
<SystemSecurityCryptographyXmlVersion>8.0.0-preview.5.23268.13</SystemSecurityCryptographyXmlVersion>
119+
<SystemSecurityPermissionsVersion>8.0.0-preview.5.23268.13</SystemSecurityPermissionsVersion>
120+
<SystemServiceProcessServiceControllerVersion>8.0.0-preview.5.23268.13</SystemServiceProcessServiceControllerVersion>
121+
<SystemTextEncodingsWebVersion>8.0.0-preview.5.23268.13</SystemTextEncodingsWebVersion>
122+
<SystemTextJsonVersion>8.0.0-preview.5.23268.13</SystemTextJsonVersion>
123+
<SystemThreadingAccessControlVersion>8.0.0-preview.5.23268.13</SystemThreadingAccessControlVersion>
124+
<SystemThreadingChannelsVersion>8.0.0-preview.5.23268.13</SystemThreadingChannelsVersion>
125+
<SystemThreadingRateLimitingVersion>8.0.0-preview.5.23268.13</SystemThreadingRateLimitingVersion>
126126
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
127-
<MicrosoftNETCorePlatformsVersion>8.0.0-preview.5.23268.1</MicrosoftNETCorePlatformsVersion>
128-
<MicrosoftBclAsyncInterfacesVersion>8.0.0-preview.5.23268.1</MicrosoftBclAsyncInterfacesVersion>
127+
<MicrosoftNETCorePlatformsVersion>8.0.0-preview.5.23268.13</MicrosoftNETCorePlatformsVersion>
128+
<MicrosoftBclAsyncInterfacesVersion>8.0.0-preview.5.23268.13</MicrosoftBclAsyncInterfacesVersion>
129129
<!-- Packages from dotnet/efcore -->
130130
<dotnetefVersion>8.0.0-preview.5.23268.2</dotnetefVersion>
131131
<MicrosoftEntityFrameworkCoreInMemoryVersion>8.0.0-preview.5.23268.2</MicrosoftEntityFrameworkCoreInMemoryVersion>

‎src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ public void CachesResourcesAfterFirstLoad()
4545
Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith("/blazor.boot.json", StringComparison.Ordinal)));
4646
Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith("/dotnet.native.wasm", StringComparison.Ordinal)));
4747
Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith(".js", StringComparison.Ordinal)));
48-
Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith(".dll", StringComparison.Ordinal)));
48+
Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith(".wasm", StringComparison.Ordinal)));
4949

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

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

@@ -87,9 +87,8 @@ public void IncrementallyUpdatesCache()
8787
Navigate("/");
8888
WaitUntilLoaded();
8989
var subsequentResourcesRequested = GetAndClearRequestedPaths();
90-
Assert.Collection(subsequentResourcesRequested.Where(url => url.Contains(".dll")),
91-
requestedDll => Assert.Contains("/Microsoft.AspNetCore.Components.dll", requestedDll));
9290
Assert.Collection(subsequentResourcesRequested.Where(url => url.Contains(".wasm")),
91+
requestedDll => Assert.Contains("/Microsoft.AspNetCore.Components.wasm", requestedDll),
9392
requestedDll => Assert.Contains("/dotnet.native.wasm", requestedDll));
9493

9594
// We also update the cache (add new items, remove unnecessary items)

0 commit comments

Comments
 (0)