105 choredeps upgrade avalonia dependencies to 1100 (#119)

* Avalonia 11.0.9 * Automated JetBrains cleanup Co-authored-by: <[email protected]> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
jinek · Oct 29, 2024 · 9264d99 · 9264d99
1 parent b6417af
commit 9264d99
Show file tree

Hide file tree

Showing 140 changed files with 1,407 additions and 1,781 deletions.
diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml
@@ -9,6 +9,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     # from https://github.com/marketplace/actions/dotnet-format
     steps:
       - name: Get branch info # todo: is this needed?
@@ -33,10 +34,11 @@ jobs:
         working-directory: ./src
 
       - name: Inspect code
-        uses: muno92/resharper_inspectcode@1.4.0
+        uses: muno92/resharper_inspectcode@1.12.0
         with:
           solutionPath: ./src/Consolonia.sln
-          exclude: "**Consolonia.GuiCS/**.*"
+          exclude: "**Consolonia.GuiCS/**.*;**Consolonia.Gallery/**.*;**Example/**.*"
+          version: '2024.2.6'
 
       - name: install-resharper
         run: |
@@ -45,7 +47,7 @@ jobs:
 
       - name: resharper-cleanup
         run: |                    
-          jb cleanupcode Consolonia.sln --exclude="**Consolonia.GuiCS\**.*"
+          jb cleanupcode Consolonia.sln --exclude="**Consolonia.GuiCS/**.*;**Consolonia.Gallery/**.*;**Example/**.*"
         working-directory: ./src
 
       - name: Commit files

diff --git a/.github/workflows/general_build.yml b/.github/workflows/general_build.yml
@@ -12,6 +12,7 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     defaults:
       run:
         working-directory: ./src

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,12 +5,12 @@
         <Nullable>disable</Nullable>
     </PropertyGroup>
     <PropertyGroup>
-        <VersionPrefix>0.10.21</VersionPrefix>
+        <VersionPrefix>11.0.9</VersionPrefix>
         <Authors>https://github.com/jinek/Consolonia/graphs/contributors</Authors>
         <Description>Text User Interface implementation of Avalonia UI (GUI Framework)</Description>
         <Copyright>Copyright © Evgeny Gorbovoy 2021 - 2022</Copyright>
     </PropertyGroup>
     <PropertyGroup>
-        <AvaloniaVersion>0.10.21</AvaloniaVersion>
+        <AvaloniaVersion>11.0.9</AvaloniaVersion>
     </PropertyGroup>
 </Project>
diff --git a/Directory.Core.Build.props b/Directory.Core.Build.props
@@ -10,4 +10,8 @@
         <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
         <TreatWarningsAsErrors Condition=" '$(Configuration)' == 'RELEASE' ">true</TreatWarningsAsErrors>
     </PropertyGroup>
+    <PropertyGroup>
+        <AvaloniaAccessUnstablePrivateApis>true</AvaloniaAccessUnstablePrivateApis>
+        <Avalonia_I_Want_To_Use_Private_Apis_In_Nuget_Package_And_Promise_To_Pin_The_Exact_Avalonia_Version_In_Package_Dependency>true</Avalonia_I_Want_To_Use_Private_Apis_In_Nuget_Package_And_Promise_To_Pin_The_Exact_Avalonia_Version_In_Package_Dependency>
+    </PropertyGroup>
 </Project>
diff --git a/src/.editorconfig b/src/.editorconfig
@@ -3224,7 +3224,7 @@ resharper_use_collection_count_property_highlighting = suggestion
 resharper_use_configure_await_false_for_async_disposable_highlighting = none
 resharper_use_configure_await_false_highlighting = suggestion
 resharper_use_deconstruction_highlighting = hint
-resharper_use_deconstruction_on_parameter_highlighting = hint
+resharper_use_deconstruction_on_parameter_highlighting = none
 resharper_use_empty_types_field_highlighting = suggestion
 resharper_use_event_args_empty_field_highlighting = suggestion
 resharper_use_format_specifier_in_format_string_highlighting = suggestion

diff --git a/src/Consolonia.Core/ApplicationStartup.cs b/src/Consolonia.Core/ApplicationStartup.cs
@@ -25,29 +25,24 @@ public static class ApplicationStartup
             lifetime.Start(args);
         }
 
