[automated] Merge branch 'release/10.0' => 'main'

global.json

@@ -1,14 +1,14 @@
 {
   "sdk": {
-    "version": "10.0.100-rc.1.25411.109",
+    "version": "10.0.100-rc.1.25420.111",
     "paths": [
       ".dotnet",
       "$host$"
     ],
     "errorMessage": "The .NET SDK could not be found, run ./restore.cmd or ./restore.sh first."
   },
   "tools": {
-    "dotnet": "10.0.100-rc.1.25411.109",
+    "dotnet": "10.0.100-rc.1.25420.111",
     "runtimes": {
       "dotnet/x86": [
         "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"

src/Components/Components/src/ComponentFactory.cs

@@ -14,6 +14,11 @@ namespace Microsoft.AspNetCore.Components;
 
 internal sealed class ComponentFactory
 {
+    // This switch is unsupported and will be removed in a future version.
+    private static readonly bool _propertyInjectionDisabled =
+        AppContext.TryGetSwitch("Microsoft.AspNetCore.Components.Unsupported.DisablePropertyInjection", out var isDisabled) &&
+        isDisabled;
+
     private const BindingFlags _injectablePropertyBindingFlags
         = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
 
@@ -82,15 +87,18 @@ public IComponent InstantiateComponent(IServiceProvider serviceProvider, [Dynami
             throw new InvalidOperationException($"The component activator returned a null value for a component of type {componentType.FullName}.");
         }
 
-        if (component.GetType() == componentType)
-        {
-            // Fast, common case: use the cached data we already looked up
-            propertyInjector(serviceProvider, component);
-        }
-        else
+        if (!_propertyInjectionDisabled)
         {
-            // Uncommon case where the activator/resolver returned a different type. Needs an extra cache lookup.
-            PerformPropertyInjection(serviceProvider, component);
+            if (component.GetType() == componentType)
+            {
+                // Fast, common case: use the cached data we already looked up
+                propertyInjector(serviceProvider, component);
+            }
+            else
+            {
+                // Uncommon case where the activator/resolver returned a different type. Needs an extra cache lookup.
+                PerformPropertyInjection(serviceProvider, component);
+            }
         }
 
         return component;