Skip to content

Commit 442e81f

Browse files
authored
Merge branch 'master' into master
2 parents b6ee8de + 2ee9a6c commit 442e81f

29 files changed

Lines changed: 1573 additions & 209 deletions

File tree

.github/workflows/build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
steps:
2424
- name: Checkout Code
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v6
2626
with:
2727
fetch-depth: 0
2828
submodules: 'recursive'
@@ -35,21 +35,21 @@ jobs:
3535
run: npm install -g auto-changelog
3636

3737
- name: Setup .NET Core
38-
uses: actions/setup-dotnet@v3
38+
uses: actions/setup-dotnet@v5
3939
with:
4040
dotnet-version: '8.0.x'
4141

4242
- name: Publish 64-bit WPF application
4343
working-directory: ${{env.GITHUB_WORKSPACE}}
44-
run: dotnet publish -p:PublishSingleFile=true -r win-x64 -c Release --self-contained false
44+
run: dotnet publish win-x64 -c Release
4545

4646
- name: CleanUp Misc Files (64-bit)
4747
working-directory: ${{github.workspace}}\bin\Release\net8.0-windows7.0\win-x64\publish
4848
run: del SAModManager.dll.config, SAModManager.pdb
4949

5050
- name: Publish 32-bit WPF application
5151
working-directory: ${{env.GITHUB_WORKSPACE}}
52-
run: dotnet publish -p:PublishSingleFile=true -r win-x86 -c Release --self-contained false
52+
run: dotnet publish -r win-x86 -c Release
5353

5454
- name: CleanUp Misc Files (32-bit)
5555
working-directory: ${{github.workspace}}\bin\Release\net8.0-windows7.0\win-x86\publish
@@ -61,15 +61,15 @@ jobs:
6161
auto-changelog --sort-commits date --hide-credit --template changelog-template.hbs --commit-limit 30 --starting-version "$env:RELEASE_TAG" --output "$env:PUBLISH_CHANGELOG_PATH"
6262
6363
- name: Archive 64-bit
64-
uses: thedoctor0/zip-release@0.7.5
64+
uses: thedoctor0/zip-release@0.7.6
6565
with:
6666
type: 'zip'
6767
filename: 'release_x64.zip'
6868
directory: bin/Release/net8.0-windows7.0/win-x64/publish
6969
exclusions: '*.git* /*node_modules/* .editorconfig'
7070

7171
- name: Archive 32-bit
72-
uses: thedoctor0/zip-release@0.7.5
72+
uses: thedoctor0/zip-release@0.7.6
7373
with:
7474
type: 'zip'
7575
filename: 'release_x86.zip'
@@ -78,7 +78,7 @@ jobs:
7878

7979

8080
- name: Create Release
81-
uses: softprops/action-gh-release@v0.1.15
81+
uses: softprops/action-gh-release@v2
8282
with:
8383
body_path: ${{ env.PUBLISH_CHANGELOG_PATH }}
8484
files: |

.github/workflows/devbuild.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout Code
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v6
2323
with:
2424
fetch-depth: 0
2525
submodules: 'recursive'
@@ -33,35 +33,35 @@ jobs:
3333
run: echo ${{github.sha}} > SA-Mod-Manager/Resources/Version.txt
3434

3535
- name: Setup .NET Core
36-
uses: actions/setup-dotnet@v3
36+
uses: actions/setup-dotnet@v5
3737
with:
3838
dotnet-version: '8.0.x'
3939

4040
- name: Publish 64-bit WPF application
4141
working-directory: ${{env.GITHUB_WORKSPACE}}
42-
run: dotnet publish -p:PublishSingleFile=true -r win-x64 -c ${{ matrix.configuration }} --self-contained false
42+
run: dotnet publish -r win-x64 -c ${{ matrix.configuration }}
4343

4444
- name: CleanUp Misc Files (64-bit)
4545
working-directory: ${{github.workspace}}\bin\${{ matrix.configuration }}\net8.0-windows7.0\win-x64\publish
4646
run: del SAModManager.dll.config, SAModManager.pdb
4747

4848
- name: Publish 32-bit WPF application
4949
working-directory: ${{env.GITHUB_WORKSPACE}}
50-
run: dotnet publish -p:PublishSingleFile=true -r win-x86 -c ${{ matrix.configuration }} --self-contained false
50+
run: dotnet publish -r win-x86 -c ${{ matrix.configuration }}
5151

5252
- name: CleanUp Misc Files (32-bit)
5353
working-directory: ${{github.workspace}}\bin\${{ matrix.configuration }}\net8.0-windows7.0\win-x86\publish
5454
run: del SAModManager.dll.config, SAModManager.pdb
5555

5656
# Step to upload the dev build artifact
5757
- name: Upload 64-bit Build Artifact
58-
uses: actions/upload-artifact@v4
58+
uses: actions/upload-artifact@v6
5959
with:
6060
name: SAModManager_x64_${{ matrix.configuration }}
6161
path: bin/${{ matrix.configuration }}/net8.0-windows7.0/win-x64/publish
6262

6363
- name: Upload 32-bit Build Artifact
64-
uses: actions/upload-artifact@v4
64+
uses: actions/upload-artifact@v6
6565
with:
6666
name: SAModManager_x86_${{ matrix.configuration }}
6767
path: bin/${{ matrix.configuration }}/net8.0-windows7.0/win-x86/publish

0 commit comments

Comments
 (0)