diff --git a/api/Avalonia.Android.nupkg.xml b/api/Avalonia.Android.nupkg.xml
deleted file mode 100644
index 5e68aafc3f..0000000000
--- a/api/Avalonia.Android.nupkg.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Android.Internal.Resource.Animation</Target>
-    <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
-    <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Android.Internal.Resource.Animator</Target>
-    <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
-    <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Android.Internal.Resource.Attribute</Target>
-    <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
-    <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Android.Internal.Resource.Boolean</Target>
-    <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
-    <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Android.Internal.Resource.Color</Target>
-    <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
-    <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Android.Internal.Resource.Dimension</Target>
-    <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
-    <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Android.Internal.Resource.Drawable</Target>
-    <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
-    <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Android.Internal.Resource.Id</Target>
-    <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
-    <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Android.Internal.Resource.Integer</Target>
-    <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
-    <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Android.Internal.Resource.Interpolator</Target>
-    <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
-    <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Android.Internal.Resource.Layout</Target>
-    <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
-    <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Android.Internal.Resource.String</Target>
-    <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
-    <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Android.Internal.Resource.Style</Target>
-    <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
-    <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Avalonia.Android.Internal.Resource.Styleable</Target>
-    <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
-    <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0007</DiagnosticId>
-    <Target>T:Avalonia.Android.Internal.Resource</Target>
-    <Left>baseline/net6.0-android31.0/Avalonia.Android.dll</Left>
-    <Right>target/net8.0-android34.0/Avalonia.Android.dll</Right>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/api/Avalonia.Browser.nupkg.xml b/api/Avalonia.Browser.nupkg.xml
deleted file mode 100644
index 16bdbfe25d..0000000000
--- a/api/Avalonia.Browser.nupkg.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Browser.AvaloniaView.get_IsComposing</Target>
-    <Left>baseline/net7.0/Avalonia.Browser.dll</Left>
-    <Right>target/net8.0-browser1.0/Avalonia.Browser.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Avalonia.Browser.AvaloniaView.OnDragEvent(System.Runtime.InteropServices.JavaScript.JSObject)</Target>
-    <Left>baseline/net7.0/Avalonia.Browser.dll</Left>
-    <Right>target/net8.0-browser1.0/Avalonia.Browser.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Avalonia.Browser.AvaloniaView</Target>
-    <Left>baseline/net7.0/Avalonia.Browser.dll</Left>
-    <Right>target/net8.0-browser1.0/Avalonia.Browser.dll</Right>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/api/Avalonia.Controls.ColorPicker.nupkg.xml b/api/Avalonia.Controls.ColorPicker.nupkg.xml
deleted file mode 100644
index 8fadd656ea..0000000000
--- a/api/Avalonia.Controls.ColorPicker.nupkg.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Fluent/ColorPicker.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Fluent/ColorPreviewer.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Fluent/ColorSlider.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Fluent/ColorSpectrum.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Fluent/ColorView.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Fluent/Fluent.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Simple/ColorPicker.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Simple/ColorPreviewer.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Simple/ColorSlider.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Simple/ColorSpectrum.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Simple/ColorView.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Simple/Simple.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Right>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/api/Avalonia.Controls.DataGrid.nupkg.xml b/api/Avalonia.Controls.DataGrid.nupkg.xml
deleted file mode 100644
index 1dc020aa79..0000000000
--- a/api/Avalonia.Controls.DataGrid.nupkg.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Fluent.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Controls.DataGrid.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Controls.DataGrid.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Simple.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Controls.DataGrid.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Controls.DataGrid.dll</Right>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/api/Avalonia.Diagnostics.nupkg.xml b/api/Avalonia.Diagnostics.nupkg.xml
deleted file mode 100644
index 5bc2bfa99c..0000000000
--- a/api/Avalonia.Diagnostics.nupkg.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Diagnostics/Controls/BrushEditor.axaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Diagnostics.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Diagnostics.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Diagnostics/Controls/FilterTextBox.axaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Diagnostics.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Diagnostics.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Diagnostics/Controls/ThicknessEditor.axaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Diagnostics.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Diagnostics.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Diagnostics/Views/ConsoleView.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Diagnostics.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Diagnostics.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Diagnostics/Views/ControlDetailsView.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Diagnostics.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Diagnostics.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Diagnostics/Views/EventsPageView.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Diagnostics.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Diagnostics.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Diagnostics/Views/LayoutExplorerView.axaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Diagnostics.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Diagnostics.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Diagnostics/Views/MainView.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Diagnostics.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Diagnostics.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Diagnostics/Views/MainWindow.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Diagnostics.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Diagnostics.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Diagnostics/Views/TreePageView.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Diagnostics.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Diagnostics.dll</Right>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/api/Avalonia.Themes.Fluent.nupkg.xml b/api/Avalonia.Themes.Fluent.nupkg.xml
deleted file mode 100644
index 08fb493760..0000000000
--- a/api/Avalonia.Themes.Fluent.nupkg.xml
+++ /dev/null
@@ -1,448 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Accents/BaseColorsPalette.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Accents/BaseResources.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Accents/FluentControlResources.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/AdornerLayer.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/AutoCompleteBox.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Button.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ButtonSpinner.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Calendar.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarButton.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarDatePicker.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarDayButton.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarItem.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CaptionButtons.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Carousel.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CheckBox.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ComboBox.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ComboBoxItem.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ContentControl.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ContextMenu.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DataValidationErrors.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DatePicker.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DateTimePickerShared.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DropDownButton.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/EmbeddableControlRoot.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Expander.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/FluentControls.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/FlyoutPresenter.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/GridSplitter.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ItemsControl.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Label.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ListBox.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ListBoxItem.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ManagedFileChooser.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Menu.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/MenuFlyoutPresenter.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/MenuItem.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/MenuScrollViewer.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/NativeMenuBar.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/NotificationCard.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/NumericUpDown.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/OverlayPopupHost.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/PathIcon.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/PopupRoot.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ProgressBar.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RadioButton.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RefreshContainer.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RefreshVisualizer.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RepeatButton.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ScrollBar.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ScrollViewer.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/SelectableTextBlock.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Separator.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Slider.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/SplitButton.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/SplitView.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabControl.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabItem.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabStrip.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabStripItem.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TextBox.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ThemeVariantScope.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TimePicker.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TitleBar.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ToggleButton.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ToggleSwitch.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ToolTip.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TransitioningContentControl.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TreeView.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TreeViewItem.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/UserControl.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Window.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/WindowNotificationManager.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/DensityStyles/Compact.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/FluentTheme.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/api/Avalonia.Themes.Simple.nupkg.xml b/api/Avalonia.Themes.Simple.nupkg.xml
deleted file mode 100644
index 8f4ac0585a..0000000000
--- a/api/Avalonia.Themes.Simple.nupkg.xml
+++ /dev/null
@@ -1,424 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Accents/Base.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/AdornerLayer.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/AutoCompleteBox.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Button.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ButtonSpinner.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Calendar.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarButton.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarDatePicker.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarDayButton.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarItem.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CaptionButtons.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Carousel.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CheckBox.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ComboBox.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ComboBoxItem.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ContentControl.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ContextMenu.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DataValidationErrors.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DatePicker.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DateTimePickerShared.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DropDownButton.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/EmbeddableControlRoot.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Expander.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/FlyoutPresenter.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/GridSplitter.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ItemsControl.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Label.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ListBox.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ListBoxItem.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ManagedFileChooser.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Menu.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/MenuFlyoutPresenter.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/MenuItem.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/NativeMenuBar.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/NotificationCard.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/NumericUpDown.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/OverlayPopupHost.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/PathIcon.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/PopupRoot.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ProgressBar.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RadioButton.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RefreshContainer.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RefreshVisualizer.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RepeatButton.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ScrollBar.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ScrollViewer.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/SelectableTextBlock.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Separator.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/SimpleControls.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Slider.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/SplitButton.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/SplitView.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabControl.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabItem.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabStrip.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabStripItem.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TextBox.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ThemeVariantScope.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TimePicker.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TitleBar.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ToggleButton.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ToggleSwitch.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ToolTip.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TransitioningContentControl.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TreeView.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TreeViewItem.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/UserControl.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Window.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/WindowNotificationManager.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/SimpleTheme.xaml</Target>
-    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
-    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/build/SharedVersion.props b/build/SharedVersion.props
index 0f3d685bba..0f51cd50e1 100644
--- a/build/SharedVersion.props
+++ b/build/SharedVersion.props
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <Product>Avalonia</Product>
     <Version>11.1.999</Version>
