diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6586925..28a5465 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ on:
push:
branches: [ main ]
tags:
- - 'v.*.*.*'
+ - 'v.*.*.*'
pull_request:
branches: [ main ]
workflow_dispatch:
@@ -21,7 +21,7 @@ on:
force_nightly:
description: 'Force this build to create a nightly release'
required: false
- default: false
+ default: 'false'
type: boolean
jobs:
@@ -82,25 +82,25 @@ jobs:
- name: Build project
run: >
- dotnet publish SubathonManager.UI/SubathonManager.UI.csproj
- -c Release
- -r ${{ env.RUNTIME }}
- --self-contained true
- -p:PublishSingleFile=true
- -p:IncludeAllContentForSelfExtract=true
- -p:PublishTrimmed=false
- -p:InformationalVersion=${{ steps.vars.outputs.version }}
- -o build
+ dotnet publish SubathonManager.UI/SubathonManager.UI.csproj
+ -c Release
+ -r ${{ env.RUNTIME }}
+ --self-contained true
+ -p:PublishSingleFile=true
+ -p:IncludeAllContentForSelfExtract=true
+ -p:PublishTrimmed=false
+ -p:InformationalVersion=${{ steps.vars.outputs.version }}
+ -o build
- name: Copy presets folder and license into build output
run: |
mkdir -Force build\presets
xcopy presets build\presets /E /I /Y
copy LICENSE build\
-
+
- name: Upload build artifact (GitHub)
- if: ${{ (github.event_name == 'workflow_dispatch' && (github.event.inputs.upload_target == 'github' || github.event.inputs.upload_target == 'default')) ||
- ((github.ref_type == 'tag' && github.ref != 'refs/tags/nightly') || github.ref_name == 'main') }}
+ if: ${{ (github.event_name == 'workflow_dispatch' && (github.event.inputs.upload_target == 'github' || github.event.inputs.upload_target == 'default')) ||
+ ((github.ref_type == 'tag' && github.ref != 'refs/tags/nightly') || github.ref_name == 'main') }}
uses: actions/upload-artifact@v4
id: artifact-upload
continue-on-error: ${{ !(github.event_name == 'workflow_dispatch' && github.event.inputs.upload_target == 'github') }}
@@ -130,8 +130,11 @@ jobs:
name: Create Release
runs-on: ubuntu-latest
needs: build
- if: ((github.ref_type == 'tag' && github.ref != 'refs/tags/nightly') || github.ref_name == 'main') || github.event.inputs.force_nightly
-
+ if: >
+ (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/tags/nightly')
+ || (github.ref_type == 'tag' && github.ref != 'refs/tags/nightly')
+ || (github.event_name == 'push' && github.ref == 'refs/heads/main')
+ || github.event.inputs.force_nightly == 'true'
steps:
- name: Download build artifact (GitHub)
if: needs.build.outputs.artifact_failed == 'false' && github.event.inputs.upload_target != 'nextcloud'
@@ -147,17 +150,17 @@ jobs:
curl -L "${{ needs.build.outputs.nextcloud_url }}/download?path=&files=${{ needs.build.outputs.artifact_name }}.zip" \
-o "${{ needs.build.outputs.filename }}"
-
+
- name: Zip release files
if: needs.build.outputs.artifact_failed == 'false' && github.event.inputs.upload_target != 'nextcloud'
run: |
cd build
zip -r ../${{ needs.build.outputs.filename }} .
echo "${{ needs.build.outputs.filename }} successfully zipped"
-
+
- name: Create GitHub Release
- if: startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/tags/nightly' && !github.event.inputs.force_nightly
+ if: startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/tags/nightly' && github.event.inputs.force_nightly == 'false'
uses: softprops/action-gh-release@v2
with:
name: Release ${{ github.ref_name }}
@@ -167,7 +170,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Delete previous nightly asset
- if: github.ref_name == 'main' || github.event.inputs.force_nightly
+ if: github.ref_name == 'main' || github.event.inputs.force_nightly == 'true'
run: |
release_id=$(gh api repos/${{ github.repository }}/releases/tags/nightly --jq .id)
asset_id=$(gh api repos/${{ github.repository }}/releases/$release_id/assets --jq '.[] | select(.name=="${{ needs.build.outputs.filename }}") | .id')
@@ -182,7 +185,7 @@ jobs:
- name: Create Nightly Release
- if: github.ref_name == 'main' || github.event.inputs.force_nightly
+ if: github.ref_name == 'main' || github.event.inputs.force_nightly == 'true'
uses: softprops/action-gh-release@v2
with:
name: "Nightly Build"
diff --git a/SubathonManager.Data/SubathonManager.Data.csproj b/SubathonManager.Data/SubathonManager.Data.csproj
index e030eea..c7d2709 100644
--- a/SubathonManager.Data/SubathonManager.Data.csproj
+++ b/SubathonManager.Data/SubathonManager.Data.csproj
@@ -11,12 +11,12 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
diff --git a/SubathonManager.Integration/SubathonManager.Integration.csproj b/SubathonManager.Integration/SubathonManager.Integration.csproj
index 950f784..74d6c30 100644
--- a/SubathonManager.Integration/SubathonManager.Integration.csproj
+++ b/SubathonManager.Integration/SubathonManager.Integration.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/SubathonManager.UI/MainWindow.xaml b/SubathonManager.UI/MainWindow.xaml
index cc649c4..a99d3ca 100644
--- a/SubathonManager.UI/MainWindow.xaml
+++ b/SubathonManager.UI/MainWindow.xaml
@@ -73,7 +73,7 @@
-
+
@@ -254,7 +254,7 @@
-
+
@@ -266,20 +266,21 @@
-
-
+
+
+
-
-
-
-
+ VerticalAlignment="Center" />
+
@@ -368,12 +369,12 @@
-
+
-
+
diff --git a/SubathonManager.UI/SubathonManager.UI.csproj b/SubathonManager.UI/SubathonManager.UI.csproj
index c8d7e5a..f3fcf48 100644
--- a/SubathonManager.UI/SubathonManager.UI.csproj
+++ b/SubathonManager.UI/SubathonManager.UI.csproj
@@ -38,8 +38,8 @@
-
-
+
+