[main] Update dependencies from dotnet/efcore, dotnet/runtime (#61503)

dotnet-maestro[bot] · web-flow · commit 69eec14e413a · 2025-04-23T19:33:43.000Z
[main] Update dependencies from dotnet/efcore, dotnet/runtime
- Coherency Updates:
  - optimization.windows_nt-x64.MIBC.Runtime: from 1.0.0-prerelease.25171.2 to 1.0.0-prerelease.25217.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
  - optimization.windows_nt-x86.MIBC.Runtime: from 1.0.0-prerelease.25171.2 to 1.0.0-prerelease.25217.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
  - optimization.linux-x64.MIBC.Runtime: from 1.0.0-prerelease.25171.2 to 1.0.0-prerelease.25217.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
  - optimization.windows_nt-arm64.MIBC.Runtime: from 1.0.0-prerelease.25171.2 to 1.0.0-prerelease.25217.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
  - optimization.linux-arm64.MIBC.Runtime: from 1.0.0-prerelease.25171.2 to 1.0.0-prerelease.25217.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)

 - Try disabling inlining for the interactivity e2e test

 - Disable preloading in tests

 - Merge branch 'main' into darc-main-c522251f-421c-4560-8005-ac855da8cf24

 - fix some tests

 - fix

 - follow pattern from working tests
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
diff --git a/eng/Versions.props b/eng/Versions.props
diff --git a/src/Components/WebAssembly/Directory.Build.props b/src/Components/WebAssembly/Directory.Build.props
@@ -5,6 +5,7 @@
     <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
   </PropertyGroup>
   <PropertyGroup>
+    <WasmPreloadAssets>false</WasmPreloadAssets>
     <WasmInlineBootConfig>false</WasmInlineBootConfig>
   </PropertyGroup>
 </Project>
diff --git a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj
@@ -11,6 +11,9 @@
         Condition=" '$(ContinuousIntegrationBuild)' != 'true' AND '$(SkipTestBuild)' != 'true' ">true</_BuildAndTest>
     <ExcludeFromBuild Condition=" !$(_BuildAndTest) ">true</ExcludeFromBuild>
     <SkipTests Condition=" !$(_BuildAndTest) ">true</SkipTests>
+
+    <!-- disable inline boot config for these tests -->
+    <WasmInlineBootConfig>false</WasmInlineBootConfig>
   </PropertyGroup>
 
   <!-- Shared testing infrastructure for running E2E tests using selenium -->
diff --git a/src/Components/test/testassets/Directory.Build.props b/src/Components/test/testassets/Directory.Build.props
@@ -20,6 +20,7 @@
     </AssemblyAttribute>
   </ItemGroup>
   <PropertyGroup>
+    <WasmPreloadAssets>false</WasmPreloadAssets>
     <WasmInlineBootConfig>false</WasmInlineBootConfig>
   </PropertyGroup>
 </Project>
diff --git a/src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs b/src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs
@@ -740,13 +740,13 @@ public void ActivityParentIdAndBaggageReadFromHeaders()
         {
             Headers = new HeaderDictionary()
             {
-                {"Request-Id", "ParentId1"},
+                {"Request-Id", "ParentId1"}, // non-standard header, won't apply to Activity
                 {"baggage", "Key1=value1, Key2=value2"}
             }
         });
         hostingApplication.CreateContext(features);
         Assert.Equal("Microsoft.AspNetCore.Hosting.HttpRequestIn", Activity.Current.OperationName);
-        Assert.Equal("ParentId1", Activity.Current.ParentId);
+        Assert.Null(Activity.Current.ParentId);
         Assert.Contains(Activity.Current.Baggage, pair => pair.Key == "Key1" && pair.Value == "value1");
         Assert.Contains(Activity.Current.Baggage, pair => pair.Key == "Key2" && pair.Value == "value2");
     }
@@ -928,7 +928,7 @@ public void ActivityTraceParentAndTraceStateFromHeaders()
             Headers = new HeaderDictionary()
             {
                 {"traceparent", "00-0123456789abcdef0123456789abcdef-0123456789abcdef-01"},
-                {"tracestate", "TraceState1"},
+                {"tracestate", "tracestate=1"},
                 {"baggage", "Key1=value1, Key2=value2"}
             }
         });
@@ -937,7 +937,7 @@ public void ActivityTraceParentAndTraceStateFromHeaders()
         Assert.Equal(ActivityIdFormat.W3C, Activity.Current.IdFormat);
         Assert.Equal("0123456789abcdef0123456789abcdef", Activity.Current.TraceId.ToHexString());
         Assert.Equal("0123456789abcdef", Activity.Current.ParentSpanId.ToHexString());
-        Assert.Equal("TraceState1", Activity.Current.TraceStateString);
+        Assert.Equal("tracestate=1", Activity.Current.TraceStateString);
 
         Assert.Contains(Activity.Current.Baggage, pair => pair.Key == "Key1" && pair.Value == "value1");
         Assert.Contains(Activity.Current.Baggage, pair => pair.Key == "Key2" && pair.Value == "value2");
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.KeyServices.cs b/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTests.KeyServices.cs
@@ -127,7 +127,7 @@ public async Task ThrowsForUnregisteredRequiredKeyService()
         var exception = await Assert.ThrowsAsync<InvalidOperationException>(
             async () => await endpoint.RequestDelegate(httpContext));
 
-        Assert.Equal("No service for type 'Microsoft.AspNetCore.Http.Generators.Tests.TestService' has been registered.", exception.Message);
+        Assert.Equal("No keyed service for type 'Microsoft.AspNetCore.Http.Generators.Tests.TestService' using key type 'System.String' has been registered.", exception.Message);
     }
 
     [Fact]
