Adapt to Avalonia 11 (#64)

AvaloniaUI · Sep 10, 2023 · a1ab34c · a1ab34c
1 parent 00b6bff
commit a1ab34c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/Directory.build.props b/Directory.build.props
@@ -21,7 +21,7 @@
 
 <!-- region package versions -->
     <PropertyGroup>
-        <AvaloniaVersion>0.10.0</AvaloniaVersion>
+        <AvaloniaVersion>11.0.0</AvaloniaVersion>
         <FuncUIVersion>0.5.0-beta</FuncUIVersion>
     </PropertyGroup>
 <!-- endregion -->

diff --git a/Live.Avalonia.Sample/App.xaml b/Live.Avalonia.Sample/App.xaml
@@ -2,6 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="Live.Avalonia.Sample.App">
     <Application.Styles>
-        <FluentTheme Mode="Light"/>
+        <FluentTheme />
     </Application.Styles>
 </Application>
diff --git a/Live.Avalonia.Sample/Live.Avalonia.Sample.csproj b/Live.Avalonia.Sample/Live.Avalonia.Sample.csproj
@@ -14,16 +14,22 @@
     </ItemGroup>
     <ItemGroup>
         <!-- Add the 'Watch' directive to watch for XAML file changes. -->
-        <Watch Include="**\*.xaml" />
+        <Watch Include="**\*.xaml"/>
     </ItemGroup>
+
+    <PropertyGroup>
+        <!--Overriding it to allow run demo app on latest version-->
+        <AvaloniaVersion>11.0.0</AvaloniaVersion>
+    </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
+        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)"/>
+        <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)"/>
+        <PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)"/>
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)"/>
     </ItemGroup>
     <ItemGroup>
-      <ProjectReference Include="..\Live.Avalonia.Sample.Library\Live.Avalonia.Sample.Library.csproj" />
-      <ProjectReference Include="..\Live.Avalonia\Live.Avalonia.csproj" />
+        <ProjectReference Include="..\Live.Avalonia.Sample.Library\Live.Avalonia.Sample.Library.csproj"/>
+        <ProjectReference Include="..\Live.Avalonia\Live.Avalonia.csproj"/>
     </ItemGroup>
 </Project>
diff --git a/Live.Avalonia/Live.Avalonia.csproj b/Live.Avalonia/Live.Avalonia.csproj
@@ -6,5 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="System.Reactive" Version="6.0.0" />
   </ItemGroup>
 </Project>
diff --git a/Live.Avalonia/LiveViewHost.cs b/Live.Avalonia/LiveViewHost.cs
@@ -2,7 +2,7 @@
 using System.Diagnostics;
 using System.Reactive.Linq;
 using Avalonia.Controls;
-using Avalonia.Threading;
+using Avalonia.ReactiveUI;
 
 namespace Live.Avalonia
 {