diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 3ad324513..b60a31bf2 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -8,7 +8,6 @@ on:
env:
ARTIFACTS_DIR: 2049ef39-42a2-46d2-b513-ee6d2e3a7b15
- TOOLS_DIR: c1c0ee3b-b22f-451f-b330-8f6337a38fd7
RELEASES: |
windows:Barotrauma/bin/ReleaseWindows/net6.0/win-x64/publish
linux:Barotrauma/bin/ReleaseLinux/net6.0/linux-x64/publish
@@ -16,13 +15,11 @@ env:
ARCHIVE_BASE_NAME: luacsforbarotrauma
# XXX: these file names are subject to shell expansion.
# Be careful when using special characters.
- PUBLICIZED_ASSEMBLIES: |
- Barotrauma.dll
- DedicatedServer.dll
ARCHIVE_FILES_SERVER: |
DedicatedServer.deps.json
DedicatedServer.dll
DedicatedServer.pdb
+ Publicized/DedicatedServer.dll
ARCHIVE_FILES_CLIENT: |
Barotrauma.deps.json
Barotrauma.dll
@@ -30,6 +27,8 @@ env:
DedicatedServer.deps.json
DedicatedServer.dll
DedicatedServer.pdb
+ Publicized/Barotrauma.dll
+ Publicized/DedicatedServer.dll
ARCHIVE_FILES_SHARED: |
0Harmony.dll
Sigil.dll
@@ -49,7 +48,6 @@ env:
System.Runtime.CompilerServices.Unsafe.dll
mscordaccore_amd64_amd64_*
Lua
- Publicized
jobs:
build:
@@ -82,42 +80,6 @@ jobs:
- name: "Build: MacClient"
run: dotnet publish Barotrauma/BarotraumaClient/MacClient.csproj -c Release -clp:"ErrorsOnly;Summary" --self-contained -r osx-x64 \/p:Platform="x64"
- - name: Publicize assemblies
- run: |
- set -e
- shopt -s globstar nullglob
- shopt -u dotglob
-
- # This converts a newline-separated (LF) list into a Bash array
- # NOTE: this doesn't discard the trailing LF that GitHub actions
- # append (which results in an extra entry in the array).
- lines_to_array() {
- IFS=$'\n' readarray -td $'\n' "$1" <<< "${!1}"
- }
-
- lines_to_array RELEASES
-
- tools_dir="$(realpath -m "$TOOLS_DIR")"
- mkdir -p "$tools_dir"
-
- dotnet tool install --tool-path "$tools_dir/asmpub" BepInEx.AssemblyPublicizer.Cli --version 0.4.1
-
- for i in "${!RELEASES[@]}"; do
- [[ -z "${RELEASES[i]}" ]] && continue
- (
- IFS=':' read platform publish_dir _rest <<< "${RELEASES[i]}"
- cd "$publish_dir"
- echo "Publicizing assemblies for $platform build"
- mkdir Publicized
- # XXX: assembly-publicizer supports processing assemblies in
- # parallel, but it aborts the entire process if it encounters
- # an invalid .NET assembly.
- parallel "$tools_dir/asmpub/assembly-publicizer" \
- {} -f --strip -o Publicized \
- ::: ${PUBLICIZED_ASSEMBLIES[@]}
- )
- done
-
- name: Create archives
run: |
set -e
@@ -145,13 +107,13 @@ jobs:
IFS=':' read platform publish_dir _rest <<< "${RELEASES[i]}"
cd "$publish_dir"
echo "Creating build_${platform}.zip"
- zip -qr "${artifacts_dir}/${ARCHIVE_BASE_NAME}_build_${platform}.zip" *
+ zip --must-match -qr "${artifacts_dir}/${ARCHIVE_BASE_NAME}_build_${platform}.zip" *
echo "Creating patch_${platform}_client.zip"
- zip -qr "${artifacts_dir}/${ARCHIVE_BASE_NAME}_patch_${platform}_client.zip" \
+ zip --must-match -qr "${artifacts_dir}/${ARCHIVE_BASE_NAME}_patch_${platform}_client.zip" \
${ARCHIVE_FILES_SHARED[@]} \
${ARCHIVE_FILES_CLIENT[@]}
echo "Creating patch_${platform}_server.zip"
- zip -qr "${artifacts_dir}/${ARCHIVE_BASE_NAME}_patch_${platform}_server.zip" \
+ zip --must-match -qr "${artifacts_dir}/${ARCHIVE_BASE_NAME}_patch_${platform}_server.zip" \
${ARCHIVE_FILES_SHARED[@]} \
${ARCHIVE_FILES_SERVER[@]}
)
diff --git a/Barotrauma/BarotraumaClient/LinuxClient.csproj b/Barotrauma/BarotraumaClient/LinuxClient.csproj
index c6c5a544d..7e0bd9fd1 100644
--- a/Barotrauma/BarotraumaClient/LinuxClient.csproj
+++ b/Barotrauma/BarotraumaClient/LinuxClient.csproj
@@ -1,10 +1,5 @@
-
-
-
-
-
WinExe
net6.0
@@ -209,4 +204,9 @@
+
+
+
+
+
diff --git a/Barotrauma/BarotraumaClient/MacClient.csproj b/Barotrauma/BarotraumaClient/MacClient.csproj
index 587e4f331..718056b43 100644
--- a/Barotrauma/BarotraumaClient/MacClient.csproj
+++ b/Barotrauma/BarotraumaClient/MacClient.csproj
@@ -1,10 +1,5 @@
-
-
-
-
-
WinExe
net6.0
@@ -19,7 +14,6 @@
Debug;Release;Unstable
true
;NU1605;CS0114;CS0108;CS8597;CS8600;CS8601;CS8602;CS8603;CS8604;CS8605;CS8606;CS8607;CS8608;CS8609;CS8610;CS8611;CS8612;CS8613;CS8614;CS8615;CS8616;CS8617;CS8618;CS8619;CS8620;CS8621;CS8622;CS8624;CS8625;CS8626;CS8629;CS8631;CS8632;CS8633;CS8634;CS8638;CS8643;CS8644;CS8645;CS8653;CS8654;CS8655;CS8667;CS8669;CS8670;CS8714;CS8717;CS8765
- false
@@ -220,4 +214,9 @@
+
+
+
+
+
diff --git a/Barotrauma/BarotraumaClient/WindowsClient.csproj b/Barotrauma/BarotraumaClient/WindowsClient.csproj
index 3c3e7e4eb..e53deb979 100644
--- a/Barotrauma/BarotraumaClient/WindowsClient.csproj
+++ b/Barotrauma/BarotraumaClient/WindowsClient.csproj
@@ -1,10 +1,5 @@
-
-
-
-
-
WinExe
net6.0
@@ -241,4 +236,9 @@
-
\ No newline at end of file
+
+
+
+
+
+
diff --git a/Barotrauma/BarotraumaServer/LinuxServer.csproj b/Barotrauma/BarotraumaServer/LinuxServer.csproj
index 3c2260777..aaae468e5 100644
--- a/Barotrauma/BarotraumaServer/LinuxServer.csproj
+++ b/Barotrauma/BarotraumaServer/LinuxServer.csproj
@@ -1,10 +1,5 @@
-
-
-
-
-
Exe
net6.0
@@ -149,4 +144,9 @@
+
+
+
+
+
diff --git a/Barotrauma/BarotraumaServer/MacServer.csproj b/Barotrauma/BarotraumaServer/MacServer.csproj
index 44198da37..81ed13f3f 100644
--- a/Barotrauma/BarotraumaServer/MacServer.csproj
+++ b/Barotrauma/BarotraumaServer/MacServer.csproj
@@ -1,10 +1,5 @@
-
-
-
-
-
Exe
net6.0
@@ -161,4 +156,9 @@
+
+
+
+
+
diff --git a/Barotrauma/BarotraumaServer/WindowsServer.csproj b/Barotrauma/BarotraumaServer/WindowsServer.csproj
index 044eba784..53336978a 100644
--- a/Barotrauma/BarotraumaServer/WindowsServer.csproj
+++ b/Barotrauma/BarotraumaServer/WindowsServer.csproj
@@ -1,10 +1,5 @@
-
-
-
-
-
Exe
net6.0
@@ -156,4 +151,9 @@
+
+
+
+
+
diff --git a/Barotrauma/BarotraumaShared/Luatrauma.props b/Barotrauma/BarotraumaShared/Luatrauma.props
index a892b2d5c..6cc17286f 100644
--- a/Barotrauma/BarotraumaShared/Luatrauma.props
+++ b/Barotrauma/BarotraumaShared/Luatrauma.props
@@ -1,5 +1,6 @@
+
@@ -7,7 +8,21 @@
+
- en
+ en
+
+
+
+
+ false