From 0f0e092461781fd2efe0d23acadfb75d31b6bdcf Mon Sep 17 00:00:00 2001 From: Li Date: Thu, 1 Sep 2022 16:40:45 +1200 Subject: [PATCH] use dotnet-script --- .github/workflows/build.yml | 33 +++++++++++-------- .../HISPd/Properties/AssemblyInfo.cs | 4 +-- .../HISPd/Resources/DEBIAN/control | 2 +- HorseIsleServer/LibHISP/LibHISP.csproj | 2 +- .../LibHISP/Properties/AssemblyInfo.cs | 4 +-- .../MPN00BS/Properties/AssemblyInfo.cs | 4 +-- 6 files changed, 28 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 49414c4..2c4131d 100755 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,8 @@ jobs: run: | sudo apt update sudo apt install -y clang zlib1g-dev dos2unix - + dotnet tool install -g dotnet-script + - name: Restore dependencies run: | dotnet restore LibHISP @@ -37,10 +38,10 @@ jobs: continue-on-error: false run: | cd HISPd - dotnet publish -p:PublishProfile=Linux64.pubxml -v diag + dotnet publish -p:PublishProfile=Linux64.pubxml cd .. cd MPN00BS - dotnet publish -p:PublishProfile=Linux64.pubxml -v diag + dotnet publish -p:PublishProfile=Linux64.pubxml cd .. # Currently broken ... @@ -61,14 +62,14 @@ jobs: continue-on-error: false run: | cd HISPd - dotnet publish -p:PublishProfile=LinuxARM.pubxml -v diag + dotnet publish -p:PublishProfile=LinuxARM.pubxml cd .. # nativeaot linux arm64 - name: Build linux-arm64 continue-on-error: false run: | cd HISPd - dotnet publish -p:PublishProfile=LinuxARM64.pubxml -v diag + dotnet publish -p:PublishProfile=LinuxARM64.pubxml cd .. # dotnet add HISPd package Microsoft.DotNet.ILCompiler --prerelease @@ -193,6 +194,9 @@ jobs: dotnet-version: 7.0.x include-prerelease: true + - name: Install utils + run: dotnet tool install -g dotnet-script + - name: Restore dependencies run: dotnet restore @@ -201,10 +205,10 @@ jobs: continue-on-error: false run: | cd HISPd - dotnet publish -p:PublishProfile=Win64.pubxml -v diag + dotnet publish -p:PublishProfile=Win64.pubxml cd .. cd MPN00BS - dotnet publish -p:PublishProfile=Win64.pubxml -v diag + dotnet publish -p:PublishProfile=Win64.pubxml cd .. # dotnet add HISPd package Microsoft.DotNet.ILCompiler --prerelease @@ -226,23 +230,23 @@ jobs: continue-on-error: false run: | cd HISPd - dotnet publish -p:PublishProfile=Win32.pubxml -v diag + dotnet publish -p:PublishProfile=Win32.pubxml cd .. cd MPN00BS - dotnet publish -p:PublishProfile=Win32.pubxml -v diag + dotnet publish -p:PublishProfile=Win32.pubxml cd .. - name: Build win-arm continue-on-error: false run: | cd HISPd - dotnet publish -p:PublishProfile=WinARM.pubxml -v diag + dotnet publish -p:PublishProfile=WinARM.pubxml cd .. #nativeaot arm64 build - name: Build win-arm64 continue-on-error: false run: | cd HISPd - dotnet publish -p:PublishProfile=WinARM64.pubxml -v diag + dotnet publish -p:PublishProfile=WinARM64.pubxml cd .. # dotnet add HISPd package Microsoft.DotNet.ILCompiler --prerelease # dotnet add HISPd package runtime.win-x64.Microsoft.DotNet.ILCompiler --prerelease @@ -313,6 +317,9 @@ jobs: with: dotnet-version: 7.0.x include-prerelease: true + + - name: Install utils + run: dotnet tool install -g dotnet-script - name: Restore dependencies run: | @@ -323,13 +330,13 @@ jobs: continue-on-error: false run: | cd HISPd - dotnet publish -p:PublishProfile=Osx64.pubxml -v diag + dotnet publish -p:PublishProfile=Osx64.pubxml cd .. - name: Build mac-arm64 continue-on-error: false run: | cd HISPd - dotnet publish -p:PublishProfile=OsxARM64.pubxml -v diag + dotnet publish -p:PublishProfile=OsxARM64.pubxml cd .. - name: Upload mac-x64 uses: actions/upload-artifact@v2 diff --git a/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs b/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs index 857108f..0a30487 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.7.133.0")] -[assembly: AssemblyFileVersion("1.7.133.0")] +[assembly: AssemblyVersion("1.7.134.0")] +[assembly: AssemblyFileVersion("1.7.134.0")] diff --git a/HorseIsleServer/HISPd/Resources/DEBIAN/control b/HorseIsleServer/HISPd/Resources/DEBIAN/control index fad5345..2990141 100755 --- a/HorseIsleServer/HISPd/Resources/DEBIAN/control +++ b/HorseIsleServer/HISPd/Resources/DEBIAN/control @@ -1,5 +1,5 @@ Package: hisp -Version: 1.7.133 +Version: 1.7.134 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 1291cbe..2939512 100755 --- a/HorseIsleServer/LibHISP/LibHISP.csproj +++ b/HorseIsleServer/LibHISP/LibHISP.csproj @@ -272,6 +272,6 @@ - + diff --git a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs index 0621dff..bcc3e36 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.7.133.0")] -[assembly: AssemblyFileVersion("1.7.133.0")] +[assembly: AssemblyVersion("1.7.134.0")] +[assembly: AssemblyFileVersion("1.7.134.0")] diff --git a/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs b/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs index 3e49d45..c1e0af8 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.7.133.0")] -[assembly: AssemblyFileVersion("1.7.133.0")] +[assembly: AssemblyVersion("1.7.134.0")] +[assembly: AssemblyFileVersion("1.7.134.0")]