diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9bd5c90..d657860 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,18 +41,16 @@ jobs: 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\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 - name: Build win-x86 continue-on-error: false run: | - dotnet add HISPd package Microsoft.DotNet.ILCompiler --prerelease - dotnet publish -a x86 -r win-x86 -c Windows --self-contained - mkdir "HISPd\bin\x86\Windows\net7.0\win-x86\native\gamedata" - copy "..\HorseIsleData\gamedata\*" "HISPd\bin\x86\Windows\net7.0\win-x86\native\gamedata" - copy "..\HorseIsleData\HI1.MAP" "HISPd\bin\x86\Windows\net7.0\win-x86\native\HI1.MAP" - copy "HISPd\bin\x86\Windows\net7.0\win-x86\e_sqlite3.dll" "HISPd\bin\x86\Windows\net7.0\win-x86\native\e_sqlite3.dll" - dotnet remove HISPd package Microsoft.DotNet.ILCompiler + dotnet publish -p:PublishProfile=Win32.pubxml + - name: Build win-arm continue-on-error: false run: | @@ -146,7 +144,7 @@ jobs: uses: actions/upload-artifact@v2 with: name: HISP-Win32 - path: HorseIsleServer\HISPd\bin\x86\Windows\net7.0\win-x86\native\ + path: HorseIsleServer\HISPd\bin\x86\Windows\net7.0\win-x86\publish\ - name: Upload win-arm uses: actions/upload-artifact@v2 diff --git a/HorseIsleServer/HISPd/HISPd.csproj b/HorseIsleServer/HISPd/HISPd.csproj index ca0f927..2dab957 100644 --- a/HorseIsleServer/HISPd/HISPd.csproj +++ b/HorseIsleServer/HISPd/HISPd.csproj @@ -48,12 +48,14 @@ win-x86 true + x86 x86 OS_WINDOWS;ARCH_X86 win-x64 true + x64 x64 OS_WINDOWS;ARCH_X86_64 @@ -204,9 +206,4 @@ - - - - - diff --git a/HorseIsleServer/HISPd/Resources/DEBIAN/control b/HorseIsleServer/HISPd/Resources/DEBIAN/control index 99ccbbe..3b1fb5d 100644 --- a/HorseIsleServer/HISPd/Resources/DEBIAN/control +++ b/HorseIsleServer/HISPd/Resources/DEBIAN/control @@ -1,5 +1,5 @@ Package: hisp -Version: 1.7.25 +Version: 1.7.33 Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev Maintainer: Li Homepage: https://islehorse.com diff --git a/HorseIsleServer/LibHISP/LibHISP.csproj b/HorseIsleServer/LibHISP/LibHISP.csproj index 09600fe..d3404df 100644 --- a/HorseIsleServer/LibHISP/LibHISP.csproj +++ b/HorseIsleServer/LibHISP/LibHISP.csproj @@ -218,6 +218,6 @@ - + diff --git a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs index a6092cc..05e0c05 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.25.0")] -[assembly: AssemblyFileVersion("1.7.25.0")] +[assembly: AssemblyVersion("1.7.33.0")] +[assembly: AssemblyFileVersion("1.7.33.0")] diff --git a/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs b/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs index 6bdb24c..d23d7a4 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.25.0")] -[assembly: AssemblyFileVersion("1.7.25.0")] +[assembly: AssemblyVersion("1.7.33.0")] +[assembly: AssemblyFileVersion("1.7.33.0")]