diff --git a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/HubConnectionHandlerTests.Activity.cs b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/HubConnectionHandlerTests.Activity.cs
@@ -132,7 +132,7 @@ public async Task HubMethodInvokesCreateActivities_ReadTraceHeaders()
                 var headers = new Dictionary<string, string>
                 {
                     {"traceparent", "00-0123456789abcdef0123456789abcdef-0123456789abcdef-01"},
-                    {"tracestate", "TraceState1"},
+                    {"tracestate", "tracestate=1"},
                     {"baggage", "Key1=value1, Key2=value2"}
                 };
 
@@ -149,7 +149,7 @@ public async Task HubMethodInvokesCreateActivities_ReadTraceHeaders()
                 Assert.Equal(ActivityIdFormat.W3C, invocationActivity.IdFormat);
                 Assert.Equal("0123456789abcdef0123456789abcdef", invocationActivity.TraceId.ToHexString());
                 Assert.Equal("0123456789abcdef", invocationActivity.ParentSpanId.ToHexString());
-                Assert.Equal("TraceState1", invocationActivity.TraceStateString);
+                Assert.Equal("tracestate=1", invocationActivity.TraceStateString);
 
                 client.Dispose();
 
@@ -262,7 +262,7 @@ public async Task StreamingHubMethodCreatesActivities_ReadTraceHeaders()
                 var headers = new Dictionary<string, string>
                 {
                     {"traceparent", "00-0123456789abcdef0123456789abcdef-0123456789abcdef-01"},
-                    {"tracestate", "TraceState1"},
+                    {"tracestate", "tracestate=1"},
                     {"baggage", "Key1=value1, Key2=value2"}
                 };
 
@@ -275,7 +275,7 @@ public async Task StreamingHubMethodCreatesActivities_ReadTraceHeaders()
                 Assert.Equal(ActivityIdFormat.W3C, invocationActivity.IdFormat);
                 Assert.Equal("0123456789abcdef0123456789abcdef", invocationActivity.TraceId.ToHexString());
                 Assert.Equal("0123456789abcdef", invocationActivity.ParentSpanId.ToHexString());
-                Assert.Equal("TraceState1", invocationActivity.TraceStateString);
+                Assert.Equal("tracestate=1", invocationActivity.TraceStateString);
 
                 client.Dispose();
 

Original file line number	Diff line number	Diff line change
`@@ -740,13 +740,13 @@ public void ActivityParentIdAndBaggageReadFromHeaders()`
`740`	`740`	`{`
`741`	`741`	`Headers = new HeaderDictionary()`
`742`	`742`	`{`
`743`		`- {"Request-Id", "ParentId1"},`
	`743`	`+ {"Request-Id", "ParentId1"}, // non-standard header, won't apply to Activity`
`744`	`744`	`{"baggage", "Key1=value1, Key2=value2"}`
`745`	`745`	`}`
`746`	`746`	`});`
`747`	`747`	`hostingApplication.CreateContext(features);`
`748`	`748`	`Assert.Equal("Microsoft.AspNetCore.Hosting.HttpRequestIn", Activity.Current.OperationName);`
`749`		`- Assert.Equal("ParentId1", Activity.Current.ParentId);`
	`749`	`+ Assert.Null(Activity.Current.ParentId);`
`750`	`750`	`Assert.Contains(Activity.Current.Baggage, pair => pair.Key == "Key1" && pair.Value == "value1");`
`751`	`751`	`Assert.Contains(Activity.Current.Baggage, pair => pair.Key == "Key2" && pair.Value == "value2");`
`752`	`752`	`}`
`@@ -928,7 +928,7 @@ public void ActivityTraceParentAndTraceStateFromHeaders()`
`928`	`928`	`Headers = new HeaderDictionary()`
`929`	`929`	`{`
`930`	`930`	`{"traceparent", "00-0123456789abcdef0123456789abcdef-0123456789abcdef-01"},`
`931`		`- {"tracestate", "TraceState1"},`
	`931`	`+ {"tracestate", "tracestate=1"},`
`932`	`932`	`{"baggage", "Key1=value1, Key2=value2"}`
`933`	`933`	`}`
`934`	`934`	`});`
`@@ -937,7 +937,7 @@ public void ActivityTraceParentAndTraceStateFromHeaders()`
`937`	`937`	`Assert.Equal(ActivityIdFormat.W3C, Activity.Current.IdFormat);`
`938`	`938`	`Assert.Equal("0123456789abcdef0123456789abcdef", Activity.Current.TraceId.ToHexString());`
`939`	`939`	`Assert.Equal("0123456789abcdef", Activity.Current.ParentSpanId.ToHexString());`
`940`		`- Assert.Equal("TraceState1", Activity.Current.TraceStateString);`
	`940`	`+ Assert.Equal("tracestate=1", Activity.Current.TraceStateString);`
`941`	`941`
`942`	`942`	`Assert.Contains(Activity.Current.Baggage, pair => pair.Key == "Key1" && pair.Value == "value1");`
`943`	`943`	`Assert.Contains(Activity.Current.Baggage, pair => pair.Key == "Key2" && pair.Value == "value2");`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public async Task ThrowsForUnregisteredRequiredKeyService()`
`127`	`127`	`var exception = await Assert.ThrowsAsync<InvalidOperationException>(`
`128`	`128`	`async () => await endpoint.RequestDelegate(httpContext));`
`129`	`129`
`130`		`- Assert.Equal("No service for type 'Microsoft.AspNetCore.Http.Generators.Tests.TestService' has been registered.", exception.Message);`
	`130`	`+ Assert.Equal("No keyed service for type 'Microsoft.AspNetCore.Http.Generators.Tests.TestService' using key type 'System.String' has been registered.", exception.Message);`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`[Fact]`