+    <ApiCompatVersion>11.1.0</ApiCompatVersion>
     <Authors>Avalonia Team</Authors>
     <Copyright>Copyright 2013-$([System.DateTime]::Now.ToString(`yyyy`)) &#169; The AvaloniaUI Project</Copyright>
     <PackageProjectUrl>https://avaloniaui.net</PackageProjectUrl>
diff --git a/nukebuild/BuildParameters.cs b/nukebuild/BuildParameters.cs
index b17812cc41..10dc2389a5 100644
--- a/nukebuild/BuildParameters.cs
+++ b/nukebuild/BuildParameters.cs
@@ -116,9 +116,10 @@ public partial class Build
             IsNuGetRelease = IsMainRepo && IsReleasable && IsReleaseBranch;
 
             // VERSION
-            Version = b.ForceNugetVersion ?? GetVersion();
+            var (propsVersion, propsApiCompatVersion) = GetVersion();
+            Version = b.ForceNugetVersion ?? propsVersion;
 
-            ApiValidationBaseline = b.ApiValidationBaseline ?? new Version(new Version(Version.Split('-', StringSplitOptions.None).First()).Major, 0).ToString();
+            ApiValidationBaseline = b.ApiValidationBaseline ?? propsApiCompatVersion;
             UpdateApiValidationSuppression = b.UpdateApiValidationSuppression ?? IsLocalBuild;
             
             if (IsRunningOnAzure)
@@ -153,10 +154,13 @@ public partial class Build
             VersionOutputDir = b.VersionOutputDir;
         }
 
-        string GetVersion()
+        (string Version, string ApiCompatVersion) GetVersion()
         {
             var xdoc = XDocument.Load(RootDirectory / "build/SharedVersion.props");
-            return xdoc.Descendants().First(x => x.Name.LocalName == "Version").Value;
+            return (
+                xdoc.Descendants().First(x => x.Name.LocalName == "Version").Value,
+                xdoc.Descendants().First(x => x.Name.LocalName == "ApiCompatVersion").Value
+            );
         }
     }