Updated to be compatible with Avalonia 11.0.5 (#117)

AvaloniaUI · Jan 8, 2024 · 0ec9f97 · 0ec9f97
1 parent 84e107e
commit 0ec9f97
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 13 deletions.
diff --git a/src/Citrus.Avalonia.Sandbox/App.xaml b/src/Citrus.Avalonia.Sandbox/App.xaml
@@ -2,6 +2,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="Citrus.Avalonia.Sandbox.App">
     <Application.Styles>
+        <SimpleTheme />
         <!-- 
         Note: In this project, the <StyleInclude /> line below has no affect.
         This happens because we override the styles in the main window styles 

diff --git a/src/Citrus.Avalonia.Sandbox/Citrus.Avalonia.Sandbox.csproj b/src/Citrus.Avalonia.Sandbox/Citrus.Avalonia.Sandbox.csproj
@@ -2,18 +2,19 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <LangVersion>9</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.19" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.19" />
-    <PackageReference Include="Avalonia.LinuxFramebuffer" Version="0.10.19" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.19" />
+    <PackageReference Include="Avalonia" Version="11.0.5" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.5" />
+    <PackageReference Include="Avalonia.LinuxFramebuffer" Version="11.0.5" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.5" />
+    <PackageReference Include="Avalonia.Themes.Simple" Version="11.0.5" />
     <PackageReference Include="ReactiveUI.Validation" Version="3.1.7" />
-    <PackageReference Include="ReactiveUI.Fody" Version="18.4.34" />
+    <PackageReference Include="ReactiveUI.Fody" Version="19.5.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Citrus.Avalonia.Sandbox/MainWindow.xaml b/src/Citrus.Avalonia.Sandbox/MainWindow.xaml
@@ -141,7 +141,7 @@
                         </StackPanel>
 
                         <!-- List views -->
-                        <ListBox VirtualizationMode="None">
+                        <ListBox>
                             <ListBoxItem>
                                 <StackPanel>
                                     <TextBlock Text="Lorem ipsum dolor sit amet"

diff --git a/src/Citrus.Avalonia.Sandbox/Program.cs b/src/Citrus.Avalonia.Sandbox/Program.cs
@@ -17,7 +17,7 @@ public static AppBuilder BuildAvaloniaApp()
                 .Configure<App>()
                 .UsePlatformDetect()
                 .With(new X11PlatformOptions {EnableMultiTouch = true, UseDBusMenu = true})
-                .With(new Win32PlatformOptions {EnableMultitouch = true, AllowEglInitialization = true})
+                .With(new Win32PlatformOptions {RenderingMode = new Win32RenderingMode[] { Win32RenderingMode.AngleEgl }})
                 .UseSkia()
                 .UseReactiveUI()
                 .UseManagedSystemDialogs();

diff --git a/src/Citrus.Avalonia/Citrus.Avalonia.csproj b/src/Citrus.Avalonia/Citrus.Avalonia.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFramework>netstandard2.1</TargetFramework>
         <IsPackable>true</IsPackable>
         <Authors>Artyom Gorchakov and Contributors</Authors>
         <Copyright>Copyright (c) 2020 Artyom Gorchakov</Copyright>
@@ -21,10 +21,11 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="0.10.19" />
+        <PackageReference Include="Avalonia" Version="11.0.5" />
+        <PackageReference Include="Avalonia.Themes.Simple" Version="11.0.5" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Nerdbank.GitVersioning" Version="3.5.119" PrivateAssets="all" />
+        <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" PrivateAssets="all" />
     </ItemGroup>
 </Project>
diff --git a/src/Citrus.Avalonia/Theme/Index.xaml b/src/Citrus.Avalonia/Theme/Index.xaml
@@ -1,6 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui" 
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
+    <StyleInclude Source="avares://Avalonia.Themes.Simple/SimpleTheme.xaml"/>
     <StyleInclude Source="avares://Citrus.Avalonia/Theme/TextBlockStyles.xaml"/>
     <StyleInclude Source="avares://Citrus.Avalonia/Theme/ButtonStyles.xaml"/>
     <StyleInclude Source="avares://Citrus.Avalonia/Theme/TextBoxStyles.xaml"/>

diff --git a/src/Citrus.Avalonia/Theme/TextBoxStyles.xaml b/src/Citrus.Avalonia/Theme/TextBoxStyles.xaml
@@ -36,7 +36,7 @@
                         </Style>
                     </Canvas.Styles>
                     <ToolTip.Tip>
-                        <ItemsControl Items="{Binding}"/>
+                        <ItemsControl ItemsSource="{Binding}"/>
                     </ToolTip.Tip>
                     <Path Data="M14,7 A7,7 0 0,0 0,7 M0,7 A7,7 0 1,0 14,7 M7,3l0,5 M7,9l0,2" 
                           Stroke="{DynamicResource ErrorBrush}"