Working with warnings

CSharp/Applications/AvaloniaLoggingDI/App.axaml

@@ -10,7 +10,7 @@
     </Application.DataTemplates>
 
     <Application.Styles>
-        <FluentTheme Mode="Light"/>
+        <FluentTheme/>
         <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
     </Application.Styles>
 </Application>

CSharp/Applications/AvaloniaLoggingDI/App.axaml.cs

@@ -1,23 +1,23 @@
-using System;
-using System.Drawing;
-using System.Reflection;
-using System.Threading;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Data.Core;
 using Avalonia.Data.Core.Plugins;
 using Avalonia.Markup.Xaml;
 using AvaloniaLoggingDI.ViewModels;
 using AvaloniaLoggingDI.Views;
 using LogViewer.Avalonia;
-using MessageBox.Avalonia;
-using MessageBox.Avalonia.Enums;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using MsBox.Avalonia;
+using MsBox.Avalonia.Enums;
 using MsLogger.Core;
 using RandomLogging.Service;
-using Icon = MessageBox.Avalonia.Enums.Icon;
+using System;
+using System.Drawing;
+using System.Linq;
+using System.Reflection;
+using System.Threading;
+using Icon = MsBox.Avalonia.Enums.Icon;
 
 namespace AvaloniaLoggingDI;
 
@@ -30,9 +30,9 @@ public partial class App : Application
     {
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
-            // Line below is needed to remove Avalonia data validation.
+            // Avoid duplicate validations from both Avalonia and the CommunityToolkit. 
-            // Without this line you will get duplicate validations from both Avalonia and CT
+            // More info: https://docs.avaloniaui.net/docs/guides/development-guides/data-validation#manage-validationplugins
-            ExpressionObserver.DataValidators.RemoveAll(x => x is DataAnnotationsValidationPlugin);
+            DisableAvaloniaDataAnnotationValidation();
 
             // catch all unhandled errors
             AppDomain.CurrentDomain.UnhandledException += OnUnhandledException;
@@ -119,7 +119,17 @@ public partial class App : Application
 
         base.OnFrameworkInitializationCompleted();
     }
+    private static void DisableAvaloniaDataAnnotationValidation()
+    {
+        // Get an array of plugins to remove
+        var dataValidationPluginsToRemove = BindingPlugins.DataValidators.OfType<DataAnnotationsValidationPlugin>().ToArray();
 
+        // remove each entry found
+        foreach (var plugin in dataValidationPluginsToRemove)
+        {
+            BindingPlugins.DataValidators.Remove(plugin);
+        }
+    }
     private void OnShutdownRequested(object? sender, ShutdownRequestedEventArgs e)
         => _ = _host!.StopAsync(_cancellationTokenSource!.Token);
 
@@ -133,19 +143,22 @@ public partial class App : Application
     private void OnUnhandledException(object sender, UnhandledExceptionEventArgs e)
         => ShowMessageBox("Unhandled Error", ((Exception)e.ExceptionObject).Message);
 
-    private void ShowMessageBox(string title, string message)
+    private static void ShowMessageBox(string title, string message)
     {
-        MessageBox.Avalonia.BaseWindows.Base.IMsBoxWindow<ButtonResult> messageBoxStandardWindow = MessageBoxManager
+        var box = MessageBoxManager.GetMessageBoxStandard(
-            .GetMessageBoxStandardWindow(title, message, ButtonEnum.Ok, Icon.Stop);
+                "Exception",
- 
+                text: message,
-        messageBoxStandardWindow.Show();
+                ButtonEnum.Ok,
+                Icon.Stop
+            );
+        _ = box.ShowAsync().GetAwaiter();
       }
 
     private void LogStartingMode()
     {
         // Get the Launch mode
         bool isDevelopment = string.Equals(Environment.GetEnvironmentVariable("DOTNET_MODIFIABLE_ASSEMBLIES"), "debug",
-            StringComparison.InvariantCultureIgnoreCase);
+            StringComparison.OrdinalIgnoreCase);
 
         // initialize a logger & EventId
         ILogger<App> logger = _host!.Services.GetRequiredService<ILogger<App>>();

CSharp/Applications/AvaloniaLoggingDI/AvaloniaLoggingDI.csproj

@@ -4,6 +4,9 @@
      <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <ItemGroup>
+    <None Remove="Assets\avalonia-logo.ico" />
+  </ItemGroup>
 
   <ItemGroup>
     <Content Include="appsettings.Development.json">
