merge avalonia_11.0 to master

VeloeMinecraftLauncher/App.axaml

@@ -1,11 +1,12 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="using:VeloeMinecraftLauncher"
-             x:Class="VeloeMinecraftLauncher.App">
+             x:Class="VeloeMinecraftLauncher.App"
+	         RequestedThemeVariant="Default">
     <Application.DataTemplates>
         <local:ViewLocator/>
     </Application.DataTemplates>
 	<Application.Styles>
-		<FluentTheme Mode="Dark"/>
+		<FluentTheme/>
 	</Application.Styles>
 </Application>

VeloeMinecraftLauncher/Program.cs

@@ -31,9 +31,10 @@ namespace VeloeMinecraftLauncher
             Trace.Listeners.Add(listener);
             
             return AppBuilder.Configure<App>()
-                  .UsePlatformDetect()                 
-                  .LogToTrace()
-                  .UseReactiveUI();
+                    .UsePlatformDetect()
+                    .WithInterFont()
+                    .LogToTrace()
+                    .UseReactiveUI();
         }
     }
 }

VeloeMinecraftLauncher/ViewLocator.cs

@@ -7,7 +7,7 @@ namespace VeloeMinecraftLauncher
 {
     public class ViewLocator : IDataTemplate
     {
-        public IControl Build(object data)
+        public Control Build(object data)
         {
             var name = data.GetType().FullName!.Replace("ViewModel", "View");
             var type = Type.GetType(name);
@@ -16,10 +16,8 @@ namespace VeloeMinecraftLauncher
             {
                 return (Control)Activator.CreateInstance(type)!;
             }
-            else
-            {
-                return new TextBlock { Text = "Not Found: " + name };
-            }
+
+            return new TextBlock { Text = "Not Found: " + name };
         }
 
         public bool Match(object data)

VeloeMinecraftLauncher/ViewModels/ViewModelBase.cs

@@ -37,9 +37,9 @@ public class ViewModelBase : ReactiveValidationObject
 
     public static void OpenErrorWindow(Exception ex)
     {
-        string message = "";
-        string stackTrace = "";
-        string logfile = "";
+        string message = string.Empty;
+        string stackTrace = string.Empty;
+        string logfile = string.Empty;
         Exception? innerException;
         switch (ex)
         {
@@ -47,11 +47,8 @@ public class ViewModelBase : ReactiveValidationObject
                 message = ex.Message;
                 Settings.logger.Error(ex.Message);
 
-                if (ex is JavaProcessException)
-                {
-                    if (Path.Exists(((JavaProcessException)ex).LogPath))
+                if (ex is JavaProcessException javaEx && Path.Exists(javaEx.LogPath))
                         logfile = ((JavaProcessException)ex).LogPath;                   
-                }
 
                 if (ex.StackTrace is not null)
                     Settings.logger.Error(ex.StackTrace);

VeloeMinecraftLauncher/Views/MainWindow.axaml

@@ -31,9 +31,6 @@
     </Design.DataContext>
 	
 	<Panel>
-
-		
-
 		<DockPanel>			
 			<titlebars:TitleBarWindow
 			  IsSeamless="False"
@@ -43,7 +40,7 @@
 			  DockPanel.Dock="Top"
 			  ZIndex="997">
 			</titlebars:TitleBarWindow>
-			
+
 			<Grid DockPanel.Dock="Left">
 				<Grid.RowDefinitions>
 					<RowDefinition Height="0"></RowDefinition>
@@ -147,7 +144,7 @@
 						Margin="3">
 					</TextBlock>
 					<ComboBox
-						Items="{Binding DownloadedVersions}"
+						ItemsSource="{Binding DownloadedVersions}"
 						PlaceholderText="Select version"
 						SelectedItem="Binding DownloadedVersion"
 						SelectedIndex="{Binding DownloadedIndex}"
@@ -167,8 +164,35 @@
 						HorizontalAlignment="Center">
 						<TextBox.Styles>
 							<Style Selector="DataValidationErrors">
-								<Setter Property="Template" Value="{DynamicResource TooltipDataValidationContentTemplate}" />
-								<Setter Property="ErrorTemplate" Value="{DynamicResource TooltipDataValidationErrorTemplate}" />
+								<Setter Property="Template">
+									<ControlTemplate>
+										<DockPanel LastChildFill="True" MaxWidth="220">
+											<ContentControl DockPanel.Dock="Right"
+															ContentTemplate="{TemplateBinding ErrorTemplate}"
+															DataContext="{TemplateBinding Owner}"
+															Content="{Binding (DataValidationErrors.Errors)}"
+															IsVisible="{Binding (DataValidationErrors.HasErrors)}"/>
+											<ContentPresenter Name="PART_ContentPresenter"
+															  Background="{TemplateBinding Background}"
+															  BorderBrush="{TemplateBinding BorderBrush}"
+															  BorderThickness="{TemplateBinding BorderThickness}"
+															  CornerRadius="{TemplateBinding CornerRadius}"
+															  ContentTemplate="{TemplateBinding ContentTemplate}"
+															  Content="{TemplateBinding Content}"
+															  Padding="{TemplateBinding Padding}"/>
+										</DockPanel>
+									</ControlTemplate>
+								</Setter>
+								<Setter Property="ErrorTemplate">
+									<DataTemplate>
+										<Canvas Width="14" Height="14" Margin="4 0 1 0"
+												Background="Transparent">
+											<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="Yellow"
+												  StrokeThickness="2"/>
+										</Canvas>
+									</DataTemplate>
+								</Setter>
 							</Style>
 						</TextBox.Styles>
 					</TextBox>

VeloeMinecraftLauncher/Views/MainWindow.axaml.cs

@@ -10,7 +10,7 @@ namespace VeloeMinecraftLauncher.Views
             InitializeComponent();
         }
 
-        private void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        private void MainWindow_Closing(object sender, WindowClosingEventArgs e)
         {
             if (DataContext is MainWindowViewModel model)
             {

VeloeMinecraftLauncher/Views/SettingsWindow.axaml

@@ -82,10 +82,10 @@
 						</Grid.ColumnDefinitions>
 						
 						<TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center">Console log event level</TextBlock>
-						<ComboBox Grid.Row="1" Grid.Column="1" Margin="5" Items="{Binding LogEventLevels}" PlaceholderText="Select level" SelectedItem="{Binding ConsoleLogEventLevel}" HorizontalAlignment="Stretch"></ComboBox>
+						<ComboBox Grid.Row="1" Grid.Column="1" Margin="5" ItemsSource="{Binding LogEventLevels}" PlaceholderText="Select level" SelectedItem="{Binding ConsoleLogEventLevel}" HorizontalAlignment="Stretch"></ComboBox>
 						
 						<TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center">File log event level</TextBlock>
-						<ComboBox Grid.Row="2" Grid.Column="1" Margin="5" Items="{Binding LogEventLevels}" PlaceholderText="Select level" SelectedItem="{Binding FileLogEventLevel}" HorizontalAlignment="Stretch"></ComboBox>
+						<ComboBox Grid.Row="2" Grid.Column="1" Margin="5" ItemsSource="{Binding LogEventLevels}" PlaceholderText="Select level" SelectedItem="{Binding FileLogEventLevel}" HorizontalAlignment="Stretch"></ComboBox>
 						
 						<CheckBox Grid.Row="3" Grid.Column="0" IsChecked="{Binding SetMaxLog}">Set max log size</CheckBox>
 						<TextBox Grid.Row="3" Grid.Column="1" Margin="5" Name="MaxLog" Text="{Binding MaxLog}" IsEnabled="{Binding SetMaxLog}" HorizontalAlignment="Left" VerticalAlignment="Top"></TextBox>

VeloeMinecraftLauncher/Views/VersionsDownloader.axaml

@@ -4,8 +4,6 @@
 		xmlns:vm="using:VeloeMinecraftLauncher.ViewModels"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-		xmlns:i="clr-namespace:Avalonia.Xaml.Interactivity;assembly=Avalonia.Xaml.Interactivity"
-             xmlns:ia="clr-namespace:Avalonia.Xaml.Interactions.Core;assembly=Avalonia.Xaml.Interactions"
 		xmlns:titlebars="using:VeloeMinecraftLauncher.Views.TitleBar"
         mc:Ignorable="d" d:DesignWidth="350" d:DesignHeight="500"
 		Width="350" Height="500"
@@ -47,7 +45,7 @@
 				<TabItem Header="Downloader">
 					<Grid Margin="10" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,*,Auto,Auto,Auto,Auto">
 						<ComboBox
-							Items="{Binding FilteredVersions}"
+							ItemsSource="{Binding FilteredVersions}"
 							PlaceholderText="Select version"
 							SelectedItem="{Binding FilteredVersion}"
 							IsEnabled="{Binding IsControlsEnabled}"
@@ -124,7 +122,7 @@
 				<TabItem Header="Manager">
 					<Grid Margin="10" RowDefinitions="Auto,*,Auto">
 						<ComboBox
-							Items="{Binding DownloadedVersions}"
+							ItemsSource="{Binding DownloadedVersions}"
 							PlaceholderText="Select version"
 							SelectedItem="{Binding DownloadedVersion}"
 							IsEnabled="{Binding IsControlsEnabled}"
@@ -132,7 +130,7 @@
 							Grid.Row="0"/>
 
 							<TreeView
-								Items="{Binding DownloadedVersionTree}"
+								ItemsSource="{Binding DownloadedVersionTree}"
 							    IsEnabled="{Binding IsControlsEnabled}"
 								x:Name="treeView"
 								Margin="0,10,0,0"

VeloeMinecraftLauncher/Views/VersionsDownloader.axaml.cs

@@ -13,7 +13,7 @@ namespace VeloeMinecraftLauncher.Views
             InitializeComponent();
         }
 
-        private void VersionDownloader_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        private void VersionDownloader_Closing(object sender, WindowClosingEventArgs e)
         {
             if (DataContext is VersionsDownloaderViewModel model)
             {

VeloeMinecraftLauncher/app.manifest

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <!-- This manifest is used on Windows only.
+       Don't remove it as it might cause problems with window transparency and embeded controls.
+       For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
+  <assemblyIdentity version="1.0.0.0" name="VeloeMinecraftLauncher.Desktop"/>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of the Windows versions that this application has been tested on
+           and is designed to work with. Uncomment the appropriate elements
+           and Windows will automatically select the most compatible environment. -->
+
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    </application>
+  </compatibility>
+</assembly>