From 745024821765fba6549437925c4e2168106556f2 Mon Sep 17 00:00:00 2001 From: Robert Baker Date: Wed, 20 Dec 2023 20:05:08 -0800 Subject: [PATCH 1/4] Add builds for Windows As XIVLauncher.Core is a cross-platform project, we should also be providing Windows builds, even if users should typically use the WPF application instead. These can be used for testing and in rare troubleshooting circumstances where the user is unable to use the WPF application, like when SquirrelSetup constantly fails, AV exceptions aren't working, or if the machine has .Net Framework disabled/removed. --- .github/workflows/build.yml | 3 +++ .github/workflows/make-release.yml | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 897dead4..dbb7cdc5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,5 +40,8 @@ jobs: - name: Dotnet Build (Fedora) 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 win-x64 --sc --configuration Release --no-restore -o ./dist/XIVLauncher.Core-winx64 + - name: Dotnet Test run: dotnet test --no-build --verbosity normal \ No newline at end of file diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml index 16efca2f..ddbffd97 100644 --- a/.github/workflows/make-release.yml +++ b/.github/workflows/make-release.yml @@ -68,6 +68,10 @@ jobs: working-directory: ./src/XIVLauncher.Core/ 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) + working-directory: ./src/XIVLauncher.Core/ + run: dotnet publish -r win-x64 --sc --configuration Release --no-restore -o ./dist/XIVLauncher.Core-winx64 + - name: Generate nuget-dependencies.json working-directory: ./src/XIVLauncher.Core/ run: | @@ -132,6 +136,7 @@ jobs: tar -czf ./dist/XIVLauncher.Core.tar.gz -C ./src/XIVLauncher.Core/dist/XIVLauncher.Core . tar -czf ./dist/XIVLauncher.Core-arch.tar.gz -C ./src/XIVLauncher.Core/dist/XIVLauncher.Core-arch . tar -czf ./dist/XIVLauncher.Core-fedora.tar.gz -C ./src/XIVLauncher.Core/dist/XIVLauncher.Core-fedora . + zip -r ./dist/XIVLauncher.Core-winx64.zip /src/XIVLauncher.Core/dist/XIVLauncher.Core-winx64 - name: Release on GitHub uses: softprops/action-gh-release@v1 @@ -143,3 +148,4 @@ jobs: ./dist/XIVLauncher.Core.tar.gz ./dist/XIVLauncher.Core-arch.tar.gz ./dist/XIVLauncher.Core-fedora.tar.gz + ./dist/XIVLauncher.Core-winx64.zip From 4803b630f6fac009b140a48a3d3a4341f9a0f317 Mon Sep 17 00:00:00 2001 From: Robert Baker Date: Wed, 20 Dec 2023 22:56:05 -0800 Subject: [PATCH 2/4] Fix whitespace in release file --- .github/workflows/make-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml index ddbffd97..6365ea25 100644 --- a/.github/workflows/make-release.yml +++ b/.github/workflows/make-release.yml @@ -136,7 +136,7 @@ jobs: tar -czf ./dist/XIVLauncher.Core.tar.gz -C ./src/XIVLauncher.Core/dist/XIVLauncher.Core . tar -czf ./dist/XIVLauncher.Core-arch.tar.gz -C ./src/XIVLauncher.Core/dist/XIVLauncher.Core-arch . tar -czf ./dist/XIVLauncher.Core-fedora.tar.gz -C ./src/XIVLauncher.Core/dist/XIVLauncher.Core-fedora . - zip -r ./dist/XIVLauncher.Core-winx64.zip /src/XIVLauncher.Core/dist/XIVLauncher.Core-winx64 + zip -r ./dist/XIVLauncher.Core-winx64.zip /src/XIVLauncher.Core/dist/XIVLauncher.Core-winx64 - name: Release on GitHub uses: softprops/action-gh-release@v1 @@ -148,4 +148,4 @@ jobs: ./dist/XIVLauncher.Core.tar.gz ./dist/XIVLauncher.Core-arch.tar.gz ./dist/XIVLauncher.Core-fedora.tar.gz - ./dist/XIVLauncher.Core-winx64.zip + ./dist/XIVLauncher.Core-winx64.zip From 989c33047c09dd9c5cc89e8a4d754f69d86ffb9f Mon Sep 17 00:00:00 2001 From: Robert Baker Date: Wed, 20 Dec 2023 22:56:22 -0800 Subject: [PATCH 3/4] Test if windows build requires restore --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dbb7cdc5..e776ecef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 win-x64 --sc --configuration Release --no-restore -o ./dist/XIVLauncher.Core-winx64 + run: dotnet publish -r win-x64 --sc --configuration Release -o ./dist/XIVLauncher.Core-winx64 - name: Dotnet Test run: dotnet test --no-build --verbosity normal \ No newline at end of file From 7ab677dea411374f78d665c62aa184c407a71db0 Mon Sep 17 00:00:00 2001 From: Robert Baker Date: Wed, 20 Dec 2023 23:07:38 -0800 Subject: [PATCH 4/4] Fix windows build If we don't target win10-x64 specifically, aria is not included. --- .github/workflows/build.yml | 2 +- .github/workflows/make-release.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e776ecef..1ba0ba42 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 win-x64 --sc --configuration Release -o ./dist/XIVLauncher.Core-winx64 + run: dotnet publish -r win10-x64 --sc --configuration Release -o ./dist/XIVLauncher.Core-win10x64 - name: Dotnet Test run: dotnet test --no-build --verbosity normal \ No newline at end of file diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml index 6365ea25..800fc0a0 100644 --- a/.github/workflows/make-release.yml +++ b/.github/workflows/make-release.yml @@ -70,7 +70,7 @@ jobs: - name: Dotnet Build (Windows) working-directory: ./src/XIVLauncher.Core/ - run: dotnet publish -r win-x64 --sc --configuration Release --no-restore -o ./dist/XIVLauncher.Core-winx64 + run: dotnet publish -r win10-x64 --sc --configuration Release -o ./dist/XIVLauncher.Core-win10x64 - name: Generate nuget-dependencies.json working-directory: ./src/XIVLauncher.Core/ @@ -136,7 +136,7 @@ jobs: tar -czf ./dist/XIVLauncher.Core.tar.gz -C ./src/XIVLauncher.Core/dist/XIVLauncher.Core . tar -czf ./dist/XIVLauncher.Core-arch.tar.gz -C ./src/XIVLauncher.Core/dist/XIVLauncher.Core-arch . tar -czf ./dist/XIVLauncher.Core-fedora.tar.gz -C ./src/XIVLauncher.Core/dist/XIVLauncher.Core-fedora . - zip -r ./dist/XIVLauncher.Core-winx64.zip /src/XIVLauncher.Core/dist/XIVLauncher.Core-winx64 + zip -r ./dist/XIVLauncher.Core-win10x64.zip /src/XIVLauncher.Core/dist/XIVLauncher.Core-win10x64 - name: Release on GitHub uses: softprops/action-gh-release@v1 @@ -148,4 +148,4 @@ jobs: ./dist/XIVLauncher.Core.tar.gz ./dist/XIVLauncher.Core-arch.tar.gz ./dist/XIVLauncher.Core-fedora.tar.gz - ./dist/XIVLauncher.Core-winx64.zip + ./dist/XIVLauncher.Core-win10x64.zip