@@ -31,4 +34,8 @@
     <ProjectReference Include="..\..\Core\MsLogger.Core\MsLogger.Core.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <AvaloniaResource Include="Assets\avalonia-logo.ico" />
+  </ItemGroup>
+
 </Project>

CSharp/Applications/AvaloniaLoggingDI/ViewLocator.cs

@@ -2,15 +2,24 @@ using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using AvaloniaLoggingDI.ViewModels;
 using System;
+using System.Diagnostics.CodeAnalysis;
 
 namespace AvaloniaLoggingDI;
-
+// <summary>
+/// Given a view model, returns the corresponding view if possible.
+/// </summary>
+[RequiresUnreferencedCode(
+    "Default implementation of ViewLocator involves reflection which may be trimmed away.",
+    Url = "https://docs.avaloniaui.net/docs/concepts/view-locator")]
 public class ViewLocator : IDataTemplate
 {
-    public IControl Build(object data)
+    public Control? Build(object? param)
     {
-        string name = data.GetType().FullName!.Replace("ViewModel", "View");
+        if (param is null)
-        Type? type = Type.GetType(name);
+            return null;
+
+        var name = param.GetType().FullName!.Replace("ViewModel", "View", StringComparison.Ordinal);
+        var type = Type.GetType(name);
 
         if (type != null)
         {
@@ -20,7 +29,7 @@ public class ViewLocator : IDataTemplate
         return new TextBlock { Text = "Not Found: " + name };
     }
 
-    public bool Match(object data)
+    public bool Match(object? data)
     {
         return data is ViewModelBase;
     }

CSharp/Applications/AvaloniaLoggingDI/Views/MainWindow.axaml

@@ -11,7 +11,7 @@
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         
         Title="C# AVALONIA | LogViewer Control Example - Dot Net 7.0"
-        Icon="avares://Avalonia.Resources/Assets/avalonia-logo.ico"
+        Icon="/Assets/avalonia-logo.ico"
         WindowStartupLocation="CenterScreen" Height="634" Width="600">
 
     <control:LogViewerControl DataContext="{Binding LogViewer}" />

CSharp/Applications/AvaloniaLoggingNoDI/App.axaml

@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Application.Styles>
-        <FluentTheme Mode="Light"/>
+        <FluentTheme/>
         <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
     </Application.Styles>
 </Application>

CSharp/Applications/AvaloniaLoggingNoDI/App.axaml.cs

@@ -4,6 +4,7 @@ using Avalonia.Data.Core;
 using Avalonia.Data.Core.Plugins;
 using Avalonia.Markup.Xaml;
 using AvaloniaLoggingNoDI.Views;
+using System.Linq;
 
 namespace AvaloniaLoggingNoDI;
 
@@ -18,12 +19,24 @@ public partial class App : Application
     {
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
-            // Line below is needed to remove Avalonia data validation.
+            // Avoid duplicate validations from both Avalonia and the CommunityToolkit. 
-            // Without this line you will get duplicate validations from both Avalonia and CT
+            // More info: https://docs.avaloniaui.net/docs/guides/development-guides/data-validation#manage-validationplugins
-            ExpressionObserver.DataValidators.RemoveAll(x => x is DataAnnotationsValidationPlugin);
+            DisableAvaloniaDataAnnotationValidation();
             desktop.MainWindow = new MainWindow();        
         }
 
         base.OnFrameworkInitializationCompleted();
     }
+    private static void DisableAvaloniaDataAnnotationValidation()
+    {
+        // Get an array of plugins to remove
+        var dataValidationPluginsToRemove =
+            BindingPlugins.DataValidators.OfType<DataAnnotationsValidationPlugin>().ToArray();
+
+        // remove each entry found
+        foreach (var plugin in dataValidationPluginsToRemove)
+        {
+            BindingPlugins.DataValidators.Remove(plugin);
+        }
+    }
 }

CSharp/Applications/AvaloniaLoggingNoDI/AvaloniaLoggingNoDI.csproj

@@ -6,6 +6,14 @@
 		<ApplicationManifest>app.manifest</ApplicationManifest>
 	</PropertyGroup>
 
+	<ItemGroup>
+	  <None Remove="Assets\avalonia-logo.ico" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <AvaloniaResource Include="Assets\avalonia-logo.ico" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<Content Include="appsettings.Development.json">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

CSharp/Applications/AvaloniaLoggingNoDI/Views/MainWindow.axaml

@@ -11,7 +11,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         
         Title="C# AVALONIA MINIMAL | LogViewer Control Example - Dot Net 7.0"
