diff --git a/AppVeyor/DownloadACEWorld.bat b/AppVeyor/DownloadACEWorld.bat index d859444c7f..6159ce6fb0 100644 --- a/AppVeyor/DownloadACEWorld.bat +++ b/AppVeyor/DownloadACEWorld.bat @@ -25,7 +25,7 @@ REM echo %sqlfile% appveyor DownloadFile %downloadfile% 7z x %zipfile% -"C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" -h localhost -u root -pPassword12! ace_world < %sqlfile% +"C:\Program Files\MySql\MySQL Server 8.0\bin\mysql.exe" -h localhost -u root -pPassword12! ace_world < %sqlfile% del %zipfile% del %sqlfile% diff --git a/AppVeyor/MySqlInstall.bat b/AppVeyor/MySqlInstall.bat index b526e4af29..fc26acf8ef 100644 --- a/AppVeyor/MySqlInstall.bat +++ b/AppVeyor/MySqlInstall.bat @@ -1,34 +1,34 @@ REM create databases -"C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" -h localhost -u root -pPassword12! mysql < Database\Create\create_mysql.sql +"C:\Program Files\MySql\MySQL Server 8.0\bin\mysql.exe" -h localhost -u root -pPassword12! mysql < Database\Create\create_mysql.sql REM execute Base Scripts -"C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" -h localhost -u root -pPassword12! ace_auth < Database\Base\AuthenticationBase.sql -"C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" -h localhost -u root -pPassword12! ace_shard < Database\Base\ShardBase.sql -"C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" -h localhost -u root -pPassword12! ace_world < Database\Base\WorldBase.sql +"C:\Program Files\MySql\MySQL Server 8.0\bin\mysql.exe" -h localhost -u root -pPassword12! ace_auth < Database\Base\AuthenticationBase.sql +"C:\Program Files\MySql\MySQL Server 8.0\bin\mysql.exe" -h localhost -u root -pPassword12! ace_shard < Database\Base\ShardBase.sql +"C:\Program Files\MySql\MySQL Server 8.0\bin\mysql.exe" -h localhost -u root -pPassword12! ace_world < Database\Base\WorldBase.sql REM execute Update Scripts for Authentication Database -REM "C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" -h localhost -u root -pPassword12! ace_auth < database\updates\authentication\changeme.sql +REM "C:\Program Files\MySql\MySQL Server 8.0\bin\mysql.exe" -h localhost -u root -pPassword12! ace_auth < database\updates\authentication\changeme.sql For /R "Database\Updates\Authentication\" %%G IN (*.sql) do ( REM echo Found file: %%G -"C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" -h localhost -u root -pPassword12! ace_auth < %%G +"C:\Program Files\MySql\MySQL Server 8.0\bin\mysql.exe" -h localhost -u root -pPassword12! ace_auth < %%G ) REM execute Update Scripts for Shard Database -REM "C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" -h localhost -u root -pPassword12! ace_shard < database\updates\shard\changeme.sql +REM "C:\Program Files\MySql\MySQL Server 8.0\bin\mysql.exe" -h localhost -u root -pPassword12! ace_shard < database\updates\shard\changeme.sql For /R "Database\Updates\Shard\" %%G IN (*.sql) do ( echo Found file: %%G -"C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" -h localhost -u root -pPassword12! ace_shard < %%G +"C:\Program Files\MySql\MySQL Server 8.0\bin\mysql.exe" -h localhost -u root -pPassword12! ace_shard < %%G ) REM execute Update Scripts for World Database -REM "C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" -h localhost -u root -pPassword12! ace_world < database\updates\world\changeme.sql +REM "C:\Program Files\MySql\MySQL Server 8.0\bin\mysql.exe" -h localhost -u root -pPassword12! ace_world < database\updates\world\changeme.sql REM Download latest ACE-World database, extract and import it call AppVeyor\DownloadACEWorld.bat REM execute Update Scripts for World Database -REM "C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" -h localhost -u root -pPassword12! ace_world < database\updates\world\changeme.sql +REM "C:\Program Files\MySql\MySQL Server 8.0\bin\mysql.exe" -h localhost -u root -pPassword12! ace_world < database\updates\world\changeme.sql REM For /R "database\updates\world\" %%G IN (*.sql) do ( REM echo Found file: %%G -REM "C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" -h localhost -u root -pPassword12! ace_world < %%G +REM "C:\Program Files\MySql\MySQL Server 8.0\bin\mysql.exe" -h localhost -u root -pPassword12! ace_world < %%G REM ) diff --git a/appveyor.yml b/appveyor.yml index ad3e06f519..2dc22a950e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,6 +21,7 @@ init: REM appveyor UpdateBuild -Version "%REVISED_VERSION%" REM set APPVEYOR_BUILD_VERSION=%REVISED_VERSION% +- ps: Start-Service MySQL80 dotnet_csproj: patch: true file: '**\*.csproj' @@ -43,7 +44,8 @@ environment: secure: huM6kANmgP1OdlmHulXVZA== access_token: secure: lGLpqex+Weod6ZiPw34RwTv999QvoSZ+imTcmYhiJWQL6XkfkVUYcqOO6pJDuAYt -services: mysql +services: + - mysql before_build: - cmd: AppVeyor\AppVeyorBeforeCompile.bat build: