Upgrade to C# Version 12. Fix one more assembly load problem in core.clj

dmiller · dmiller · commit a199da9d7d13 · 2024-12-06T16:24:20.000-05:00
diff --git a/Clojure/Clojure.Compile/Clojure.Compile.csproj b/Clojure/Clojure.Compile/Clojure.Compile.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net462</TargetFrameworks>
-	<LangVersion>7.3</LangVersion>
+	 <LangVersion>12.0</LangVersion>
     <StartupObject>BootstrapCompile.Compile</StartupObject>
   </PropertyGroup>
 
diff --git a/Clojure/Clojure.Main/Clojure.Main.csproj b/Clojure/Clojure.Main/Clojure.Main.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
-	  <LangVersion>7.3</LangVersion>
+	 <LangVersion>12.0</LangVersion>
     <StartupObject>Clojure.CljMain</StartupObject>
 	 <PackAsTool>true</PackAsTool>
   </PropertyGroup>
diff --git a/Clojure/Clojure.Main461/Clojure.Main461.csproj b/Clojure/Clojure.Main461/Clojure.Main461.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net462</TargetFrameworks>
-	  <LangVersion>7.3</LangVersion>
+	 <LangVersion>12.0</LangVersion>
     <StartupObject>Clojure.CljMain</StartupObject>
 	 <PackAsTool>true</PackAsTool>
   </PropertyGroup>
diff --git a/Clojure/Clojure.Samples/Clojure.Samples.csproj b/Clojure/Clojure.Samples/Clojure.Samples.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+	  <TargetFrameworks>net462;net6.0;net8.0;net9.0</TargetFrameworks>
+
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Clojure/Clojure.Source/Clojure.Source.csproj b/Clojure/Clojure.Source/Clojure.Source.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+	  <TargetFrameworks>net462;net6.0;net8.0;net9.0</TargetFrameworks>
     <RootNamespace></RootNamespace>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
diff --git a/Clojure/Clojure.Source/clojure/core.clj b/Clojure/Clojure.Source/clojure/core.clj
@@ -8085,7 +8085,7 @@ clojure.lang.IKVReduce
   "Return true if x is a java.net.URI"
   {:added "1.9"}
   [x] (instance? System.Uri x))                                                    ;;; java.net.URI
-
+(try   (assembly-load-from (str clojure.lang.RT/SystemRuntimeDirectory "System.Collections.Concurrent.dll")) (catch Exception e (System.Console/WriteLine (str "Missing System.Collections.Concurrent"))))
 (defonce ^:private tapset (atom #{}))
 (defonce ^:private ^|System.Collections.Concurrent.BlockingCollection`1[System.Object]| tapq (|System.Collections.Concurrent.BlockingCollection`1[System.Object]|. 1024))    ;;; ^java.util.concurrent.ArrayBlockingQueue   java.util.concurrent.ArrayBlockingQueue.
 
diff --git a/Clojure/Clojure.Tests.Support/Clojure.Tests.Support.csproj b/Clojure/Clojure.Tests.Support/Clojure.Tests.Support.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
 	  <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+	  <LangVersion>12.0</LangVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/Clojure/Clojure/Clojure.csproj b/Clojure/Clojure/Clojure.csproj
@@ -2,6 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net60;net80;net90;net462</TargetFrameworks>
+		<LangVersion>12.0</LangVersion>
 		<NeutralLanguage></NeutralLanguage>
 		<RootNamespace>clojure.lang</RootNamespace>
 	</PropertyGroup>
diff --git a/Clojure/Csharp.Tests/Csharp.Tests.csproj b/Clojure/Csharp.Tests/Csharp.Tests.csproj
@@ -1,7 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
+	  <LangVersion>12.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
