Remove BinaryFormatter, Start Adding AOT Markup (#3943)

ChrisPulman · web-flow · commit 84be0b11691d · 2025-01-23T00:16:48.000Z
**What kind of change does this PR introduce?**  update **What is the current behavior?**  BinaryFormatter is used for suspension **What is the new behavior?**  Remove BinaryFormatter Start adding AOT Markup **What might this PR break?** Suspension will fail to Deserialize **** BREAKING CHANGE **** **Please check if the PR fulfills these requirements** - [ ] Tests for the changes have been added (for bug fixes / features) - [ ] Docs have been added / updated (for bug fixes / features) **Other information**:
diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.DotNet8_0.verified.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.DotNet8_0.verified.txt
@@ -117,15 +117,25 @@ namespace ReactiveUI
     public class CreatesCommandBindingViaCommandParameter : ReactiveUI.ICreatesCommandBinding
     {
         public CreatesCommandBindingViaCommandParameter() { }
+        [System.Diagnostics.CodeAnalysis.RequiresDynamicCode("Calls GetRuntimeProperty(string name)")]
+        [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Calls GetRuntimeProperty(string name)")]
         public System.IDisposable? BindCommandToObject(System.Windows.Input.ICommand? command, object? target, System.IObservable<object?> commandParameter) { }
         public System.IDisposable? BindCommandToObject<TEventArgs>(System.Windows.Input.ICommand? command, object? target, System.IObservable<object?> commandParameter, string eventName) { }
+        [System.Diagnostics.CodeAnalysis.RequiresDynamicCode("Calls GetRuntimeProperty(string name)")]
+        [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Calls GetRuntimeProperty(string name)")]
         public int GetAffinityForObject(System.Type type, bool hasEventTarget) { }
     }
     public class CreatesCommandBindingViaEvent : ReactiveUI.ICreatesCommandBinding
     {
         public CreatesCommandBindingViaEvent() { }
+        [System.Diagnostics.CodeAnalysis.RequiresDynamicCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]
+        [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]
         public System.IDisposable? BindCommandToObject(System.Windows.Input.ICommand? command, object? target, System.IObservable<object?> commandParameter) { }
+        [System.Diagnostics.CodeAnalysis.RequiresDynamicCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]
+        [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]
         public System.IDisposable? BindCommandToObject<TEventArgs>(System.Windows.Input.ICommand? command, object? target, System.IObservable<object?> commandParameter, string eventName) { }
+        [System.Diagnostics.CodeAnalysis.RequiresDynamicCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]
+        [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]
         public int GetAffinityForObject(System.Type type, bool hasEventTarget) { }
     }
     public class DecimalToStringTypeConverter : ReactiveUI.IBindingTypeConverter, Splat.IEnableLogger
@@ -137,6 +147,8 @@ namespace ReactiveUI
     public sealed class DefaultViewLocator : ReactiveUI.IViewLocator, Splat.IEnableLogger
     {
         public System.Func<string, string> ViewModelToViewFunc { get; set; }
+        [System.Diagnostics.CodeAnalysis.RequiresDynamicCode("The method is used to resolve views for view models.")]
+        [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]
         public ReactiveUI.IViewFor? ResolveView<T>(T? viewModel, string? contract = null) { }
     }
     public static class DependencyResolverMixins
@@ -369,7 +381,7 @@ namespace ReactiveUI
     public interface ISuspensionDriver
     {
         System.IObservable<System.Reactive.Unit> InvalidateState();
-        System.IObservable<object> LoadState();
+        System.IObservable<object?> LoadState();
         System.IObservable<System.Reactive.Unit> SaveState(object state);
     }
     public interface ISuspensionHost : ReactiveUI.IReactiveObject, Splat.IEnableLogger, System.ComponentModel.INotifyPropertyChanged, System.ComponentModel.INotifyPropertyChanging
@@ -813,6 +825,8 @@ namespace ReactiveUI
     public static class Reflection
     {
         public static string ExpressionToPropertyNames(System.Linq.Expressions.Expression? expression) { }
+        [System.Diagnostics.CodeAnalysis.RequiresDynamicCode("Calls GetRuntimeMethods()")]
+        [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Calls GetRuntimeMethods()")]
         public static System.Type GetEventArgsTypeForEvent(System.Type type, string? eventName) { }
         public static System.Func<object?, object?[]?, object?>? GetValueFetcherForProperty(System.Reflection.MemberInfo? member) { }
         public static System.Func<object?, object?[]?, object?> GetValueFetcherOrThrow(System.Reflection.MemberInfo? member) { }
@@ -821,6 +835,8 @@ namespace ReactiveUI
         public static bool IsStatic(this System.Reflection.PropertyInfo item) { }
         public static System.Type? ReallyFindType(string? type, bool throwOnFailure) { }
         public static System.Linq.Expressions.Expression Rewrite(System.Linq.Expressions.Expression? expression) { }
+        [System.Diagnostics.CodeAnalysis.RequiresDynamicCode("Calls GetTypeInfo()")]
+        [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Calls GetTypeInfo()")]
         public static void ThrowIfMethodsNotOverloaded(string callingTypeName, object targetObject, params string[] methodsToCheck) { }
         public static bool TryGetAllValuesForPropertyChain(out ReactiveUI.IObservedChange<object, object?>[] changeValues, object? current, System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression> expressionChain) { }
         public static bool TryGetValueForPropertyChain<TValue>(out TValue changeValue, object? current, System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression> expressionChain) { }
diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.DotNet9_0.verified.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.DotNet9_0.verified.txt
@@ -117,15 +117,25 @@ namespace ReactiveUI
     public class CreatesCommandBindingViaCommandParameter : ReactiveUI.ICreatesCommandBinding
     {
         public CreatesCommandBindingViaCommandParameter() { }
+        [System.Diagnostics.CodeAnalysis.RequiresDynamicCode("Calls GetRuntimeProperty(string name)")]
+        [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Calls GetRuntimeProperty(string name)")]
         public System.IDisposable? BindCommandToObject(System.Windows.Input.ICommand? command, object? target, System.IObservable<object?> commandParameter) { }
         public System.IDisposable? BindCommandToObject<TEventArgs>(System.Windows.Input.ICommand? command, object? target, System.IObservable<object?> commandParameter, string eventName) { }
+        [System.Diagnostics.CodeAnalysis.RequiresDynamicCode("Calls GetRuntimeProperty(string name)")]
+        [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Calls GetRuntimeProperty(string name)")]
         public int GetAffinityForObject(System.Type type, bool hasEventTarget) { }
     }
     public class CreatesCommandBindingViaEvent : ReactiveUI.ICreatesCommandBinding
     {
         public CreatesCommandBindingViaEvent() { }
+        [System.Diagnostics.CodeAnalysis.RequiresDynamicCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]
+        [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]
         public System.IDisposable? BindCommandToObject(System.Windows.Input.ICommand? command, object? target, System.IObservable<object?> commandParameter) { }
+        [System.Diagnostics.CodeAnalysis.RequiresDynamicCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]
+        [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]
         public System.IDisposable? BindCommandToObject<TEventArgs>(System.Windows.Input.ICommand? command, object? target, System.IObservable<object?> commandParameter, string eventName) { }
+        [System.Diagnostics.CodeAnalysis.RequiresDynamicCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]
+        [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]
         public int GetAffinityForObject(System.Type type, bool hasEventTarget) { }
     }
     public class DecimalToStringTypeConverter : ReactiveUI.IBindingTypeConverter, Splat.IEnableLogger
@@ -137,6 +147,8 @@ namespace ReactiveUI
     public sealed class DefaultViewLocator : ReactiveUI.IViewLocator, Splat.IEnableLogger
     {
         public System.Func<string, string> ViewModelToViewFunc { get; set; }
+        [System.Diagnostics.CodeAnalysis.RequiresDynamicCode("The method is used to resolve views for view models.")]
+        [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]
         public ReactiveUI.IViewFor? ResolveView<T>(T? viewModel, string? contract = null) { }
     }
     public static class DependencyResolverMixins
@@ -369,7 +381,7 @@ namespace ReactiveUI
     public interface ISuspensionDriver
     {
         System.IObservable<System.Reactive.Unit> InvalidateState();
-        System.IObservable<object> LoadState();
+        System.IObservable<object?> LoadState();
         System.IObservable<System.Reactive.Unit> SaveState(object state);
     }
     public interface ISuspensionHost : ReactiveUI.IReactiveObject, Splat.IEnableLogger, System.ComponentModel.INotifyPropertyChanged, System.ComponentModel.INotifyPropertyChanging
@@ -813,6 +825,8 @@ namespace ReactiveUI
     public static class Reflection
     {
         public static string ExpressionToPropertyNames(System.Linq.Expressions.Expression? expression) { }
+        [System.Diagnostics.CodeAnalysis.RequiresDynamicCode("Calls GetRuntimeMethods()")]
+        [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Calls GetRuntimeMethods()")]
         public static System.Type GetEventArgsTypeForEvent(System.Type type, string? eventName) { }
         public static System.Func<object?, object?[]?, object?>? GetValueFetcherForProperty(System.Reflection.MemberInfo? member) { }
         public static System.Func<object?, object?[]?, object?> GetValueFetcherOrThrow(System.Reflection.MemberInfo? member) { }
@@ -821,6 +835,8 @@ namespace ReactiveUI
         public static bool IsStatic(this System.Reflection.PropertyInfo item) { }
         public static System.Type? ReallyFindType(string? type, bool throwOnFailure) { }
         public static System.Linq.Expressions.Expression Rewrite(System.Linq.Expressions.Expression? expression) { }
+        [System.Diagnostics.CodeAnalysis.RequiresDynamicCode("Calls GetTypeInfo()")]
+        [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Calls GetTypeInfo()")]
         public static void ThrowIfMethodsNotOverloaded(string callingTypeName, object targetObject, params string[] methodsToCheck) { }
         public static bool TryGetAllValuesForPropertyChain(out ReactiveUI.IObservedChange<object, object?>[] changeValues, object? current, System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression> expressionChain) { }
         public static bool TryGetValueForPropertyChain<TValue>(out TValue changeValue, object? current, System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression> expressionChain) { }
diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.Net4_7.verified.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.Net4_7.verified.txt
@@ -367,7 +367,7 @@ namespace ReactiveUI
     public interface ISuspensionDriver
     {
         System.IObservable<System.Reactive.Unit> InvalidateState();
-        System.IObservable<object> LoadState();
+        System.IObservable<object?> LoadState();
         System.IObservable<System.Reactive.Unit> SaveState(object state);
     }
     public interface ISuspensionHost : ReactiveUI.IReactiveObject, Splat.IEnableLogger, System.ComponentModel.INotifyPropertyChanged, System.ComponentModel.INotifyPropertyChanging
diff --git a/src/ReactiveUI/Bindings/Command/CreatesCommandBinding.cs b/src/ReactiveUI/Bindings/Command/CreatesCommandBinding.cs
@@ -40,6 +40,10 @@ public static IDisposable BindCommandToObject(ICommand? command, object? target,
         return ret;
     }
 
+#if NET6_0_OR_GREATER
+    [RequiresUnreferencedCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]
+    [RequiresDynamicCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]
+#endif
     public static IDisposable BindCommandToObject(ICommand? command, object? target, IObservable<object?> commandParameter, string? eventName)
     {
         var type = target!.GetType();
diff --git a/src/ReactiveUI/Bindings/Command/CreatesCommandBindingViaCommandParameter.cs b/src/ReactiveUI/Bindings/Command/CreatesCommandBindingViaCommandParameter.cs
@@ -14,6 +14,10 @@ namespace ReactiveUI;
 public class CreatesCommandBindingViaCommandParameter : ICreatesCommandBinding
 {
     /// <inheritdoc/>
+#if NET6_0_OR_GREATER
+    [RequiresUnreferencedCode("Calls GetRuntimeProperty(string name)")]
+    [RequiresDynamicCode("Calls GetRuntimeProperty(string name)")]
+#endif
     public int GetAffinityForObject(Type type, bool hasEventTarget)
     {
         if (hasEventTarget)
@@ -35,6 +39,10 @@ public int GetAffinityForObject(Type type, bool hasEventTarget)
     }
 
     /// <inheritdoc/>
+#if NET6_0_OR_GREATER
+    [RequiresUnreferencedCode("Calls GetRuntimeProperty(string name)")]
+    [RequiresDynamicCode("Calls GetRuntimeProperty(string name)")]
+#endif
     public IDisposable? BindCommandToObject(ICommand? command, object? target, IObservable<object?> commandParameter)
     {
         target.ArgumentNullExceptionThrowIfNull(nameof(target));
diff --git a/src/ReactiveUI/Bindings/Command/CreatesCommandBindingViaEvent.cs b/src/ReactiveUI/Bindings/Command/CreatesCommandBindingViaEvent.cs
@@ -30,6 +30,10 @@ public class CreatesCommandBindingViaEvent : ICreatesCommandBinding
     ];
 
     /// <inheritdoc/>
+#if NET6_0_OR_GREATER
+    [RequiresUnreferencedCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]
+    [RequiresDynamicCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]
+#endif
     public int GetAffinityForObject(Type type, bool hasEventTarget)
     {
         if (hasEventTarget)
@@ -45,6 +49,10 @@ public int GetAffinityForObject(Type type, bool hasEventTarget)
     }
 
     /// <inheritdoc/>
+#if NET6_0_OR_GREATER
+    [RequiresUnreferencedCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]
+    [RequiresDynamicCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]
+#endif
     public IDisposable? BindCommandToObject(ICommand? command, object? target, IObservable<object?> commandParameter)
     {
         target.ArgumentNullExceptionThrowIfNull(nameof(target));
@@ -61,6 +69,10 @@ public int GetAffinityForObject(Type type, bool hasEventTarget)
     }
 
     /// <inheritdoc/>
+#if NET6_0_OR_GREATER
+    [RequiresUnreferencedCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]
+    [RequiresDynamicCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]
+#endif
     public IDisposable? BindCommandToObject<TEventArgs>(ICommand? command, object? target, IObservable<object?> commandParameter, string eventName)
 #if MONO
         where TEventArgs : EventArgs
diff --git a/src/ReactiveUI/Expression/Reflection.cs b/src/ReactiveUI/Expression/Reflection.cs
@@ -331,6 +331,10 @@ public static bool TrySetValueToPropertyChain<TValue>(object? target, IEnumerabl
     /// <param name="eventName">The name of the event.</param>
     /// <returns>The Type of the EventArgs to use.</returns>
     /// <exception cref="Exception">If there is no event matching the name on the target type.</exception>
+#if NET6_0_OR_GREATER
+    [RequiresUnreferencedCode("Calls GetRuntimeMethods()")]
+    [RequiresDynamicCode("Calls GetRuntimeMethods()")]
+#endif
     public static Type GetEventArgsTypeForEvent(Type type, string? eventName) // TODO: Create Test
     {
         type.ArgumentNullExceptionThrowIfNull(nameof(type));
@@ -354,6 +358,10 @@ public static Type GetEventArgsTypeForEvent(Type type, string? eventName) // TOD
     /// <param name="targetObject">The object to check.</param>
     /// <param name="methodsToCheck">The name of the methods to check.</param>
     /// <exception cref="Exception">Thrown if the methods aren't overriden on the target object.</exception>
+#if NET6_0_OR_GREATER
+    [RequiresUnreferencedCode("Calls GetTypeInfo()")]
+    [RequiresDynamicCode("Calls GetTypeInfo()")]
+#endif
     public static void ThrowIfMethodsNotOverloaded(string callingTypeName, object targetObject, params string[] methodsToCheck) // TODO: Create Test
     {
         var (methodName, methodImplementation) = methodsToCheck
diff --git a/src/ReactiveUI/Interfaces/ISuspensionDriver.cs b/src/ReactiveUI/Interfaces/ISuspensionDriver.cs
@@ -16,7 +16,7 @@ public interface ISuspensionDriver
     /// Loads the application state from persistent storage.
     /// </summary>
     /// <returns>An object observable.</returns>
-    IObservable<object> LoadState();
+    IObservable<object?> LoadState();
 
     /// <summary>
     /// Saves the application state to disk.
@@ -30,4 +30,4 @@ public interface ISuspensionDriver
     /// </summary>
     /// <returns>A completed observable.</returns>
     IObservable<Unit> InvalidateState();
-}
+}
diff --git a/src/ReactiveUI/Mixins/AutoPersistHelper.cs b/src/ReactiveUI/Mixins/AutoPersistHelper.cs
@@ -17,7 +17,7 @@ namespace ReactiveUI;
 public static class AutoPersistHelper
 {
     private static readonly MemoizingMRUCache<Type, Dictionary<string, bool>> _persistablePropertiesCache = new(
-     (type, _) => type.GetTypeInfo().DeclaredProperties
+     static (type, _) => type.GetTypeInfo().DeclaredProperties
                       .Where(x => x.CustomAttributes.Any(y => typeof(DataMemberAttribute).GetTypeInfo().IsAssignableFrom(y.AttributeType.GetTypeInfo())))
                       .ToDictionary(k => k.Name, _ => true),
      RxApp.SmallCacheLimit);
diff --git a/src/ReactiveUI/PlatformRegistrationManager.cs b/src/ReactiveUI/PlatformRegistrationManager.cs
@@ -11,7 +11,11 @@ namespace ReactiveUI;
 public static class PlatformRegistrationManager
 {
     internal static RegistrationNamespace[] DefaultRegistrationNamespaces { get; } =
+#if NET6_0_OR_GREATER
+        Enum.GetValues<RegistrationNamespace>();
+#else
         (RegistrationNamespace[])Enum.GetValues(typeof(RegistrationNamespace));
+#endif
 
     internal static RegistrationNamespace[] NamespacesToRegister { get; set; } = DefaultRegistrationNamespaces;
 
@@ -21,4 +25,4 @@ public static class PlatformRegistrationManager
     /// </summary>
     /// <param name="namespaces">The namespaces to register.</param>
     public static void SetRegistrationNamespaces(params RegistrationNamespace[] namespaces) => NamespacesToRegister = namespaces;
-}
+}
diff --git a/src/ReactiveUI/Platforms/android/BundleSuspensionDriver.cs b/src/ReactiveUI/Platforms/android/BundleSuspensionDriver.cs
@@ -4,7 +4,7 @@
 // See the LICENSE file in the project root for full license information.
 
 using System.IO;
-using System.Runtime.Serialization.Formatters.Binary;
+using System.Text.Json;
 
 namespace ReactiveUI;
 
@@ -14,7 +14,11 @@ namespace ReactiveUI;
 public class BundleSuspensionDriver : ISuspensionDriver
 {
     /// <inheritdoc/>
-    public IObservable<object> LoadState() // TODO: Create Test
+#if NET6_0_OR_GREATER
+    [RequiresUnreferencedCode("Calls Deserialize<object>()")]
+    [RequiresDynamicCode("Calls Deserialize<object>()")]
+#endif
+    public IObservable<object?> LoadState() // TODO: Create Test
     {
         try
         {
@@ -24,7 +28,6 @@ public IObservable<object> LoadState() // TODO: Create Test
                 return Observable.Throw<object>(new Exception("New bundle, start from scratch"));
             }
 
-            var serializer = new BinaryFormatter();
             var buffer = AutoSuspendHelper.LatestBundle.GetByteArray("__state");
 
             if (buffer is null)
@@ -34,7 +37,7 @@ public IObservable<object> LoadState() // TODO: Create Test
 
             var st = new MemoryStream(buffer);
 
-            return Observable.Return(serializer.Deserialize(st));
+            return Observable.Return(JsonSerializer.Deserialize<object>(st));
         }
         catch (Exception ex)
         {
@@ -43,13 +46,16 @@ public IObservable<object> LoadState() // TODO: Create Test
     }
 
     /// <inheritdoc/>
+#if NET6_0_OR_GREATER
+    [RequiresUnreferencedCode("Calls Serialize<object>()")]
+    [RequiresDynamicCode("Calls Serialize<object>()")]
+#endif
     public IObservable<Unit> SaveState(object state) // TODO: Create Test
     {
         try
         {
-            var serializer = new BinaryFormatter();
             var st = new MemoryStream();
-
+            JsonSerializer.Serialize(st, state);
             AutoSuspendHelper.LatestBundle?.PutByteArray("__state", st.ToArray());
             return Observables.Unit;
         }
diff --git a/src/ReactiveUI/Platforms/android/ReactiveViewHost.cs b/src/ReactiveUI/Platforms/android/ReactiveViewHost.cs
diff --git a/src/ReactiveUI/Platforms/apple-common/AppSupportJsonSuspensionDriver.cs b/src/ReactiveUI/Platforms/apple-common/AppSupportJsonSuspensionDriver.cs
diff --git a/src/ReactiveUI/Platforms/mobile-common/ComponentModelTypeConverter.cs b/src/ReactiveUI/Platforms/mobile-common/ComponentModelTypeConverter.cs
diff --git a/src/ReactiveUI/ReactiveUI.csproj b/src/ReactiveUI/ReactiveUI.csproj
diff --git a/src/ReactiveUI/View/DefaultViewLocator.cs b/src/ReactiveUI/View/DefaultViewLocator.cs

Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,7 @@ namespace ReactiveUI`
`367`	`367`	`public interface ISuspensionDriver`
`368`	`368`	`{`
`369`	`369`	`System.IObservable<System.Reactive.Unit> InvalidateState();`
`370`		`- System.IObservable<object> LoadState();`
	`370`	`+ System.IObservable<object?> LoadState();`
`371`	`371`	`System.IObservable<System.Reactive.Unit> SaveState(object state);`
`372`	`372`	`}`
`373`	`373`	`public interface ISuspensionHost : ReactiveUI.IReactiveObject, Splat.IEnableLogger, System.ComponentModel.INotifyPropertyChanged, System.ComponentModel.INotifyPropertyChanging`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,10 @@ public static IDisposable BindCommandToObject(ICommand? command, object? target,`
`40`	`40`	`return ret;`
`41`	`41`	`}`
`42`	`42`
	`43`	`+#if NET6_0_OR_GREATER`
	`44`	`+ [RequiresUnreferencedCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]`
	`45`	`+ [RequiresDynamicCode("Calls System.Reflection.MethodInfo.MakeGenericMethod(params Type[])")]`
	`46`	`+#endif`
`43`	`47`	`public static IDisposable BindCommandToObject(ICommand? command, object? target, IObservable<object?> commandParameter, string? eventName)`
`44`	`48`	`{`
`45`	`49`	`var type = target!.GetType();`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,10 @@ namespace ReactiveUI;`
`14`	`14`	`public class CreatesCommandBindingViaCommandParameter : ICreatesCommandBinding`
`15`	`15`	`{`
`16`	`16`	`/// <inheritdoc/>`
	`17`	`+#if NET6_0_OR_GREATER`
	`18`	`+ [RequiresUnreferencedCode("Calls GetRuntimeProperty(string name)")]`
	`19`	`+ [RequiresDynamicCode("Calls GetRuntimeProperty(string name)")]`
	`20`	`+#endif`
`17`	`21`	`public int GetAffinityForObject(Type type, bool hasEventTarget)`
`18`	`22`	`{`
`19`	`23`	`if (hasEventTarget)`
`@@ -35,6 +39,10 @@ public int GetAffinityForObject(Type type, bool hasEventTarget)`
`35`	`39`	`}`
`36`	`40`
`37`	`41`	`/// <inheritdoc/>`
	`42`	`+#if NET6_0_OR_GREATER`
	`43`	`+ [RequiresUnreferencedCode("Calls GetRuntimeProperty(string name)")]`
	`44`	`+ [RequiresDynamicCode("Calls GetRuntimeProperty(string name)")]`
	`45`	`+#endif`
`38`	`46`	`public IDisposable? BindCommandToObject(ICommand? command, object? target, IObservable<object?> commandParameter)`
`39`	`47`	`{`
`40`	`48`	`target.ArgumentNullExceptionThrowIfNull(nameof(target));`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ namespace ReactiveUI;`
`17`	`17`	`public static class AutoPersistHelper`
`18`	`18`	`{`
`19`	`19`	`private static readonly MemoizingMRUCache<Type, Dictionary<string, bool>> _persistablePropertiesCache = new(`
`20`		`- (type, _) => type.GetTypeInfo().DeclaredProperties`
	`20`	`+ static (type, _) => type.GetTypeInfo().DeclaredProperties`
`21`	`21`	`.Where(x => x.CustomAttributes.Any(y => typeof(DataMemberAttribute).GetTypeInfo().IsAssignableFrom(y.AttributeType.GetTypeInfo())))`
`22`	`22`	`.ToDictionary(k => k.Name, _ => true),`
`23`	`23`	`RxApp.SmallCacheLimit);`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`// See the LICENSE file in the project root for full license information.`
`5`	`5`
`6`	`6`	`using System.IO;`
`7`		`-using System.Runtime.Serialization.Formatters.Binary;`
	`7`	`+using System.Text.Json;`
`8`	`8`
`9`	`9`	`namespace ReactiveUI;`
`10`	`10`
`@@ -14,7 +14,11 @@ namespace ReactiveUI;`
`14`	`14`	`public class BundleSuspensionDriver : ISuspensionDriver`
`15`	`15`	`{`
`16`	`16`	`/// <inheritdoc/>`
`17`		`- public IObservable<object> LoadState() // TODO: Create Test`
	`17`	`+#if NET6_0_OR_GREATER`
	`18`	`+ [RequiresUnreferencedCode("Calls Deserialize<object>()")]`
	`19`	`+ [RequiresDynamicCode("Calls Deserialize<object>()")]`
	`20`	`+#endif`
	`21`	`+ public IObservable<object?> LoadState() // TODO: Create Test`
`18`	`22`	`{`
`19`	`23`	`try`
`20`	`24`	`{`
`@@ -24,7 +28,6 @@ public IObservable<object> LoadState() // TODO: Create Test`
`24`	`28`	`return Observable.Throw<object>(new Exception("New bundle, start from scratch"));`
`25`	`29`	`}`
`26`	`30`
`27`		`- var serializer = new BinaryFormatter();`
`28`	`31`	`var buffer = AutoSuspendHelper.LatestBundle.GetByteArray("__state");`
`29`	`32`
`30`	`33`	`if (buffer is null)`
`@@ -34,7 +37,7 @@ public IObservable<object> LoadState() // TODO: Create Test`
`34`	`37`
`35`	`38`	`var st = new MemoryStream(buffer);`
`36`	`39`
`37`		`- return Observable.Return(serializer.Deserialize(st));`
	`40`	`+ return Observable.Return(JsonSerializer.Deserialize<object>(st));`
`38`	`41`	`}`
`39`	`42`	`catch (Exception ex)`
`40`	`43`	`{`
`@@ -43,13 +46,16 @@ public IObservable<object> LoadState() // TODO: Create Test`
`43`	`46`	`}`
`44`	`47`
`45`	`48`	`/// <inheritdoc/>`
	`49`	`+#if NET6_0_OR_GREATER`
	`50`	`+ [RequiresUnreferencedCode("Calls Serialize<object>()")]`
	`51`	`+ [RequiresDynamicCode("Calls Serialize<object>()")]`
	`52`	`+#endif`
`46`	`53`	`public IObservable<Unit> SaveState(object state) // TODO: Create Test`
`47`	`54`	`{`
`48`	`55`	`try`
`49`	`56`	`{`
`50`		`- var serializer = new BinaryFormatter();`
`51`	`57`	`var st = new MemoryStream();`
`52`		`-`
	`58`	`+ JsonSerializer.Serialize(st, state);`
`53`	`59`	`AutoSuspendHelper.LatestBundle?.PutByteArray("__state", st.ToArray());`
`54`	`60`	`return Observables.Unit;`
`55`	`61`	`}`