Skip to content
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

Jump to bottom

Upgrade XIVLauncher.Core to net8 #141

Merged
merged 5 commits into from
Jun 28, 2024
Merged

Upgrade XIVLauncher.Core to net8 #141

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6038a2a
net8
Blooym Jun 28, 2024
f885752
update ci for net8
Blooym Jun 28, 2024
464d36a
re-add net6 for python script
Blooym Jun 28, 2024
c10c11d
readd freedesktop 22.08
Blooym Jun 28, 2024
06198fe
force use of net8 for nuget deps
Blooym Jun 28, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x

- name: Dotnet Restore
run: dotnet restore
Expand All @@ -41,7 +41,7 @@ jobs:
run: dotnet publish -r linux-x64 --sc --configuration Release -p:DefineConstants=WINE_XIV_FEDORA_LINUX --no-restore -o ./dist/XIVLauncher.Core-fedora

- name: Dotnet Build (Windows)
run: dotnet publish -r win10-x64 --sc --configuration Release -o ./dist/XIVLauncher.Core-win10x64
run: dotnet publish -r win-x64 --sc --configuration Release -o ./dist/XIVLauncher.Core-win10x64

- name: Dotnet Test
run: dotnet test --no-build --verbosity normal
4 changes: 2 additions & 2 deletions .github/workflows/generate_flatpak_nuget_deps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ jobs:
sudo apt update -y
sudo apt install flatpak -y
flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
flatpak install --user org.freedesktop.Sdk.Extension.dotnet6/x86_64/22.08 -y # Update this when needed.
flatpak install --user org.freedesktop.Sdk/x86_64/22.08 -y # As well as this, if dependency generation is failing.
flatpak install --user org.freedesktop.Sdk.Extension.dotnet8/x86_64/23.08 -y # Update this when needed.
flatpak install --user org.freedesktop.Sdk/x86_64/23.08 -y # As well as this, if dependency generation is failing.

- name: Generate nuget-dependencies.json
working-directory: ./src/XIVLauncher.Core/
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/make-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ jobs:
sudo apt update -y
sudo apt install flatpak -y
flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
flatpak install --user org.freedesktop.Sdk.Extension.dotnet6/x86_64/22.08 -y
flatpak install --user org.freedesktop.Sdk/x86_64/22.08 -y
flatpak install --user org.freedesktop.Sdk.Extension.dotnet8/x86_64/23.08 -y
flatpak install --user org.freedesktop.Sdk/x86_64/23.08 -y

- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x # Set this to be the same as the projects required dotnet version.
dotnet-version: 8.0.x # Set this to be the same as the projects required dotnet version.

- name: Dotnet Restore
working-directory: ./src/XIVLauncher.Core/
Expand All @@ -55,7 +55,7 @@ jobs:

- name: Dotnet Build (Windows)
working-directory: ./src/XIVLauncher.Core/
run: dotnet publish -r win10-x64 --sc --configuration Release -o ./dist/XIVLauncher.Core-win10x64
run: dotnet publish -r win-x64 --sc --configuration Release -o ./dist/XIVLauncher.Core-win10x64

- name: Generate nuget-dependencies.json
working-directory: ./src/XIVLauncher.Core/
Expand Down
2 changes: 1 addition & 1 deletion lib/FFXIVQuickLauncher
Open in desktop
Submodule FFXIVQuickLauncher updated 4 files
+1 −1 src/XIVLauncher.Common.Tests/XIVLauncher.Common.Tests.csproj
+1 −1 src/XIVLauncher.Common.Unix/XIVLauncher.Common.Unix.csproj
+1 −1 src/XIVLauncher.Common.Windows/XIVLauncher.Common.Windows.csproj
+1 −1 src/XIVLauncher.Common/XIVLauncher.Common.csproj
6 changes: 3 additions & 3 deletions src/XIVLauncher.Core/XIVLauncher.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand All @@ -13,9 +13,9 @@
<FileVersion>$(Version)</FileVersion>
<AssemblyVersion>$(Version)</AssemblyVersion>

<RuntimeIdentifiers>win10-x64;linux-x64;osx-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
<PublishSingleFile>true</PublishSingleFile>
<!-- <SelfContained>true</SelfContained> -->
<SelfContained>true</SelfContained>

<IsWindows
Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">
Expand Down
Loading