Skip to content

Commit 2ccc98a

Browse files
committed
Add support for net8.0. Drop support for coreapp3.1
1 parent 5087fe6 commit 2ccc98a

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

Clojure/Clojure.Main/Clojure.Main.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
5+
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
66
<StartupObject>Clojure.CljMain</StartupObject>
77
<PackAsTool>true</PackAsTool>
88
</PropertyGroup>

Clojure/build.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<TestTargetFramework Condition=" '$(TestTargetFramework)' == '' ">net6.0</TestTargetFramework>
2828

29-
<Error Condition=" '$(TestTargetFramework)' != 'net462' AND '$(TestTargetFramework)' != 'netcoreapp3.1' AND '$(TestTargetFramework)' != 'net7.0' AND '$(TestTargetFramework)' != 'net6.0'"/>
29+
<Error Condition=" '$(TestTargetFramework)' != 'net462' AND '$(TestTargetFramework)' != 'net8.0' AND '$(TestTargetFramework)' != 'net7.0' AND '$(TestTargetFramework)' != 'net6.0'"/>
3030

3131

3232
<TestLibraryFramework Condition=" '$(TestTargetFramework)' == 'net462' ">netstandard2.0</TestLibraryFramework>

docs/Preparing-a-release.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Modify `Clojure\Clojure\Bootstrap\version.properties` to desired release version.
88
* Set the version info in `Clojure\CurrentVersion.props`.
99
* Please note that you should use lowercase letters only in the pre-release designation in order to avoid problems on non-Windows systems, i.e., `beta1` instead of `Beta1`, `rc1` instead of `RC1`.
10-
* Build and test. From the `Clojure` directory with X in {net462, netcoreapp3.1, net6.0, net7.0} (Configuration will default to Debug. Substitute in names accordingly if that is case.)
10+
* Build and test. From the `Clojure` directory with X in {net462, net6.0, net7.0, net8.0} (Configuration will default to Debug. Substitute in names accordingly if that is case.)
1111
* `msbuild build.proj -t:Test -p:TestTargetFramework=X -p:Configuration=Release`
1212
* `msbuild build.proj -t:TestGen -p:TestTargetFramework=X -p:Configuration=Release`
1313
* Package. From the `Clojure` directory, run
@@ -20,7 +20,7 @@
2020
* clojure-clr-1.10.0-alpha1-Release-net6.0.zip
2121
* clojure-clr-1.10.0-alpha1-Release-net4.6.1.zip
2222
* Validate these by any manner of your choosing. I moved the zips somewhere, unzipped them, and checked that the following start up:
23-
* in core3.1, net5.0, and net6.0:
23+
* in net6.0 and later:
2424
* > `Clojure.Main.exe` (This might not be created on non-Windows builds.)
2525
* > `dotnet Clojure.Main.dll`
2626
* in net462:

0 commit comments

Comments
 (0)