Merge branch 'fix-binaryformatter-usage' into net8.0

filmor · filmor · commit 38c87d989056 · 2025-08-11T23:42:09.000+02:00
diff --git a/src/runtime/StateSerialization/RuntimeData.cs b/src/runtime/StateSerialization/RuntimeData.cs
@@ -18,11 +18,19 @@ public static class RuntimeData
 
         public readonly static Func<IFormatter> DefaultFormatterFactory = () =>
         {
-            try
+            var fw = RuntimeInformation.FrameworkDescription;
+            if (fw.StartsWith(".NET Framework") || fw.StartsWith("Mono"))
             {
-                return new BinaryFormatter();
+                try
+                {
+                    return new BinaryFormatter();
+                }
+                catch
+                {
+                    return new NoopFormatter();
+                }
             }
-            catch
+            else
             {
                 return new NoopFormatter();
             }

Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,19 @@ public static class RuntimeData`
`18`	`18`
`19`	`19`	`public readonly static Func<IFormatter> DefaultFormatterFactory = () =>`
`20`	`20`	`{`
`21`		`- try`
	`21`	`+ var fw = RuntimeInformation.FrameworkDescription;`
	`22`	`+ if (fw.StartsWith(".NET Framework") \|\| fw.StartsWith("Mono"))`
`22`	`23`	`{`
`23`		`- return new BinaryFormatter();`
	`24`	`+ try`
	`25`	`+ {`
	`26`	`+ return new BinaryFormatter();`
	`27`	`+ }`
	`28`	`+ catch`
	`29`	`+ {`
	`30`	`+ return new NoopFormatter();`
	`31`	`+ }`
`24`	`32`	`}`
`25`		`- catch`
	`33`	`+ else`
`26`	`34`	`{`
`27`	`35`	`return new NoopFormatter();`
`28`	`36`	`}`