Skip to content

Commit 20ba7d3

Browse files
dmillerdmiller
committed
Prepare release 1.11.0-beta1
1 parent bdd0715 commit 20ba7d3

File tree

4 files changed

+46
-32
lines changed

4 files changed

+46
-32
lines changed

‎Clojure/Clojure/Bootstrap/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=1.10.3-master-SNAPSHOT
1+
version=1.11.0-beta1

‎Clojure/CurrentVersion.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<MajorVersion>1</MajorVersion>
5-
<MinorVersion>10</MinorVersion>
6-
<PatchVersion>3</PatchVersion>
7-
<VersionSuffix>alpha1</VersionSuffix>
5+
<MinorVersion>11</MinorVersion>
6+
<PatchVersion>0</PatchVersion>
7+
<VersionSuffix>beta1</VersionSuffix>
88
</PropertyGroup>
99
</Project>

‎Clojure/build.proj

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,9 @@
212212
<ZipDirectory SourceDirectory="$(RootDir)Clojure.Main\bin\$(Configuration)\net5.0\publish"
213213
DestinationFile ="$(StageDir)\clojure-clr-$(ZipVersion)-$(Configuration)-net5.0.zip"
214214
Overwrite="true"/>
215-
215+
<ZipDirectory SourceDirectory="$(RootDir)Clojure.Main\bin\$(Configuration)\net6.0\publish"
216+
DestinationFile ="$(StageDir)\clojure-clr-$(ZipVersion)-$(Configuration)-net6.0.zip"
217+
Overwrite="true"/>
216218
<ItemGroup>
217219
<ClojureCompileAssets Include="$(RootDir)Clojure.Compile\bin\$(Configuration)\net461\Clojure.Compile.*" />
218220
<ClojureMain461Assets Include="$(RootDir)Clojure.Main461\bin\$(Configuration)\net461\**\*" />
@@ -251,7 +253,17 @@
251253
<Exec Command="dotnet build Clojure.sln -c Release -p:Platform=&quot;Any CPU&quot; -f net5.0 -o clojure-clr-release5"
252254
WorkingDirectory="$(OutputPath)" />
253255
</Target>
256+
257+
<Target Name="BuildD6">
258+
<Exec Command="dotnet build Clojure.sln -c Debug -p:Platform=&quot;Any CPU&quot; -f net6.0 -o clojure-clr-debug5"
259+
WorkingDirectory="$(OutputPath)" />
260+
</Target>
254261

262+
<Target Name="BuildR6">
263+
<Exec Command="dotnet build Clojure.sln -c Release -p:Platform=&quot;Any CPU&quot; -f net6.0 -o clojure-clr-release5"
264+
WorkingDirectory="$(OutputPath)" />
265+
</Target>
266+
255267
<Target Name="CleanD3">
256268
<Exec Command="dotnet clean Clojure.sln -p:Platform=&quot;Any CPU&quot; -o clojure-clr-debug3"
257269
WorkingDirectory="$(OutputPath)" />

‎docs/Preparing-a-release.md

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,32 @@
44

55
## Preparation
66

