Skip to content

Commit fcf51b6

Browse files
ArthriArthri
committed
Merge remote-tracking branch 'upstream/upcoming' into upcoming
2 parents 70be1d0 + fb24f53 commit fcf51b6

72 files changed

Lines changed: 1902 additions & 1443 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-ilverify": {
6-
"version": "5.0.0",
6+
"version": "9.0.0",
77
"commands": [
88
"ilverify"
99
]

‎.github/workflows/ci-launcher.yml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# This is a basic workflow to help you get started with Actions
2-
31
name: "CI-Launcher"
42

53
# Controls when the workflow will run
@@ -49,6 +47,7 @@ jobs:
4947
release_tag: launcher-linux,
5048
},
5149
]
50+
name: Build ${{ matrix.profile.name }}
5251
defaults:
5352
run:
5453
shell: bash
@@ -57,26 +56,26 @@ jobs:
5756
# Steps represent a sequence of tasks that will be executed as part of the job
5857
steps:
5958
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
60-
- uses: actions/checkout@v3
59+
- uses: actions/checkout@v4
6160
with:
6261
submodules: 'recursive'
6362

6463
- uses: actions/setup-dotnet@v2
6564
with:
66-
dotnet-version: '6.0.x' # SDK Version to use; x will use the latest version of the 3.1 channel
65+
dotnet-version: '9.0.x' # SDK Version to use; x will use the latest version of the 3.1 channel
6766

6867
# - name: MonoMod dev build
6968
# run: dotnet nuget add source https://pkgs.dev.azure.com/MonoMod/MonoMod/_packaging/DevBuilds%40Local/nuget/v3/index.json -n DevBuilds@Local
7069

