Update all dependencies*

Except Pidgin, because I found a bug in it.
PJB3005 · Dec 25, 2022 · 98e2baa · 98e2baa
1 parent b768a65
commit 98e2baa
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 28 deletions.
diff --git a/Drizzle.Benchmarks/Drizzle.Benchmarks.csproj b/Drizzle.Benchmarks/Drizzle.Benchmarks.csproj
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+      <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Drizzle.ConsoleApp/Drizzle.ConsoleApp.csproj b/Drizzle.ConsoleApp/Drizzle.ConsoleApp.csproj
@@ -9,8 +9,8 @@
 
   <ItemGroup>
     <PackageReference Include="meow_hash.net" Version="0.5.0" />
-    <PackageReference Include="Serilog" Version="2.10.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog" Version="2.12.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Drizzle.ConsoleApp/Program.cs b/Drizzle.ConsoleApp/Program.cs
@@ -16,6 +16,7 @@
 using Meow;
 using Serilog;
 using Serilog.Sinks.SystemConsole.Themes;
+using SixLabors.ImageSharp;
 
 CultureFix.FixCulture();
 
@@ -38,6 +39,8 @@
 
 int DoCmdRender(CommandLineArgs.VerbRender options)
 {
+    Configuration.Default.PreferContiguousImageBuffers = true;
+
     Console.WriteLine("Initializing Zygote runtime");
 
     var zygote = MakeZygoteRuntime();

diff --git a/Drizzle.Editor/Drizzle.Editor.csproj b/Drizzle.Editor/Drizzle.Editor.csproj
@@ -8,26 +8,23 @@
         <AvaloniaResource Include="Assets\**" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="0.10.10" />
-        <PackageReference Include="Avalonia.Desktop" Version="0.10.10" />
-        <PackageReference Include="Avalonia.Diagnostics" Version="0.10.10" Condition="'$(Configuration)' == 'Debug'" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.10" />
-        <PackageReference Include="Avalonia.Controls.PanAndZoom" Version="4.3.0" />
-        <PackageReference Include="DynamicData" Version="7.4.3" />
-        <PackageReference Include="ReactiveUI.Fody" Version="17.1.4" />
-        <PackageReference Include="Serilog" Version="2.10.0" />
-        <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
-        <PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
+        <PackageReference Include="Avalonia" Version="0.10.18" />
+        <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
+        <PackageReference Include="Avalonia.Diagnostics" Version="0.10.18" Condition="'$(Configuration)' == 'Debug'" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.18" />
+        <PackageReference Include="Avalonia.Controls.PanAndZoom" Version="10.14.0" />
+        <PackageReference Include="DynamicData" Version="7.12.11" />
+        <PackageReference Include="ReactiveUI.Fody" Version="18.4.1" />
+        <PackageReference Include="Serilog" Version="2.12.0" />
+        <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
+        <PackageReference Include="XamlNameReferenceGenerator" Version="1.5.1" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Drizzle.Lingo.Runtime\Drizzle.Lingo.Runtime.csproj" />
         <ProjectReference Include="..\Drizzle.Ported\Drizzle.Ported.csproj" />
         <ProjectReference Include="..\Drizzle.Logic\Drizzle.Logic.csproj" />
     </ItemGroup>
     <ItemGroup>
-      <Compile Update="Views\LingoFrames\FrameRenderEffectsView.axaml.cs">
-        <DependentUpon>FrameRenderEffectsView.axaml</DependentUpon>
-      </Compile>
       <Compile Update="Views\EditorContentView.axaml.cs">
         <DependentUpon>EditorContentView.axaml</DependentUpon>
       </Compile>

diff --git a/Drizzle.Editor/Program.cs b/Drizzle.Editor/Program.cs
@@ -3,6 +3,7 @@
 using Drizzle.Lingo.Runtime.Utils;
 using Serilog;
 using Serilog.Sinks.SystemConsole.Themes;
+using SixLabors.ImageSharp;
 
 namespace Drizzle.Editor;
 
@@ -15,6 +16,8 @@ public static void Main(string[] args)
     {
         CultureFix.FixCulture();
 
+        Configuration.Default.PreferContiguousImageBuffers = true;
+
         Log.Logger = new LoggerConfiguration()
             .MinimumLevel.Debug()
             .WriteTo.Console(theme: AnsiConsoleTheme.Literate)

diff --git a/Drizzle.Lingo.Runtime/Drizzle.Lingo.Runtime.csproj b/Drizzle.Lingo.Runtime/Drizzle.Lingo.Runtime.csproj
@@ -7,10 +7,10 @@
 
   <ItemGroup>
     <PackageReference Include="Pidgin" Version="3.0.0" />
-    <PackageReference Include="DynamicLanguageRuntime" Version="1.3.1" />
-    <PackageReference Include="Serilog" Version="2.10.0" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
-    <PackageReference Include="System.Runtime.Experimental" Version="6.0.0" />
+    <PackageReference Include="DynamicLanguageRuntime" Version="1.3.3" />
+    <PackageReference Include="Serilog" Version="2.12.0" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
+    <PackageReference Include="System.Runtime.Experimental" Version="6.0.2" />
   </ItemGroup>
 
 </Project>
diff --git a/Drizzle.Lingo.Runtime/Utility/ImageSharpExt.cs b/Drizzle.Lingo.Runtime/Utility/ImageSharpExt.cs
@@ -27,9 +27,9 @@ public static void ShowImage(this Image img)
 
     public static Span<T> GetSinglePixelSpan<T>(this Image<T> img) where T : unmanaged, IPixel<T>
     {
-        if (!img.TryGetSinglePixelSpan(out var span))
+        if (!img.DangerousTryGetSinglePixelMemory(out var memory))
             throw new InvalidOperationException("Unable to get single pixel span!");
 
-        return span;
+        return memory.Span;
     }
-}
+}
diff --git a/Drizzle.Lingo.Tests/Drizzle.Lingo.Tests.csproj b/Drizzle.Lingo.Tests/Drizzle.Lingo.Tests.csproj
@@ -5,11 +5,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit.Analyzers" Version="3.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Include="coverlet.collector" Version="3.1.0">
+    <PackageReference Include="NUnit.Analyzers" Version="3.5.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>