Merge pull request #1163 from b-editor/upgrade/packages

chore(deps): bump Avalonia, Microsoft.Extensions, OpenTelemetry, and other packages to latest versions
b-editor · Nov 15, 2024 · 1b08506 · 1b08506
2 parents bab4423 + 566ae92
commit 1b08506
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 59 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,16 +4,16 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="AsyncImageLoader.Avalonia" Version="3.3.0" />
-    <PackageVersion Include="Avalonia" Version="11.2.0" />
+    <PackageVersion Include="Avalonia" Version="11.1.4" />
     <PackageVersion Include="Avalonia.Controls.ItemsRepeater" Version="11.1.4" />
-    <PackageVersion Include="Avalonia.Controls.PanAndZoom" Version="11.1.0.1" />
+    <PackageVersion Include="Avalonia.Controls.PanAndZoom" Version="11.1.0.2" />
     <PackageVersion Include="Avalonia.Desktop" Version="11.1.4" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.2.0" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.1.4" />
     <PackageVersion Include="Avalonia.ReactiveUI" Version="11.1.4" />
     <PackageVersion Include="Avalonia.Svg.Skia" Version="11.1.0.1" />
-    <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.2.0" />
-    <PackageVersion Include="Avalonia.Xaml.Behaviors" Version="11.1.0.5" />
-    <PackageVersion Include="Avalonia.Xaml.Interactivity" Version="11.2.0" />
+    <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.1.4" />
+    <PackageVersion Include="Avalonia.Xaml.Behaviors" Version="11.1.0.7" />
+    <PackageVersion Include="Avalonia.Xaml.Interactivity" Version="11.1.0.7" />
     <PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.3.0" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
@@ -27,13 +27,13 @@
     <PackageVersion Include="FluentIcons.FluentAvalonia" Version="1.1.224" />
     <PackageVersion Include="FluentTextTable" Version="1.0.0" />
     <PackageVersion Include="ILGPU.Algorithms" Version="1.5.1" />
-    <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.10.0" />
+    <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.0.0" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.106" />
     <PackageVersion Include="MonoMac.NetStandard" Version="0.0.4" />
     <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="NAudio.Wasapi" Version="2.2.1" />
     <PackageVersion Include="HarfBuzzSharp" Version="7.3.0.3" />
-    <PackageVersion Include="HarfBuzzSharp.NativeAssets.Linux" Version="7.3.0.2" />
+    <PackageVersion Include="HarfBuzzSharp.NativeAssets.Linux" Version="7.3.0.3" />
     <PackageVersion Include="ILGPU" Version="1.5.1" />
     <PackageVersion Include="Kokuban" Version="0.2.0" />
     <PackageVersion Include="Kurukuru" Version="1.4.2" />
@@ -42,29 +42,29 @@
     <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="9.0.0" />
     <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="8.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="9.0.0" />
     <PackageVersion Include="NAudio.Core" Version="2.2.1" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageVersion Include="Nito.AsyncEx" Version="5.1.2" />
-    <PackageVersion Include="NuGet.ProjectModel" Version="6.11.1" />
+    <PackageVersion Include="NuGet.ProjectModel" Version="6.12.1" />
     <PackageVersion Include="NuGet.Protocol" Version="6.12.1" />
-    <PackageVersion Include="NuGet.Resolver" Version="6.11.1" />
-    <PackageVersion Include="Nuke.Common" Version="8.1.2" />
+    <PackageVersion Include="NuGet.Resolver" Version="6.12.1" />
+    <PackageVersion Include="Nuke.Common" Version="8.1.4" />
     <PackageVersion Include="NUnit" Version="4.2.2" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageVersion Include="OpenCvSharp4" Version="4.9.0.20240103" />
+    <PackageVersion Include="OpenCvSharp4" Version="4.10.0.20241108" />
     <PackageVersion Include="OpenCvSharp4.runtime.osx.10.15-x64" Version="4.6.0.20230105" />
     <PackageVersion Include="OpenCvSharp4.runtime.osx_arm64" Version="4.8.1-rc" />
-    <PackageVersion Include="OpenCvSharp4.runtime.win" Version="4.9.0.20240103" />
+    <PackageVersion Include="OpenCvSharp4.runtime.win" Version="4.10.0.20241108" />
     <PackageVersion Include="OpenTelemetry" Version="1.10.0" />
-    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
-    <PackageVersion Include="OpenTelemetry.Exporter.Zipkin" Version="1.9.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.10.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.Zipkin" Version="1.10.0" />
     <PackageVersion Include="OpenTK.OpenAL" Version="5.0.0-pre.8" />
-    <PackageVersion Include="OpenTK.Windowing.GraphicsLibraryFramework" Version="5.0.0-pre.12" />
+    <PackageVersion Include="OpenTK.Windowing.GraphicsLibraryFramework" Version="5.0.0-pre.13" />
     <PackageVersion Include="PanelExtension" Version="1.0.0" />
     <PackageVersion Include="ReactiveProperty" Version="9.6.0" />
