diff --git a/api/Avalonia.Controls.ColorPicker.nupkg.xml b/api/Avalonia.Controls.ColorPicker.nupkg.xml
index 90271d6e98..8fadd656ea 100644
--- a/api/Avalonia.Controls.ColorPicker.nupkg.xml
+++ b/api/Avalonia.Controls.ColorPicker.nupkg.xml
@@ -31,6 +31,12 @@
     <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>
@@ -61,4 +67,10 @@
     <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
new file mode 100644
index 0000000000..1dc020aa79
--- /dev/null
+++ b/api/Avalonia.Controls.DataGrid.nupkg.xml
@@ -0,0 +1,16 @@
+<?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
index d364618e59..5bc2bfa99c 100644
--- a/api/Avalonia.Diagnostics.nupkg.xml
+++ b/api/Avalonia.Diagnostics.nupkg.xml
@@ -1,10 +1,64 @@
 <?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.Skia.nupkg.xml b/api/Avalonia.Skia.nupkg.xml
index 6348b8f033..a88fc8ba0a 100644
--- a/api/Avalonia.Skia.nupkg.xml
+++ b/api/Avalonia.Skia.nupkg.xml
@@ -7,4 +7,4 @@
     <Left>baseline/netstandard2.0/Avalonia.Skia.dll</Left>
     <Right>target/netstandard2.0/Avalonia.Skia.dll</Right>
   </Suppression>
-</Suppressions>
+</Suppressions>
\ No newline at end of file
diff --git a/api/Avalonia.Themes.Fluent.nupkg.xml b/api/Avalonia.Themes.Fluent.nupkg.xml
index a5be5ceeb9..08fb493760 100644
--- a/api/Avalonia.Themes.Fluent.nupkg.xml
+++ b/api/Avalonia.Themes.Fluent.nupkg.xml
@@ -1,6 +1,12 @@
 <?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>
@@ -145,6 +151,12 @@
     <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>
@@ -421,4 +433,16 @@
     <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
index e6a62495d9..8f4ac0585a 100644
--- a/api/Avalonia.Themes.Simple.nupkg.xml
+++ b/api/Avalonia.Themes.Simple.nupkg.xml
@@ -289,6 +289,12 @@
     <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>
@@ -409,4 +415,10 @@
     <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/api/Avalonia.nupkg.xml b/api/Avalonia.nupkg.xml
index b56906842b..9a11864491 100644
--- a/api/Avalonia.nupkg.xml
+++ b/api/Avalonia.nupkg.xml
@@ -1069,21 +1069,27 @@
     <Left>baseline/netstandard2.0/Avalonia.Controls.dll</Left>
     <Right>target/netstandard2.0/Avalonia.Controls.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/AboutAvaloniaDialog.xaml</Target>
+    <Left>baseline/netstandard2.0/Avalonia.Dialogs.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Dialogs.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.Rendering.Composition.ICompositionGpuImportedObject.ImportCompleted</Target>
+    <Target>P:Avalonia.Media.IRadialGradientBrush.RadiusX</Target>
     <Left>baseline/netstandard2.0/Avalonia.Base.dll</Left>
     <Right>target/netstandard2.0/Avalonia.Base.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.Media.IRadialGradientBrush.RadiusX</Target>
+    <Target>P:Avalonia.Media.IRadialGradientBrush.RadiusY</Target>
     <Left>baseline/netstandard2.0/Avalonia.Base.dll</Left>
     <Right>target/netstandard2.0/Avalonia.Base.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Avalonia.Media.IRadialGradientBrush.RadiusY</Target>
+    <Target>P:Avalonia.Rendering.Composition.ICompositionGpuImportedObject.ImportCompleted</Target>
     <Left>baseline/netstandard2.0/Avalonia.Base.dll</Left>
     <Right>target/netstandard2.0/Avalonia.Base.dll</Right>
   </Suppression>
diff --git a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
index 66b1bab004..dd11dd7003 100644
--- a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
+++ b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
@@ -445,7 +445,7 @@ namespace Avalonia.Build.Tasks
                             populateBuilder,
                             document.TypeBuilderProvider.BuildMethod,
                             builder,
-                            builder.DefineSubType(compilerConfig.WellKnownTypes.Object, "NamespaceInfo:" + res.Name, XamlVisibility.Public),
+                            builder.DefineSubType(compilerConfig.WellKnownTypes.Object, "NamespaceInfo:" + res.Name, XamlVisibility.Assembly),
                             res.Uri, res
                         );