Merge branch 'master' into qme

Author: dmiller

Clojure/Clojure.Main/Clojure.Main.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <StartupObject>Clojure.CljMain</StartupObject>
 	 <PackAsTool>true</PackAsTool>
   </PropertyGroup>

Clojure/Clojure.sln

@@ -18,7 +18,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Clojure.Main461", "Clojure.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Clojure.Samples", "Clojure.Samples\Clojure.Samples.csproj", "{08563A3D-D4F1-45DB-84BD-000EEC94C55C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp1", "ConsoleApp1\ConsoleApp1.csproj", "{EB8B9CB5-4820-4F7F-9AA2-058C2A080235}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp1", "ConsoleApp1\ConsoleApp1.csproj", "{EB8B9CB5-4820-4F7F-9AA2-058C2A080235}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Clojure.Tests.Support", "Clojure.Tests.Support\Clojure.Tests.Support.csproj", "{0C630871-4464-40A9-BB8E-A6C351EC203A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -62,6 +64,10 @@ Global
 		{EB8B9CB5-4820-4F7F-9AA2-058C2A080235}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EB8B9CB5-4820-4F7F-9AA2-058C2A080235}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EB8B9CB5-4820-4F7F-9AA2-058C2A080235}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0C630871-4464-40A9-BB8E-A6C351EC203A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C630871-4464-40A9-BB8E-A6C351EC203A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C630871-4464-40A9-BB8E-A6C351EC203A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C630871-4464-40A9-BB8E-A6C351EC203A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Clojure/Csharp.Tests/Csharp.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

Clojure/build.proj

@@ -24,9 +24,9 @@
 
   <PropertyGroup>	
 
-	<TestTargetFramework Condition=" '$(TestTargetFramework)' == '' ">net6.0</TestTargetFramework>
+	<TestTargetFramework Condition=" '$(TestTargetFramework)' == '' ">net8.0</TestTargetFramework>
 
-	<Error Condition=" '$(TestTargetFramework)' != 'net462' AND '$(TestTargetFramework)' != 'net8.0' AND '$(TestTargetFramework)' != 'net7.0' AND '$(TestTargetFramework)' != 'net6.0'"/>
+	<Error Condition=" '$(TestTargetFramework)' != 'net462' AND '$(TestTargetFramework)' != 'net8.0' AND '$(TestTargetFramework)' != 'net6.0'"/>
 
 
 	<TestLibraryFramework Condition=" '$(TestTargetFramework)' == 'net462' ">netstandard2.0</TestLibraryFramework>
@@ -251,10 +251,7 @@
 	<ZipDirectory SourceDirectory="$(RootDir)Clojure.Main\bin\$(Configuration)\net8.0\publish"
 	              DestinationFile ="$(StageDir)\clojure-clr-$(ZipVersion)-$(Configuration)-net8.0.zip"
 				  Overwrite="true"/>	
-   
-	<ZipDirectory SourceDirectory="$(RootDir)Clojure.Main\bin\$(Configuration)\net7.0\publish"
-	              DestinationFile ="$(StageDir)\clojure-clr-$(ZipVersion)-$(Configuration)-net7.0.zip"
-				  Overwrite="true"/>	
+
 	<ZipDirectory SourceDirectory="$(RootDir)Clojure.Main\bin\$(Configuration)\net6.0\publish"
 	              DestinationFile ="$(StageDir)\clojure-clr-$(ZipVersion)-$(Configuration)-net6.0.zip"
 				  Overwrite="true"/>			  
@@ -278,13 +275,13 @@
 
   <!-- RJ: New build and clean targets for .Net Core 3.X and .Net 5-->
 
-  <Target Name="BuildD7">
-    <Exec Command="dotnet build Clojure.sln -c Debug -p:Platform=&quot;Any CPU&quot; -f net7.0 -o clojure-clr-debug7" 
+  <Target Name="BuildD8">
+    <Exec Command="dotnet build Clojure.sln -c Debug -p:Platform=&quot;Any CPU&quot; -f net8.0 -o clojure-clr-debug7" 
           WorkingDirectory="$(OutputPath)" />
   </Target>
 
-  <Target Name="BuildR7">
-    <Exec Command="dotnet build Clojure.sln -c Release -p:Platform=&quot;Any CPU&quot; -f net7.0 -o clojure-clr-release7" 
+  <Target Name="BuildR8">
+    <Exec Command="dotnet build Clojure.sln -c Release -p:Platform=&quot;Any CPU&quot; -f net8.0 -o clojure-clr-release7" 
           WorkingDirectory="$(OutputPath)" />
   </Target>