7170
- name: Build
7271
run: |
7372
cd OTAPI.Client.Launcher
74-
dotnet publish -r ${{ matrix.profile.runtime_identifier }} --framework net6.0 -p:PublishReadyToRun=true --self-contained false -c Release
75-
if ${{ matrix.profile.runs_on != 'macos_latest' }} ; then
76-
7z a ../${{ matrix.profile.archive_name }} .bin/Release/net6.0/${{ matrix.profile.runtime_identifier }}/publish/*
73+
dotnet publish -r ${{ matrix.profile.runtime_identifier }} --framework net9.0 -p:PublishReadyToRun=true --self-contained false -c Release
74+
if ${{ matrix.profile.runs_on != 'macos-latest' }} ; then
75+
7z a ../${{ matrix.profile.archive_name }} './bin/Release/net9.0/${{ matrix.profile.runtime_identifier }}/publish/*'
7776
else
7877
mkdir -p OTAPI.app/Contents/Resources
79-
mv bin/Release/net6.0/osx-x64/publish OTAPI.app/Contents/MacOS
78+
mv bin/Release/net9.0/osx-x64/publish OTAPI.app/Contents/MacOS
8079
cp ../docs/MacOS.Info.plist OTAPI.app/Contents/Info.plist
8180
cp OTAPI.osx.sh OTAPI.app/Contents/MacOS/OTAPI
8281
chmod +x OTAPI.app/Contents/MacOS/OTAPI
@@ -86,7 +85,7 @@ jobs:
8685
# - uses: actions/upload-artifact@v2
8786
# with:
8887
# name: ${{ matrix.profile.name }} Launcher
89-
# path: OTAPI.Client.Launcher/bin/Release/net6.0/${{ matrix.profile.runtime_identifier }}/publish
88+
# path: OTAPI.Client.Launcher/bin/Release/net9.0/${{ matrix.profile.runtime_identifier }}/publish
9089

9190
- uses: "marvinpinto/action-automatic-releases@latest"
9291
with:

‎.github/workflows/ci-nuget.yml‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
push:
77
branches: [ upcoming-nuget-release ]
88

9+
# Allows you to run this workflow manually from the Actions tab
10+
workflow_dispatch:
11+
912
jobs:
1013

1114
Server:
@@ -36,36 +39,38 @@ jobs:
3639
name: ${{ matrix.profile.name }} Server
3740

3841
steps:
39-
- uses: actions/checkout@v3
42+
- uses: actions/checkout@v4
4043
with:
4144
submodules: 'recursive'
4245

43-
- uses: actions/setup-dotnet@v3
46+
- uses: actions/setup-dotnet@v4
4447
with:
45-
dotnet-version: '6.0.x'
48+
dotnet-version: '9.0.x'
4649

4750
- name: Build the project
4851
run: |
49-
(cd OTAPI.Patcher && exec dotnet run -patchTarget=${{ matrix.profile.patch_target }} -latest=n --framework net6.0)
50-
(cd OTAPI.Server.Launcher && exec dotnet run -test-init)
52+
dotnet build OTAPI.Mods.slnf
53+
(cd OTAPI.Patcher/bin/Debug/net9.0 && exec dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=${{ matrix.profile.patch_target }} -latest=n --framework net9.0)
54+
dotnet build OTAPI.Server.Launcher.slnf
55+
(cd OTAPI.Server.Launcher/bin/Debug/net9.0 && exec dotnet OTAPI.Server.Launcher.dll -test-init)
5156
52-
- uses: actions/upload-artifact@v3
57+
- uses: actions/upload-artifact@v4
5358
with:
5459
name: ${{ matrix.profile.name }} NuGet Package
55-
path: OTAPI.Patcher/bin/Debug/net6.0/${{ matrix.profile.package_path }}
60+
path: OTAPI.Patcher/bin/Debug/net9.0/${{ matrix.profile.package_path }}
5661

57-
- uses: actions/upload-artifact@v3
62+
- uses: actions/upload-artifact@v4
5863
with:
5964
name: ${{ matrix.profile.name }} Binaries
6065
path: |
61-
OTAPI.Patcher/bin/Debug/net6.0/artifact-*/*
66+
OTAPI.Patcher/bin/Debug/net9.0/artifact-*/*
6267
63-
- uses: actions/upload-artifact@v3
68+
- uses: actions/upload-artifact@v4
6469
with:
6570
name: ${{ matrix.profile.name }} Wiki MD files
66-
path: OTAPI.Patcher/bin/Debug/net6.0/*.mfw.md
71+
path: OTAPI.Patcher/bin/Debug/net9.0/*.mfw.md
6772

6873
- name: "Releasing to NuGet: ${{ matrix.profile.name }}"
6974
env:
7075
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
71-
run: dotnet nuget push OTAPI.Patcher/bin/Debug/net6.0/${{ matrix.profile.package_path }} --source https://api.nuget.org/v3/index.json --api-key "$NUGET_API_KEY"
76+
run: dotnet nuget push OTAPI.Patcher/bin/Debug/net9.0/${{ matrix.profile.package_path }} --source https://api.nuget.org/v3/index.json --api-key "$NUGET_API_KEY"

‎.github/workflows/ci.yml‎

Lines changed: 44 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,23 @@ on:
1515
jobs:
1616

1717
Server:
18-
runs-on: ubuntu-latest
19-
2018
strategy:
2119
fail-fast: false
2220
matrix:
21+
os: [
22+
{
23+
name: Windows,
24+
runs-on: windows-latest,
25+
},
26+
{
27+
name: Ubuntu,
28+
runs-on: ubuntu-latest,
29+
},
30+
{
31+
name: MacOS,
32+
runs-on: macos-latest,
33+
}
34+
]
2335
profile: [
2436
{
2537
name: PC,
@@ -31,41 +43,50 @@ jobs:
3143
patch_target: m,
3244
package_path: OTAPI.Mobile.nupkg,
3345
},
34-
{
35-
name: tModLoader,
36-
patch_target: t,
37-
package_path: OTAPI.TML.nupkg,
38-
},
46+
# { this is ultimately not supported yet, consideration in future when time permits
47+
# name: tModLoader,
48+
# patch_target: t,
49+
# package_path: OTAPI.TML.nupkg,
50+
# },
3951
]
52+
53+
runs-on: ${{ matrix.os.runs-on }}
4054

41-
name: ${{ matrix.profile.name }} Server
55+
name: ${{ matrix.os.name }} ${{ matrix.profile.name }} Server
4256

4357
steps:
44-
- uses: actions/checkout@v3
58+
- uses: actions/checkout@v4
4559
with:
4660
submodules: 'recursive'
4761

48-
- uses: actions/setup-dotnet@v3
62+
- uses: actions/setup-dotnet@v4
4963
with:
50-
dotnet-version: '6.0.x'
64+
dotnet-version: '9.0.x'
65+
66+
- name: Server patch
67+
run: |
68+
dotnet build OTAPI.Mods.slnf
69+
cd OTAPI.Patcher/bin/Debug/net9.0
70+
dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=${{ matrix.profile.patch_target }} -latest=n --framework net9.0
5171
52-
- name: Build the project
72+
- name: Server boot
5373
run: |
54-
(cd OTAPI.Patcher && exec dotnet run -patchTarget=${{ matrix.profile.patch_target }} -latest=n --framework net6.0)
55-
(cd OTAPI.Server.Launcher && exec dotnet run -test-init)
74+
dotnet build OTAPI.Server.Launcher.slnf
75+
cd OTAPI.Server.Launcher/bin/Debug/net9.0
76+
dotnet OTAPI.Server.Launcher.dll -test-init
5677
57-
- uses: actions/upload-artifact@v3
78+
- uses: actions/upload-artifact@v4
5879
with:
59-
name: ${{ matrix.profile.name }} NuGet Package
60-
path: OTAPI.Patcher/bin/Debug/net6.0/${{ matrix.profile.package_path }}
80+
name: ${{ matrix.os.name }} ${{ matrix.profile.name }} NuGet Package
81+
path: OTAPI.Patcher/bin/Debug/net9.0/${{ matrix.profile.package_path }}
6182

62-
- uses: actions/upload-artifact@v3
83+
- uses: actions/upload-artifact@v4
6384
with:
64-
name: ${{ matrix.profile.name }} Binaries
85+
name: ${{ matrix.os.name }} ${{ matrix.profile.name }} Binaries
6586
path: |
66-
OTAPI.Patcher/bin/Debug/net6.0/artifact-*/*
87+
OTAPI.Patcher/bin/Debug/net9.0/artifact-*/*
6788
68-
- uses: actions/upload-artifact@v3
89+
- uses: actions/upload-artifact@v4
6990
with:
70-
name: ${{ matrix.profile.name }} Wiki MD files
71-
path: OTAPI.Patcher/bin/Debug/net6.0/*.mfw.md
91+
name: ${{ matrix.os.name }} ${{ matrix.profile.name }} Wiki MD files
92+
path: OTAPI.Patcher/bin/Debug/net9.0/*.mfw.md

‎.gitignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,4 +355,9 @@ MigrationBackup/
355355
.idea
356356

357357
OTAPI.Client.Launcher/OTAPI.app/
358-
server/
358+
server/
359+
dependencies/
360+
terraria-server-*
361+
artifact-*/
362+
AutoGenerated.target
363+
*.mfw.md