7-
* Modify Clojure\Clojure\Bootstrap\version.properties to desired release version
8-
* Set the version info in Clojure\CurrentVersion.props
9-
** Please note that you should 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 {net461, netcoreapp3.1, net5.0} (Configuration will default to Debug. Substitute in names accordingly if that is case.)
11-
** Clojure> msbuild build.proj -t:Test -p:TestTargetFramework=X -p:Configuration=Release
12-
** Clojure> msbuild build.proj -t:TestGen -p:TestTargetFramework=X -p:Configuration=Release
13-
** Clojure> msbuild build.proj -t:ZipAll -p:Configuration=Release
14-
* At this point, you will the artifacts for distribution in the Clojure\Stage directory. Something along the lines of (with version/release adjusted suitably):
15-
** Clojure.1.10.0-alpha1.nupkg
16-
** Clojure.Main.1.10.0-alpha1.nupkg
17-
** clojure-clr-1.10.0-alpha1-Release-core3.1.zip
18-
** clojure-clr-1.10.0-alpha1-Release-net5.0.zip
19-
** clojure-clr-1.10.0-alpha1-Release-net4.6.1.zip
7+
* Modify `Clojure\Clojure\Bootstrap\version.properties` to desired release version.
8+
* Set the version info in `Clojure\CurrentVersion.props`.
9+
* 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 {net461, netcoreapp3.1, net5.0, net6.0} (Configuration will default to Debug. Substitute in names accordingly if that is case.)
11+
* `msbuild build.proj -t:Test -p:TestTargetFramework=X -p:Configuration=Release`
12+
* `msbuild build.proj -t:TestGen -p:TestTargetFramework=X -p:Configuration=Release`
13+
* Package. From the `Clojure` directory, run
14+
* `msbuild build.proj -t:ZipAll -p:Configuration=Release`
15+
* Artifacts. At this point, you will the artifacts for distribution in the `Clojure\Stage` directory. Something along the lines of (with version/release adjusted suitably):
16+
* Clojure.1.10.0-alpha1.nupkg
17+
* Clojure.Main.1.10.0-alpha1.nupkg
18+
* clojure-clr-1.10.0-alpha1-Release-core3.1.zip
19+
* clojure-clr-1.10.0-alpha1-Release-net5.0.zip
20+
* clojure-clr-1.10.0-alpha1-Release-net6.0.zip
21+
* clojure-clr-1.10.0-alpha1-Release-net4.6.1.zip
2022
* Validate these by any manner of your choosing. I moved the zips somewhere, unzipped them, and checked that the following start up:
21-
** in core3.1 and net5.0:
22-
*** > Clojure.Main.exe (This might not be created on non-Windows builds.)
23-
*** > dotnet Clojure.Main.dll
24-
** in net461:
25-
*** > Clojure.Main461.exe
26-
*** > Clojure.Compile.exe (Without command-line args, will just exit after the startup delay)
27-
** I test the tool install via:
28-
*** > dotnet tool list -g # to see if already installed
29-
*** > dotnet tool uninstall clojure.main -g # if so, do this
30-
*** > dotnet tool install -g --add-source . --version 1.10.0-alpha1 Clojure.Main # version needed only if pre-release.
23+
* in core3.1, net5.0, and net6.0:
24+
* > `Clojure.Main.exe` (This might not be created on non-Windows builds.)
25+
* > `dotnet Clojure.Main.dll`
26+
* in net461:
27+
* > `Clojure.Main461.exe`
28+
* > `Clojure.Compile.exe` (Without command-line args, will just exit after the startup delay)
29+
* I test the tool install via:
30+
* > `dotnet tool list -g` # to see if already installed
31+
* > `dotnet tool uninstall clojure.main -g` # if so, do this
32+
* > `dotnet tool install -g --add-source . --version 1.10.0-alpha1 Clojure.Main` # version needed only if pre-release.
3133
3234

3335
## Repo
@@ -40,8 +42,8 @@ In git:
4042

4143
## Nuget distribution
4244

43-
** Clojure\Stage> dotnet nuget push Clojure.Main<whatever>.nupkg -s nuget.org
44-
** Clojure\Stage> dotnet nuget push Clojure<whatever>.nupkg -s nuget.org
45+
* Clojure\Stage> `dotnet nuget push Clojure.Main<whatever>.nupkg -s nuget.org`
46+
* Clojure\Stage> `dotnet nuget push Clojure<whatever>.nupkg -s nuget.org`
4547

4648

4749
## SourceForge distribution
@@ -50,6 +52,6 @@ In git:
5052

5153
# Preparing for next release
5254

53-
* Modify Clojure\Clojure\Bootstrap\version.properties to desired development version ( usually master-SNAPSHOT)
54-
* Set the version info in Clojure\CurrentVersion.props to match.
55+
* Modify `Clojure\Clojure\Bootstrap\version.properties` to desired development version ( usually `master-SNAPSHOT`)
56+
* Set the version info in `Clojure\CurrentVersion.props` to match.
5557
* Commit the change (Prepare for next development iteration ...)

0 commit comments

Comments
 (0)