Skip to content

Commit 432dbe1

Browse files
committed
Prepare release v1.12.0-alpha11
1 parent cbd8c7d commit 432dbe1

File tree

4 files changed

+21
-6
lines changed

4 files changed

+21
-6
lines changed
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=1.12.0-alpha10
1+
version=1.12.0-alpha11

Clojure/CurrentVersion.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<MajorVersion>1</MajorVersion>
55
<MinorVersion>12</MinorVersion>
66
<PatchVersion>0</PatchVersion>
7-
<VersionSuffix>alpha10</VersionSuffix>
7+
<VersionSuffix>alpha11</VersionSuffix>
88
</PropertyGroup>
99
</Project>

Clojure/build.proj

+18-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

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

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

3131

3232
<TestLibraryFramework Condition=" '$(TestTargetFramework)' == 'net462' ">netstandard2.0</TestLibraryFramework>
@@ -247,6 +247,10 @@
247247

248248

249249
<Target Name="ZipAll" DependsOnTargets="PackAll;ILMerge462">
250+
251+
<ZipDirectory SourceDirectory="$(RootDir)Clojure.Main\bin\$(Configuration)\net9.0\publish"
252+
DestinationFile ="$(StageDir)\clojure-clr-$(ZipVersion)-$(Configuration)-net9.0.zip"
253+
Overwrite="true"/>
250254

251255
<ZipDirectory SourceDirectory="$(RootDir)Clojure.Main\bin\$(Configuration)\net8.0\publish"
252256
DestinationFile ="$(StageDir)\clojure-clr-$(ZipVersion)-$(Configuration)-net8.0.zip"
@@ -274,14 +278,25 @@
274278
<!-- $$$$$$$$$$$$$$$$$$$$$$$$$$ -->
275279

276280
<!-- RJ: New build and clean targets for .Net Core 3.X and .Net 5-->
281+
282+
283+
<Target Name="BuildD9">
284+
<Exec Command="dotnet build Clojure.sln -c Debug -p:Platform=&quot;Any CPU&quot; -f net9.0 -o clojure-clr-debug9"
285+
WorkingDirectory="$(OutputPath)" />
286+
</Target>
287+
288+
<Target Name="BuildR9">
289+
<Exec Command="dotnet build Clojure.sln -c Release -p:Platform=&quot;Any CPU&quot; -f net9.0 -o clojure-clr-release9"
290+
WorkingDirectory="$(OutputPath)" />
291+
</Target>
277292

278293
<Target Name="BuildD8">
279-
<Exec Command="dotnet build Clojure.sln -c Debug -p:Platform=&quot;Any CPU&quot; -f net8.0 -o clojure-clr-debug7"
294+
<Exec Command="dotnet build Clojure.sln -c Debug -p:Platform=&quot;Any CPU&quot; -f net8.0 -o clojure-clr-debug8"
280295
WorkingDirectory="$(OutputPath)" />
281296
</Target>
282297

283298
<Target Name="BuildR8">
284-
<Exec Command="dotnet build Clojure.sln -c Release -p:Platform=&quot;Any CPU&quot; -f net8.0 -o clojure-clr-release7"
299+
<Exec Command="dotnet build Clojure.sln -c Release -p:Platform=&quot;Any CPU&quot; -f net8.0 -o clojure-clr-release8"
285300
WorkingDirectory="$(OutputPath)" />
286301
</Target>
287302

docs/Preparing-a-release.md

+1-1
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, net6.0, net8.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, net8.0, net9.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

0 commit comments

Comments
 (0)