diff --git a/HorseIsleServer/HISP.sln b/HorseIsleServer/HISP.sln index 2796b1b..f53da30 100644 --- a/HorseIsleServer/HISP.sln +++ b/HorseIsleServer/HISP.sln @@ -23,6 +23,11 @@ Global Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + iOS|Any CPU = iOS|Any CPU + iOS|ARM = iOS|ARM + iOS|ARM64 = iOS|ARM64 + iOS|x64 = iOS|x64 + iOS|x86 = iOS|x86 Linux|Any CPU = Linux|Any CPU Linux|ARM = Linux|ARM Linux|ARM64 = Linux|ARM64 @@ -65,6 +70,14 @@ Global {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|x64.Build.0 = Debug|x64 {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|x86.ActiveCfg = Debug|x86 {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|x86.Build.0 = Debug|x86 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.iOS|Any CPU.ActiveCfg = iOS|Any CPU + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.iOS|Any CPU.Build.0 = iOS|Any CPU + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.iOS|ARM.ActiveCfg = iOS|ARM + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.iOS|ARM.Build.0 = iOS|ARM + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.iOS|ARM64.ActiveCfg = iOS|ARM64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.iOS|ARM64.Build.0 = iOS|ARM64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.iOS|x64.ActiveCfg = iOS|x64 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.iOS|x86.ActiveCfg = iOS|x86 {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|Any CPU.ActiveCfg = Linux|Any CPU {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|Any CPU.Build.0 = Linux|Any CPU {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|ARM.ActiveCfg = Linux|ARM @@ -125,6 +138,14 @@ Global {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Debug|x64.Build.0 = Debug|x64 {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Debug|x86.ActiveCfg = Debug|x86 {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Debug|x86.Build.0 = Debug|x86 + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.iOS|Any CPU.ActiveCfg = iOS|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.iOS|Any CPU.Build.0 = iOS|Any CPU + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.iOS|ARM.ActiveCfg = iOS|ARM + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.iOS|ARM.Build.0 = iOS|ARM + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.iOS|ARM64.ActiveCfg = iOS|ARM64 + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.iOS|ARM64.Build.0 = iOS|ARM64 + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.iOS|x64.ActiveCfg = iOS|x64 + {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.iOS|x86.ActiveCfg = iOS|x86 {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Linux|Any CPU.ActiveCfg = Debug|Any CPU {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Linux|Any CPU.Build.0 = Debug|Any CPU {DEAD5CB0-C6B6-4B63-B1FB-A9F649CA1D27}.Linux|ARM.ActiveCfg = Linux|ARM @@ -179,6 +200,11 @@ Global {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Debug|x64.Build.0 = Debug|x64 {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Debug|x86.ActiveCfg = Debug|x86 {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Debug|x86.Build.0 = Debug|x86 + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.iOS|Any CPU.ActiveCfg = Windows|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.iOS|ARM.ActiveCfg = Windows|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.iOS|ARM64.ActiveCfg = Windows|Any CPU + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.iOS|x64.ActiveCfg = Debug|x64 + {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.iOS|x86.ActiveCfg = Windows|x86 {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Linux|Any CPU.ActiveCfg = Debug|Any CPU {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Linux|Any CPU.Build.0 = Debug|Any CPU {6B45A1E8-0F54-4BF7-AF48-41B9FE676570}.Linux|ARM.ActiveCfg = Debug|Any CPU @@ -218,6 +244,11 @@ Global {D330A197-67D4-42B0-8906-54264AF95EC1}.Debug|ARM64.ActiveCfg = Windows {D330A197-67D4-42B0-8906-54264AF95EC1}.Debug|x64.ActiveCfg = Windows {D330A197-67D4-42B0-8906-54264AF95EC1}.Debug|x86.ActiveCfg = Windows + {D330A197-67D4-42B0-8906-54264AF95EC1}.iOS|Any CPU.ActiveCfg = Windows + {D330A197-67D4-42B0-8906-54264AF95EC1}.iOS|ARM.ActiveCfg = Windows + {D330A197-67D4-42B0-8906-54264AF95EC1}.iOS|ARM64.ActiveCfg = Windows + {D330A197-67D4-42B0-8906-54264AF95EC1}.iOS|x64.ActiveCfg = Windows + {D330A197-67D4-42B0-8906-54264AF95EC1}.iOS|x86.ActiveCfg = Windows {D330A197-67D4-42B0-8906-54264AF95EC1}.Linux|Any CPU.ActiveCfg = Debug {D330A197-67D4-42B0-8906-54264AF95EC1}.Linux|ARM.ActiveCfg = Debug {D330A197-67D4-42B0-8906-54264AF95EC1}.Linux|ARM64.ActiveCfg = Debug diff --git a/HorseIsleServer/HISPd/HISPd.csproj b/HorseIsleServer/HISPd/HISPd.csproj index 9d1a217..abf6e16 100644 --- a/HorseIsleServer/HISPd/HISPd.csproj +++ b/HorseIsleServer/HISPd/HISPd.csproj @@ -1,235 +1,247 @@ - - - Exe - HISP.Cli - 10.0 - x64;x86;ARM;ARM64;AnyCPU - Debug;Windows;Linux;MacOS;Android - - - - - - - True - True - Resources.resx - - + + + Exe + HISP.Cli + 10.0 + x64;x86;ARM;ARM64;AnyCPU + Debug;Windows;Linux;MacOS;Android;iOS + + + + + + + True + True + Resources.resx + + PublicResXFileCodeGenerator Resources.Designer.cs - - - false - false - - - net7.0 - false - true - icon.ico - HISP.Cli.Program - OnBuildSuccess - embedded - False - none - False - Public Domain, 2022 - https://islehorse.com - https://github.com/islehorse/HISP - git - - - - win-x86 - 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 - - - - - android-arm - true - ARM - OS_ANDROID;ARCH_ARM - 3 - 1701;1702;2026 - - - android-arm64 - true - ARM64 - OS_ANDROID;ARCH_ARM64 - 3 - 1701;1702;2026 - - - - linux-x64 - 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 - - - - osx-x64 - true - x64 - OS_MACOS;ARCH_X86_64 - 3 - 1701;1702;2026 - - - osx-arm64 - true - OS_MACOS;ARCH_ARM64 - 3 - 1701;1702;2026 - - - - - win-x86;win-x64;win-arm;win-arm64;linux-x64;linux-arm;linux-arm64;osx-x64;osx-arm64 - True - OS_ALL;ARCH_ANYCPU - - - - - ARM - False - DEBUG;TRACE;OS_DEBUG;ARCH_ARM - 3 - 1701;1702;2026 - - - - - 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 - - - - + + + false + false + + + net7.0 + false + true + icon.ico + HISP.Cli.Program + OnBuildSuccess + embedded + False + none + False + Public Domain, 2022 + https://islehorse.com + https://github.com/islehorse/HISP + git + + + + win-x86 + 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 + + + + + android-arm + true + ARM + OS_ANDROID;ARCH_ARM + 3 + 1701;1702;2026 + + + android-arm64 + true + ARM64 + OS_ANDROID;ARCH_ARM64 + 3 + 1701;1702;2026 + + + + linux-x64 + 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 + + + + osx-x64 + true + x64 + OS_MACOS;ARCH_X86_64 + 3 + 1701;1702;2026 + + + osx-arm64 + true + OS_MACOS;ARCH_ARM64 + 3 + 1701;1702;2026 + + + + ios-arm + true + ARM + OS_IOS;ARCH_ARM + + + ios-arm64 + true + ARM64 + OS_IOS;ARCH_ARM64 + + + + win-x86;win-x64;win-arm;win-arm64;linux-x64;linux-arm;linux-arm64;osx-x64;osx-arm64 + True + OS_ALL;ARCH_ANYCPU + + + + + ARM + False + DEBUG;TRACE;OS_DEBUG;ARCH_ARM + 3 + 1701;1702;2026 + + + + + 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/HISPd.csproj.user b/HorseIsleServer/HISPd/HISPd.csproj.user index c52fb3a..86a0523 100644 --- a/HorseIsleServer/HISPd/HISPd.csproj.user +++ b/HorseIsleServer/HISPd/HISPd.csproj.user @@ -1,6 +1,6 @@  - <_LastSelectedProfileId>C:\Users\User\Documents\git\HISP\HorseIsleServer\HISPCli\Properties\PublishProfiles\Linux64.pubxml + <_LastSelectedProfileId>C:\Users\User\Documents\git\HISP\HorseIsleServer\HISPd\Properties\PublishProfiles\AndroidARM.pubxml \ No newline at end of file diff --git a/HorseIsleServer/HISPd/Properties/PublishProfiles/AndroidARM.pubxml b/HorseIsleServer/HISPd/Properties/PublishProfiles/AndroidARM.pubxml index 0d398ff..e1eff10 100644 --- a/HorseIsleServer/HISPd/Properties/PublishProfiles/AndroidARM.pubxml +++ b/HorseIsleServer/HISPd/Properties/PublishProfiles/AndroidARM.pubxml @@ -11,7 +11,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. net7.0 android-arm True - False + True + True True True OS_ANDROID;ARCH_ARM diff --git a/HorseIsleServer/HISPd/Properties/PublishProfiles/AndroidARM64.pubxml b/HorseIsleServer/HISPd/Properties/PublishProfiles/AndroidARM64.pubxml index e0a8ce1..59f44f0 100644 --- a/HorseIsleServer/HISPd/Properties/PublishProfiles/AndroidARM64.pubxml +++ b/HorseIsleServer/HISPd/Properties/PublishProfiles/AndroidARM64.pubxml @@ -11,7 +11,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. net7.0 android-arm64 True - False + True + True True True OS_ANDROID;ARCH_ARM64 diff --git a/HorseIsleServer/HISPd/Properties/PublishProfiles/iOSARM.pubxml b/HorseIsleServer/HISPd/Properties/PublishProfiles/iOSARM.pubxml new file mode 100644 index 0000000..3312d3f --- /dev/null +++ b/HorseIsleServer/HISPd/Properties/PublishProfiles/iOSARM.pubxml @@ -0,0 +1,19 @@ + + + + + iOS + ARM + bin\arm\iOS\net7.0\ios-arm\publish\ + FileSystem + net7.0 + ios-arm + True + False + False + True + OS_IOS;ARCH_ARM + + \ No newline at end of file diff --git a/HorseIsleServer/HISPd/Properties/PublishProfiles/iOSARM64.pubxml b/HorseIsleServer/HISPd/Properties/PublishProfiles/iOSARM64.pubxml new file mode 100644 index 0000000..14fe938 --- /dev/null +++ b/HorseIsleServer/HISPd/Properties/PublishProfiles/iOSARM64.pubxml @@ -0,0 +1,19 @@ + + + + + iOS + ARM64 + bin\arm64\iOS\net7.0\ios-arm64\publish\ + FileSystem + net7.0 + ios-arm64 + True + False + False + True + OS_IOS;ARCH_ARM64 + + \ No newline at end of file diff --git a/HorseIsleServer/LibHISP/LibHISP.csproj b/HorseIsleServer/LibHISP/LibHISP.csproj index 1699fed..a1870c8 100644 --- a/HorseIsleServer/LibHISP/LibHISP.csproj +++ b/HorseIsleServer/LibHISP/LibHISP.csproj @@ -4,7 +4,7 @@ HISP 10.0 x64;x86;ARM;ARM64;AnyCPU - Debug;Windows;Linux;MacOS;Android + Debug;Windows;Linux;MacOS;Android;iOS @@ -81,6 +81,19 @@ OS_WINDOWS;ARCH_ARM64 + + ios-arm + true + ARM + OS_IOS;ARCH_ARM + + + ios-arm64 + true + ARM64 + OS_IOS;ARCH_ARM64 + + android-arm true diff --git a/HorseIsleServer/LibHISP/LibHISP.csproj.user b/HorseIsleServer/LibHISP/LibHISP.csproj.user new file mode 100644 index 0000000..19a143c --- /dev/null +++ b/HorseIsleServer/LibHISP/LibHISP.csproj.user @@ -0,0 +1,6 @@ + + + + <_LastSelectedProfileId>C:\Users\User\Documents\git\HISP\HorseIsleServer\LibHISP\Properties\PublishProfiles\iOSARM.pubxml + + \ No newline at end of file diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/iOSARM.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/iOSARM.pubxml new file mode 100644 index 0000000..d1b7b51 --- /dev/null +++ b/HorseIsleServer/LibHISP/Properties/PublishProfiles/iOSARM.pubxml @@ -0,0 +1,19 @@ + + + + + iOS + ARM + bin\arm\iOS\net7.0\ios-arm\publish\ + FileSystem + net7.0 + ios-arm + True + + True + True + OS_IOS;ARCH_ARM + + \ No newline at end of file diff --git a/HorseIsleServer/LibHISP/Properties/PublishProfiles/iOSARM64.pubxml b/HorseIsleServer/LibHISP/Properties/PublishProfiles/iOSARM64.pubxml new file mode 100644 index 0000000..6e41855 --- /dev/null +++ b/HorseIsleServer/LibHISP/Properties/PublishProfiles/iOSARM64.pubxml @@ -0,0 +1,19 @@ + + + + + iOS + ARM64 + bin\arm64\iOS\net7.0\ios-arm64\publish\ + FileSystem + net7.0 + ios-arm64 + True + + True + True + OS_IOS;ARCH_ARM64 + + \ No newline at end of file diff --git a/HorseIsleServer/LibHISP/Server/ServerVersion.cs b/HorseIsleServer/LibHISP/Server/ServerVersion.cs index 1131528..8d477ce 100644 --- a/HorseIsleServer/LibHISP/Server/ServerVersion.cs +++ b/HorseIsleServer/LibHISP/Server/ServerVersion.cs @@ -31,6 +31,8 @@ namespace HISP.Server return "WINDOWS"; #elif OS_ANDROID return "ANDROID"; +#elif OS_IOS + return "IOS"; #elif OS_LINUX return "LINUX"; #elif OS_MACOS