Fix for #3714

reactiveui · Apr 24, 2024 · 6e03e5f · 6e03e5f
1 parent 274d199
commit 6e03e5f
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/src/ReactiveUI/Platforms/android/ControlFetcherMixin.cs b/src/ReactiveUI/Platforms/android/ControlFetcherMixin.cs
@@ -227,16 +227,19 @@ private static int GetControlIdByName(Assembly assembly, string? name)
                                        assembly,
                                        currentAssembly =>
                                        {
-                                           var resources = currentAssembly.GetModules().SelectMany(x => x.GetTypes()).First(x => x.Name == "Resource");
-
-                                           var idType = resources.GetNestedType("Id");
-
-                                           if (idType is null)
-                                           {
-                                               throw new InvalidOperationException("Id is not a valid nested type in the resources.");
-                                           }
-
-                                           return idType.GetFields()
+#if NET8_0_OR_GREATER
+                                            var resources = Assembly.Load(currentAssembly
+                                                            .GetReferencedAssemblies()
+                                                            .First(an => an.FullName.StartsWith("_Microsoft.Android.Resource.Designer")).ToString())
+                                                            .GetModules()
+                                                            .SelectMany(x => x.GetTypes())
+                                                            .First(x => x.Name == "ResourceConstant");
+#else
+                                            var resources = currentAssembly.GetModules().SelectMany(x => x.GetTypes()).First(x => x.Name == "Resource");
+#endif
+
+                                            var idType = resources.GetNestedType("Id") ?? throw new InvalidOperationException("Id is not a valid nested type in the resources.");
+                                            return idType.GetFields()
                                                         .Where(x => x.FieldType == typeof(int))
                                                         .ToDictionary(k => k.Name, v => ((int?)v.GetRawConstantValue()) ?? 0, StringComparer.InvariantCultureIgnoreCase);
                                        });