‎.vscode/launch.json‎

Lines changed: 9 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,20 @@
11
{
2-
// Use IntelliSense to find out which attributes exist for C# debugging
3-
// Use hover for the description of the existing attributes
4-
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
55
"version": "0.2.0",
66
"configurations": [
77
{
8-
"name": "Setup (Vanilla)",
9-
"type": "coreclr",
8+
"name": "C#: Patcher Debug",
9+
"type": "dotnet",
1010
"request": "launch",
11-
"preLaunchTask": "build-setup",
12-
// If you have changed target frameworks, make sure to update the program path.
13-
"program": "${workspaceFolder}/OTAPI.Setup/bin/Debug/net6.0/OTAPI.Setup.dll",
14-
"args": ["-patchTarget=v", "-latestVanilla=n"],
15-
"cwd": "${workspaceFolder}/OTAPI.Setup/bin/Debug/net6.0/",
16-
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
17-
"console": "internalConsole",
18-
"stopAtEntry": false
11+
"projectPath": "${workspaceFolder}/OTAPI.Patcher/OTAPI.Patcher.csproj"
1912
},
2013
{
21-
"name": "Patcher (Vanilla)",
22-
"type": "coreclr",
14+
"name": "C#: Server Launcher Debug",
15+
"type": "dotnet",
2316
"request": "launch",
24-
"preLaunchTask": "build-mods",
25-
// If you have changed target frameworks, make sure to update the program path.
26-
"program": "${workspaceFolder}/OTAPI.Patcher/bin/Debug/net6.0/OTAPI.Patcher.dll",
27-
"args": ["-patchTarget=v", "-latestVanilla=n"],
28-
"cwd": "${workspaceFolder}/OTAPI.Patcher/bin/Debug/net6.0/",
29-
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
30-
"console": "internalConsole",
31-
"stopAtEntry": false
32-
},
33-
{
34-
"name": "Launcher (Vanilla)",
35-
"type": "coreclr",
36-
"request": "launch",
37-
"preLaunchTask": "build-launcher",
38-
// If you have changed target frameworks, make sure to update the program path.
39-
"program": "${workspaceFolder}/OTAPI.Launcher/bin/Debug/net6.0/OTAPI.Launcher.dll",
40-
"args": ["-patchTarget=v", "-latestVanilla=n"],
41-
"cwd": "${workspaceFolder}/OTAPI.Launcher/bin/Debug/net6.0/", // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
42-
"console": "externalTerminal",
43-
"stopAtEntry": false
44-
},
45-
{
46-
"name": ".NET Core Attach",
47-
"type": "coreclr",
48-
"request": "attach",
49-
"processId": "${command:pickProcess}"
17+
"projectPath": "${workspaceFolder}/OTAPI.Server.Launcher/OTAPI.Server.Launcher.csproj"
5018
}
5119
]
5220
}

‎.vscode/tasks.json‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎FNA‎

Submodule FNA updated 328 files

0 commit comments

Comments
 (0)