From 663106ca348721f772387a70761f65d11d49fc62 Mon Sep 17 00:00:00 2001 From: Li Date: Tue, 4 Oct 2022 15:59:42 +1300 Subject: [PATCH] add macos MPNoobs build task --- .github/workflows/build.yml | 9 +++++++ .../HISPd/Properties/AssemblyInfo.cs | 4 +-- .../HISPd/Resources/DEBIAN/control | 2 +- .../LibHISP/Properties/AssemblyInfo.cs | 4 +-- HorseIsleServer/LibHISP/Server/GameClient.cs | 27 +++++++++++-------- .../MPN00BS/Properties/AssemblyInfo.cs | 4 +-- 6 files changed, 32 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 65ccdc2..df4994b 100755 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -332,6 +332,9 @@ jobs: cd HISPd dotnet publish -p:PublishProfile=Osx64.pubxml cd .. + cd MPN00BS + dotnet publish -p:PublishProfile=Osx64.pubxml + cd .. - name: Build mac-arm64 continue-on-error: false run: | @@ -350,6 +353,12 @@ jobs: name: HISP-MacARM64 path: HorseIsleServer/HISPd/bin/arm64/MacOS/net7.0/osx-arm64/publish/ + - name: Upload mac-x64-noobs + uses: actions/upload-artifact@v2 + with: + name: HISP-Mac-Noobs + path: HorseIsleServer/MPN00BS/bin/x64/MacOS/net7.0/osx-x64/publish/ + build-web: runs-on: ubuntu-latest steps: diff --git a/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs b/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs index bb3cbf3..6b66e6f 100755 --- a/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/HISPd/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.8.2.0")] -[assembly: AssemblyFileVersion("1.8.2.0")] +[assembly: AssemblyVersion("1.8.3.0")] +[assembly: AssemblyFileVersion("1.8.3.0")] diff --git a/HorseIsleServer/HISPd/Resources/DEBIAN/control b/HorseIsleServer/HISPd/Resources/DEBIAN/control index 76e5411..7766ad7 100755 --- a/HorseIsleServer/HISPd/Resources/DEBIAN/control +++ b/HorseIsleServer/HISPd/Resources/DEBIAN/control @@ -1,5 +1,5 @@ Package: hisp -Version: 1.8.2 +Version: 1.8.3 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 8acffe9..3b3410c 100755 --- a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs @@ -30,8 +30,8 @@ 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.8.2.0")] -[assembly: AssemblyFileVersion("1.8.2.0")] +[assembly: AssemblyVersion("1.8.3.0")] +[assembly: AssemblyFileVersion("1.8.3.0")] diff --git a/HorseIsleServer/LibHISP/Server/GameClient.cs b/HorseIsleServer/LibHISP/Server/GameClient.cs index 5dcc41e..ea1c7f7 100755 --- a/HorseIsleServer/LibHISP/Server/GameClient.cs +++ b/HorseIsleServer/LibHISP/Server/GameClient.cs @@ -120,21 +120,26 @@ namespace HISP.Server } public static void CreateClient(object sender, SocketAsyncEventArgs e) { - try{ - do - { - Socket eSocket = e.AcceptSocket; + try + { + do + { + Socket eSocket = e.AcceptSocket; + + if (GameServer.ServerSocket == null) + return; if (eSocket == null) - continue; + return; if (eSocket.RemoteEndPoint == null) continue; new GameClient(eSocket); - e.AcceptSocket = null; - - if(GameServer.ServerSocket == null) - return; - } while (!GameServer.ServerSocket.AcceptAsync(e)); - }catch(ObjectDisposedException) {} // server shutdown + e.AcceptSocket = null; + + if (GameServer.ServerSocket == null) + return; + } while (!GameServer.ServerSocket.AcceptAsync(e)); + } + catch (ObjectDisposedException) { } // server shutdown } private void timeoutTimerTick(object state) { diff --git a/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs b/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs index d708641..d191789 100755 --- a/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs @@ -30,8 +30,8 @@ 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.8.2.0")] -[assembly: AssemblyFileVersion("1.8.2.0")] +[assembly: AssemblyVersion("1.8.3.0")] +[assembly: AssemblyFileVersion("1.8.3.0")]