Enable BinaryFormatter for .Net 9 version

Author: dmiller

Clojure/Clojure.Main/Clojure.Main.csproj

@@ -6,6 +6,7 @@
 	 <LangVersion>12.0</LangVersion>
     <StartupObject>Clojure.CljMain</StartupObject>
 	 <PackAsTool>true</PackAsTool>
+	 <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
   </PropertyGroup>
 
 	<PropertyGroup>

Clojure/Clojure.Tests/clojure/test_clojure/java_interop.clj

@@ -236,7 +236,13 @@
   [^String s]
   (.GetString System.Text.Encoding/UTF8 (System.Convert/FromBase64String s)))     ;;; (.decode (Base64/getDecoder) s)
 
-#_(deftest test-proxy-non-serializable
+(compile-when (>= (:major clojure-version) 9)
+
+(assembly-load-from "System.Runtime.Serialization.Formatters.dll")
+
+)
+
+(deftest test-proxy-non-serializable
   (testing "That proxy classes refuse serialization and deserialization"
     ;; Serializable listed directly in interface list:
     (is (thrown? System.Runtime.Serialization.SerializationException                                                     ;;;  java.io.NotSerializableException

Clojure/Clojure.Tests/clojure/test_clojure/serialization.clj

@@ -12,7 +12,15 @@
 (ns clojure.test-clojure.serialization
   (:use clojure.test)
   (:import (System.IO MemoryStream)                                                 ;;;(java.io ObjectOutputStream ObjectInputStream
-           (System.Runtime.Serialization.Formatters.Binary BinaryFormatter)))        ;;; ByteArrayOutputStream ByteArrayInputStream)))
+           #_(System.Runtime.Serialization.Formatters.Binary BinaryFormatter)))        ;;; ByteArrayOutputStream ByteArrayInputStream)))   -- defer import until after load
+
+(compile-when (>= (:major clojure-version) 9)
+
+(assembly-load-from "System.Runtime.Serialization.Formatters.dll")
+
+)
+
+(import '(System.Runtime.Serialization.Formatters.Binary BinaryFormatter))
 
 (defn- serialize
   "Serializes a single object, returning a byte array."
@@ -48,7 +56,7 @@
       (= (hash v) (hash rt))
       (= (.GetHashCode v) (.GetHashCode rt)))))          ;;; .hashCode .hashCode
 
-#_(deftest sequable-serialization
+(deftest sequable-serialization
   (are [val] (roundtrip val)
     ; lists and related
     ;;; (list)                          <--- We cannot handle seq of this, which is nil.  Cannot serialize nil.
@@ -123,14 +131,14 @@
       (nth r 35)
       r)))
 
-#_(deftest misc-serialization
+(deftest misc-serialization
   (are [v] (= v (-> v serialize deserialize))
     25/3
     :keyword
     ::namespaced-keyword
     'symbol))
 
-#_(deftest tostringed-bytes
+(deftest tostringed-bytes
   (let [rt #(-> % serialize seq)
         s1 (rt 'sym123)
         k1 (rt :kw123)
@@ -141,7 +149,7 @@
     (is (= s1 s2))
     (is (= k1 k2))))
 
-#_(deftest interned-serializations
+(deftest interned-serializations
   (are [v] (identical? v (-> v serialize deserialize))
     clojure.lang.RT/DefaultComparerInstance                                       ;;; clojure.lang.RT/DEFAULT_COMPARATOR
 
@@ -152,7 +160,7 @@
      ; vars get serialized back into the same var in the present runtime
     #'clojure.core/conj))
 
- #_(deftest new-var-unbound-on-read
+ (deftest new-var-unbound-on-read
   (let [v (intern 'user 'foobarbaz 10)
         sv (serialize v)]
     (ns-unmap 'user 'foobarbaz) ;; unmap #'user.V
@@ -170,7 +178,7 @@
 ;;;      (fn [] capture)                                      <--- TODO: unable to find assembly eval
 )))  ;;;      #(do capture))))                                <--- TODO: unable to find assembly eval
 
-#_(deftest check-unserializable-objects
+(deftest check-unserializable-objects
   (are [t] (thrown?  System.Runtime.Serialization.SerializationException (serialize t))              ;;; java.io.NotSerializableException
     ;; transients
     (transient [])
@@ -187,7 +195,7 @@
     (iterator-seq (.GetEnumerator (range 50)))))               ;;; (.iterator (range 50)))))
 
 ;; necessary for CVE-2024-22871
-#_(deftest CLJ-2839
+(deftest CLJ-2839
   (are [e] (thrown? Exception (.GetHashCode ^Object (-> e serialize deserialize)))              ;;; .hashCode
     (repeat 1)
     (iterate identity nil)

Clojure/Clojure/Clojure.csproj

@@ -5,6 +5,7 @@
 		<LangVersion>12.0</LangVersion>
 		<NeutralLanguage></NeutralLanguage>
 		<RootNamespace>clojure.lang</RootNamespace>
+		<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)'=='Debug'">
@@ -30,6 +31,10 @@
 		</EmbeddedResource>
 	</ItemGroup>
 
+	<ItemGroup Condition="'$(TargetFramework)' == 'net90' ">
+		<PackageReference Include="System.Runtime.Serialization.Formatters" Version="9.0.0-*" />
+	</ItemGroup>
+	
 
 	<!-- The following pieces are required to get Clojure.Source.dll included in the Nuget package -->