diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 4f3dfd8..c259a0a 100755
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -21,7 +21,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
- dotnet-version: 5.0.x
+ dotnet-version: 6.0.x
- name: Restore dependencies
run: dotnet restore
@@ -31,43 +31,43 @@ jobs:
continue-on-error: false
run: |
dotnet publish -p:PublishProfile=Linux64.pubxml
- cp ../HorseIsleData/*.json "HorseIsleServer/bin/x64/Linux/net5.0/linux-x64/publish/"
- cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/x64/Linux/net5.0/linux-x64/publish/"
- mkdir "HorseIsleServer/bin/x64/Linux/net5.0/linux-x64/publish/www"
- cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/x64/Linux/net5.0/linux-x64/publish/www"
+ cp ../HorseIsleData/*.json "HorseIsleServer/bin/x64/Linux/net6.0/linux-x64/publish/"
+ cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/x64/Linux/net6.0/linux-x64/publish/"
+ mkdir "HorseIsleServer/bin/x64/Linux/net6.0/linux-x64/publish/www"
+ cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/x64/Linux/net6.0/linux-x64/publish/www"
- name: Build linux-arm
continue-on-error: false
run: |
dotnet publish -p:PublishProfile=LinuxARM.pubxml
- cp ../HorseIsleData/*.json "HorseIsleServer/bin/ARM/Linux/net5.0/linux-arm/publish/"
- cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/ARM/Linux/net5.0/linux-arm/publish/"
- mkdir "HorseIsleServer/bin/ARM/Linux/net5.0/linux-arm/publish/www"
- cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/ARM/Linux/net5.0/linux-arm/publish/www"
+ cp ../HorseIsleData/*.json "HorseIsleServer/bin/ARM/Linux/net6.0/linux-arm/publish/"
+ cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/ARM/Linux/net6.0/linux-arm/publish/"
+ mkdir "HorseIsleServer/bin/ARM/Linux/net6.0/linux-arm/publish/www"
+ cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/ARM/Linux/net6.0/linux-arm/publish/www"
- name: Build linux-arm64
continue-on-error: false
run: |
dotnet publish -p:PublishProfile=LinuxARM64.pubxml
- cp ../HorseIsleData/*.json "HorseIsleServer/bin/ARM64/Linux/net5.0/linux-arm64/publish/"
- cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/ARM64/Linux/net5.0/linux-arm64/publish/"
- mkdir "HorseIsleServer/bin/ARM64/Linux/net5.0/linux-arm64/publish/www/"
- cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/ARM64/Linux/net5.0/linux-arm64/publish/www/"
+ cp ../HorseIsleData/*.json "HorseIsleServer/bin/ARM64/Linux/net6.0/linux-arm64/publish/"
+ cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/ARM64/Linux/net6.0/linux-arm64/publish/"
+ mkdir "HorseIsleServer/bin/ARM64/Linux/net6.0/linux-arm64/publish/www/"
+ cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/ARM64/Linux/net6.0/linux-arm64/publish/www/"
- name: upload linux-64
uses: actions/upload-artifact@v2
with:
name: linux-x64
- path: HorseIsleServer/HorseIsleServer/bin/x64/Linux/net5.0/linux-x64/publish/
+ path: HorseIsleServer/HorseIsleServer/bin/x64/Linux/net6.0/linux-x64/publish/
- name: upload linux-arm
uses: actions/upload-artifact@v2
with:
name: linux-arm
- path: HorseIsleServer/HorseIsleServer/bin/ARM/Linux/net5.0/linux-arm/publish/
+ path: HorseIsleServer/HorseIsleServer/bin/ARM/Linux/net6.0/linux-arm/publish/
- name: upload linux-arm64
uses: actions/upload-artifact@v2
with:
name: linux-arm64
- path: HorseIsleServer/HorseIsleServer/bin/ARM64/Linux/net5.0/linux-arm64/publish/
+ path: HorseIsleServer/HorseIsleServer/bin/ARM64/Linux/net6.0/linux-arm64/publish/
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 324cf26..3774176 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -21,23 +21,23 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
- dotnet-version: 5.0.x
+ dotnet-version: 6.0.x
- name: Restore dependencies
run: dotnet restore
- - name: Build mac-64
+ - name: Build mac-x64
continue-on-error: false
run: |
- dotnet publish -p:PublishProfile=MacOS.pubxml
- cp ../HorseIsleData/*.json "HorseIsleServer/bin/x64/MacOS/net5.0/osx-x64/publish/"
- cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/x64/MacOS/net5.0/osx-x64/publish/"
- mkdir "HorseIsleServer/bin/x64/MacOS/net5.0/osx-x64/publish/www"
- cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/x64/MacOS/net5.0/osx-x64/publish/www"
+ dotnet publish -p:PublishProfile=Osx64.pubxml
+ cp ../HorseIsleData/*.json "HorseIsleServer/bin/x64/MacOS/net6.0/osx-x64/publish/"
+ cp ../HorseIsleData/*.MAP "HorseIsleServer/bin/x64/MacOS/net6.0/osx-x64/publish/"
+ mkdir "HorseIsleServer/bin/x64/MacOS/net6.0/osx-x64/publish/www"
+ cp -R ../HorseIsleWeb/* "HorseIsleServer/bin/x64/MacOS/net6.0/osx-x64/publish/www"
- - name: upload mac-64
+ - name: upload mac-x64
uses: actions/upload-artifact@v2
with:
name: mac-x64
- path: HorseIsleServer/HorseIsleServer/bin/x64/MacOS/net5.0/osx-x64/publish/
+ path: HorseIsleServer/HorseIsleServer/bin/x64/MacOS/net6.0/osx-x64/publish/
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index f3e80be..2dcc628 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -21,7 +21,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
- dotnet-version: 5.0.x
+ dotnet-version: 6.0.x
- name: Restore dependencies
run: dotnet restore
@@ -31,37 +31,50 @@ jobs:
continue-on-error: false
run: |
dotnet publish -p:PublishProfile=Win64.pubxml
- copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\x64\Windows\net5.0\win-x64\publish\gamedata.json"
- copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\x64\Windows\net5.0\win-x64\publish\HI1.MAP"
- copy ..\HorseIsleWeb "HorseIsleServer\bin\x64\Windows\net5.0\win-x64\publish\www" -Recurse
+ copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\x64\Windows\net6.0\win-x64\publish\gamedata.json"
+ copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\x64\Windows\net6.0\win-x64\publish\HI1.MAP"
+ copy ..\HorseIsleWeb "HorseIsleServer\bin\x64\Windows\net6.0\win-x64\publish\www" -Recurse
- name: Build win-x86
continue-on-error: false
run: |
dotnet publish -p:PublishProfile=Win32.pubxml
- copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\x86\Windows\net5.0\win-x86\publish\gamedata.json"
- copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\x86\Windows\net5.0\win-x86\publish\HI1.MAP"
- copy ..\HorseIsleWeb "HorseIsleServer\bin\x86\Windows\net5.0\win-x86\publish\www" -Recurse
+ copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\x86\Windows\net6.0\win-x86\publish\gamedata.json"
+ copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\x86\Windows\net6.0\win-x86\publish\HI1.MAP"
+ copy ..\HorseIsleWeb "HorseIsleServer\bin\x86\Windows\net6.0\win-x86\publish\www" -Recurse
- name: Build win-arm
continue-on-error: false
run: |
dotnet publish -p:PublishProfile=WinARM.pubxml
- copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\arm\Windows\net5.0\windows-arm\publish\gamedata.json"
- copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\arm\Windows\net5.0\windows-arm\publish\HI1.MAP"
- copy ..\HorseIsleWeb "HorseIsleServer\bin\arm\Windows\net5.0\windows-arm\publish\www" -Recurse
+ copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\arm\Windows\net6.0\windows-arm\publish\gamedata.json"
+ copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\arm\Windows\net6.0\windows-arm\publish\HI1.MAP"
+ copy ..\HorseIsleWeb "HorseIsleServer\bin\arm\Windows\net6.0\windows-arm\publish\www" -Recurse
+ - name: Build win-arm64
+ continue-on-error: false
+ run: |
+ dotnet publish -p:PublishProfile=WinARM64.pubxml
+ copy ..\HorseIsleData\gamedata.json "HorseIsleServer\bin\arm64\Windows\net6.0\windows-arm64\publish\gamedata.json"
+ copy ..\HorseIsleData\HI1.MAP "HorseIsleServer\bin\arm64\Windows\net6.0\windows-arm64\publish\HI1.MAP"
+ copy ..\HorseIsleWeb "HorseIsleServer\bin\arm64\Windows\net6.0\windows-arm64\publish\www" -Recurse
- name: Upload win-x64
uses: actions/upload-artifact@v2
with:
name: win-x64
- path: HorseIsleServer\HorseIsleServer\bin/x64\Windows\net5.0\win-x64\publish\
+ path: HorseIsleServer\HorseIsleServer\bin/x64\Windows\net6.0\win-x64\publish\
- name: Upload win-x86
uses: actions/upload-artifact@v2
with:
name: win-x86
- path: HorseIsleServer\HorseIsleServer\bin\x86\Windows\net5.0\win-x86\publish\
+ path: HorseIsleServer\HorseIsleServer\bin\x86\Windows\net6.0\win-x86\publish\
- name: Upload win-arm
uses: actions/upload-artifact@v2
with:
name: win-arm
- path: HorseIsleServer\HorseIsleServer\bin\arm\Windows\net5.0\win-arm\publish\
+ path: HorseIsleServer\HorseIsleServer\bin\arm\Windows\net6.0\win-arm\publish\
+
+ - name: Upload win-arm64
+ uses: actions/upload-artifact@v2
+ with:
+ name: win-arm64
+ path: HorseIsleServer\HorseIsleServer\bin\arm64\Windows\net6.0\win-arm64\publish\
diff --git a/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj b/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj
index 768dad8..de2505a 100644
--- a/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj
+++ b/HorseIsleServer/HorseIsleServer/HorseIsleServer.csproj
@@ -43,7 +43,7 @@
true
- net5.0
+ net6.0
false
true
icon.ico
diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Linux64.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Linux64.pubxml
index 471f4a8..80a3911 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\net5.0\linux-x64\publish\
+ bin\x64\Linux\net6.0\linux-x64\publish\
FileSystem
- net5.0
+ net6.0
linux-x64
True
True
diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM.pubxml
index db4d3fc..011adfe 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\net5.0\linux-arm\publish\
+ bin\ARM\Linux\net6.0\linux-arm\publish\
FileSystem
- net5.0
+ net6.0
linux-arm
True
True
diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM64.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/LinuxARM64.pubxml
index 1bedc71..d88a07e 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\net5.0\linux-arm64\publish\
+ bin\ARM64\Linux\net6.0\linux-arm64\publish\
FileSystem
- net5.0
+ net6.0
linux-arm64
True
True
diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/MacOS.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Osx64.pubxml
similarity index 81%
rename from HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/MacOS.pubxml
rename to HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Osx64.pubxml
index 7080eec..7c47855 100644
--- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/MacOS.pubxml
+++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Osx64.pubxml
@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
MacOS
x64
- bin\x64\MacOS\net5.0\osx-x64\publish\
+ bin\x64\MacOS\net6.0\osx-x64\publish\
FileSystem
- net5.0
+ net6.0
osx-x64
True
True
diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml
index ecb71ba..6d89c58 100644
--- a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml
+++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win32.pubxml
@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
Windows
x86
- bin\x86\Windows\net5.0\win-x86\publish\
+ bin\x86\Windows\net6.0\win-x86\publish\
FileSystem
- net5.0
+ net6.0
win-x86
True
True
diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win64.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/Win64.pubxml
index 14e7809..b07a2d3 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\net5.0\win-x64\publish\
+ bin\x64\Windows\net6.0\win-x64\publish\
FileSystem
- net5.0
+ net6.0
win-x64
True
True
diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM.pubxml
index 8992c0e..5c71c07 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\net5.0\windows-arm\publish\
+ bin\arm\Windows\net6.0\windows-arm\publish\
FileSystem
- net5.0
+ net6.0
win-arm
true
True
diff --git a/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM64.pubxml b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM64.pubxml
new file mode 100644
index 0000000..545cf1c
--- /dev/null
+++ b/HorseIsleServer/HorseIsleServer/Properties/PublishProfiles/WinARM64.pubxml
@@ -0,0 +1,18 @@
+
+
+
+
+ Windows
+ ARM64
+ bin\arm64\Windows\net6.0\windows-arm64\publish\
+ FileSystem
+ net6.0
+ win-arm64
+ True
+ True
+ True
+ True
+
+
\ No newline at end of file
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 02c38bf..ebd67e7 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