Fix serialization tests (due to target platform change in Clojure.Tests).

Author: dmiller

Clojure/Clojure.Tests/Clojure.Tests.csproj

@@ -277,4 +277,16 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="System.Runtime.Serialization.Formatters">
+      <Version>9.0.8</Version>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+    <PackageReference Include="System.Runtime.Serialization.Formatters">
+      <Version>9.0.8</Version>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>

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

@@ -19,6 +19,15 @@
   (:import                                                                   ;;; java.util.Base64
            (clojure.lang AtomicLong AtomicInteger)))                         ;;; java.util.concurrent.atomic
 
+           
+(compile-when (>= (:major dotnet-version) 9)
+
+(assembly-load-from "System.Runtime.Serialization.Formatters.dll")
+
+)
+
+(import '(System.Runtime.Serialization.Formatters.Binary BinaryFormatter))
+
 ; http://clojure.org/java_interop
 ; http://clojure.org/compilation
 
@@ -236,17 +245,11 @@
   [^String s]
   (.GetString System.Text.Encoding/UTF8 (System.Convert/FromBase64String s)))     ;;; (.decode (Base64/getDecoder) s)
 
-(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
-                 (let [formatter (System.Runtime.Serialization.Formatters.Binary.BinaryFormatter.)]                      ;;; (-> (java.io.ByteArrayOutputStream.)
+                 (let [formatter (BinaryFormatter.)]                      ;;; (-> (java.io.ByteArrayOutputStream.)
                     (.Serialize formatter (System.IO.MemoryStream.)                                                      ;;;     (java.io.ObjectOutputStream.)
                                           (proxy [Object System.Runtime.Serialization.ISerializable] [])))))             ;;;     (.writeObject (proxy [Object java.io.Serializable] [])))
     ;; Serializable included via inheritence:

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

@@ -14,14 +14,16 @@
   (:import (System.IO MemoryStream)                                                 ;;;(java.io ObjectOutputStream ObjectInputStream
            #_(System.Runtime.Serialization.Formatters.Binary BinaryFormatter)))        ;;; ByteArrayOutputStream ByteArrayInputStream)))   -- defer import until after load
 
-(compile-when (>= (:major clojure-version) 9)
+
+(compile-when (>= (:major dotnet-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."
   [v]

Clojure/build.proj

@@ -28,9 +28,13 @@
 
 	<Error Condition=" '$(TestTargetFramework)' != 'net462' AND '$(TestTargetFramework)' != 'net9.0' AND '$(TestTargetFramework)' != 'net8.0' AND '$(TestTargetFramework)' != 'net6.0'"/>
 
-		
+	<!--	
 	<TestLibraryFramework Condition=" '$(TestTargetFramework)' == 'net462' ">netstandard2.0</TestLibraryFramework>
 	<TestLibraryFramework Condition=" '$(TestTargetFramework)' != 'net462' ">netstandard2.1</TestLibraryFramework>
+	-->
+	
+	<!-- When I switched target frameworks for Clojure.Source and Clojure.Tests, needed to change TestLibraryFramework to match TestTargetFramework -->
+	<TestLibraryFramework>$(TestTargetFramework)</TestLibraryFramework>
 
 
 	<TestDir>$(RootDir)Test\$(Configuration)\$(TestTargetFramework)</TestDir>