-    <PackageVersion Include="ReDocking.Avalonia" Version="1.0.3" />
+    <PackageVersion Include="ReDocking.Avalonia" Version="1.0.2" />
     <PackageVersion Include="Roslynator.Analyzers" Version="4.12.9" />
     <PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
     <PackageVersion Include="Serilog.Sinks.Async" Version="2.1.0" />
@@ -76,12 +76,12 @@
     <PackageVersion Include="Sharprompt" Version="2.4.5" />
     <PackageVersion Include="SkiaSharp" Version="2.88.9" />
     <PackageVersion Include="SkiaSharp.HarfBuzz" Version="2.88.9" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.8" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageVersion Include="System.Interactive" Version="6.0.1" />
     <PackageVersion Include="System.Interactive.Async" Version="6.0.1" />
-    <PackageVersion Include="System.Management" Version="8.0.0" />
+    <PackageVersion Include="System.Management" Version="9.0.0" />
     <PackageVersion Include="System.Reactive" Version="6.0.1" />
     <PackageVersion Include="Vortice.XAudio2" Version="3.6.2" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/Beutl.Engine/Graphics/Image.cs b/src/Beutl.Engine/Graphics/Image.cs
@@ -157,12 +157,12 @@ public static SKBitmap ToSKBitmap(this Mat self)
 
     public static Mat ToMat(this Bitmap<Bgra8888> self)
     {
-        return new Mat(self.Height, self.Width, MatType.CV_8UC4, self.Data);
+        return Mat.FromPixelData(self.Height, self.Width, MatType.CV_8UC4, self.Data);
     }
 
     public static Mat AsMat(this Bitmap<Bgra8888> self)
     {
-        return new Mat(self.Height, self.Width, MatType.CV_8UC4, self.Data);
+        return Mat.FromPixelData(self.Height, self.Width, MatType.CV_8UC4, self.Data);
     }
 
     internal static EncodedImageFormat ToImageFormat(string filename)

diff --git a/src/Beutl/Models/FrameCacheManager.CacheEntry.cs b/src/Beutl/Models/FrameCacheManager.CacheEntry.cs
@@ -99,7 +99,7 @@ private static unsafe Bitmap<Bgra8888> ToBitmap(Mat mat, int bottom, int right)
             else
             {
                 bitmap = new Bitmap<Bgra8888>(mat.Width, (int)(mat.Height / 1.5));
-                using var bgra = new Mat(bitmap.Height, bitmap.Width, MatType.CV_8UC4, bitmap.Data);
+                using var bgra = Mat.FromPixelData(bitmap.Height, bitmap.Width, MatType.CV_8UC4, bitmap.Data);
 
                 Cv2.CvtColor(mat, bgra, ColorConversionCodes.YUV2BGRA_I420);
 

diff --git a/src/Beutl/ViewModels/Dialogs/AddOutputQueueViewModel.cs b/src/Beutl/ViewModels/Dialogs/AddOutputQueueViewModel.cs
@@ -8,12 +8,8 @@
 using DynamicData;
 using DynamicData.Binding;
 
-using Microsoft.Extensions.DependencyInjection;
-
 using Reactive.Bindings;
 
-using ReactiveUI;
-
 namespace Beutl.ViewModels.Dialogs;
 
 public sealed class AddOutputQueueViewModel : IDisposable

diff --git a/src/Beutl/ViewModels/Editors/BrushEditorViewModel.cs b/src/Beutl/ViewModels/Editors/BrushEditorViewModel.cs
@@ -1,5 +1,4 @@
-using System.Collections.Immutable;
-using System.Text.Json.Nodes;
+using System.Text.Json.Nodes;
 
 using Beutl.Animation;
 using Beutl.Media;
@@ -9,8 +8,6 @@
 
 using Reactive.Bindings;
 
-using ReactiveUI;
-
 namespace Beutl.ViewModels.Editors;
 
 public sealed class BrushEditorViewModel : BaseEditorViewModel
@@ -61,8 +58,8 @@ public BrushEditorViewModel(IPropertyAdapter property)
 
         Value.CombineWithPrevious()
             .Select(v => v.OldValue as IAnimatable)
-            .WhereNotNull()
-            .Subscribe(v => this.GetService<ISupportCloseAnimation>()?.Close(v))
+            .Where(v => v != null)
+            .Subscribe(v => this.GetService<ISupportCloseAnimation>()?.Close(v!))
             .DisposeWith(Disposables);
     }
 

diff --git a/src/Beutl/ViewModels/Editors/FilterEffectEditorViewModel.cs b/src/Beutl/ViewModels/Editors/FilterEffectEditorViewModel.cs
@@ -6,7 +6,6 @@
 using Beutl.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Reactive.Bindings;
-using ReactiveUI;
 
 namespace Beutl.ViewModels.Editors;
 
@@ -91,8 +90,8 @@ public FilterEffectEditorViewModel(IPropertyAdapter<FilterEffect?> property)
 
         Value.CombineWithPrevious()
             .Select(v => v.OldValue)
-            .WhereNotNull()
-            .Subscribe(v => this.GetService<ISupportCloseAnimation>()?.Close(v))
+            .Where(v => v != null)
+            .Subscribe(v => this.GetService<ISupportCloseAnimation>()?.Close(v!))
             .DisposeWith(Disposables);
     }
 