-        Icon="avares://Avalonia.Resources/Assets/avalonia-logo.ico"
+        Icon="/Assets/avalonia-logo.ico"
         WindowStartupLocation="CenterScreen" Height="634" Width="600">
 
     <control:LogViewerControl x:Name="LogViewerControl" />

CSharp/Applications/AvaloniaSerilogDI/App.axaml

@@ -8,7 +8,7 @@
     </Application.DataTemplates>
 
     <Application.Styles>
-        <FluentTheme Mode="Light"/>
+        <FluentTheme />
         <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
     </Application.Styles>
 </Application>

CSharp/Applications/AvaloniaSerilogDI/App.axaml.cs

@@ -1,6 +1,5 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Data.Core;
 using Avalonia.Data.Core.Plugins;
 using Avalonia.Markup.Xaml;
 using AvaloniaSerilogDI.ViewModels;
@@ -8,20 +7,20 @@ using AvaloniaSerilogDI.Views;
 using Common.Core.Extensions;
 using LogViewer.Avalonia;
 using LogViewer.Core;
-using MessageBox.Avalonia;
-using MessageBox.Avalonia.Enums;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using MsBox.Avalonia;
+using MsBox.Avalonia.Enums;
 using RandomLogging.Service;
 using Serilog;
 using Serilog.Sinks.LogView.Core;
 using System;
-using System.Drawing;
+using System.Globalization;
+using System.Linq;
 using System.Reflection;
 using System.Threading;
-using Icon = MessageBox.Avalonia.Enums.Icon;
+using Icon = MsBox.Avalonia.Enums.Icon;
-
 namespace AvaloniaSerilogDI;
 
 public partial class App : Application
@@ -46,10 +45,9 @@ public partial class App : Application
     {
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
-            // Line below is needed to remove Avalonia data validation.
+            // Avoid duplicate validations from both Avalonia and the CommunityToolkit. 
-            // Without this line you will get duplicate validations from both Avalonia and CT
+            // More info: https://docs.avaloniaui.net/docs/guides/development-guides/data-validation#manage-validationplugins
-            ExpressionObserver.DataValidators.RemoveAll(x => x is DataAnnotationsValidationPlugin);
+            DisableAvaloniaDataAnnotationValidation();
-
             // catch all unhandled errors
             AppDomain.CurrentDomain.UnhandledException += OnUnhandledException;
 
@@ -78,43 +76,11 @@ public partial class App : Application
             services.AddLogging(configure: cfg =>
             {
                 Log.Logger = new LoggerConfiguration()
-            //Serilog.Core.Logger logger = new LoggerConfiguration()
                     .ReadFrom.Configuration(builder.Configuration)
-                .WriteTo.DataStoreLoggerSink(
+                    .WriteTo.DataStoreLoggerSink( dataStoreProvider: () => _host!.Services.TryGetService<ILogDataStore>()!,formatProvider: CultureInfo.InvariantCulture)
-                    dataStoreProvider: () => _host!.Services.TryGetService<ILogDataStore>()!
-
-                    //dataStoreProvider: () => _host!.Services.TryGetService<ILogDataStore>()!,
-                    //options =>
-                    //{
-                    //    options.Colors[LogLevel.Trace] = new()
-                    //    {
-                    //        Foreground = Color.White,
-                    //        Background = Color.DarkGray
-                    //    };
-
-                    //    options.Colors[LogLevel.Debug] = new()
-                    //    {
-                    //        Foreground = Color.White,
-                    //        Background = Color.Gray
-                    //    };
-
-                    //    options.Colors[LogLevel.Information] = new()
-                    //    {
-                    //        Foreground = Color.White,
-                    //        Background = Color.DodgerBlue
-                    //    };
-
-                    //    options.Colors[LogLevel.Warning] = new()
-                    //    {
-                    //        Foreground = Color.White,
-                    //        Background = Color.Orchid
-                    //    };
-                    //}
-                    )
                     .CreateLogger();
 
-            cfg.ClearProviders()
+                cfg.ClearProviders().AddSerilog(Log.Logger);
-                .AddSerilog(Log.Logger);
             });
 
             services
@@ -155,7 +121,17 @@ public partial class App : Application
 
         base.OnFrameworkInitializationCompleted();
     }
+    private static void DisableAvaloniaDataAnnotationValidation()
+    {
+        // Get an array of plugins to remove
+        var dataValidationPluginsToRemove = BindingPlugins.DataValidators.OfType<DataAnnotationsValidationPlugin>().ToArray();
 
+        // remove each entry found
+        foreach (var plugin in dataValidationPluginsToRemove)
+        {
+            BindingPlugins.DataValidators.Remove(plugin);
+        }
+    }
     private void OnShutdownRequested(object? sender, ShutdownRequestedEventArgs e)
         => CleanUp();
 
