deps: Update to support Avalonia 0.10 (#6)

AvaloniaUI · Feb 6, 2021 · 5d38592 · 5d38592
1 parent 309da4a
commit 5d38592
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 21 deletions.
diff --git a/Directory.build.props b/Directory.build.props
@@ -18,4 +18,11 @@
     <ItemGroup>
         <None Include="$(MSBuildThisFileDirectory)\LICENSE" Pack="true" PackagePath="LICENSE" />
     </ItemGroup>
+
+<!-- region package versions -->
+    <PropertyGroup>
+        <AvaloniaVersion>0.10.0</AvaloniaVersion>
+        <FuncUIVersion>0.5.0-beta</FuncUIVersion>
+    </PropertyGroup>
+<!-- endregion -->
 </Project>
diff --git a/Live.Avalonia.FuncUI.Sample/Live.Avalonia.FuncUI.Sample.fsproj b/Live.Avalonia.FuncUI.Sample/Live.Avalonia.FuncUI.Sample.fsproj
@@ -17,10 +17,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia.Desktop" Version="0.9.11" />
-        <PackageReference Include="JaggerJo.Avalonia.FuncUI" Version="0.4.1" />
-        <PackageReference Include="JaggerJo.Avalonia.FuncUI.DSL" Version="0.4.3" />
-        <PackageReference Include="JaggerJo.Avalonia.FuncUI.Elmish" Version="0.4.0" />
+        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="JaggerJo.Avalonia.FuncUI" Version="$(FuncUIVersion)" />
+        <PackageReference Include="JaggerJo.Avalonia.FuncUI.DSL" Version="$(FuncUIVersion)" />
+        <PackageReference Include="JaggerJo.Avalonia.FuncUI.Elmish" Version="$(FuncUIVersion)" />
     </ItemGroup>
 
     <ItemGroup>

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>
-        <StyleInclude Source="avares://Citrus.Avalonia/Citrus.xaml"/>
+        <FluentTheme Mode="Light"/>
     </Application.Styles>
 </Application>
diff --git a/Live.Avalonia.Sample/AppView.xaml b/Live.Avalonia.Sample/AppView.xaml
@@ -1,18 +1,16 @@
-<UserControl 
+<UserControl
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    Background="{DynamicResource ThemeBackgroundColor}"
     x:Class="Live.Avalonia.Sample.AppView">
     <!-- Try editing the code below after launching the app -->
-    <Border HorizontalAlignment="Center" 
-            VerticalAlignment="Center" 
-            Classes="Card" 
+    <Border HorizontalAlignment="Center"
+            VerticalAlignment="Center"
             Width="350">
         <StackPanel>
-            <TextBox HorizontalAlignment="Stretch" 
-                     Watermark="Please, enter your name..." 
+            <TextBox HorizontalAlignment="Stretch"
+                     Watermark="Please, enter your name..."
                      Text="{Binding Name}" />
-            <Button Content="Execute the command" 
+            <Button Content="Execute the command"
                     Command="{Binding Execute}"/>
         </StackPanel>
     </Border>

diff --git a/Live.Avalonia.Sample/Live.Avalonia.Sample.csproj b/Live.Avalonia.Sample/Live.Avalonia.Sample.csproj
@@ -17,10 +17,10 @@
         <Watch Include="**\*.xaml" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="0.9.11" />
-        <PackageReference Include="Avalonia.Desktop" Version="0.9.11" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="0.9.11" />
-        <PackageReference Include="Citrus.Avalonia" Version="1.2.6" />
+        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
     </ItemGroup>
     <ItemGroup>
       <ProjectReference Include="..\Live.Avalonia.Sample.Library\Live.Avalonia.Sample.Library.csproj" />

diff --git a/Live.Avalonia.Sample/Program.cs b/Live.Avalonia.Sample/Program.cs
@@ -1,5 +1,4 @@
 using Avalonia;
-using Avalonia.Logging.Serilog;
 using Avalonia.ReactiveUI;
 
 namespace Live.Avalonia.Sample
@@ -12,6 +11,6 @@ private static AppBuilder BuildAvaloniaApp() =>
             AppBuilder.Configure<App>()
                 .UsePlatformDetect()
                 .UseReactiveUI()
-                .LogToDebug();
+                .LogToTrace();
     }
 }
diff --git a/Live.Avalonia/Live.Avalonia.csproj b/Live.Avalonia/Live.Avalonia.csproj
@@ -1,10 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.9.11" />
+    <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
   </ItemGroup>
 </Project>