Skip to content

Commit f2eec29

Browse files
committed
Update version for the NuGet packages to 3.0.0
- Update State of Development - Update release build references
1 parent aeb11c2 commit f2eec29

File tree

5 files changed

+9
-14
lines changed

5 files changed

+9
-14
lines changed

readme.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@ SFML is a simple, fast, cross-platform and object-oriented multimedia API. It pr
66

77
## State of Development
88

9-
Development is focused on the next major version in the `master` branch. No more features are planned for the 2.x release series.
10-
11-
- The [`master`](https://github.com/SFML/CSFML/tree/master) branch contains work in progress for the next major version CSFML 3. As such it's considered unstable, but any testing and feedback is highly appreciated.
12-
- The [`2.6.1`](https://github.com/SFML/CSFML/tree/2.6.1) tag is the latest official CSFML release and will be the last minor release in the 2.x series.
13-
- The [`2.6.x`](https://github.com/SFML/CSFML/tree/2.6.x) branch contains the latest bugfix work on CSFML 2.6.x, matching SFML's `2.6.x` branch.
9+
Development is focused on version 3 in the `master` branch. No more features are planned for the 2.x release series.
1410

1511
## Authors
1612

tools/nuget/CSFML/CSFML.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66

7-
<Version>3.0.0-rc.3</Version>
7+
<Version>3.0.0</Version>
88
<Authors>Laurent Gomila</Authors>
99
<PackageTags>sfml csfml</PackageTags>
1010
<Copyright>Copyright © Laurent Gomila</Copyright>

tools/nuget/README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,20 @@ All build scripts follow the same routine:
1717

1818
* `build.linux.sh`
1919
* A [Bash](https://www.gnu.org/software/bash/) script to build libraries for a generic Linux distribution. The [Runtime Identifier](https://docs.microsoft.com/en-us/dotnet/core/rid-catalog) of the linux distribution must be specified as a parameter to the script.
20-
This generic script doesn't install any of its dependencies. As such, you must have cmake and make installed, as well as all [SFML Dependencies](https://www.sfml-dev.org/tutorials/2.6/compile-with-cmake.php#installing-dependencies) available to cmake.
20+
This generic script doesn't install any of its dependencies. As such, you must have cmake and make installed, as well as all [SFML Dependencies](https://www.sfml-dev.org/tutorials/3.0/getting-started/build-from-source/#installing-dependencies) available to cmake.
2121

2222
* `build.macos.sh`
2323
* A [Bash](https://www.gnu.org/software/bash/) script to build libraries for macOS. The [Runtime Identifier](https://docs.microsoft.com/en-us/dotnet/core/rid-catalog#macos-rids) of the macOS distribution must be specified as parameter to the script. Latest macOS SDKs can be downloaded [here](https://github.com/phracker/MacOSX-SDKs/releases).
2424
Currently supported RIDs are:
25-
* `osx-x64` (uses macOS SDK 10.12)
26-
* `osx.11.0-x64`
27-
* `osx.11.0-arm64` (requires SFML 2.6+)
25+
* `osx-x64`
26+
* `osx-arm64` (requires SFML 2.6+)
2827

2928
* `build.docker.sh`, `build.docker.ps1`
3029
* A script to build the native libraries for a Linux distribution in a Docker container. If no RID is specified as a parameter, all supported RIDs will be built. Currently, the supported RIDs are:
3130
* `linux-x64` (uses Ubuntu)
3231
* `linux-musl-x64` (uses Apline)
3332
* `linux-arm` (uses Arm32v7 Ubuntu)
34-
* `linux-arm64` (uses Arm64v8 Ubuntu )
33+
* `linux-arm64` (uses Arm64v8 Ubuntu)
3534
* `alpine-x64`
3635
* `debian-x64` (compatible with derivatives such as Ubuntu and Linux Mint)
3736
* `ubuntu-x64`

tools/nuget/build.linux.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ copymodule()
161161
# SFML.Net only searches for the name with common pre- and suffixes
162162
# As such we need to ship e.g. libcsfml-graphics.so
163163
# But the CSFML libs will look for the major.minor version
164-
# As such we also need to ship e.g. libcsfml-graphics.so.2.6
164+
# As such we also need to ship e.g. libcsfml-graphics.so.3.0
165165
# Unfortunately NuGet package don't support symlinks: https://github.com/NuGet/Home/issues/10734
166166
# For SFML, we can just ship one version that CSFML will be looking for
167167
cp "$SFMLLibDir/libsfml-$MODULE.so.$SFMLMajorMinor" "$OutDir"

tools/nuget/build.macos.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ if [ $RID == "osx-x64" ]; then
9595
elif [ $RID == "osx-arm64" ]; then
9696
ARCHITECTURE="arm64"
9797

98-
echo "Note: arm64 is only supported with SFML 2.6"
98+
echo "Note: arm64 is only supported starting with SFML 2.6"
9999
else
100100
echo "Unsupported RID provided. Use 'osx-x64', 'osx-arm64'"
101101
exit 1
@@ -168,7 +168,7 @@ copymodule()
168168
# SFML.Net only searches for the name with common pre- and suffixes
169169
# As such we need to ship e.g. libcsfml-graphics.dylib
170170
# But the CSFML libs will look for the major.minor version
171-
# As such we also need to ship e.g. libcsfml-graphics.2.6.dylib
171+
# As such we also need to ship e.g. libcsfml-graphics.3.0.dylib
172172
# Unfortunately NuGet package don't support symlinks: https://github.com/NuGet/Home/issues/10734
173173
# For SFML, we can just ship one version that CSFML will be looking for
174174
cp "$SFMLLibDir/libsfml-$MODULE.$SFMLMajorMinor.dylib" "$OutDir"

0 commit comments

Comments
 (0)