diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 289c095..0960d4b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,7 +42,7 @@ jobs: dotnet publish -r linux-x64 -c Linux /p:Platform=x64 --self-contained cd .. mkdir -p "HISPd/bin/x64/Linux/net7.0/linux-x64/native/gamedata" - cp -r "../HorseIsleData/gamedata" "HISPd/bin/x64/Linux/net7.0/linux-x64/native" + cp -r "../HorseIsleData/gamedata/*" "HISPd/bin/x64/Linux/net7.0/linux-x64/native/gamedata" cp "../HorseIsleData/HI1.MAP" "HISPd/bin/x64/Linux/net7.0/linux-x64/native/HI1.MAP" cp "HISPd/bin/x64/Linux/net7.0/linux-x64/publish/libe_sqlite3.so" "HISPd/bin/x64/Linux/net7.0/linux-x64/native/libe_sqlite3.so" rm -f "HISPd/bin/x64/Linux/net7.0/linux-x64/native/HISPd.pdb" @@ -57,12 +57,22 @@ jobs: cd HISPd dotnet publish -p:PublishProfile=LinuxARM.pubxml cd .. + - name: Build linux-arm64 continue-on-error: false run: | + dotnet add HISPd package Microsoft.DotNet.ILCompiler --prerelease cd HISPd - dotnet publish -p:PublishProfile=LinuxARM64.pubxml + dotnet publish -r linux-arm64 -c Linux /p:Platform=ARM64 --self-contained cd .. + mkdir -p "HISPd/bin/ARM64/Linux/net7.0/linux-arm64/native/gamedata" + cp -r "../HorseIsleData/gamedata/*" "HISPd/bin/ARM64/Linux/net7.0/linux-arm64/native/gamedata" + cp "../HorseIsleData/HI1.MAP" "HISPd/bin/ARM64/Linux/net7.0/linux-arm64/native/HI1.MAP" + cp "HISPd/bin/ARM64/Linux/net7.0/linux-arm64/publish/libe_sqlite3.so" "HISPd/bin/ARM64/Linux/net7.0/linux-arm64/native/libe_sqlite3.so" + rm -f "HISPd/bin/ARM64/Linux/net7.0/linux-arm64/native/HISPd.pdb" + rm -f "HISPd/bin/ARM64/Linux/net7.0/linux-arm64/native/HISPd.lib" + rm -f "HISPd/bin/ARM64/Linux/net7.0/linux-arm64/native/HISPd.exp" + dotnet remove HISPd package Microsoft.DotNet.ILCompiler - name: Build deb package continue-on-error: false @@ -178,10 +188,10 @@ jobs: cd HISPd dotnet publish -r win-x64 -c Windows /p:Platform=x64 --self-contained cd .. - tree /F /A mkdir "HISPd\bin\x64\Windows\net7.0\win-x64\native\gamedata" copy "..\HorseIsleData\gamedata\*" "HISPd\bin\x64\Windows\net7.0\win-x64\native\gamedata" copy "..\HorseIsleData\HI1.MAP" "HISPd\bin\x64\Windows\net7.0\win-x64\native\HI1.MAP" + tree /F /A copy "HISPd\bin\x64\Windows\net7.0\win-x64\publish\e_sqlite3.dll" "HISPd\bin\x64\Windows\net7.0\win-x64\native\e_sqlite3.dll" del "HISPd\bin\x64\Windows\net7.0\win-x64\native\HISPd.pdb" del "HISPd\bin\x64\Windows\net7.0\win-x64\native\HISPd.lib" diff --git a/HorseIsleServer/HISPd/HISPd.csproj b/HorseIsleServer/HISPd/HISPd.csproj index aa7f725..f01bcc3 100644 --- a/HorseIsleServer/HISPd/HISPd.csproj +++ b/HorseIsleServer/HISPd/HISPd.csproj @@ -5,6 +5,8 @@ 10.0 x64;x86;ARM;ARM64;AnyCPU Debug;Windows;Linux;MacOS;Android;iOS + Speed + true diff --git a/HorseIsleServer/HISPd/Resources/DEBIAN/control b/HorseIsleServer/HISPd/Resources/DEBIAN/control index a9ad9c4..e28811e 100644 --- a/HorseIsleServer/HISPd/Resources/DEBIAN/control +++ b/HorseIsleServer/HISPd/Resources/DEBIAN/control @@ -1,5 +1,5 @@ Package: hisp -Version: 1.7.59 +Version: 1.7.70 Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev Maintainer: Li Homepage: https://islehorse.com diff --git a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs index d6f27c5..1def2ca 100644 --- a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs @@ -30,5 +30,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.7.59.0")] -[assembly: AssemblyFileVersion("1.7.59.0")] +[assembly: AssemblyVersion("1.7.70.0")] +[assembly: AssemblyFileVersion("1.7.70.0")] diff --git a/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs b/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs index f0205da..ed7b4be 100644 --- a/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.7.59.0")] -[assembly: AssemblyFileVersion("1.7.59.0")] +[assembly: AssemblyVersion("1.7.70.0")] +[assembly: AssemblyFileVersion("1.7.70.0")]