Skip to content

Update to .Net 10 #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Pspritechologist wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to .Net 10 #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 9.0.x
dotnet-version: 10.0.x
- name: Install dependencies
run: dotnet restore
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 9.0.x
dotnet-version: 10.0.x

- name: Create build
run: ./publish.sh
Expand Down
2 changes: 1 addition & 1 deletion Launcher.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
3. Local dev SS14.Loader launching code.
4. build-test.yml GitHub Actions workflow
-->
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Version>1.3.1</Version>

<!--
Expand Down
2 changes: 1 addition & 1 deletion Robust.LoaderApi
Open in desktop
Submodule Robust.LoaderApi updated 2 files
+12 −0 Robust.LoaderApi/IFileApi.cs
+1 −1 Robust.LoaderApi/Robust.LoaderApi.csproj
2 changes: 1 addition & 1 deletion SS14.Launcher/Models/Connector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ private static async Task<ProcessStartInfo> GetLoaderStartInfo()
basePath = Path.GetFullPath(Path.Combine(
LauncherPaths.DirLauncherInstall,
"..", "..", "..", "..",
"SS14.Loader", "bin", "Debug", "net9.0"));
"SS14.Loader", "bin", "Debug", "net10.0"));
}

if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
Expand Down
2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
in
rec {
packages = forAllSystems (pkgs: {
default = packages.${pkgs.system}.simple-station-launcher-development;
default = packages.${pkgs.stdenv.hostPlatform.system}.simple-station-launcher-development;
# Build via nix build -L 'git+file://PATH?submodules=1'
simple-station-launcher-development = pkgs.callPackage ./nix/package.nix { };
simple-station-launcher = pkgs.callPackage ./nix/package.nix rec {
Expand Down
36 changes: 2 additions & 34 deletions nix/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,9 @@
libXcursor,
libXext,
libXrandr,
fontconfig,
glew,
SDL2,
glfw,
glibc,
libGL,
freetype,
openal,
fluidsynth,
gtk3,
pango,
atk,
cairo,
zlib,
glib,
gdk-pixbuf,
soundfont-fluid,
# Path to set ROBUST_SOUNDFONT_OVERRIDE to, essentially the default soundfont used.
soundfont-path ? "${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2",
Expand Down Expand Up @@ -58,9 +45,8 @@ buildDotnetModule rec {
inherit version;
};

# A Robust Loader component uses sdk_8_0
dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_9_0 sdk_8_0 ];
dotnet-runtime = with dotnetCorePackages; combinePackages [ runtime_9_0 runtime_8_0 ];
dotnet-sdk = dotnetCorePackages.sdk_10_0;
dotnet-runtime = dotnetCorePackages.runtime_10_0;

dotnetFlags = [
"-p:FullRelease=true"
Expand All @@ -69,40 +55,22 @@ buildDotnetModule rec {
];

nativeBuildInputs = [
wrapGAppsHook
iconConvTools
copyDesktopItems
];

runtimeDeps = [
# Required by the game.
glfw
SDL2
glibc
libGL
openal
freetype
fluidsynth

# Needed for file dialogs.
gtk3
pango
cairo
atk
zlib
glib
gdk-pixbuf

# Avalonia UI dependencies.
libX11
libICE
libSM
libXi
libXcursor
libXext
libXrandr
fontconfig
glew

# TODO: Figure out dependencies for CEF support.
];
Expand Down
4 changes: 2 additions & 2 deletions publish_linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ mkdir -p bin/publish/Linux/bin/loader
mkdir -p bin/publish/Linux/dotnet

cp PublishFiles/SS14.Launcher PublishFiles/SS14.desktop bin/publish/Linux/
cp SS14.Launcher/bin/Release/net9.0/linux-x64/publish/* bin/publish/Linux/bin/
cp SS14.Loader/bin/Release/net9.0/linux-x64/publish/* bin/publish/Linux/bin/loader
cp SS14.Launcher/bin/Release/net10.0/linux-x64/publish/* bin/publish/Linux/bin/
cp SS14.Loader/bin/Release/net10.0/linux-x64/publish/* bin/publish/Linux/bin/loader
cp -r Dependencies/dotnet/linux/* bin/publish/Linux/dotnet/

cd bin/publish/Linux
Expand Down
4 changes: 2 additions & 2 deletions publish_osx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ mkdir -p "bin/publish/macOS/SimpleStation14 Launcher.app/Contents/Resources/bin/
mkdir -p "bin/publish/macOS/SimpleStation14 Launcher.app/Contents/Resources/bin/loader/SimpleStation14.app/Contents/Resources/bin/"

cp -r Dependencies/dotnet/mac/* "bin/publish/macOS/SimpleStation14 Launcher.app/Contents/Resources/dotnet/"
cp -r SS14.Launcher/bin/Release/net9.0/osx-x64/publish/* "bin/publish/macOS/SimpleStation14 Launcher.app/Contents/Resources/bin/"
cp -r SS14.Loader/bin/Release/net9.0/osx-x64/publish/* "bin/publish/macOS/SimpleStation14 Launcher.app/Contents/Resources/bin/loader/SimpleStation14.app/Contents/Resources/bin/"
cp -r SS14.Launcher/bin/Release/net10.0/osx-x64/publish/* "bin/publish/macOS/SimpleStation14 Launcher.app/Contents/Resources/bin/"
cp -r SS14.Loader/bin/Release/net10.0/osx-x64/publish/* "bin/publish/macOS/SimpleStation14 Launcher.app/Contents/Resources/bin/loader/SimpleStation14.app/Contents/Resources/bin/"
pushd bin/publish/macOS
zip -r ../../../SS14.Launcher_macOS.zip *
popd
8 changes: 4 additions & 4 deletions publish_windows.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ dotnet publish SS14.Launcher/SS14.Launcher.csproj /p:FullRelease=True -c Release
dotnet publish SS14.Loader/SS14.Loader.csproj -c Release --no-self-contained -r win-x64 /nologo
dotnet publish SS14.Launcher.Bootstrap/SS14.Launcher.Bootstrap.csproj -c Release /nologo

./exe_set_subsystem.py "SS14.Launcher/bin/Release/net9.0/win-x64/publish/SS14.Launcher.exe" 2
./exe_set_subsystem.py "SS14.Loader/bin/Release/net9.0/win-x64/publish/SS14.Loader.exe" 2
./exe_set_subsystem.py "SS14.Launcher/bin/Release/net10.0/win-x64/publish/SS14.Launcher.exe" 2
./exe_set_subsystem.py "SS14.Loader/bin/Release/net10.0/win-x64/publish/SS14.Loader.exe" 2

# Create intermediate directories.
mkdir -p bin/publish/Windows/bin
Expand All @@ -23,8 +23,8 @@ mkdir -p bin/publish/Windows/dotnet
cp -r Dependencies/dotnet/windows/* bin/publish/Windows/dotnet
cp "SS14.Launcher.Bootstrap/bin/Release/net45/publish/SimpleStation14 Launcher.exe" bin/publish/Windows
cp "SS14.Launcher.Bootstrap/console.bat" bin/publish/Windows
cp SS14.Launcher/bin/Release/net9.0/win-x64/publish/* bin/publish/Windows/bin
cp SS14.Loader/bin/Release/net9.0/win-x64/publish/* bin/publish/Windows/bin/loader
cp SS14.Launcher/bin/Release/net10.0/win-x64/publish/* bin/publish/Windows/bin
cp SS14.Loader/bin/Release/net10.0/win-x64/publish/* bin/publish/Windows/bin/loader

pushd bin/publish/Windows
zip -r ../../../SS14.Launcher_Windows.zip *
Expand Down
Loading