@@ -169,23 +145,25 @@ public partial class App : Application
         CleanUp();
     }
 
-    private void ShowMessageBox(string title, string message)
+    private static void ShowMessageBox(string title, string message)
     {
-        MessageBox.Avalonia.BaseWindows.Base.IMsBoxWindow<ButtonResult> messageBoxStandardWindow = MessageBoxManager
+        var box = MessageBoxManager.GetMessageBoxStandard(
-            .GetMessageBoxStandardWindow(title, message, ButtonEnum.Ok, Icon.Stop);
+                "Exception",
-
+                text: message,
-        messageBoxStandardWindow.Show();
+                ButtonEnum.Ok,
+                Icon.Stop
+            );
+        _ = box.ShowAsync().GetAwaiter();
     }
-
     private void LogStartingMode()
     {
         // Get the Launch mode
         bool isDevelopment = string.Equals(Environment.GetEnvironmentVariable("DOTNET_MODIFIABLE_ASSEMBLIES"), "debug",
-            StringComparison.InvariantCultureIgnoreCase);
+            StringComparison.OrdinalIgnoreCase);
 
         // initialize a logger & EventId
         ILogger<App> logger = _host!.Services.GetRequiredService<ILogger<App>>();
-        EventId eventId = new EventId(id: 0, name: Assembly.GetEntryAssembly()!.GetName().Name);
+        EventId eventId = new(id: 0, name: Assembly.GetEntryAssembly()!.GetName().Name);
 
         // log a test pattern for each log level
         logger.TestPattern(eventId: eventId);
