From 35c51946e476611c9ddba1a736261b6cb4b08b78 Mon Sep 17 00:00:00 2001 From: Li Date: Sun, 8 May 2022 13:37:13 +1200 Subject: [PATCH] Update to v1.7 --- HorseIsleServer/HISPd/HISPd.csproj | 49 +++---------------- .../HISPd/Properties/AssemblyInfo.cs | 4 +- .../HISPd/Resources/DEBIAN/control | 2 +- HorseIsleServer/LibHISP/LibHISP.csproj | 2 +- .../LibHISP/Properties/AssemblyInfo.cs | 4 +- HorseIsleServer/N00BS/N00BS.csproj | 4 ++ .../N00BS/Properties/AssemblyInfo.cs | 4 +- HorseIsleServer/prebuild.py | 11 ++--- 8 files changed, 22 insertions(+), 58 deletions(-) diff --git a/HorseIsleServer/HISPd/HISPd.csproj b/HorseIsleServer/HISPd/HISPd.csproj index abf6e16..ca0f927 100644 --- a/HorseIsleServer/HISPd/HISPd.csproj +++ b/HorseIsleServer/HISPd/HISPd.csproj @@ -41,6 +41,8 @@ https://islehorse.com https://github.com/islehorse/HISP git + 3 + 1701;1702;2026 @@ -48,32 +50,24 @@ true x86 OS_WINDOWS;ARCH_X86 - 3 - 1701;1702;2026 win-x64 true x64 OS_WINDOWS;ARCH_X86_64 - 3 - 1701;1702;2026 win-arm true ARM OS_WINDOWS;ARCH_ARM - 3 - 1701;1702;2026 win-arm64 true ARM64 OS_WINDOWS;ARCH_ARM64 - 3 - 1701;1702;2026 @@ -90,8 +84,6 @@ true ARM64 OS_ANDROID;ARCH_ARM64 - 3 - 1701;1702;2026 @@ -99,24 +91,18 @@ true x64 OS_LINUX;ARCH_X86_64 - 3 - 1701;1702;2026 linux-arm ARM true OS_LINUX;ARCH_ARM - 3 - 1701;1702;2026 linux-arm64 ARM64 true OS_LINUX;ARCH_ARM64 - 3 - 1701;1702;2026 @@ -124,15 +110,11 @@ true x64 OS_MACOS;ARCH_X86_64 - 3 - 1701;1702;2026 osx-arm64 true OS_MACOS;ARCH_ARM64 - 3 - 1701;1702;2026 @@ -159,8 +141,6 @@ ARM False DEBUG;TRACE;OS_DEBUG;ARCH_ARM - 3 - 1701;1702;2026 @@ -168,80 +148,65 @@ ARM64 False DEBUG;TRACE;OS_DEBUG;ARCH_ARM64 - 3 - 1701;1702;2026 False DEBUG;TRACE;OS_DEBUG;ARCH_X86_64 - 3 - 1701;1702;2026 False DEBUG;TRACE;OS_DEBUG;ARCH_X86 - 3 - 1701;1702;2026 True OS_MACOS;ARCH_X86 - 3 - 1701;1702;2026 True OS_LINUX;ARCH_X86 - 3 - 1701;1702;2026 False OS_LINUX;ARCH_ANYCPU - 3 - 1701;1702;2026 False OS_WINDOWS;ARCH_ANYCPU - 3 - 1701;1702;2026 False OS_MACOS;ARCH_ANYCPU - 3 - 1701;1702;2026 True OS_MACOS;ARCH_ARM - 3 - 1701;1702;2026 3 - 1701;1702;2026 - False + + + + + diff --git a/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs b/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs index 044c095..76d6644 100644 --- 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.6.2.19")] -[assembly: AssemblyFileVersion("1.6.2.19")] +[assembly: AssemblyVersion("1.7.0.0")] +[assembly: AssemblyFileVersion("1.7.0.0")] diff --git a/HorseIsleServer/HISPd/Resources/DEBIAN/control b/HorseIsleServer/HISPd/Resources/DEBIAN/control index 41a0d9e..389b58a 100644 --- a/HorseIsleServer/HISPd/Resources/DEBIAN/control +++ b/HorseIsleServer/HISPd/Resources/DEBIAN/control @@ -1,5 +1,5 @@ Package: hisp -Version: 1.6.2.19 +Version: 1.7.0 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 1b99b14..09600fe 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 006b0b9..ed06bef 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.6.2.19")] -[assembly: AssemblyFileVersion("1.6.2.19")] +[assembly: AssemblyVersion("1.7.0.0")] +[assembly: AssemblyFileVersion("1.7.0.0")] diff --git a/HorseIsleServer/N00BS/N00BS.csproj b/HorseIsleServer/N00BS/N00BS.csproj index 862dfad..4496178 100644 --- a/HorseIsleServer/N00BS/N00BS.csproj +++ b/HorseIsleServer/N00BS/N00BS.csproj @@ -143,5 +143,9 @@ False + + + + diff --git a/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs b/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs index 562a92f..009e182 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.6.2.19")] -[assembly: AssemblyFileVersion("1.6.2.19")] +[assembly: AssemblyVersion("1.7.0.0")] +[assembly: AssemblyFileVersion("1.7.0.0")] diff --git a/HorseIsleServer/prebuild.py b/HorseIsleServer/prebuild.py index 7afe142..51e4c11 100644 --- a/HorseIsleServer/prebuild.py +++ b/HorseIsleServer/prebuild.py @@ -5,7 +5,6 @@ import time import datetime import binascii - def update_asm_info(assemblyinfofile): global commit_hash global commit_tag @@ -14,9 +13,9 @@ def update_asm_info(assemblyinfofile): lines = open(assemblyinfofile, "rb").readlines() for i in range(0,len(lines)): if lines[i].startswith(b"[assembly: AssemblyVersion(\""): - lines[i] = b"[assembly: AssemblyVersion(\""+bytes(assembly_version, "UTF-8")+b"\")]\n" + lines[i] = b"[assembly: AssemblyVersion(\""+bytes(assembly_version, "UTF-8")+b"\")]\r\n" if lines[i].startswith(b"[assembly: AssemblyFileVersion(\""): - lines[i] = b"[assembly: AssemblyFileVersion(\""+bytes(assembly_version, "UTF-8")+b"\")]\n" + lines[i] = b"[assembly: AssemblyFileVersion(\""+bytes(assembly_version, "UTF-8")+b"\")]\r\n" open(assemblyinfofile, "wb").writelines(lines) @@ -57,6 +56,7 @@ update_asm_info(os.path.join("LibHISP", "Properties", "AssemblyInfo.cs")) update_asm_info(os.path.join("N00BS", "Properties", "AssemblyInfo.cs")) update_asm_info(os.path.join("HISPd", "Properties", "AssemblyInfo.cs")) +# Update control file control_file = os.path.join("HISPd", "Resources", "DEBIAN", "control") lines = open(control_file, "rb").readlines() for i in range(0,len(lines)): @@ -64,8 +64,3 @@ for i in range(0,len(lines)): lines[i] = b"Version: "+bytes(commit_tag.replace("v", ""), "UTF-8")+b"\n" open(control_file, "wb").writelines(lines) -try: - subprocess.run(['git', 'add', '-A'], stdout=subprocess.PIPE) - subprocess.run(['git', 'commit', '-m', 'Update made automatically due to pressing build'], stdout=subprocess.PIPE) -except FileNotFoundError: - pass \ No newline at end of file