-        public static TAppBuilder UseStandardConsole<TAppBuilder>(this TAppBuilder builder)
-            where TAppBuilder : AppBuilderBase<TAppBuilder>, new()
+        public static AppBuilder UseStandardConsole(this AppBuilder builder)
         {
             return builder.UseConsole(new DefaultNetConsole());
         }
 
-        public static TAppBuilder UseConsole<TAppBuilder>(this TAppBuilder builder, IConsole console)
-            where TAppBuilder : AppBuilderBase<TAppBuilder>, new()
+        public static AppBuilder UseConsole(this AppBuilder builder, IConsole console)
         {
             return builder.With(console);
         }
 
-        public static TAppBuilder UseConsolonia<TAppBuilder>(this TAppBuilder builder)
-            where TAppBuilder : AppBuilderBase<TAppBuilder>, new()
+        public static AppBuilder UseConsolonia(this AppBuilder builder)
         {
             return builder
+                .UseStandardRuntimePlatformSubsystem()
                 .UseWindowingSubsystem(() => new ConsoloniaPlatform().Initialize(), nameof(ConsoloniaPlatform))
                 .UseRenderingSubsystem(() =>
                 {
-                    var platformRenderInterface =
-                        AvaloniaLocator.CurrentMutable.GetService<IPlatformRenderInterface>();
-
-                    var consoloniaRenderInterface = new ConsoloniaRenderInterface(platformRenderInterface);
+                    var consoloniaRenderInterface = new ConsoloniaRenderInterface();
 
                     AvaloniaLocator.CurrentMutable
                         .Bind<IPlatformRenderInterface>().ToConstant(consoloniaRenderInterface);
@@ -65,8 +60,7 @@ public static ClassicDesktopStyleApplicationLifetime BuildLifetime<TApp>(IConsol
             return CreateLifetime(consoloniaAppBuilder, args);
         }
 
-        private static ClassicDesktopStyleApplicationLifetime CreateLifetime<T>(T builder, string[] args)
-            where T : AppBuilderBase<T>, new()
+        private static ClassicDesktopStyleApplicationLifetime CreateLifetime(AppBuilder builder, string[] args)
         {
             var lifetime = new ConsoloniaLifetime
             {
@@ -77,9 +71,8 @@ private static ClassicDesktopStyleApplicationLifetime CreateLifetime<T>(T builde
             return lifetime;
         }
 
-        public static int StartWithConsoleLifetime<T>(
-            this T builder, string[] args)
-            where T : AppBuilderBase<T>, new()
+        public static int StartWithConsoleLifetime(
+            this AppBuilder builder, string[] args)
         {
             ClassicDesktopStyleApplicationLifetime lifetime = CreateLifetime(builder, args);
             return lifetime.Start(args);

diff --git a/src/Consolonia.Core/Consolonia.Core.csproj b/src/Consolonia.Core/Consolonia.Core.csproj
@@ -9,3 +9,4 @@
     </ItemGroup>
 
 </Project>
+
diff --git a/src/Consolonia.Core/Drawing/ConsoloniaPlatformRenderInterfaceContext.cs b/src/Consolonia.Core/Drawing/ConsoloniaPlatformRenderInterfaceContext.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Platform;
+
+namespace Consolonia.Core.Drawing
+{
+    internal sealed class ConsoloniaPlatformRenderInterfaceContext : IPlatformRenderInterfaceContext
+    {
+        public object TryGetFeature(Type featureType)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Dispose()
+        {
+        }
+
+        public IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces)
+        {
+            return new RenderTarget(surfaces);
+        }
+
+        public bool IsLost => false;
+    }
+}
diff --git a/src/Consolonia.Core/Drawing/ConsoloniaRenderInterface.cs b/src/Consolonia.Core/Drawing/ConsoloniaRenderInterface.cs
@@ -3,34 +3,15 @@
 using System.IO;
 using Avalonia;
 using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Media.TextFormatting;
 using Avalonia.Platform;
-using Avalonia.Visuals.Media.Imaging;
-using FormattedText = Consolonia.Core.Text.FormattedText;
+using Consolonia.Core.Text;
 
 namespace Consolonia.Core.Drawing
 {
     internal class ConsoloniaRenderInterface : IPlatformRenderInterface
     {
-        private readonly IPlatformRenderInterface _platformRenderInterface;
-
-        public ConsoloniaRenderInterface(IPlatformRenderInterface platformRenderInterface)
-        {
-            _platformRenderInterface = platformRenderInterface;
-        }
-
-        public IFormattedTextImpl CreateFormattedText(
-            string text,
-            Typeface typeface,
-            double fontSize,
-            TextAlignment textAlignment,
-            TextWrapping wrapping,
-            Size constraint,
-            IReadOnlyList<FormattedTextStyleSpan> spans)
-        {
-            return new FormattedText(text, textAlignment, wrapping, constraint, spans);
-            //return _platformRenderInterface.CreateFormattedText(text, typeface, fontSize, textAlignment, wrapping, constraint, spans);
-        }
-
         public IGeometryImpl CreateEllipseGeometry(Rect rect)
         {
             throw new NotImplementedException();
@@ -39,66 +20,61 @@ public IGeometryImpl CreateEllipseGeometry(Rect rect)
         public IGeometryImpl CreateLineGeometry(Point p1, Point p2)
         {
             return Line.CreateMyLine(p1, p2);
-            //return _platformRenderInterface.CreateLineGeometry(p1, p2);
         }
 
         public IGeometryImpl CreateRectangleGeometry(Rect rect)
         {
             return new Rectangle(rect);
-            //return _platformRenderInterface.CreateRectangleGeometry(rect);
         }
 
         public IStreamGeometryImpl CreateStreamGeometry()
         {
             throw new NotImplementedException();
-            //return _platformRenderInterface.CreateStreamGeometry();
         }
 
-        public IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<Geometry> children)
+        public IGeometryImpl CreateGeometryGroup(FillRule fillRule, IReadOnlyList<IGeometryImpl> children)
         {
             throw new NotImplementedException();
         }
 
-        public IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, Geometry g1, Geometry g2)
+        public IGeometryImpl CreateCombinedGeometry(GeometryCombineMode combineMode, IGeometryImpl g1, IGeometryImpl g2)
         {
             throw new NotImplementedException();
         }
 
-        public IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces)
+        public IGeometryImpl BuildGlyphRunGeometry(GlyphRun glyphRun)
         {
-            return new RenderTarget(surfaces);
-
-            //return _platformRenderInterface.CreateRenderTarget(surfaces);
+            throw new NotImplementedException();
         }
 
         public IRenderTargetBitmapImpl CreateRenderTargetBitmap(PixelSize size, Vector dpi)
         {
-            return _platformRenderInterface.CreateRenderTargetBitmap(size, dpi);
+            throw new NotImplementedException();
         }
 
         public IWriteableBitmapImpl CreateWriteableBitmap(PixelSize size, Vector dpi, PixelFormat format,
             AlphaFormat alphaFormat)
         {
-            return _platformRenderInterface.CreateWriteableBitmap(size, dpi, format, alphaFormat);
+            throw new NotImplementedException();
         }
 
         public IBitmapImpl LoadBitmap(string fileName)
         {
-            return _platformRenderInterface.LoadBitmap(fileName);
+            throw new NotImplementedException();
         }
 
         public IBitmapImpl LoadBitmap(Stream stream)
         {
-            return _platformRenderInterface.LoadBitmap(stream);
+            throw new NotImplementedException();
         }
 
-        public IWriteableBitmapImpl LoadWriteableBitmapToWidth(Stream stream, int width,
-            BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        IWriteableBitmapImpl IPlatformRenderInterface.LoadWriteableBitmapToHeight(Stream stream, int height,
+            BitmapInterpolationMode interpolationMode)
         {
             throw new NotImplementedException();
         }
 
-        public IWriteableBitmapImpl LoadWriteableBitmapToHeight(Stream stream, int height,
+        public IWriteableBitmapImpl LoadWriteableBitmapToWidth(Stream stream, int width,
             BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
         {
             throw new NotImplementedException();
@@ -114,24 +90,22 @@ public IWriteableBitmapImpl LoadWriteableBitmap(Stream stream)
             throw new NotImplementedException();
         }
 
-        public IBitmapImpl LoadBitmapToWidth(Stream stream, int width,
-            BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        IBitmapImpl IPlatformRenderInterface.LoadBitmapToWidth(Stream stream, int width,
+            BitmapInterpolationMode interpolationMode)
         {
-            return _platformRenderInterface.LoadBitmapToWidth(stream, width, interpolationMode);
+            throw new NotImplementedException();
         }
 
-        public IBitmapImpl LoadBitmapToHeight(Stream stream, int height,
-            BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        IBitmapImpl IPlatformRenderInterface.LoadBitmapToHeight(Stream stream, int height,
+            BitmapInterpolationMode interpolationMode)
         {
-            return _platformRenderInterface.LoadBitmapToHeight(stream, height, interpolationMode);
+            throw new NotImplementedException();
         }
 
-        public IBitmapImpl ResizeBitmap(
-            IBitmapImpl bitmapImpl,
-            PixelSize destinationSize,
-            BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+        IBitmapImpl IPlatformRenderInterface.ResizeBitmap(IBitmapImpl bitmapImpl, PixelSize destinationSize,
+            BitmapInterpolationMode interpolationMode)
         {
-            return _platformRenderInterface.ResizeBitmap(bitmapImpl, destinationSize, interpolationMode);
+            throw new NotImplementedException();
         }
 
         public IBitmapImpl LoadBitmap(
@@ -142,12 +116,26 @@ public IBitmapImpl LoadBitmap(
             Vector dpi,
             int stride)
         {
-            return _platformRenderInterface.LoadBitmap(format, alphaFormat, data, size, dpi, stride);
+            throw new NotImplementedException();
         }
 
-        public IGlyphRunImpl CreateGlyphRun(GlyphRun glyphRun, out double width)
+        public IGlyphRunImpl CreateGlyphRun(IGlyphTypeface glyphTypeface, double fontRenderingEmSize,
+            IReadOnlyList<GlyphInfo> glyphInfos,
+            Point baselineOrigin)
         {
-            return _platformRenderInterface.CreateGlyphRun(glyphRun, out width);
+            return new GlyphRunImpl(glyphTypeface, glyphInfos, baselineOrigin);
+        }
+
+        public IPlatformRenderInterfaceContext CreateBackendContext(IPlatformGraphicsContext graphicsApiContext)
+        {
+            if (graphicsApiContext != null)
+                throw new NotImplementedException("Investigate this cases");
+            return new ConsoloniaPlatformRenderInterfaceContext();
+        }
+
+        public bool IsSupportedBitmapPixelFormat(PixelFormat format)
+        {
+            throw new NotImplementedException();
         }
 
         public bool SupportsIndividualRoundRects => false;

diff --git a/src/Consolonia.Core/Drawing/DrawingContextHelper.cs b/src/Consolonia.Core/Drawing/DrawingContextHelper.cs
@@ -9,17 +9,16 @@ internal static class DrawingContextHelper
         // ReSharper disable once UnusedMethodReturnValue.Global Can be used later
         public static bool ExecuteWithClipping(this Rect rect, Point place, Action action)
         {
-            if (!ContainsAligned(rect, place)) return false;
+            if (!rect.ContainsExclusive(place)) return false;
 
             action();
             return true;
         }
 
-        public static bool ContainsAligned(this Rect rect, Point p)
+        public static bool IsEmpty(this Rect rect)
         {
-            (double x, double y) = p;
-            return x >= rect.X && x < rect.X + rect.Width &&
-                   y >= rect.Y && y < rect.Y + rect.Height;
+            //todo: check if this implementation serves our needs. Avalonia uses == 0
+            return rect.Width <= 0 || rect.Height <= 0;
         }
 
         public static bool IsTranslateOnly(this Matrix transform)
@@ -32,7 +31,7 @@ public static bool IsTranslateOnly(this Matrix transform)
 
         public static bool NoRotation(this Matrix transform)
         {
-            return transform.M12 == 0 && transform.M21 == 0;
+            return transform is { M12: 0, M21: 0 };
         }
     }
 }