From d89ceccb64552cf2b9329c88d81ada335ed99c46 Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sat, 18 Nov 2023 16:04:44 -0500 Subject: [PATCH 01/32] Switch to net8 --- Source/ACE.Adapter/ACE.Adapter.csproj | 2 +- Source/ACE.Database.Tests/ACE.Database.Tests.csproj | 2 +- Source/ACE.Database/ACE.Database.csproj | 2 +- Source/ACE.Server.Tests/ACE.Server.Tests.csproj | 2 +- Source/ACE.Server/ACE.Server.csproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/ACE.Adapter/ACE.Adapter.csproj b/Source/ACE.Adapter/ACE.Adapter.csproj index 8e91e01a02..e73ca96ba3 100644 --- a/Source/ACE.Adapter/ACE.Adapter.csproj +++ b/Source/ACE.Adapter/ACE.Adapter.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 disable disable AnyCPU diff --git a/Source/ACE.Database.Tests/ACE.Database.Tests.csproj b/Source/ACE.Database.Tests/ACE.Database.Tests.csproj index ca3e98224a..de4218d2ab 100644 --- a/Source/ACE.Database.Tests/ACE.Database.Tests.csproj +++ b/Source/ACE.Database.Tests/ACE.Database.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 false diff --git a/Source/ACE.Database/ACE.Database.csproj b/Source/ACE.Database/ACE.Database.csproj index 08813a632c..cc9fc65129 100644 --- a/Source/ACE.Database/ACE.Database.csproj +++ b/Source/ACE.Database/ACE.Database.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 disable disable AnyCPU diff --git a/Source/ACE.Server.Tests/ACE.Server.Tests.csproj b/Source/ACE.Server.Tests/ACE.Server.Tests.csproj index 0f102c8c83..f39a2d31d6 100644 --- a/Source/ACE.Server.Tests/ACE.Server.Tests.csproj +++ b/Source/ACE.Server.Tests/ACE.Server.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 false diff --git a/Source/ACE.Server/ACE.Server.csproj b/Source/ACE.Server/ACE.Server.csproj index fc20426f23..de648bce31 100644 --- a/Source/ACE.Server/ACE.Server.csproj +++ b/Source/ACE.Server/ACE.Server.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 x64 From 5ba175a09bea7b87c6f1f1bd70d8d661fe092a73 Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sun, 26 Nov 2023 19:06:54 -0500 Subject: [PATCH 02/32] Update appveyor.yml --- appveyor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 2dc22a950e..f282eab55d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,6 +22,8 @@ init: REM set APPVEYOR_BUILD_VERSION=%REVISED_VERSION% - ps: Start-Service MySQL80 + Invoke-WebRequest -Uri 'https://dot.net/v1/dotnet-install.ps1' -UseBasicParsing -OutFile "$env:temp\dotnet-install.ps1" + & $env:temp\dotnet-install.ps1 -Architecture x64 -Version '6.0.100-rc.2.21505.57' -InstallDir "$env:ProgramFiles\dotnet" dotnet_csproj: patch: true file: '**\*.csproj' @@ -44,7 +46,7 @@ environment: secure: huM6kANmgP1OdlmHulXVZA== access_token: secure: lGLpqex+Weod6ZiPw34RwTv999QvoSZ+imTcmYhiJWQL6XkfkVUYcqOO6pJDuAYt -services: +services: - mysql before_build: - cmd: AppVeyor\AppVeyorBeforeCompile.bat From bc1377bcebbed7bbfb57e3c0857288e51c9194e5 Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sun, 26 Nov 2023 19:09:06 -0500 Subject: [PATCH 03/32] Update appveyor.yml --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f282eab55d..c6845134ca 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,9 +21,10 @@ init: REM appveyor UpdateBuild -Version "%REVISED_VERSION%" REM set APPVEYOR_BUILD_VERSION=%REVISED_VERSION% + + Invoke-WebRequest -Uri 'https://dot.net/v1/dotnet-install.ps1' -UseBasicParsing -OutFile "$env:temp\dotnet-install.ps1" + & $env:temp\dotnet-install.ps1 -Architecture x64 -Version '6.0.100-rc.2.21505.57' -InstallDir "$env:ProgramFiles\dotnet" - ps: Start-Service MySQL80 - Invoke-WebRequest -Uri 'https://dot.net/v1/dotnet-install.ps1' -UseBasicParsing -OutFile "$env:temp\dotnet-install.ps1" - & $env:temp\dotnet-install.ps1 -Architecture x64 -Version '6.0.100-rc.2.21505.57' -InstallDir "$env:ProgramFiles\dotnet" dotnet_csproj: patch: true file: '**\*.csproj' From c42036ab1f12c6df8e154c1c269299ae76945314 Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sun, 26 Nov 2023 19:10:56 -0500 Subject: [PATCH 04/32] Update appveyor.yml --- appveyor.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c6845134ca..130f0b32d8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,10 +21,8 @@ init: REM appveyor UpdateBuild -Version "%REVISED_VERSION%" REM set APPVEYOR_BUILD_VERSION=%REVISED_VERSION% - - Invoke-WebRequest -Uri 'https://dot.net/v1/dotnet-install.ps1' -UseBasicParsing -OutFile "$env:temp\dotnet-install.ps1" - & $env:temp\dotnet-install.ps1 -Architecture x64 -Version '6.0.100-rc.2.21505.57' -InstallDir "$env:ProgramFiles\dotnet" - ps: Start-Service MySQL80 +- ps: Invoke-WebRequest -Uri 'https://dot.net/v1/dotnet-install.ps1' -UseBasicParsing -OutFile "$env:temp\dotnet-install.ps1" & $env:temp\dotnet-install.ps1 -Architecture x64 -Version '8.0.100' -InstallDir "$env:ProgramFiles\dotnet" dotnet_csproj: patch: true file: '**\*.csproj' From bca6c1e48e3d25fbeeb32f4004e8c2ec0534ff6e Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sun, 26 Nov 2023 19:13:26 -0500 Subject: [PATCH 05/32] Update appveyor.yml --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 130f0b32d8..0f1ad608bd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,7 +22,8 @@ init: REM set APPVEYOR_BUILD_VERSION=%REVISED_VERSION% - ps: Start-Service MySQL80 -- ps: Invoke-WebRequest -Uri 'https://dot.net/v1/dotnet-install.ps1' -UseBasicParsing -OutFile "$env:temp\dotnet-install.ps1" & $env:temp\dotnet-install.ps1 -Architecture x64 -Version '8.0.100' -InstallDir "$env:ProgramFiles\dotnet" +- ps: Invoke-WebRequest -Uri 'https://dot.net/v1/dotnet-install.ps1' -UseBasicParsing -OutFile "$env:temp\dotnet-install.ps1" + $env:temp\dotnet-install.ps1 -Architecture x64 -Version '8.0.100' -InstallDir "$env:ProgramFiles\dotnet" dotnet_csproj: patch: true file: '**\*.csproj' From e3807f9acb50bff9c8c37226b4be87402f484792 Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sun, 26 Nov 2023 19:20:33 -0500 Subject: [PATCH 06/32] Update appveyor.yml --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0f1ad608bd..b9d9ca31b4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,8 +22,7 @@ init: REM set APPVEYOR_BUILD_VERSION=%REVISED_VERSION% - ps: Start-Service MySQL80 -- ps: Invoke-WebRequest -Uri 'https://dot.net/v1/dotnet-install.ps1' -UseBasicParsing -OutFile "$env:temp\dotnet-install.ps1" - $env:temp\dotnet-install.ps1 -Architecture x64 -Version '8.0.100' -InstallDir "$env:ProgramFiles\dotnet" +- ps: AppVeyor\AppVeyorInit.ps1 dotnet_csproj: patch: true file: '**\*.csproj' From add9df8db0926aa948d675ebbc6e7c2bc48cc05a Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sun, 26 Nov 2023 19:21:29 -0500 Subject: [PATCH 07/32] Create AppVeyorInit.ps1 --- AppVeyor/AppVeyorInit.ps1 | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 AppVeyor/AppVeyorInit.ps1 diff --git a/AppVeyor/AppVeyorInit.ps1 b/AppVeyor/AppVeyorInit.ps1 new file mode 100644 index 0000000000..c8f3fdf69d --- /dev/null +++ b/AppVeyor/AppVeyorInit.ps1 @@ -0,0 +1,2 @@ +Invoke-WebRequest -Uri 'https://dot.net/v1/dotnet-install.ps1' -UseBasicParsing -OutFile "$env:temp\dotnet-install.ps1" +& $env:temp\dotnet-install.ps1 -Architecture x64 -Version '8.0.100' -InstallDir "$env:ProgramFiles\dotnet" From 833f7bdb152602ce4a9b0e7a265f2bd48cf24a14 Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sun, 26 Nov 2023 19:23:34 -0500 Subject: [PATCH 08/32] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index b9d9ca31b4..7f6b16b0aa 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,7 +22,7 @@ init: REM set APPVEYOR_BUILD_VERSION=%REVISED_VERSION% - ps: Start-Service MySQL80 -- ps: AppVeyor\AppVeyorInit.ps1 +- ps: ./AppVeyor\AppVeyorInit.ps1 dotnet_csproj: patch: true file: '**\*.csproj' From 7892faf70035920e81ce6e233e75510a2173ce8d Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sun, 26 Nov 2023 19:27:32 -0500 Subject: [PATCH 09/32] Delete AppVeyorInit.ps1 --- AppVeyor/AppVeyorInit.ps1 | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 AppVeyor/AppVeyorInit.ps1 diff --git a/AppVeyor/AppVeyorInit.ps1 b/AppVeyor/AppVeyorInit.ps1 deleted file mode 100644 index c8f3fdf69d..0000000000 --- a/AppVeyor/AppVeyorInit.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -Invoke-WebRequest -Uri 'https://dot.net/v1/dotnet-install.ps1' -UseBasicParsing -OutFile "$env:temp\dotnet-install.ps1" -& $env:temp\dotnet-install.ps1 -Architecture x64 -Version '8.0.100' -InstallDir "$env:ProgramFiles\dotnet" From d75b9f25196b076656118616c05461cb6a6ae99b Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sun, 26 Nov 2023 19:27:48 -0500 Subject: [PATCH 10/32] Create AppVeyorInstall.ps1 --- AppVeyor/AppVeyorInstall.ps1 | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 AppVeyor/AppVeyorInstall.ps1 diff --git a/AppVeyor/AppVeyorInstall.ps1 b/AppVeyor/AppVeyorInstall.ps1 new file mode 100644 index 0000000000..c8f3fdf69d --- /dev/null +++ b/AppVeyor/AppVeyorInstall.ps1 @@ -0,0 +1,2 @@ +Invoke-WebRequest -Uri 'https://dot.net/v1/dotnet-install.ps1' -UseBasicParsing -OutFile "$env:temp\dotnet-install.ps1" +& $env:temp\dotnet-install.ps1 -Architecture x64 -Version '8.0.100' -InstallDir "$env:ProgramFiles\dotnet" From 3c6276cb4bf1cf43e6181d26524b76a95955a7ca Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sun, 26 Nov 2023 19:27:55 -0500 Subject: [PATCH 11/32] Update appveyor.yml --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 7f6b16b0aa..379f0c3f52 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,7 +22,6 @@ init: REM set APPVEYOR_BUILD_VERSION=%REVISED_VERSION% - ps: Start-Service MySQL80 -- ps: ./AppVeyor\AppVeyorInit.ps1 dotnet_csproj: patch: true file: '**\*.csproj' @@ -47,6 +46,8 @@ environment: secure: lGLpqex+Weod6ZiPw34RwTv999QvoSZ+imTcmYhiJWQL6XkfkVUYcqOO6pJDuAYt services: - mysql +install: + - ps: AppVeyor\AppVeyorInstall.ps1 before_build: - cmd: AppVeyor\AppVeyorBeforeCompile.bat build: From a2de1eabd3b7ec6437546c2513ebeb4c464a6dc9 Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sun, 26 Nov 2023 19:35:29 -0500 Subject: [PATCH 12/32] Update Dockerfile.arm64 --- Dockerfile.arm64 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 54e29189fb..f0eb9845ec 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /Source # copy csproj and restore as distinct layers @@ -20,7 +20,7 @@ COPY . ../. RUN dotnet publish ./ACE.Server/ACE.Server.csproj -c release -o /ace -r linux-arm64 --self-contained false --no-restore # final stage/image -FROM mcr.microsoft.com/dotnet/runtime:6.0-bullseye-slim-arm64v8 +FROM mcr.microsoft.com/dotnet/runtime:8.0-jammy-chiseled ARG DEBIAN_FRONTEND="noninteractive" WORKDIR /ace From 80b247c987eb7265999acb8838c3ea4fa47f727b Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sun, 26 Nov 2023 19:35:31 -0500 Subject: [PATCH 13/32] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 58cab5af5a..e810b4a685 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /Source # copy csproj and restore as distinct layers @@ -20,7 +20,7 @@ COPY . ../. RUN dotnet publish ./ACE.Server/ACE.Server.csproj -c release -o /ace --no-restore # final stage/image -FROM mcr.microsoft.com/dotnet/runtime:6.0-bullseye-slim +FROM mcr.microsoft.com/dotnet/runtime:8.0-jammy-chiseled ARG DEBIAN_FRONTEND="noninteractive" WORKDIR /ace From 0fb8dd8c73a1d8d5123e9740aec236ce569c3def Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Wed, 13 Dec 2023 10:35:20 -0500 Subject: [PATCH 14/32] Update appveyor.yml --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 379f0c3f52..26ff1c85d4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -46,8 +46,8 @@ environment: secure: lGLpqex+Weod6ZiPw34RwTv999QvoSZ+imTcmYhiJWQL6XkfkVUYcqOO6pJDuAYt services: - mysql -install: - - ps: AppVeyor\AppVeyorInstall.ps1 +#install: +# - ps: AppVeyor\AppVeyorInstall.ps1 before_build: - cmd: AppVeyor\AppVeyorBeforeCompile.bat build: From eeae522fb2e89eb6a208d30b5c17435e2176024d Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Fri, 29 Dec 2023 13:03:09 -0500 Subject: [PATCH 15/32] Update ACE.Adapter.csproj --- Source/ACE.Adapter/ACE.Adapter.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/ACE.Adapter/ACE.Adapter.csproj b/Source/ACE.Adapter/ACE.Adapter.csproj index 71777f209b..6042bfc66d 100644 --- a/Source/ACE.Adapter/ACE.Adapter.csproj +++ b/Source/ACE.Adapter/ACE.Adapter.csproj @@ -35,7 +35,7 @@ - + From 697c7c8588b501f2dbf51deb4d15c6edd0f9b19e Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Fri, 29 Dec 2023 13:03:12 -0500 Subject: [PATCH 16/32] Update ACE.Common.csproj --- Source/ACE.Common/ACE.Common.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/ACE.Common/ACE.Common.csproj b/Source/ACE.Common/ACE.Common.csproj index ab7bc04754..4f16ef65a7 100644 --- a/Source/ACE.Common/ACE.Common.csproj +++ b/Source/ACE.Common/ACE.Common.csproj @@ -16,7 +16,7 @@ - + From 12218d5998fcc005e068067bd543cf01f6c99c22 Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Fri, 29 Dec 2023 13:03:15 -0500 Subject: [PATCH 17/32] Update ACE.Database.csproj --- Source/ACE.Database/ACE.Database.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/ACE.Database/ACE.Database.csproj b/Source/ACE.Database/ACE.Database.csproj index 322d0c59d2..607976348d 100644 --- a/Source/ACE.Database/ACE.Database.csproj +++ b/Source/ACE.Database/ACE.Database.csproj @@ -18,7 +18,7 @@ - + From bdd54d78f552a21506f8ee514a34e10d7d9a0ab3 Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Fri, 29 Dec 2023 13:03:17 -0500 Subject: [PATCH 18/32] Update ACE.DatLoader.csproj --- Source/ACE.DatLoader/ACE.DatLoader.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/ACE.DatLoader/ACE.DatLoader.csproj b/Source/ACE.DatLoader/ACE.DatLoader.csproj index f76b450d40..e6eb4445b9 100644 --- a/Source/ACE.DatLoader/ACE.DatLoader.csproj +++ b/Source/ACE.DatLoader/ACE.DatLoader.csproj @@ -17,14 +17,14 @@ - + - + From 5cfbe56955f608fa4b8ab4788e697ff915bb3cb1 Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Fri, 29 Dec 2023 13:03:19 -0500 Subject: [PATCH 19/32] Update ACE.Server.csproj --- Source/ACE.Server/ACE.Server.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/ACE.Server/ACE.Server.csproj b/Source/ACE.Server/ACE.Server.csproj index e106bd6801..54d3938854 100644 --- a/Source/ACE.Server/ACE.Server.csproj +++ b/Source/ACE.Server/ACE.Server.csproj @@ -240,7 +240,7 @@ - + From 954c543de979747111519dbd1547ceca346bb9ee Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Fri, 29 Dec 2023 13:09:12 -0500 Subject: [PATCH 20/32] Update copyrights --- Source/ACE.Adapter/ACE.Adapter.csproj | 2 +- Source/ACE.Common/ACE.Common.csproj | 2 +- Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj | 2 +- Source/ACE.DatLoader/ACE.DatLoader.csproj | 2 +- Source/ACE.Database.Tests/ACE.Database.Tests.csproj | 2 +- Source/ACE.Database/ACE.Database.csproj | 2 +- Source/ACE.Entity/ACE.Entity.csproj | 2 +- Source/ACE.Server.Tests/ACE.Server.Tests.csproj | 2 +- Source/ACE.Server/ACE.Server.csproj | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Source/ACE.Adapter/ACE.Adapter.csproj b/Source/ACE.Adapter/ACE.Adapter.csproj index 6042bfc66d..6629ae1901 100644 --- a/Source/ACE.Adapter/ACE.Adapter.csproj +++ b/Source/ACE.Adapter/ACE.Adapter.csproj @@ -9,7 +9,7 @@ ACEmulator Contributors ACEmulator Asheron's Call server emulator - © 2017-2022 ACEmulator Team and Contributors + © 2017-2024 ACEmulator Team and Contributors LICENSE https://emulator.ac https://github.com/ACEmulator/ACE diff --git a/Source/ACE.Common/ACE.Common.csproj b/Source/ACE.Common/ACE.Common.csproj index 4f16ef65a7..7d29e76029 100644 --- a/Source/ACE.Common/ACE.Common.csproj +++ b/Source/ACE.Common/ACE.Common.csproj @@ -7,7 +7,7 @@ git https://github.com/ACEmulator/ACE https://emulator.ac - © 2017-2022 ACEmulator Team and Contributors + © 2017-2024 ACEmulator Team and Contributors LICENSE Asheron's Call server emulator ACEmulator diff --git a/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj b/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj index 7cc04c0ec4..52486f4a50 100644 --- a/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj +++ b/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj @@ -13,7 +13,7 @@ Asheron's Call server emulator - © 2017-2022 ACEmulator Team and Contributors + © 2017-2024 ACEmulator Team and Contributors LICENSE diff --git a/Source/ACE.DatLoader/ACE.DatLoader.csproj b/Source/ACE.DatLoader/ACE.DatLoader.csproj index e6eb4445b9..a1b7cb286f 100644 --- a/Source/ACE.DatLoader/ACE.DatLoader.csproj +++ b/Source/ACE.DatLoader/ACE.DatLoader.csproj @@ -7,7 +7,7 @@ git https://github.com/ACEmulator/ACE https://emulator.ac - © 2017-2022 ACEmulator Team and Contributors + © 2017-2024 ACEmulator Team and Contributors LICENSE Asheron's Call server emulator ACEmulator diff --git a/Source/ACE.Database.Tests/ACE.Database.Tests.csproj b/Source/ACE.Database.Tests/ACE.Database.Tests.csproj index de4218d2ab..6ff05548d2 100644 --- a/Source/ACE.Database.Tests/ACE.Database.Tests.csproj +++ b/Source/ACE.Database.Tests/ACE.Database.Tests.csproj @@ -13,7 +13,7 @@ Asheron's Call server emulator - © 2017-2022 ACEmulator Team and Contributors + © 2017-2024 ACEmulator Team and Contributors LICENSE diff --git a/Source/ACE.Database/ACE.Database.csproj b/Source/ACE.Database/ACE.Database.csproj index 607976348d..06e68f0cee 100644 --- a/Source/ACE.Database/ACE.Database.csproj +++ b/Source/ACE.Database/ACE.Database.csproj @@ -9,7 +9,7 @@ git https://github.com/ACEmulator/ACE https://emulator.ac - © 2017-2022 ACEmulator Team and Contributors + © 2017-2024 ACEmulator Team and Contributors LICENSE Asheron's Call server emulator ACEmulator diff --git a/Source/ACE.Entity/ACE.Entity.csproj b/Source/ACE.Entity/ACE.Entity.csproj index 811d3cddb5..be83153acc 100644 --- a/Source/ACE.Entity/ACE.Entity.csproj +++ b/Source/ACE.Entity/ACE.Entity.csproj @@ -7,7 +7,7 @@ git https://github.com/ACEmulator/ACE https://emulator.ac - © 2017-2022 ACEmulator Team and Contributors + © 2017-2024 ACEmulator Team and Contributors LICENSE Asheron's Call server emulator ACEmulator diff --git a/Source/ACE.Server.Tests/ACE.Server.Tests.csproj b/Source/ACE.Server.Tests/ACE.Server.Tests.csproj index c97f1861b6..d803641144 100644 --- a/Source/ACE.Server.Tests/ACE.Server.Tests.csproj +++ b/Source/ACE.Server.Tests/ACE.Server.Tests.csproj @@ -13,7 +13,7 @@ Asheron's Call server emulator - © 2017-2022 ACEmulator Team and Contributors + © 2017-2024 ACEmulator Team and Contributors LICENSE diff --git a/Source/ACE.Server/ACE.Server.csproj b/Source/ACE.Server/ACE.Server.csproj index 54d3938854..b5af2d8618 100644 --- a/Source/ACE.Server/ACE.Server.csproj +++ b/Source/ACE.Server/ACE.Server.csproj @@ -22,7 +22,7 @@ git https://github.com/ACEmulator/ACE https://emulator.ac - © 2017-2022 ACEmulator Team and Contributors + © 2017-2024 ACEmulator Team and Contributors LICENSE Asheron's Call server emulator ACEmulator From 474c8704e89402ce82eccad3862148b649677e4b Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Fri, 29 Dec 2023 13:16:49 -0500 Subject: [PATCH 21/32] Update DeveloperContentCommands.cs --- .../ACE.Server/Command/Handlers/DeveloperContentCommands.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/ACE.Server/Command/Handlers/DeveloperContentCommands.cs b/Source/ACE.Server/Command/Handlers/DeveloperContentCommands.cs index b42851297a..571f5ac6b4 100644 --- a/Source/ACE.Server/Command/Handlers/DeveloperContentCommands.cs +++ b/Source/ACE.Server/Command/Handlers/DeveloperContentCommands.cs @@ -1342,7 +1342,7 @@ public static void SyncInstances(Session session, ushort landblock, List Date: Fri, 29 Dec 2023 13:16:52 -0500 Subject: [PATCH 22/32] Update DeveloperFixCommands.cs --- Source/ACE.Server/Command/Handlers/DeveloperFixCommands.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/ACE.Server/Command/Handlers/DeveloperFixCommands.cs b/Source/ACE.Server/Command/Handlers/DeveloperFixCommands.cs index 42c5c437e4..b273669eea 100644 --- a/Source/ACE.Server/Command/Handlers/DeveloperFixCommands.cs +++ b/Source/ACE.Server/Command/Handlers/DeveloperFixCommands.cs @@ -1447,9 +1447,9 @@ public static void HandleVerifyClothingWieldLevel(Session session, params string wieldLevel = 180; } - ctx.Database.ExecuteSqlRaw($"insert into biota_properties_int set object_Id={objectId}, `type`={(ushort)PropertyInt.WieldRequirements}, value={(int)WieldRequirement.Level};"); - ctx.Database.ExecuteSqlRaw($"insert into biota_properties_int set object_Id={objectId}, `type`={(ushort)PropertyInt.WieldSkillType}, value=1;"); - ctx.Database.ExecuteSqlRaw($"insert into biota_properties_int set object_Id={objectId}, `type`={(ushort)PropertyInt.WieldDifficulty}, value={wieldLevel};"); + ctx.Database.ExecuteSqlInterpolated($"insert into biota_properties_int set object_Id={objectId}, `type`={(ushort)PropertyInt.WieldRequirements}, value={(int)WieldRequirement.Level};"); + ctx.Database.ExecuteSqlInterpolated($"insert into biota_properties_int set object_Id={objectId}, `type`={(ushort)PropertyInt.WieldSkillType}, value=1;"); + ctx.Database.ExecuteSqlInterpolated($"insert into biota_properties_int set object_Id={objectId}, `type`={(ushort)PropertyInt.WieldDifficulty}, value={wieldLevel};"); } var item = clothing[objectId]; From cdf07c6b2fe331ffd4de4b89bd4b8496b74a2305 Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Fri, 29 Dec 2023 13:21:01 -0500 Subject: [PATCH 23/32] Update ACE.Database.csproj --- Source/ACE.Database/ACE.Database.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/ACE.Database/ACE.Database.csproj b/Source/ACE.Database/ACE.Database.csproj index 06e68f0cee..e7d4389394 100644 --- a/Source/ACE.Database/ACE.Database.csproj +++ b/Source/ACE.Database/ACE.Database.csproj @@ -19,7 +19,7 @@ - + From c40cff05542868db191fac83be2e5d9745bd5dcc Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Fri, 29 Dec 2023 13:27:38 -0500 Subject: [PATCH 24/32] Update ACE.Database.csproj --- Source/ACE.Database/ACE.Database.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/ACE.Database/ACE.Database.csproj b/Source/ACE.Database/ACE.Database.csproj index e7d4389394..df1d6757d8 100644 --- a/Source/ACE.Database/ACE.Database.csproj +++ b/Source/ACE.Database/ACE.Database.csproj @@ -18,8 +18,8 @@ - - + + From 3263d12e0653f21096f5a6d628875b34193df61d Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Fri, 12 Jan 2024 10:19:09 -0500 Subject: [PATCH 25/32] Update ACE.Common.csproj --- Source/ACE.Common/ACE.Common.csproj | 3 --- 1 file changed, 3 deletions(-) diff --git a/Source/ACE.Common/ACE.Common.csproj b/Source/ACE.Common/ACE.Common.csproj index 72c50ab51f..0b30df260b 100644 --- a/Source/ACE.Common/ACE.Common.csproj +++ b/Source/ACE.Common/ACE.Common.csproj @@ -15,9 +15,6 @@ - - - From da1ec0a016bf3932ee2c498adfeee9ae3fbf362e Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Fri, 12 Jan 2024 10:21:19 -0500 Subject: [PATCH 26/32] Update ACE.DatLoader.csproj --- Source/ACE.DatLoader/ACE.DatLoader.csproj | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Source/ACE.DatLoader/ACE.DatLoader.csproj b/Source/ACE.DatLoader/ACE.DatLoader.csproj index 800aed779a..7d3ff6c942 100644 --- a/Source/ACE.DatLoader/ACE.DatLoader.csproj +++ b/Source/ACE.DatLoader/ACE.DatLoader.csproj @@ -16,17 +16,8 @@ - - - - - - - - - From d6f874db92692ff62eb4987b1bb46aa57bf19e90 Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Fri, 12 Jan 2024 10:23:42 -0500 Subject: [PATCH 27/32] Update ACE.Common.csproj --- Source/ACE.Common/ACE.Common.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/ACE.Common/ACE.Common.csproj b/Source/ACE.Common/ACE.Common.csproj index 0b30df260b..a17c9aac6d 100644 --- a/Source/ACE.Common/ACE.Common.csproj +++ b/Source/ACE.Common/ACE.Common.csproj @@ -16,7 +16,7 @@ - + From 24652991fdde270af0945c9505d7033df1da27ca Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sat, 20 Jan 2024 15:14:57 -0500 Subject: [PATCH 28/32] Update ACE.Server.csproj --- Source/ACE.Server/ACE.Server.csproj | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Source/ACE.Server/ACE.Server.csproj b/Source/ACE.Server/ACE.Server.csproj index 56cc0a140e..a6eb6afdb2 100644 --- a/Source/ACE.Server/ACE.Server.csproj +++ b/Source/ACE.Server/ACE.Server.csproj @@ -238,10 +238,8 @@ - - - + From f4c71382923128e68069d3cc1c7c29db2fdcb547 Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sat, 27 Jan 2024 18:37:59 -0500 Subject: [PATCH 29/32] Update ACE.Server.csproj --- Source/ACE.Server/ACE.Server.csproj | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Source/ACE.Server/ACE.Server.csproj b/Source/ACE.Server/ACE.Server.csproj index c9024b9c51..08a1dd7fe3 100644 --- a/Source/ACE.Server/ACE.Server.csproj +++ b/Source/ACE.Server/ACE.Server.csproj @@ -238,10 +238,8 @@ - - - + From ed9a721984ce014367c03b2521a9efe7f81264ab Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Fri, 5 Apr 2024 13:19:10 -0400 Subject: [PATCH 30/32] Update ACE.DatLoader.csproj --- Source/ACE.DatLoader/ACE.DatLoader.csproj | 3 --- 1 file changed, 3 deletions(-) diff --git a/Source/ACE.DatLoader/ACE.DatLoader.csproj b/Source/ACE.DatLoader/ACE.DatLoader.csproj index c903b9d01e..7d3ff6c942 100644 --- a/Source/ACE.DatLoader/ACE.DatLoader.csproj +++ b/Source/ACE.DatLoader/ACE.DatLoader.csproj @@ -18,9 +18,6 @@ - - - From b51138d5511761c27b295cbfce2ff6398e167623 Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Fri, 5 Apr 2024 13:20:37 -0400 Subject: [PATCH 31/32] Update ACE.Server.csproj --- Source/ACE.Server/ACE.Server.csproj | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Source/ACE.Server/ACE.Server.csproj b/Source/ACE.Server/ACE.Server.csproj index c02e610cb6..940ff903d0 100644 --- a/Source/ACE.Server/ACE.Server.csproj +++ b/Source/ACE.Server/ACE.Server.csproj @@ -5,11 +5,6 @@ net8.0 x64 - - Exe - net6.0 - x64 - disable @@ -243,10 +238,8 @@ - - - + From 4be885791ab3d2ab27b330acb1d28b7519cfa1f8 Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sun, 21 Apr 2024 15:41:52 -0400 Subject: [PATCH 32/32] Update ACE.DatLoader.csproj --- Source/ACE.DatLoader/ACE.DatLoader.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/ACE.DatLoader/ACE.DatLoader.csproj b/Source/ACE.DatLoader/ACE.DatLoader.csproj index 7d3ff6c942..3b9d69d3d3 100644 --- a/Source/ACE.DatLoader/ACE.DatLoader.csproj +++ b/Source/ACE.DatLoader/ACE.DatLoader.csproj @@ -15,7 +15,7 @@ - +