@@ -197,7 +175,7 @@ public partial class App : Application
     private void CleanUp()
     {
         // tell the background services that we are shutting down
-        _ = _host!.StopAsync(_cancellationTokenSource!.Token);
+        _ = _host?.StopAsync(_cancellationTokenSource?.Token ?? CancellationToken.None);
 
         // flush logs
         Log.CloseAndFlush();

CSharp/Applications/AvaloniaSerilogDI/AvaloniaSerilogDI.csproj

@@ -4,6 +4,12 @@
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <ItemGroup>
+    <None Remove="Assets\avalonia-logo.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <AvaloniaResource Include="Assets\avalonia-logo.ico" />
+  </ItemGroup>
 
   <ItemGroup>
     <Content Include="appsettings.Development.json">

CSharp/Applications/AvaloniaSerilogDI/ViewLocator.cs

@@ -2,15 +2,24 @@ using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using AvaloniaSerilogDI.ViewModels;
 using System;
+using System.Diagnostics.CodeAnalysis;
 
 namespace AvaloniaSerilogDI;
-
+// <summary>
+/// Given a view model, returns the corresponding view if possible.
+/// </summary>
+[RequiresUnreferencedCode(
+    "Default implementation of ViewLocator involves reflection which may be trimmed away.",
+    Url = "https://docs.avaloniaui.net/docs/concepts/view-locator")]
 public class ViewLocator : IDataTemplate
 {
-    public IControl Build(object data)
+    public Control? Build(object? param)
     {
-        string name = data.GetType().FullName!.Replace("ViewModel", "View");
+        if (param is null)
-        Type? type = Type.GetType(name);
+            return null;
+
+        var name = param.GetType().FullName!.Replace("ViewModel", "View", StringComparison.Ordinal);
+        var type = Type.GetType(name);
 
         if (type != null)
         {
@@ -20,7 +29,7 @@ public class ViewLocator : IDataTemplate
         return new TextBlock { Text = "Not Found: " + name };
     }
 
-    public bool Match(object data)
+    public bool Match(object? data)
     {
         return data is ViewModelBase;
     }

CSharp/Applications/AvaloniaSerilogDI/Views/MainWindow.axaml

@@ -11,7 +11,7 @@
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         
         Title="C# AVALONIA SeriLog | LogViewer Control Example - Dot Net 7.0"
-        Icon="avares://Avalonia.Resources/Assets/avalonia-logo.ico"
+        Icon="/Assets/avalonia-logo.ico"
         WindowStartupLocation="CenterScreen" Height="634" Width="600">
 
     <control:LogViewerControl DataContext="{Binding LogViewer}" />

CSharp/Applications/AvaloniaSerilogNoDI/App.axaml

@@ -3,7 +3,7 @@
              x:Class="AvaloniaSerilogNoDI.App">
 
     <Application.Styles>
-        <FluentTheme Mode="Light"/>
+        <FluentTheme/>
         <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
     </Application.Styles>
 </Application>

CSharp/Applications/AvaloniaSerilogNoDI/AvaloniaSerilogNoDI.csproj

@@ -4,6 +4,12 @@
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <ItemGroup>
+    <None Remove="Assets\avalonia-logo.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <AvaloniaResource Include="Assets\avalonia-logo.ico" />
+  </ItemGroup>
 
   <ItemGroup>
     <Content Include="appsettings.Development.json">

CSharp/Applications/AvaloniaSerilogNoDI/Helpers/LoggingHelper.cs

@@ -5,6 +5,7 @@ using Microsoft.Extensions.Logging;
 using Serilog;
 using Serilog.Sinks.LogView.Core;
 using System.Drawing;
+using System.Globalization;
 
 namespace AvaloniaSerilogNoDI.Helpers;
 
@@ -21,10 +22,7 @@ public static class LoggingHelper
 
         Log.Logger = new LoggerConfiguration()
             .ReadFrom.Configuration(configuration)
-            .WriteTo.DataStoreLoggerSink(
+            .WriteTo.DataStoreLoggerSink(dataStoreProvider: () => MainControlsDataStore.DataStore,
-                //dataStoreProvider: () => MainControlsDataStore.DataStore
-
-                dataStoreProvider: () => MainControlsDataStore.DataStore,
                 options =>
                 {
                     options.Colors[LogLevel.Trace] = new()
@@ -50,7 +48,7 @@ public static class LoggingHelper
                         Foreground = Color.White,
                         Background = Color.Orchid
                     };
-                }
+                }, formatProvider: CultureInfo.InvariantCulture
             )
             .CreateLogger();
 

CSharp/Applications/AvaloniaSerilogNoDI/MainWindow.axaml

@@ -11,7 +11,7 @@
         xmlns:control="clr-namespace:LogViewer.Avalonia;assembly=LogViewer.Avalonia"
 
         Title="C# AVALONIA | SeriLog LogViewer Control Example - Dot Net 7.0"
-        Icon="avares://Avalonia.Resources/Assets/avalonia-logo.ico"
+        Icon="/Assets/avalonia-logo.ico"
         WindowStartupLocation="CenterScreen" Height="634" Width="600">
 
     <control:LogViewerControl x:Name="LogViewerControl" />

CSharp/Controls/LogViewer.Avalonia/LogViewer.Avalonia.csproj

@@ -2,18 +2,20 @@
 
 	<PropertyGroup>
 		<ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="Avalonia" Version="11.3.13" />
 		<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.13" />
 		<PackageReference Include="Avalonia.Desktop" Version="11.3.13" />
+		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.13" />
+		<PackageReference Include="Avalonia.Themes.Simple" Version="11.3.13" />
+
 		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
 		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.13" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
-    <PackageReference Include="XamlNameReferenceGenerator" Version="1.6.1" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.5" />
+		<PackageReference Include="MessageBox.Avalonia" Version="3.3.1.1" />
 	</ItemGroup>
 
 	<ItemGroup>

CSharp/Controls/LogViewer.Avalonia/LogViewerControl.axaml

@@ -34,7 +34,7 @@
             </Style>
         </Grid.Styles>
         <DataGrid x:Name="MyDataGrid"
-                  Items="{Binding DataStore.Entries}" AutoGenerateColumns="False"
+                  ItemsSource="{Binding DataStore.Entries}" AutoGenerateColumns="False"
                   CanUserSortColumns="False"
                   LayoutUpdated="OnLayoutUpdated">
             <DataGrid.Columns>

CSharp/Controls/LogViewer.Avalonia/LogViewerControl.axaml.cs

@@ -8,7 +8,10 @@ namespace LogViewer.Avalonia;
 public partial class LogViewerControl : UserControl
 {
     public LogViewerControl()
-        => InitializeComponent();
+    {
+        InitializeComponent();
+    }
+  
 
     private ILogDataStoreImpl? vm;
     private LogModel? item;
@@ -23,7 +26,7 @@ public partial class LogViewerControl : UserControl
     }
 
     private void OnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-        => item = MyDataGrid.Items.Cast<LogModel>().LastOrDefault();
+        => item = MyDataGrid.ItemsSource.Cast<LogModel>().LastOrDefault();
 
     private void OnLayoutUpdated(object? sender, EventArgs e)
     {