Skip to content

Commit 112b52b

Browse files
committed
Update Avalonia library version
1 parent 12b7b7b commit 112b52b

File tree

8 files changed

+19
-21
lines changed

8 files changed

+19
-21
lines changed

AvaloniaEdit

AvaloniaStyles/AvaloniaStyles.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
<ItemGroup>
1818
<PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
1919
<PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
20-
<PackageReference Include="HarfBuzzSharp" Version="2.8.2-preview.127" />
21-
<PackageReference Include="SkiaSharp" Version="2.88.0-preview.127" />
2220
<PackageReference Include="FuzzySharp" Version="2.0.2" />
2321
</ItemGroup>
2422
<ItemGroup>

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
https://nuget.avaloniaui.net/repository/avalonia-all/index.json
66
</RestoreAdditionalProjectSources>
77
<NoWarn>CS0067,CS3021,CS1998,CA1416</NoWarn>
8-
<AvaloniaVersion>0.10.999-cibuild0015264-beta</AvaloniaVersion>
8+
<AvaloniaVersion>0.10.999-cibuild0016933-beta</AvaloniaVersion>
99
<LangVersion>preview</LangVersion>
1010
</PropertyGroup>
1111
</Project>

Rendering/TheAvaloniaOpenGL/TheAvaloniaOpenGL.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<ItemGroup>
1919
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
2020
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
21-
<PackageReference Include="Avalonia" Version="0.10.999-cibuild0015264-beta" />
22-
<PackageReference Include="Avalonia.OpenTK" Version="0.10.999-cibuild0015264-beta" />
21+
<PackageReference Include="Avalonia" Version="0.10.999-cibuild0016933-beta" />
22+
<PackageReference Include="Avalonia.OpenTK" Version="0.10.999-cibuild0016933-beta" />
2323
</ItemGroup>
2424

2525
</Project>

WoWDatabaseEditorCore.Avalonia/WoWDatabaseEditorCore.Avalonia.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626
<PackageReference Include="Prism.Core" Version="7.2.0.1422" />
2727
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.0-preview.127" />
2828
<PackageReference Include="SmartFormat.NET" Version="2.5.3" />
29-
<PackageReference Include="HarfBuzzSharp" Version="2.8.2-preview.127" />
30-
<PackageReference Include="SkiaSharp" Version="2.88.0-preview.127" />
31-
<PackageReference Include="Avalonia.OpenTK" Version="0.10.999-cibuild0015264-beta" />
29+
<PackageReference Include="Avalonia.OpenTK" Version="0.10.999-cibuild0016933-beta" />
3230
</ItemGroup>
3331
<ItemGroup>
3432
<ProjectReference Include="..\AvaloniaStyles\AvaloniaStyles.csproj" />

appveyor.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,12 @@ build_script:
7777
7z a WoWDatabaseEditorLinux.zip .\bin\wowdatabaseeditor-avalonia-linux\*
7878
test_script:
7979
- cmd: >-
80+
cd test
81+
82+
bash database_test.sh localhost 3306 root 'Password12!' 'C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql'
83+
84+
cd ../
85+
8086
dotnet test WDE.MVVM.Test/WDE.MVVM.Test.csproj
8187
8288
dotnet test WDE.RemoteSOAP.Test/WDE.RemoteSOAP.Test.csproj
@@ -98,10 +104,6 @@ test_script:
98104
dotnet test WDE.WoWHeadConnector.Test/WDE.WoWHeadConnector.Test.csproj
99105
100106
dotnet test WoWDatabaseEditorCore.Test/WoWDatabaseEditorCore.Test.csproj
101-
102-
cd test
103-
104-
bash database_test.sh localhost 3306 root 'Password12!' 'C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql'
105107
artifacts:
106108
- path: WoWDatabaseEditorMacOs.zip
107109
name: WoWDatabaseEditorMacOs.zip

test/database_test.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,34 +31,34 @@ for index in ${!URLs[*]}; do
3131
git sparse-checkout add data/sql/base/db_world/
3232
git sparse-checkout add data/sql/updates/db_world/
3333

34-
mysql -u ${USER} -p${PASSWORD} -e 'DROP DATABASE IF EXISTS temp_CI'
35-
mysql -u ${USER} -p${PASSWORD} -e 'CREATE DATABASE temp_CI'
34+
"${MYSQL_PATH}" -u ${USER} -p${PASSWORD} -e 'DROP DATABASE IF EXISTS temp_CI'
35+
"${MYSQL_PATH}" -u ${USER} -p${PASSWORD} -e 'CREATE DATABASE temp_CI'
3636

3737
if [ -f "sql/base/dev/world_database.sql" ];
3838
then
39-
mysql -u ${USER} -p${PASSWORD} temp_CI < sql/base/dev/world_database.sql
39+
"${MYSQL_PATH}" -u ${USER} -p${PASSWORD} temp_CI < sql/base/dev/world_database.sql
4040

4141
for i in sql/updates/world/${UPDATEs[$index]}/*.sql
4242
do
43-
mysql -u ${USER} -p${PASSWORD} temp_CI < ${i}
43+
"${MYSQL_PATH}" -u ${USER} -p${PASSWORD} temp_CI < ${i}
4444
done
4545
else
4646
for i in data/sql/base/db_world/*.sql
4747
do
48-
mysql -u ${USER} -p${PASSWORD} temp_CI < ${i}
48+
"${MYSQL_PATH}" -u ${USER} -p${PASSWORD} temp_CI < ${i}
4949
done
5050

5151
for i in data/sql/updates/db_world/*.sql
5252
do
53-
mysql -u ${USER} -p${PASSWORD} temp_CI < ${i}
53+
"${MYSQL_PATH}" -u ${USER} -p${PASSWORD} temp_CI < ${i}
5454
done
5555
fi
5656

5757
cd ../
5858

5959
dotnet run --project ../DatabaseTester/DatabaseTester.csproj $HOST $PORT $USER $PASSWORD temp_CI ${COREs[$index]}
6060

61-
${MYSQL_PATH} -u ${USER} -p${PASSWORD} -e 'DROP DATABASE temp_CI'
61+
"${MYSQL_PATH}" -u ${USER} -p${PASSWORD} -e 'DROP DATABASE temp_CI'
6262

6363
rm -rf Repo
6464

0 commit comments

Comments
 (0)