Fix annotations

Author: javiercn

src/Components/WebAssembly/WebAssembly/src/Rendering/WebAssemblyRenderer.cs

@@ -33,6 +33,7 @@ public WebAssemblyRenderer(IServiceProvider serviceProvider, ILoggerFactory logg
         DefaultWebAssemblyJSRuntime.Instance.OnUpdateRootComponents += OnUpdateRootComponents;
     }
 
+    [UnconditionalSuppressMessage("Trimming", "IL2067", Justification = "These are root components which belong to the user and are in assemblies that don't get trimmed.")]
     private void OnUpdateRootComponents(OperationDescriptor[] operations)
     {
         for (var i = 0; i < operations.Length; i++)

src/Components/WebAssembly/WebAssembly/src/Services/DefaultWebAssemblyJSRuntime.cs

@@ -27,6 +27,7 @@ internal sealed partial class DefaultWebAssemblyJSRuntime : WebAssemblyJSRuntime
     [DynamicDependency(nameof(EndInvokeJS))]
     [DynamicDependency(nameof(BeginInvokeDotNet))]
     [DynamicDependency(nameof(ReceiveByteArrayFromJS))]
+    [DynamicDependency(nameof(UpdateRootComponentsCore))]
     private DefaultWebAssemblyJSRuntime()
     {
         ElementReferenceContext = new WebElementReferenceContext(this);
@@ -97,8 +98,8 @@ private static void UpdateRootComponentsCore(string operationsJson)
     }
 
     [DynamicDependency(JsonSerialized, typeof(RootComponentOperation))]
-    [DynamicDependency(Component, typeof(OperationDescriptor))]
     [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "The correct members will be preserved by the above DynamicDependency")]
+    [SuppressMessage("Trimming", "IL2072:Target parameter argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The return value of the source method does not have matching annotations.", Justification = "Types in that cache are components from the user assembly which are never trimmed.")]
     internal static OperationDescriptor[] DeserializeOperations(string operationsJson)
     {
         var deserialized = JsonSerializer.Deserialize<RootComponentOperation[]>(
@@ -137,23 +138,15 @@ internal static OperationDescriptor[] DeserializeOperations(string operationsJso
                 {
                     throw new InvalidOperationException($"The component operation of type '{operation.Type}' requires a '{nameof(operation.SelectorId)}' to be specified.");
                 }
-                componentType = ResolveComponentType(operation);
+                componentType = Instance._rootComponentCache.GetRootComponent(operation.Marker!.Value.Assembly!, operation.Marker.Value.TypeName!)
+                ?? throw new InvalidOperationException($"Root component type '{operation.Marker.Value.TypeName}' could not be found in the assembly '{operation.Marker.Value.Assembly}'.");
             }
 
             var parameters = DeserializeComponentParameters(operation.Marker.Value);
             operations[i] = new(operation, componentType, parameters);
         }
 
         return operations;
-
-        [return: DynamicallyAccessedMembers(Component)]
-        [SuppressMessage("Trimming", "IL2073:Target method return value does not satisfy 'DynamicallyAccessedMembersAttribute' requirements. The return value of the source method does not have matching annotations.", Justification = "The dynamic dependency above makes sure the type is" +
-        "preserved.")]
-        static Type ResolveComponentType(RootComponentOperation operation)
-        {
-            return Instance._rootComponentCache.GetRootComponent(operation.Marker!.Value.Assembly!, operation.Marker.Value.TypeName!)
-                ?? throw new InvalidOperationException($"Root component type '{operation.Marker.Value.TypeName}' could not be found in the assembly '{operation.Marker.Value.Assembly}'.");
-        }
     }
 
     static ParameterView DeserializeComponentParameters(ComponentMarker marker)
@@ -188,7 +181,7 @@ internal readonly struct OperationDescriptor
 {
     public OperationDescriptor(
         RootComponentOperation operation,
-        [DynamicallyAccessedMembers(Component)] Type? componentType,
+        Type? componentType,
         ParameterView parameters)
     {
         Operation = operation;
@@ -198,12 +191,11 @@ public OperationDescriptor(
 
     public RootComponentOperation Operation { get; }
 
-    [DynamicallyAccessedMembers(Component)]
     public Type? ComponentType { get; }
 
     public ParameterView Parameters { get; }
 
-    public void Deconstruct(out RootComponentOperation operation, [DynamicallyAccessedMembers(Component)] out Type? componentType, out ParameterView parameters)
+    public void Deconstruct(out RootComponentOperation operation, out Type? componentType, out ParameterView parameters)
     {
         operation = Operation;
         componentType = ComponentType;

src/Components/WebAssembly/WebAssembly/src/Services/InternalJSImportMethods.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Runtime.InteropServices.JavaScript;
 using Microsoft.AspNetCore.Components.Web;
@@ -17,6 +18,7 @@ private InternalJSImportMethods() { }
     public string GetPersistedState()
         => GetPersistedStateCore();
 
+    [UnconditionalSuppressMessage("Trimming", "IL2067", Justification = "These are root components which belong to the user and are in assemblies that don't get trimmed.")]
     public static async Task<RootComponentMapping[]> GetInitialComponentUpdate()
     {
         var components = await InternalJSImportMethods.GetInitialUpdateCore();

src/Components/test/testassets/Components.WasmMinimal/Program.cs

@@ -8,7 +8,6 @@
 
 Assembly.Load(nameof(TestContentPackage));
 
-
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.Services.AddSingleton<AsyncOperationService>();