diff --git a/HorseIsleServer/HISP.sln b/HorseIsleServer/HISP.sln index e45c0e6..495e057 100644 --- a/HorseIsleServer/HISP.sln +++ b/HorseIsleServer/HISP.sln @@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HISPd", "HISPd\HISPd.csproj EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "N00BS", "N00BS\N00BS.csproj", "{6B45A1E8-0F54-4BF7-AF48-41B9FE676570}" EndProject -Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Installer", "Installer\Installer.vdproj", "{D330A197-67D4-42B0-8906-54264AF95EC1}" +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "N00BSInstaller", "N00BSInstaller\N00BSInstaller.vdproj", "{D330A197-67D4-42B0-8906-54264AF95EC1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/HorseIsleServer/HISPd/HISPd.csproj b/HorseIsleServer/HISPd/HISPd.csproj index 86703d1..f21d406 100644 --- a/HorseIsleServer/HISPd/HISPd.csproj +++ b/HorseIsleServer/HISPd/HISPd.csproj @@ -23,6 +23,7 @@ + diff --git a/HorseIsleServer/HISPd/Resources/DEBIAN/control b/HorseIsleServer/HISPd/Resources/DEBIAN/control index 8093acd..e8a8695 100644 --- a/HorseIsleServer/HISPd/Resources/DEBIAN/control +++ b/HorseIsleServer/HISPd/Resources/DEBIAN/control @@ -1,5 +1,5 @@ Package: hisp -Version: 1.7.36 +Version: 1.7.43 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.user b/HorseIsleServer/LibHISP/LibHISP.csproj.user index ed08094..8df2096 100644 --- a/HorseIsleServer/LibHISP/LibHISP.csproj.user +++ b/HorseIsleServer/LibHISP/LibHISP.csproj.user @@ -1,6 +1,6 @@  - <_LastSelectedProfileId>C:\Users\User\Documents\git\HISP\HorseIsleServer\LibHISP\Properties\PublishProfiles\Linux64.pubxml + <_LastSelectedProfileId>C:\Users\Li\Documents\git\HISP\HorseIsleServer\LibHISP\Properties\PublishProfiles\Linux64.pubxml \ No newline at end of file diff --git a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs index 6c01c73..e53257d 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.36.0")] -[assembly: AssemblyFileVersion("1.7.36.0")] +[assembly: AssemblyVersion("1.7.43.0")] +[assembly: AssemblyFileVersion("1.7.43.0")] diff --git a/HorseIsleServer/N00BS/N00BS.csproj.user b/HorseIsleServer/N00BS/N00BS.csproj.user index 1ee8c31..3a78a43 100644 --- a/HorseIsleServer/N00BS/N00BS.csproj.user +++ b/HorseIsleServer/N00BS/N00BS.csproj.user @@ -1,7 +1,7 @@  - <_LastSelectedProfileId>C:\Users\User\Documents\git\HISP\HorseIsleServer\N00BS\Properties\PublishProfiles\Win64.pubxml + <_LastSelectedProfileId>C:\Users\Li\Documents\git\HISP\HorseIsleServer\N00BS\Properties\PublishProfiles\Win64.pubxml diff --git a/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs b/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs index cba1296..14bc36a 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.36.0")] -[assembly: AssemblyFileVersion("1.7.36.0")] +[assembly: AssemblyVersion("1.7.43.0")] +[assembly: AssemblyFileVersion("1.7.43.0")] diff --git a/HorseIsleServer/N00BS/Properties/PublishProfiles/Win64.pubxml.user b/HorseIsleServer/N00BS/Properties/PublishProfiles/Win64.pubxml.user new file mode 100644 index 0000000..4d85d09 --- /dev/null +++ b/HorseIsleServer/N00BS/Properties/PublishProfiles/Win64.pubxml.user @@ -0,0 +1,9 @@ + + + + + True|2022-07-15T04:32:58.3157042Z; + + \ No newline at end of file diff --git a/HorseIsleServer/Installer/Installer.vdproj b/HorseIsleServer/N00BSInstaller/N00BSInstaller.vdproj similarity index 100% rename from HorseIsleServer/Installer/Installer.vdproj rename to HorseIsleServer/N00BSInstaller/N00BSInstaller.vdproj diff --git a/HorseIsleServer/prebuild.py b/HorseIsleServer/prebuild.py index 6880b78..f162e0c 100644 --- a/HorseIsleServer/prebuild.py +++ b/HorseIsleServer/prebuild.py @@ -11,7 +11,7 @@ def update_asm_info(assemblyinfofile): global commit_tag global commit_branch global assembly_version - print("Updating Versopn inside: "+assemblyinfofile) + print("Updating Verson inside: "+assemblyinfofile) lines = open(assemblyinfofile, "rb").readlines() for i in range(0,len(lines)): if lines[i].startswith(b"[assembly: AssemblyVersion(\""): @@ -68,7 +68,7 @@ update_asm_info(os.path.join("HISPd" , "Properties", "AssemblyInfo.cs")) # Update control file in dpkg control_file = os.path.join("HISPd", "Resources", "DEBIAN", "control") -print("Updating Versopn inside: "+control_file) +print("Updating Verson inside: "+control_file) lines = open(control_file, "rb").readlines() for i in range(0,len(lines)): if lines[i].startswith(b"Version: "): diff --git a/HorseIsleServer/migrate-1.0-to-1.1.sql b/MigrationSQL/migrate-1.0-to-1.1.sql similarity index 100% rename from HorseIsleServer/migrate-1.0-to-1.1.sql rename to MigrationSQL/migrate-1.0-to-1.1.sql diff --git a/HorseIsleServer/migrate-1.1-to-1.2.sql b/MigrationSQL/migrate-1.1-to-1.2.sql similarity index 100% rename from HorseIsleServer/migrate-1.1-to-1.2.sql rename to MigrationSQL/migrate-1.1-to-1.2.sql diff --git a/HorseIsleServer/migrate-1.2-to-1.8.sql b/MigrationSQL/migrate-1.2-to-1.8.sql similarity index 100% rename from HorseIsleServer/migrate-1.2-to-1.8.sql rename to MigrationSQL/migrate-1.2-to-1.8.sql