Merge branch 'main' into fix-extensions-hybrid

akoeplinger · web-flow · commit 89ad8ec23332 · 2025-07-10T18:51:11.000+02:00
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/global.json b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "10.0.100-preview.6.25315.102"
+    "version": "10.0.100-preview.7.25322.101"
   },
   "tools": {
-    "dotnet": "10.0.100-preview.6.25315.102",
+    "dotnet": "10.0.100-preview.7.25322.101",
     "runtimes": {
       "dotnet/x86": [
         "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"
@@ -27,9 +27,9 @@
     "jdk": "latest"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25351.105",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25351.105",
-    "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25351.105",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25358.102",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25358.102",
+    "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25358.102",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0"
   }
diff --git a/src/Components/Components/src/PersistentStateValueProvider.cs b/src/Components/Components/src/PersistentStateValueProvider.cs
@@ -19,7 +19,7 @@ internal sealed class PersistentStateValueProvider(PersistentComponentState stat
 {
     private static readonly ConcurrentDictionary<(string, string, string), byte[]> _keyCache = new();
     private static readonly ConcurrentDictionary<(Type, string), PropertyGetter> _propertyGetterCache = new();
-    private readonly ConcurrentDictionary<Type, IPersistentComponentStateSerializer?> _serializerCache = new();
+    private static readonly ConcurrentDictionary<Type, IPersistentComponentStateSerializer?> _serializerCache = new();
 
     private readonly Dictionary<ComponentState, PersistingComponentStateSubscription> _subscriptions = [];
 
diff --git a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj
@@ -38,7 +38,6 @@
     <GenerateInstallers Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</GenerateInstallers>
     <BuildDebPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildDebPackage>
     <BuildRpmPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildRpmPackage>
-    <UseArcadeRpmTooling>true</UseArcadeRpmTooling>
     <GenerateVSInsertionPackages>true</GenerateVSInsertionPackages>
   </PropertyGroup>
 
diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj
@@ -46,7 +46,6 @@
     <GenerateInstallers Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</GenerateInstallers>
     <BuildDebPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildDebPackage>
     <BuildRpmPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildRpmPackage>
-    <UseArcadeRpmTooling>true</UseArcadeRpmTooling>
     <GenerateVSInsertionPackages>true</GenerateVSInsertionPackages>
   </PropertyGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ internal sealed class PersistentStateValueProvider(PersistentComponentState stat`
`19`	`19`	`{`
`20`	`20`	`private static readonly ConcurrentDictionary<(string, string, string), byte[]> _keyCache = new();`
`21`	`21`	`private static readonly ConcurrentDictionary<(Type, string), PropertyGetter> _propertyGetterCache = new();`
`22`		`- private readonly ConcurrentDictionary<Type, IPersistentComponentStateSerializer?> _serializerCache = new();`
	`22`	`+ private static readonly ConcurrentDictionary<Type, IPersistentComponentStateSerializer?> _serializerCache = new();`
`23`	`23`
`24`	`24`	`private readonly Dictionary<ComponentState, PersistingComponentStateSubscription> _subscriptions = [];`
`25`	`25`