tmp

Author: javiercn

AspNetCore.sln

@@ -11405,6 +11405,7 @@ Global
 		{9788C76F-658B-4441-88F8-22C6B86FAD27} = {7D2B0799-A634-42AC-AE77-5D167BA51389}
 		{1970D5CD-D9A4-4673-A297-179BB04199F4} = {7D2B0799-A634-42AC-AE77-5D167BA51389}
 		{A40350FE-4334-4007-B1C3-6BEB1B070309} = {7D2B0799-A634-42AC-AE77-5D167BA51389}
+		{A40350FE-4334-4007-B1C3-6BEB1B070308} = {6126DCE4-9692-4EE2-B240-C65743572995}
 		{C1E7F837-6988-43E2-9E1C-7302DB484F99} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
 		{2A91479A-4ABE-4BB7-9A5E-CA3B9CCFC69E} = {C1E7F837-6988-43E2-9E1C-7302DB484F99}
 		{7CB09412-C9B0-47E8-A8C3-311AA4CFDE04} = {C1E7F837-6988-43E2-9E1C-7302DB484F99}

src/Components/WebAssembly/WebAssembly/src/Hosting/WebAssemblyHostBuilder.cs

@@ -3,6 +3,7 @@
 
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
+using System.Reflection;
 using System.Text.Json;
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.Components.Infrastructure;
@@ -76,6 +77,8 @@ internal WebAssemblyHostBuilder(
         Services = new ServiceCollection();
         Logging = new LoggingBuilder(Services);
 
+        InitializeRoutingAppContextSwitch();
+
         InitializeWebAssemblyRenderer();
 
         // Retrieve required attributes from JSRuntimeInvoker
@@ -93,6 +96,17 @@ internal WebAssemblyHostBuilder(
         };
     }
 
+    private static InitializeRoutingAppContextSwitch()
+    {
+        var value = Assembly.GetEntryAssembly().GetAttributes().OfType<AssemblyMetadataAttribute>()
+            .Where(ama => string.Equals(ama.Key, "Microsoft.AspNetCore.Components.Routing.RegexConstraintSupport", StringComparison.Ordinal))
+            .SingleOrDefault()?.Value;
+        if (value != null && string.Equals(value, "true", StringComparison.OrdinalIgnoreCase))
+        {
+            AppContext.SetSwitch("Microsoft.AspNetCore.Components.Routing.RegexConstraintSupport", value);
+        }
+    }
+
     [UnconditionalSuppressMessage("Trimming", "IL2072", Justification = "Root components are expected to be defined in assemblies that do not get trimmed.")]
     private void InitializeRegisteredRootComponents(IInternalJSImportMethods jsMethods)
     {

src/Components/WebAssembly/WebAssembly/src/targets/Microsoft.AspNetCore.Components.WebAssembly.props

@@ -1,5 +1,21 @@
 <Project>
   <PropertyGroup>
     <BlazorWebAssemblyJSPath>$(MSBuildThisFileDirectory)blazor.webassembly.js</BlazorWebAssemblyJSPath>
+    <BlazorRoutingEnableRegexConstraint Condition="'$(BlazorRoutingEnableRegexConstraint)' == ''">false</BlazorRoutingEnableRegexConstraint>
   </PropertyGroup>
+
+  <ItemGroup>
+    <RuntimeHostConfigurationOption Include="Microsoft.AspNetCore.Components.Routing.RegexConstraintSupport"
+      Condition="'$(BlazorRoutingEnableRegexConstraint)' != ''"
+      Value="$(BlazorRoutingEnableRegexConstraint)"
+      Trim="true" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(BlazorRoutingEnableRegexConstraint)' != ''">
+      <_Parameter1>Microsoft.AspNetCore.Components.Routing.RegexConstraintSupport</_Parameter1>
+      <_Parameter2>true</_Parameter2>
+    </AssemblyAttribute>
+  </ItemGroup>
+  
 </Project>

src/Components/test/testassets/Components.TestServer/Components.TestServer.csproj

@@ -12,11 +12,18 @@
   </PropertyGroup>
 
   <ItemGroup>
+
     <RuntimeHostConfigurationOption Include="Microsoft.AspNetCore.Components.Routing.RegexConstraintSupport"
       Condition="'$(BlazorRoutingEnableRegexConstraint)' != ''"
       Value="$(BlazorRoutingEnableRegexConstraint)"
       Trim="true" />
-</ItemGroup>
+    
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(BlazorRoutingEnableRegexConstraint)' != ''">
+      <_Parameter1>Microsoft.AspNetCore.Components.Routing.RegexConstraintSupport</_Parameter1>
+      <_Parameter2>true</_Parameter2>
+    </AssemblyAttribute>
+    
+  </ItemGroup>
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore" />