Updated Avalonia

wieslawsoltes · Oct 27, 2020 · e56c62d · e56c62d
1 parent 04869d0
commit e56c62d
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 21 deletions.
diff --git a/build/Avalonia.AvaloniaEdit.props b/build/Avalonia.AvaloniaEdit.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.AvaloniaEdit" Version="0.10.0-preview1" />
+    <PackageReference Include="Avalonia.AvaloniaEdit" Version="0.10.0-preview6" />
     <PackageReference Include="System.Collections.Immutable" Version="1.6.0" />
     <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.1" />
   </ItemGroup>

diff --git a/build/Avalonia.Desktop.props b/build/Avalonia.Desktop.props
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview5" />
-    <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2019013001" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview6" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.Diagnostics.props b/build/Avalonia.Diagnostics.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-preview5" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-preview6" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.props b/build/Avalonia.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.0-preview5" />
+    <PackageReference Include="Avalonia" Version="0.10.0-preview6" />
   </ItemGroup>
 </Project>
diff --git a/build/Base.props b/build/Base.props
@@ -2,7 +2,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VersionPrefix>0.10.0</VersionPrefix>
-    <VersionSuffix>preview5</VersionSuffix>
+    <VersionSuffix>preview6</VersionSuffix>
     <Authors>Wiesław Šoltés</Authors>
     <Company>Wiesław Šoltés</Company>
     <Description>A docking layout system.</Description>

diff --git a/build/ReactiveUI.props b/build/ReactiveUI.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="reactiveui" Version="10.3.6" />
+    <PackageReference Include="reactiveui" Version="11.5.17" />
   </ItemGroup>
 </Project>
diff --git a/samples/AvaloniaDemo.Debug/Program.cs b/samples/AvaloniaDemo.Debug/Program.cs
@@ -14,6 +14,6 @@ private static void Main(string[] args)
         public static AppBuilder BuildAvaloniaApp()
             => AppBuilder.Configure<App>()
                          .UsePlatformDetect()
-                         .LogToDebug();
+                         .LogToTrace();
     }
 }
diff --git a/samples/AvaloniaDemo.Perspectives/Program.cs b/samples/AvaloniaDemo.Perspectives/Program.cs
@@ -14,6 +14,6 @@ private static void Main(string[] args)
         public static AppBuilder BuildAvaloniaApp()
             => AppBuilder.Configure<App>()
                          .UsePlatformDetect()
-                         .LogToDebug();
+                         .LogToTrace();
     }
 }
diff --git a/samples/AvaloniaDemo.Static/Program.cs b/samples/AvaloniaDemo.Static/Program.cs
@@ -14,6 +14,6 @@ private static void Main(string[] args)
         public static AppBuilder BuildAvaloniaApp()
             => AppBuilder.Configure<App>()
                          .UsePlatformDetect()
-                         .LogToDebug();
+                         .LogToTrace();
     }
 }
diff --git a/samples/AvaloniaDemo/Program.cs b/samples/AvaloniaDemo/Program.cs
@@ -14,6 +14,6 @@ private static void Main(string[] args)
         public static AppBuilder BuildAvaloniaApp()
             => AppBuilder.Configure<App>()
                          .UsePlatformDetect()
-                         .LogToDebug();
+                         .LogToTrace();
     }
 }
diff --git a/samples/AvaloniaDemo/Views/DragAndDropView.xaml.cs b/samples/AvaloniaDemo/Views/DragAndDropView.xaml.cs
@@ -74,7 +74,11 @@ private void Drop(object? sender, DragEventArgs e)
             {
                 if (_DropState != null)
                 {
-                    _DropState.Text = string.Join(Environment.NewLine, e.Data.GetFileNames());
+                    var values = e.Data.GetFileNames();
+                    if (values is {})
+                    {
+                        _DropState.Text = string.Join(Environment.NewLine, values);
+                    }
                 }
             }
         }

diff --git a/samples/Notepad/Program.cs b/samples/Notepad/Program.cs
@@ -14,6 +14,6 @@ private static void Main(string[] args)
         public static AppBuilder BuildAvaloniaApp()
             => AppBuilder.Configure<App>()
                          .UsePlatformDetect()
-                         .LogToDebug();
+                         .LogToTrace();
     }
 }
diff --git a/samples/Notepad/ViewModels/MainWindowViewModel.cs b/samples/Notepad/ViewModels/MainWindowViewModel.cs
@@ -207,19 +207,20 @@ public void Drop(object? sender, DragEventArgs e)
             if (e.Data.Contains(DataFormats.FileNames))
             {
                 var result = e.Data.GetFileNames();
-
-                foreach (var path in result)
+                if (result is {})
                 {
-                    if (!string.IsNullOrEmpty(path))
+                    foreach (var path in result)
                     {
-                        var untitledFileViewModel = OpenFileViewModel(path);
-                        if (untitledFileViewModel != null)
+                        if (!string.IsNullOrEmpty(path))
                         {
-                            AddFileViewModel(untitledFileViewModel);
+                            var untitledFileViewModel = OpenFileViewModel(path);
+                            if (untitledFileViewModel != null)
+                            {
+                                AddFileViewModel(untitledFileViewModel);
+                            }
                         }
                     }
                 }
-
                 e.Handled = true;
             }
         }

diff --git a/samples/ProportionalStackPanelDemo/Program.cs b/samples/ProportionalStackPanelDemo/Program.cs
@@ -14,6 +14,6 @@ private static void Main(string[] args)
         public static AppBuilder BuildAvaloniaApp()
             => AppBuilder.Configure<App>()
                          .UsePlatformDetect()
-                         .LogToDebug();
+                         .LogToTrace();
     }
 }