From 4dbd9a91c8dedcfb16465ae5a0d97c80bf26c3d7 Mon Sep 17 00:00:00 2001 From: affederaffe <68356204+affederaffe@users.noreply.github.com> Date: Sat, 25 Feb 2023 12:27:23 +0100 Subject: [PATCH 1/5] Add Avalonia.Fonts.Inter to Avalonia.Desktop.slnf --- Avalonia.Desktop.slnf | 1 + 1 file changed, 1 insertion(+) diff --git a/Avalonia.Desktop.slnf b/Avalonia.Desktop.slnf index 4a7a329fc6..477aaec6a8 100644 --- a/Avalonia.Desktop.slnf +++ b/Avalonia.Desktop.slnf @@ -21,6 +21,7 @@ "src\\Avalonia.Desktop\\Avalonia.Desktop.csproj", "src\\Avalonia.Diagnostics\\Avalonia.Diagnostics.csproj", "src\\Avalonia.Dialogs\\Avalonia.Dialogs.csproj", + "src\\Avalonia.Fonts.Inter\\Avalonia.Fonts.Inter.csproj", "src\\Avalonia.FreeDesktop\\Avalonia.FreeDesktop.csproj", "src\\Avalonia.Headless.Vnc\\Avalonia.Headless.Vnc.csproj", "src\\Avalonia.Headless\\Avalonia.Headless.csproj", From 5009fb9d9baf41bd4365df588c019fc1fa6a301d Mon Sep 17 00:00:00 2001 From: Giuseppe Lippolis Date: Sat, 25 Feb 2023 12:37:25 +0100 Subject: [PATCH 2/5] fix: CA1823 Unused field ```bash Warning CA1823 Unused field '_transform' Avalonia.Base (net6.0) .\src\Avalonia.Base\Media\DrawingGroup.cs 110 Active Warning CA1823 Unused field '_matrix' Avalonia.Base (netstandard2.0) .\src\Avalonia.Base\Media\DrawingContext.cs 280 Active ``` --- src/Avalonia.Base/Media/DrawingContext.cs | 1 - src/Avalonia.Base/Media/DrawingGroup.cs | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/Avalonia.Base/Media/DrawingContext.cs b/src/Avalonia.Base/Media/DrawingContext.cs index 31a16dc69c..f2106f2f86 100644 --- a/src/Avalonia.Base/Media/DrawingContext.cs +++ b/src/Avalonia.Base/Media/DrawingContext.cs @@ -277,7 +277,6 @@ namespace Avalonia.Media private readonly record struct RestoreState : IDisposable { private readonly DrawingContext _context; - private readonly Matrix _matrix; private readonly PushedStateType _type; public enum PushedStateType diff --git a/src/Avalonia.Base/Media/DrawingGroup.cs b/src/Avalonia.Base/Media/DrawingGroup.cs index 812d315912..a41054202e 100644 --- a/src/Avalonia.Base/Media/DrawingGroup.cs +++ b/src/Avalonia.Base/Media/DrawingGroup.cs @@ -107,8 +107,6 @@ namespace Avalonia.Media private readonly DrawingGroup _drawingGroup; private readonly IPlatformRenderInterface _platformRenderInterface = AvaloniaLocator.Current.GetRequiredService(); - private Matrix _transform; - private bool _disposed; // Root drawing created by this DrawingContext. From ffe6fe8a39b0504cd2bd77eb9b1975c627406f61 Mon Sep 17 00:00:00 2001 From: affederaffe <68356204+affederaffe@users.noreply.github.com> Date: Sat, 25 Feb 2023 13:34:29 +0100 Subject: [PATCH 3/5] Fix dependency of Avalonia.Fonts.Inter --- samples/ControlCatalog/ControlCatalog.csproj | 1 - src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj | 1 + src/Avalonia.Themes.Simple/Avalonia.Themes.Simple.csproj | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj index 0e84b3d182..c223bfe1a9 100644 --- a/samples/ControlCatalog/ControlCatalog.csproj +++ b/samples/ControlCatalog/ControlCatalog.csproj @@ -29,7 +29,6 @@ - diff --git a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj index 8d266ce82f..66fcce2163 100644 --- a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj +++ b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj @@ -8,6 +8,7 @@ + diff --git a/src/Avalonia.Themes.Simple/Avalonia.Themes.Simple.csproj b/src/Avalonia.Themes.Simple/Avalonia.Themes.Simple.csproj index 4aa6b66743..aefa407645 100644 --- a/src/Avalonia.Themes.Simple/Avalonia.Themes.Simple.csproj +++ b/src/Avalonia.Themes.Simple/Avalonia.Themes.Simple.csproj @@ -8,6 +8,7 @@ + From b9644c3068ca90196e61f69aa851fdd9f3fc18f9 Mon Sep 17 00:00:00 2001 From: affederaffe <68356204+affederaffe@users.noreply.github.com> Date: Sun, 26 Feb 2023 02:51:39 +0100 Subject: [PATCH 5/5] Revert "Fix dependency of Avalonia.Fonts.Inter" This reverts commit ffe6fe8a39b0504cd2bd77eb9b1975c627406f61. --- samples/ControlCatalog/ControlCatalog.csproj | 1 + src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj | 1 - src/Avalonia.Themes.Simple/Avalonia.Themes.Simple.csproj | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj index c223bfe1a9..0e84b3d182 100644 --- a/samples/ControlCatalog/ControlCatalog.csproj +++ b/samples/ControlCatalog/ControlCatalog.csproj @@ -29,6 +29,7 @@ + diff --git a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj index 66fcce2163..8d266ce82f 100644 --- a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj +++ b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj @@ -8,7 +8,6 @@ - diff --git a/src/Avalonia.Themes.Simple/Avalonia.Themes.Simple.csproj b/src/Avalonia.Themes.Simple/Avalonia.Themes.Simple.csproj index aefa407645..4aa6b66743 100644 --- a/src/Avalonia.Themes.Simple/Avalonia.Themes.Simple.csproj +++ b/src/Avalonia.Themes.Simple/Avalonia.Themes.Simple.csproj @@ -8,7 +8,6 @@ -