Updated to Avalonia 11

macaba · Aug 25, 2023 · c8011c4 · c8011c4
1 parent 15524c0
commit c8011c4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 20 deletions.
diff --git a/source/NSD.UI/App.axaml.cs b/source/NSD.UI/App.axaml.cs
@@ -24,6 +24,7 @@ public static int Main(string[] args)
         public static AppBuilder BuildAvaloniaApp()
           => AppBuilder.Configure<App>()
                 .UsePlatformDetect()
+                .WithInterFont()
                 .LogToTrace();
     }
 }
diff --git a/source/NSD.UI/MainWindow.axaml b/source/NSD.UI/MainWindow.axaml
@@ -45,7 +45,7 @@
 						<Button Grid.Row="0" Grid.Column="2" Margin="6,0,0,0" Content="Search" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Click="BtnSearch_Click"></Button>
 
 						<Label Grid.Row="1" Grid.Column="0" VerticalAlignment="Center">Input CSV file</Label>
-						<ComboBox Grid.Row="1" Grid.Column="1"  HorizontalAlignment="Stretch" Items="{Binding InputFileNames}" SelectedIndex="{Binding SelectedInputFileIndex}" IsEnabled="{Binding Enabled}"  VerticalContentAlignment="Center"></ComboBox>
+						<ComboBox Grid.Row="1" Grid.Column="1"  HorizontalAlignment="Stretch" ItemsSource="{Binding InputFileNames}" SelectedIndex="{Binding SelectedInputFileIndex}" IsEnabled="{Binding Enabled}"  VerticalContentAlignment="Center"></ComboBox>
 
 						<Label Grid.Row="3" Grid.Column="0" VerticalAlignment="Center">Acquisition time</Label>
 						<StackPanel Orientation="Horizontal" Grid.Row="3" Grid.Column="1">

diff --git a/source/NSD.UI/MainWindow.axaml.cs b/source/NSD.UI/MainWindow.axaml.cs
@@ -1,17 +1,13 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Avalonia.Input;
-using CsvHelper;
 using CsvHelper.Configuration;
-using NReco.Csv;
 using System;
 using System.Collections.Generic;
 using System.Dynamic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Avalonia.Input.GestureRecognizers;
 
 namespace NSD.UI
 {

diff --git a/source/NSD.UI/MainWindowViewModel.cs b/source/NSD.UI/MainWindowViewModel.cs
@@ -3,7 +3,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using System;
 using System.Collections.ObjectModel;
-using System.Reactive;
 using System.Reflection;
 
 namespace NSD.UI

diff --git a/source/NSD.UI/NSD.UI.csproj b/source/NSD.UI/NSD.UI.csproj
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
 		<TargetFramework>net6.0</TargetFramework>
-		<Version>1.1</Version>
+		<Version>1.2</Version>
 		<Nullable>enable</Nullable>
 		<InvariantGlobalization>true</InvariantGlobalization>
 		<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
@@ -12,24 +12,17 @@
 		<None Remove=".gitignore" />
 	</ItemGroup>
 	<ItemGroup>
-		<!--This helps with theme dll-s trimming.
-	If you will publish your application in self-contained mode with p:PublishTrimmed=true and it will use Fluent theme Default theme will be trimmed from the output and vice versa.
-	https://github.com/AvaloniaUI/Avalonia/issues/5593 -->
-		<!--<TrimmableAssembly Include="Avalonia.Themes.Fluent" />-->
-		<TrimmableAssembly Include="Avalonia.Themes.Default" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="Avalonia" Version="0.10.22" />
-		<PackageReference Include="Avalonia.Desktop" Version="0.10.22" />
+		<PackageReference Include="Avalonia.Desktop" Version="11.0.4" />
 		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.22" />
+		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.4" />
+		<PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.4" />
+		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.4" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
 		<PackageReference Include="CsvHelper" Version="30.0.1" />
-		<PackageReference Include="MessageBox.Avalonia" Version="2.1.0" />
-		<PackageReference Include="ScottPlot.Avalonia" Version="4.1.64" />
+		<PackageReference Include="MessageBox.Avalonia" Version="2.2.0" />
+		<PackageReference Include="ScottPlot.Avalonia" Version="4.1.67" />
 		<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
 		<PackageReference Include="System.Linq.Async" Version="6.0.1" />
-		<PackageReference Include="XamlNameReferenceGenerator" Version="1.6.1" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\NReco.Csv\NReco.Csv.csproj" />