diff --git a/HorseIsleServer/HorseIsleServer.sln b/HorseIsleServer/HorseIsleServer.sln index c529892..d4881b3 100644 --- a/HorseIsleServer/HorseIsleServer.sln +++ b/HorseIsleServer/HorseIsleServer.sln @@ -7,35 +7,40 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HorseIsleServer", "HorseIsl EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU Debug|ARM = Debug|ARM Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Debug|AnyCPU = Debug|AnyCPU + Linux|Any CPU = Linux|Any CPU Linux|ARM = Linux|ARM Linux|ARM64 = Linux|ARM64 Linux|x64 = Linux|x64 Linux|x86 = Linux|x86 + MacOS|Any CPU = MacOS|Any CPU MacOS|ARM = MacOS|ARM MacOS|ARM64 = MacOS|ARM64 MacOS|x64 = MacOS|x64 MacOS|x86 = MacOS|x86 + Windows|Any CPU = Windows|Any CPU Windows|ARM = Windows|ARM Windows|ARM64 = Windows|ARM64 Windows|x64 = Windows|x64 Windows|x86 = Windows|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|Any CPU.ActiveCfg = Debug|AnyCPU + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|Any CPU.Build.0 = Debug|AnyCPU {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|ARM.ActiveCfg = Debug|ARM {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|ARM.Build.0 = Debug|ARM {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|ARM64.ActiveCfg = Debug|ARM64 {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|ARM64.Build.0 = Debug|ARM64 {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|x64.ActiveCfg = Debug|x64 {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}.Debug|x86.ActiveCfg = Debug|AnyCPU {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Debug|x86.Build.0 = Debug|AnyCPU + {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 {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|ARM.Build.0 = Linux|ARM {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|ARM64.ActiveCfg = Linux|ARM64 @@ -44,6 +49,8 @@ Global {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|x64.Build.0 = Linux|x64 {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|x86.ActiveCfg = Linux|x86 {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Linux|x86.Build.0 = Linux|x86 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|Any CPU.ActiveCfg = MacOS|Any CPU + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|Any CPU.Build.0 = MacOS|Any CPU {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|ARM.ActiveCfg = MacOS|ARM {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|ARM.Build.0 = MacOS|ARM {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|ARM64.ActiveCfg = MacOS|ARM64 @@ -52,6 +59,8 @@ Global {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|x64.Build.0 = MacOS|x64 {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|x86.ActiveCfg = MacOS|x86 {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.MacOS|x86.Build.0 = MacOS|x86 + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|Any CPU.ActiveCfg = Windows|Any CPU + {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|Any CPU.Build.0 = Windows|Any CPU {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|ARM.ActiveCfg = Windows|ARM {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|ARM.Build.0 = Windows|ARM {C48CBD82-AB30-494A-8FFA-4DE7069B5827}.Windows|ARM64.ActiveCfg = Windows|ARM64 diff --git a/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj b/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj index 0985f21..9801b24 100644 --- a/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj +++ b/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj @@ -6,13 +6,14 @@ x64;x86;ARM;ARM64;AnyCPU Windows;Debug;Linux;MacOS - ARCH_x86 - ARCH_x86_64 - ARCH_ARM - ARCH_ARM64 + $(DefineConstants);ARCH_x86 + $(DefineConstants);ARCH_x86_64 + $(DefineConstants);ARCH_ARM + $(DefineConstants);ARCH_ARM64 $(DefineConstants);OS_LINUX $(DefineConstants);OS_MACOS $(DefineConstants);OS_WINDOWS + $(DefineConstants);DEBUG;TRACE @@ -43,7 +44,7 @@ true - net6.0 + net5.0 false true icon.ico @@ -64,7 +65,7 @@ win-arm true - ARM + ARM32 win-arm64 @@ -102,10 +103,25 @@ - net6.0 + net5.0 win-x86;win-x64;win-arm;win-arm64;linux-x64;linux-arm;linux-arm64;osx-x64;osx-arm64 true + + + + ARM32 + + + + + ARM64 + + + + + TRACE;DEBUG + diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Linux64.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Linux64.pubxml index 80a3911..471f4a8 100644 --- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Linux64.pubxml +++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Linux64.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Linux x64 - bin\x64\Linux\net6.0\linux-x64\publish\ + bin\x64\Linux\net5.0\linux-x64\publish\ FileSystem - net6.0 + net5.0 linux-x64 True True diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM.pubxml index 011adfe..db4d3fc 100644 --- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM.pubxml +++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Linux ARM - bin\ARM\Linux\net6.0\linux-arm\publish\ + bin\ARM\Linux\net5.0\linux-arm\publish\ FileSystem - net6.0 + net5.0 linux-arm True True diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM64.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM64.pubxml index d88a07e..1bedc71 100644 --- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM64.pubxml +++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM64.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Linux ARM64 - bin\ARM64\Linux\net6.0\linux-arm64\publish\ + bin\ARM64\Linux\net5.0\linux-arm64\publish\ FileSystem - net6.0 + net5.0 linux-arm64 True True diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Osx64.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Osx64.pubxml index 7c47855..7080eec 100644 --- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Osx64.pubxml +++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Osx64.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. MacOS x64 - bin\x64\MacOS\net6.0\osx-x64\publish\ + bin\x64\MacOS\net5.0\osx-x64\publish\ FileSystem - net6.0 + net5.0 osx-x64 True True diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml index 6d89c58..59f878e 100644 --- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml +++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml @@ -2,15 +2,15 @@ - + Windows x86 - bin\x86\Windows\net6.0\win-x86\publish\ + bin\x86\Windows\net5.0\win-x86\publish\ FileSystem - net6.0 + net5.0 win-x86 - True + true True True True diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml.user b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml.user new file mode 100644 index 0000000..2b9ae8d --- /dev/null +++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml.user @@ -0,0 +1,9 @@ + + + + + False|2021-10-26T07:36:44.5305762Z; + + \ No newline at end of file diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win64.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win64.pubxml index b07a2d3..14e7809 100644 --- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win64.pubxml +++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win64.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Windows x64 - bin\x64\Windows\net6.0\win-x64\publish\ + bin\x64\Windows\net5.0\win-x64\publish\ FileSystem - net6.0 + net5.0 win-x64 True True diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM.pubxml index 5c71c07..8992c0e 100644 --- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM.pubxml +++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Windows ARM - bin\arm\Windows\net6.0\windows-arm\publish\ + bin\arm\Windows\net5.0\windows-arm\publish\ FileSystem - net6.0 + net5.0 win-arm true True diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM64.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM64.pubxml index 545cf1c..bd5dca7 100644 --- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM64.pubxml +++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM64.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Windows ARM64 - bin\arm64\Windows\net6.0\windows-arm64\publish\ + bin\arm64\Windows\net5.0\windows-arm64\publish\ FileSystem - net6.0 + net5.0 win-arm64 True True diff --git a/HorseIsleServer/HorseIsleServer/Resources/GitCommit b/HorseIsleServer/HorseIsleServer/Resources/GitCommit index 4c6d344..aa26086 100644 --- a/HorseIsleServer/HorseIsleServer/Resources/GitCommit +++ b/HorseIsleServer/HorseIsleServer/Resources/GitCommit @@ -1 +1 @@ -99f10ead55e2e76a0c31216d2aa6b8aa3b9d33c4 +0f22c6597f4fd76e98abaa87dacf90655825c5d6 diff --git a/HorseIsleServer/packages/MySqlConnector.1.0.1/MySqlConnector.1.0.1.nupkg b/HorseIsleServer/packages/MySqlConnector.1.0.1/MySqlConnector.1.0.1.nupkg index ebd67e7..02c38bf 100644 Binary files a/HorseIsleServer/packages/MySqlConnector.1.0.1/MySqlConnector.1.0.1.nupkg and b/HorseIsleServer/packages/MySqlConnector.1.0.1/MySqlConnector.1.0.1.nupkg differ