IsleHorse/HISP
1
0
Fork 0
mirror of https://github.com/islehorse/HISP.git synced 2025-04-06 21:25:42 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert NativeAOT becuase MS broke it

Browse source
This commit is contained in:
Li 2022-07-18 00:09:57 +12:00
parent 41a6038527
commit 39acd7f7eb
6 changed files with 49 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
.github/workflows/build.yml vendored
View file

@ -36,16 +36,21 @@ jobs:
- name: Build linux-x64 - name: Build linux-x64
continue-on-error: false continue-on-error: false
run: | run: |
dotnet add HISPd package Microsoft.DotNet.ILCompiler --prerelease
cd HISPd cd HISPd
dotnet publish -r linux-x64 -c Linux /p:Platform=x64 --self-contained dotnet publish -p:PublishProfile=LinuxARM.pubxml
cd .. cd ..
mkdir -p HISPd/bin/x64/Linux/net7.0/linux-x64/native/gamedata # Currently broken ...
cp -r HISPd/bin/x64/Linux/net7.0/linux-x64/gamedata/* HISPd/bin/x64/Linux/net7.0/linux-x64/native/gamedata
cp HISPd/bin/x64/Linux/net7.0/linux-x64/HI1.MAP HISPd/bin/x64/Linux/net7.0/linux-x64/native/HI1.MAP # dotnet add HISPd package Microsoft.DotNet.ILCompiler --prerelease
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 # cd HISPd
rm -f HISPd/bin/x64/Linux/net7.0/linux-x64/native/HISPd.dbg # dotnet publish -r linux-x64 -c Linux /p:Platform=x64 --self-contained
dotnet remove HISPd package Microsoft.DotNet.ILCompiler # cd ..
# mkdir -p HISPd/bin/x64/Linux/net7.0/linux-x64/native/gamedata
# cp -r HISPd/bin/x64/Linux/net7.0/linux-x64/gamedata/* HISPd/bin/x64/Linux/net7.0/linux-x64/native/gamedata
# cp HISPd/bin/x64/Linux/net7.0/linux-x64/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.dbg
# dotnet remove HISPd package Microsoft.DotNet.ILCompiler
- name: Build linux-arm - name: Build linux-arm
@ -185,21 +190,24 @@ jobs:
- name: Build win-x64 - name: Build win-x64
continue-on-error: false continue-on-error: false
run: | run: |
dotnet add HISPd package Microsoft.DotNet.ILCompiler --prerelease
cd HISPd cd HISPd
dotnet publish -r win-x64 -c Windows /p:Platform=x64 --self-contained
cd ..
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"
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"
del "HISPd\bin\x64\Windows\net7.0\win-x64\native\HISPd.exp"
dotnet remove HISPd package Microsoft.DotNet.ILCompiler
cd N00BS
dotnet publish -p:PublishProfile=Win64.pubxml dotnet publish -p:PublishProfile=Win64.pubxml
cd .. cd ..
# dotnet add HISPd package Microsoft.DotNet.ILCompiler --prerelease
# cd HISPd
# dotnet publish -r win-x64 -c Windows /p:Platform=x64 --self-contained
# cd ..
# 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"
# 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"
# del "HISPd\bin\x64\Windows\net7.0\win-x64\native\HISPd.exp"
# dotnet remove HISPd package Microsoft.DotNet.ILCompiler
# cd N00BS
# dotnet publish -p:PublishProfile=Win64.pubxml
# cd ..
- name: Build win-x86 - name: Build win-x86
continue-on-error: false continue-on-error: false
run: | run: |
@ -219,20 +227,23 @@ jobs:
- name: Build win-arm64 - name: Build win-arm64
continue-on-error: false continue-on-error: false
run: | run: |
dotnet add HISPd package Microsoft.DotNet.ILCompiler --prerelease
dotnet add HISPd package runtime.win-x64.Microsoft.DotNet.ILCompiler --prerelease
cd HISPd cd HISPd
dotnet publish -r win-arm64 -c Windows /p:Platform=ARM64 --self-contained dotnet publish -p:PublishProfile=WinARM.pubxml
cd .. cd ..
mkdir "HISPd\bin\ARM64\Windows\net7.0\win-arm64\native\gamedata" # dotnet add HISPd package Microsoft.DotNet.ILCompiler --prerelease
copy "..\HorseIsleData\gamedata\*" "HISPd\bin\ARM64\Windows\net7.0\win-arm64\native\gamedata" # dotnet add HISPd package runtime.win-x64.Microsoft.DotNet.ILCompiler --prerelease
copy "..\HorseIsleData\HI1.MAP" "HISPd\bin\ARM64\Windows\net7.0\win-arm64\native\HI1.MAP" # cd HISPd
copy "HISPd\bin\ARM64\Windows\net7.0\win-arm64\publish\e_sqlite3.dll" "HISPd\bin\ARM64\Windows\net7.0\win-arm64\native\e_sqlite3.dll" # dotnet publish -r win-arm64 -c Windows /p:Platform=ARM64 --self-contained
del "HISPd\bin\ARM64\Windows\net7.0\win-arm64\native\HISPd.pdb" # cd ..
del "HISPd\bin\ARM64\Windows\net7.0\win-arm64\native\HISPd.lib" # mkdir "HISPd\bin\ARM64\Windows\net7.0\win-arm64\native\gamedata"
del "HISPd\bin\ARM64\Windows\net7.0\win-arm64\native\HISPd.exp" # copy "..\HorseIsleData\gamedata\*" "HISPd\bin\ARM64\Windows\net7.0\win-arm64\native\gamedata"
dotnet remove HISPd package Microsoft.DotNet.ILCompiler # copy "..\HorseIsleData\HI1.MAP" "HISPd\bin\ARM64\Windows\net7.0\win-arm64\native\HI1.MAP"
dotnet remove HISPd package runtime.win-x64.Microsoft.DotNet.ILCompiler # copy "HISPd\bin\ARM64\Windows\net7.0\win-arm64\publish\e_sqlite3.dll" "HISPd\bin\ARM64\Windows\net7.0\win-arm64\native\e_sqlite3.dll"
# del "HISPd\bin\ARM64\Windows\net7.0\win-arm64\native\HISPd.pdb"
# del "HISPd\bin\ARM64\Windows\net7.0\win-arm64\native\HISPd.lib"
# del "HISPd\bin\ARM64\Windows\net7.0\win-arm64\native\HISPd.exp"
# dotnet remove HISPd package Microsoft.DotNet.ILCompiler
# dotnet remove HISPd package runtime.win-x64.Microsoft.DotNet.ILCompiler
# Upload WINDOWS # Upload WINDOWS

1
HorseIsleServer/HISPd/HISPd.csproj
View file

@ -5,7 +5,6 @@
<LangVersion>10.0</LangVersion> <LangVersion>10.0</LangVersion>
<Platforms>x64;x86;ARM;ARM64;AnyCPU</Platforms> <Platforms>x64;x86;ARM;ARM64;AnyCPU</Platforms>
<Configurations>Debug;Windows;Linux;MacOS;Android;iOS</Configurations> <Configurations>Debug;Windows;Linux;MacOS;Android;iOS</Configurations>
<StripSymbols>true</StripSymbols>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\LibHISP\LibHISP.csproj" /> <ProjectReference Include="..\LibHISP\LibHISP.csproj" />

2
HorseIsleServer/HISPd/Resources/DEBIAN/control
View file

@ -1,5 +1,5 @@
Package: hisp Package: hisp
Version: 1.7.91 Version: 1.7.92
Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev
Maintainer: Li Maintainer: Li
Homepage: https://islehorse.com Homepage: https://islehorse.com

4
HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs
View file

@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.7.91.0")] [assembly: AssemblyVersion("1.7.92.0")]
[assembly: AssemblyFileVersion("1.7.91.0")] [assembly: AssemblyFileVersion("1.7.92.0")]

2
HorseIsleServer/LibHISP/Server/Entry.cs
View file

@ -75,10 +75,10 @@ namespace HISP.Server
File.AppendAllText("crashlog.txt", "HISP HAS CRASHED :(\n"); File.AppendAllText("crashlog.txt", "HISP HAS CRASHED :(\n");
File.AppendAllText("crashlog.txt", "Unhandled Exception: " + execpt.ToString() + "\n"); File.AppendAllText("crashlog.txt", "Unhandled Exception: " + execpt.ToString() + "\n");
File.AppendAllText("crashlog.txt", execpt.StackTrace + "\n"); File.AppendAllText("crashlog.txt", execpt.StackTrace + "\n");
GameServer.ShutdownServer();
} }
catch (Exception) { }; catch (Exception) { };
GameServer.ShutdownServer();
Thread.Sleep(5000); Thread.Sleep(5000);
Environment.Exit(1); Environment.Exit(1);
} }

4
HorseIsleServer/N00BS/Properties/AssemblyInfo.cs
View file

@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.7.91.0")] [assembly: AssemblyVersion("1.7.92.0")]
[assembly: AssemblyFileVersion("1.7.91.0")] [assembly: AssemblyFileVersion("1.7.92.0")]