diff --git a/src/Beutl/ViewModels/Editors/GeometryEditorViewModel.cs b/src/Beutl/ViewModels/Editors/GeometryEditorViewModel.cs
@@ -7,8 +7,6 @@
 
 using Reactive.Bindings;
 
-using ReactiveUI;
-
 namespace Beutl.ViewModels.Editors;
 
 public sealed class GeometryEditorViewModel : ValueEditorViewModel<Geometry?>
@@ -57,8 +55,8 @@ public GeometryEditorViewModel(IPropertyAdapter<Geometry?> property)
 
         Value.CombineWithPrevious()
             .Select(v => v.OldValue)
-            .WhereNotNull()
-            .Subscribe(v => this.GetService<ISupportCloseAnimation>()?.Close(v))
+            .Where(v => v != null)
+            .Subscribe(v => this.GetService<ISupportCloseAnimation>()?.Close(v!))
             .DisposeWith(Disposables);
     }
 

diff --git a/src/Beutl/ViewModels/Editors/PathFigureEditorViewModel.cs b/src/Beutl/ViewModels/Editors/PathFigureEditorViewModel.cs
@@ -7,8 +7,6 @@
 
 using Reactive.Bindings;
 
-using ReactiveUI;
-
 namespace Beutl.ViewModels.Editors;
 
 public sealed class PathFigureEditorViewModel : ValueEditorViewModel<PathFigure>
@@ -51,8 +49,8 @@ public PathFigureEditorViewModel(IPropertyAdapter<PathFigure> property)
 
         Value.CombineWithPrevious()
             .Select(v => v.OldValue)
-            .WhereNotNull()
-            .Subscribe(v => this.GetService<ISupportCloseAnimation>()?.Close(v))
+            .Where(v=> v != null)
+            .Subscribe(v => this.GetService<ISupportCloseAnimation>()?.Close(v!))
             .DisposeWith(Disposables);
 
         Value.CombineWithPrevious()

diff --git a/src/Beutl/ViewModels/Editors/PathOperationEditorViewModel.cs b/src/Beutl/ViewModels/Editors/PathOperationEditorViewModel.cs
@@ -3,14 +3,10 @@
 using Beutl.Media;
 using Beutl.Services;
 
-using FluentAvalonia.UI.Controls;
-
 using Microsoft.Extensions.DependencyInjection;
 
 using Reactive.Bindings;
 
-using ReactiveUI;
-
 namespace Beutl.ViewModels.Editors;
 
 public sealed class PathOperationEditorViewModel : ValueEditorViewModel<PathSegment?>
@@ -75,7 +71,7 @@ public PathOperationEditorViewModel(IPropertyAdapter<PathSegment?> property)
 
         Value.CombineWithPrevious()
             .Select(v => v.OldValue)
-            .WhereNotNull()
+            .Where(v => v != null)
             .Subscribe(v => this.GetService<ISupportCloseAnimation>()?.Close(v))
             .DisposeWith(Disposables);
     }

diff --git a/src/Beutl/ViewModels/Editors/SoundEffectEditorViewModel.cs b/src/Beutl/ViewModels/Editors/SoundEffectEditorViewModel.cs
@@ -8,8 +8,6 @@
 
 using Reactive.Bindings;
 
-using ReactiveUI;
-
 namespace Beutl.ViewModels.Editors;
 
 public sealed class SoundEffectEditorViewModel : ValueEditorViewModel<ISoundEffect?>
@@ -88,8 +86,8 @@ public SoundEffectEditorViewModel(IPropertyAdapter<ISoundEffect?> property)
 
         Value.CombineWithPrevious()
             .Select(v => v.OldValue)
-            .WhereNotNull()
-            .Subscribe(v => this.GetService<ISupportCloseAnimation>()?.Close(v))
+            .Where(v => v != null)
+            .Subscribe(v => this.GetService<ISupportCloseAnimation>()?.Close(v!))
             .DisposeWith(Disposables);
     }
 

diff --git a/src/Beutl/ViewModels/Editors/TransformEditorViewModel.cs b/src/Beutl/ViewModels/Editors/TransformEditorViewModel.cs
@@ -7,8 +7,6 @@
 
 using Reactive.Bindings;
 
-using ReactiveUI;
-
 namespace Beutl.ViewModels.Editors;
 
 public enum KnownTransformType
@@ -133,8 +131,8 @@ public TransformEditorViewModel(IPropertyAdapter<ITransform?> property)
 
         Value.CombineWithPrevious()
             .Select(v => v.OldValue as IAnimatable)
-            .WhereNotNull()
-            .Subscribe(v => this.GetService<ISupportCloseAnimation>()?.Close(v))
+            .Where(v => v != null)
+            .Subscribe(v => this.GetService<ISupportCloseAnimation>()?.Close(v!))
             .DisposeWith(Disposables);
     }
 
@@ -211,6 +209,7 @@ public override void ReadFromJson(JsonObject json)
             {
                 IsExpanded.Value = (bool)isExpanded;
             }
+
             Properties.Value?.ReadFromJson(json);
 
             if (Group.Value != null