From 79b6d86a0ff7f279dd4c0f4200bfcf5f67f565dc Mon Sep 17 00:00:00 2001 From: AtelierWindows Date: Thu, 28 Jan 2021 22:33:51 +1300 Subject: [PATCH] Port to linux --- Horse Isle Server/HorseIsleServer.sln | 16 +++++-- .../HorseIsleServer/HorseIsleServer.csproj | 48 ++++++++++++++++--- .../HorseIsleServer.csproj.user | 4 +- Horse Isle Server/HorseIsleServer/Program.cs | 3 -- .../PublishProfiles/FolderProfile.pubxml | 18 +++++++ .../PublishProfiles/FolderProfile.pubxml.user | 6 +++ .../Properties/launchSettings.json | 22 +-------- 7 files changed, 79 insertions(+), 38 deletions(-) create mode 100644 Horse Isle Server/HorseIsleServer/Properties/PublishProfiles/FolderProfile.pubxml create mode 100644 Horse Isle Server/HorseIsleServer/Properties/PublishProfiles/FolderProfile.pubxml.user diff --git a/Horse Isle Server/HorseIsleServer.sln b/Horse Isle Server/HorseIsleServer.sln index de7a384..bdbe804 100644 --- a/Horse Isle Server/HorseIsleServer.sln +++ b/Horse Isle Server/HorseIsleServer.sln @@ -3,18 +3,26 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30114.105 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HorseIsleServer", "HorseIsleServer\HorseIsleServer.csproj", "{C48CBD82-AB30-494A-8FFA-4DE7069B5827}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HorseIsleServer", "HorseIsleServer\HorseIsleServer.csproj", "{C48CBD82-AB30-494A-8FFA-4DE7069B5827}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU + Linux|ARM = Linux|ARM + Linux|x64 = Linux|x64 + Windows|x64 = Windows|x64 + Windows|x86 = Windows|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Release|Any CPU.Build.0 = Release|Any CPU + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|ARM.ActiveCfg = Linux|ARM + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|ARM.Build.0 = Linux|ARM + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|x64.ActiveCfg = Linux|x64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|x64.Build.0 = Linux|x64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|x64.ActiveCfg = Windows|x64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|x64.Build.0 = Windows|x64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|x86.ActiveCfg = Windows|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Horse Isle Server/HorseIsleServer/HorseIsleServer.csproj b/Horse Isle Server/HorseIsleServer/HorseIsleServer.csproj index 1727b6f..8f4e9a1 100644 --- a/Horse Isle Server/HorseIsleServer/HorseIsleServer.csproj +++ b/Horse Isle Server/HorseIsleServer/HorseIsleServer.csproj @@ -1,11 +1,10 @@ - + Exe HISP - 7.0 - - - icon.ico + 8.0 + x64;x86;ARM;AnyCPU + Windows;Debug;Linux @@ -29,11 +28,46 @@ - copy "$(SolutionDir)..\DataCollection\GameData.json" "$(TargetDir)gamedata.json" /Y -copy "$(SolutionDir)..\DataCollection\HI1.MAP" "$(TargetDir)HI1.MAP" /Y + + copy "$(SolutionDir)..\DataCollection\GameData.json" "$(TargetDir)gamedata.json" /Y + copy "$(SolutionDir)..\DataCollection\HI1.MAP" "$(TargetDir)HI1.MAP" /Y + + + cp -f "$(SolutionDir)..\DataCollection\GameData.json" "$(TargetDir)gamedata.json" + cp -f "$(SolutionDir)..\DataCollection\HI1.MAP" "$(TargetDir)HI1.MAP" + net5.0 false + true + icon.ico + + + icon.ico + net5.0 + win-x86 + true + x86 + + + icon.ico + net5.0 + win-x64 + true + x64 + + + net5.0 + linux-x64 + true + x64 + + + net5.0 + linux-arm + true + ARM + 1 \ No newline at end of file diff --git a/Horse Isle Server/HorseIsleServer/HorseIsleServer.csproj.user b/Horse Isle Server/HorseIsleServer/HorseIsleServer.csproj.user index 8a25379..8b0e118 100644 --- a/Horse Isle Server/HorseIsleServer/HorseIsleServer.csproj.user +++ b/Horse Isle Server/HorseIsleServer/HorseIsleServer.csproj.user @@ -2,8 +2,6 @@ HorseIsleServer - - - ProjectDebugger + <_LastSelectedProfileId>C:\Users\SilicaAndPina\Documents\HISP\Horse Isle Server\HorseIsleServer\Properties\PublishProfiles\FolderProfile.pubxml \ No newline at end of file diff --git a/Horse Isle Server/HorseIsleServer/Program.cs b/Horse Isle Server/HorseIsleServer/Program.cs index 2f2320b..b204c7f 100644 --- a/Horse Isle Server/HorseIsleServer/Program.cs +++ b/Horse Isle Server/HorseIsleServer/Program.cs @@ -1,6 +1,4 @@ using System; -using System.IO; -using System.Reflection; using HISP.Game; using HISP.Game.Horse; using HISP.Game.SwfModules; @@ -13,7 +11,6 @@ namespace HISP static void Main(string[] args) { Console.Title = "HISP - Horse Isle Server Emulator"; - Directory.SetCurrentDirectory(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location)); ConfigReader.OpenConfig(); CrossDomainPolicy.GetPolicy(); Database.OpenDatabase(); diff --git a/Horse Isle Server/HorseIsleServer/Properties/PublishProfiles/FolderProfile.pubxml b/Horse Isle Server/HorseIsleServer/Properties/PublishProfiles/FolderProfile.pubxml new file mode 100644 index 0000000..5c9c82a --- /dev/null +++ b/Horse Isle Server/HorseIsleServer/Properties/PublishProfiles/FolderProfile.pubxml @@ -0,0 +1,18 @@ + + + + + Windows + x64 + bin\x64\Windows\net5.0\win-x64\publish\ + FileSystem + net5.0 + win-x64 + true + True + True + True + + \ No newline at end of file diff --git a/Horse Isle Server/HorseIsleServer/Properties/PublishProfiles/FolderProfile.pubxml.user b/Horse Isle Server/HorseIsleServer/Properties/PublishProfiles/FolderProfile.pubxml.user new file mode 100644 index 0000000..312c6e3 --- /dev/null +++ b/Horse Isle Server/HorseIsleServer/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/Horse Isle Server/HorseIsleServer/Properties/launchSettings.json b/Horse Isle Server/HorseIsleServer/Properties/launchSettings.json index 178ea64..0b242de 100644 --- a/Horse Isle Server/HorseIsleServer/Properties/launchSettings.json +++ b/Horse Isle Server/HorseIsleServer/Properties/launchSettings.json @@ -1,27 +1,7 @@ { - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:15584/", - "sslPort": 44326 - } - }, "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, "HorseIsleServer": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "https://localhost:5001;http://localhost:5000" + "commandName": "Project" } } } \ No newline at end of file