Mark private apis as private

nukebuild/RefAssemblyGenerator.cs

@@ -123,6 +123,16 @@ static void ProcessType(TypeDefinition type, MethodReference obsoleteCtor)
             }
         }
 
+        foreach (var cl in type.NestedTypes)
+        {
+            ProcessType(cl, obsoleteCtor);
+            if (hideMembers)
+            {
+                var dflags = TypeAttributes.Public;
+                cl.Attributes = ((cl.Attributes | dflags) ^ dflags) | TypeAttributes.NotPublic;
+            }
+        }
+
         foreach (var m in type.Properties)
             MarkAsUnstable(m, obsoleteCtor, forceUnstable);
         foreach (var m in type.Events)

samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj

@@ -16,6 +16,7 @@
 
   <ItemGroup>
     <Compile Include="..\..\src\Avalonia.X11\NativeDialogs\Gtk.cs" Link="NativeControls\Gtk\Gtk.cs" />
+    <Compile Include="..\..\src\Avalonia.Base\Platform\Interop\Utf8Buffer.cs" Link="NativeControls\Utf8Buffer.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs

@@ -10,7 +10,7 @@
 
 namespace Avalonia.Android
 {
-    internal abstract class InvalidationAwareSurfaceView : SurfaceView, ISurfaceHolderCallback, IPlatformNativeSurfaceHandle
+    internal abstract class InvalidationAwareSurfaceView : SurfaceView, ISurfaceHolderCallback, INativePlatformHandleSurface
     {
         bool _invalidateQueued;
         readonly object _lock = new object();

src/Avalonia.Base/AvaloniaLocator.cs

@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
+using Avalonia.Metadata;
 
 #pragma warning disable CS1591 // Enable me later
 
 namespace Avalonia
 {
+    [PrivateApi]
     public class AvaloniaLocator : IAvaloniaDependencyResolver
     {
         private readonly IAvaloniaDependencyResolver? _parentScope;
@@ -114,11 +116,13 @@ public static IDisposable EnterScope()
         }
     }
 
+    [PrivateApi]
     public interface IAvaloniaDependencyResolver
     {
         object? GetService(Type t);
     }
 
+    [PrivateApi]
     public static class LocatorExtensions
     {
         public static T? GetService<T>(this IAvaloniaDependencyResolver resolver)

src/Avalonia.Base/Input/DragDropDevice.cs

@@ -2,9 +2,11 @@
 using Avalonia.VisualTree;
 using System.Linq;
 using Avalonia.Input.Raw;
+using Avalonia.Metadata;
 
 namespace Avalonia.Input
 {
+    [PrivateApi]
     public class DragDropDevice : IDragDropDevice
     {
         public static readonly DragDropDevice Instance = new DragDropDevice();

src/Avalonia.Base/Input/IInputDevice.cs

@@ -3,7 +3,7 @@
 
 namespace Avalonia.Input
 {
-    [NotClientImplementable]
+    [NotClientImplementable, PrivateApi]
     public interface IInputDevice
     {
         /// <summary>

src/Avalonia.Base/Input/IInputManager.cs

@@ -8,7 +8,7 @@ namespace Avalonia.Input
     /// Receives input from the windowing subsystem and dispatches it to interested parties
     /// for processing.
     /// </summary>
-    [NotClientImplementable]
+    [NotClientImplementable, PrivateApi]
     public interface IInputManager
     {
         /// <summary>

src/Avalonia.Base/Input/IKeyboardNavigationHandler.cs

@@ -15,6 +15,7 @@ public interface IKeyboardNavigationHandler
         /// <remarks>
         /// This method can only be called once, typically by the owner itself on creation.
         /// </remarks>
+        [PrivateApi]
         void SetOwner(IInputRoot owner);
 
         /// <summary>

src/Avalonia.Base/Input/InputManager.cs

@@ -8,7 +8,7 @@ namespace Avalonia.Input
     /// Receives input from the windowing subsystem and dispatches it to interested parties
     /// for processing.
     /// </summary>
-    public class InputManager : IInputManager
+    internal class InputManager : IInputManager
     {
         private readonly LightweightSubject<RawInputEventArgs> _preProcess = new();
         private readonly LightweightSubject<RawInputEventArgs> _process = new();

src/Avalonia.Base/Input/KeyboardNavigationHandler.cs

@@ -10,7 +10,7 @@ namespace Avalonia.Input
     /// Handles keyboard navigation for a window.
     /// </summary>
     [Unstable]
-    public class KeyboardNavigationHandler : IKeyboardNavigationHandler
+    public sealed class KeyboardNavigationHandler : IKeyboardNavigationHandler
     {
         /// <summary>
         /// The window to which the handler belongs.
@@ -24,6 +24,7 @@ public class KeyboardNavigationHandler : IKeyboardNavigationHandler
         /// <remarks>
         /// This method can only be called once, typically by the owner itself on creation.
         /// </remarks>
+        [PrivateApi]
         public void SetOwner(IInputRoot owner)
         {
             if (_owner != null)
@@ -102,7 +103,7 @@ public void Move(
         /// </summary>
         /// <param name="sender">The event sender.</param>
         /// <param name="e">The event args.</param>
-        protected virtual void OnKeyDown(object? sender, KeyEventArgs e)
+        void OnKeyDown(object? sender, KeyEventArgs e)
         {
             if (e.Key == Key.Tab)
             {

src/Avalonia.Base/Input/Raw/RawDragEvent.cs

@@ -1,7 +1,9 @@
 using System;
+using Avalonia.Metadata;
 
 namespace Avalonia.Input.Raw
 {
+    [PrivateApi]
     public class RawDragEvent : RawInputEventArgs
     {
         public Point Location { get; set; }

src/Avalonia.Base/Input/Raw/RawInputEventArgs.cs

@@ -1,4 +1,5 @@
 using System;
+using Avalonia.Metadata;
 
 namespace Avalonia.Input.Raw
 {
@@ -11,6 +12,7 @@ namespace Avalonia.Input.Raw
     /// pre-processing they are consumed by the relevant <see cref="Device"/> and turned into
     /// standard Avalonia events.
     /// </remarks>
+    [PrivateApi]
     public class RawInputEventArgs : EventArgs
     {
         /// <summary>

src/Avalonia.Base/Input/Raw/RawKeyEventArgs.cs

@@ -1,3 +1,5 @@
+using Avalonia.Metadata;
+
 namespace Avalonia.Input.Raw
 {
     public enum RawKeyEventType
@@ -6,6 +8,7 @@ public enum RawKeyEventType
         KeyUp
     }
 
+    [PrivateApi]
     public class RawKeyEventArgs : RawInputEventArgs
     {
         public RawKeyEventArgs(

src/Avalonia.Base/Input/Raw/RawMouseWheelEventArgs.cs

@@ -1,6 +1,9 @@
 
+using Avalonia.Metadata;
+
 namespace Avalonia.Input.Raw
 {
+    [PrivateApi]
     public class RawMouseWheelEventArgs : RawPointerEventArgs
     {
         public RawMouseWheelEventArgs(

src/Avalonia.Base/Input/Raw/RawPointerEventArgs.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Avalonia.Metadata;
 
 namespace Avalonia.Input.Raw
 {
@@ -31,6 +32,7 @@ public enum RawPointerEventType
     /// <summary>
     /// A raw mouse event.
     /// </summary>
+    [PrivateApi]
     public class RawPointerEventArgs : RawInputEventArgs
     {
         private RawPointerPoint _point;
@@ -124,6 +126,7 @@ public Point Position
         internal IInputElement? InputHitTestResult { get; set; }
     }
 
+    [PrivateApi]
     public record struct RawPointerPoint
     {
         /// <summary>

src/Avalonia.Base/Input/Raw/RawPointerGestureEventArgs.cs

@@ -1,5 +1,8 @@
+using Avalonia.Metadata;
+
 namespace Avalonia.Input.Raw
 {
+    [PrivateApi]
     public class RawPointerGestureEventArgs : RawPointerEventArgs
     {
         public RawPointerGestureEventArgs(

src/Avalonia.Base/Input/Raw/RawSizeEventArgs.cs

@@ -1,7 +1,9 @@
 using System;
+using Avalonia.Metadata;
 
 namespace Avalonia.Input.Raw
 {
+    [PrivateApi]
     public class RawSizeEventArgs : EventArgs
     {
         public RawSizeEventArgs(Size size)

src/Avalonia.Base/Input/Raw/RawTextInputEventArgs.cs

@@ -1,5 +1,8 @@
+using Avalonia.Metadata;
+
 namespace Avalonia.Input.Raw
 {
+    [PrivateApi]
     public class RawTextInputEventArgs : RawInputEventArgs
     {
         public RawTextInputEventArgs(

src/Avalonia.Base/Input/Raw/RawTouchEventArgs.cs

@@ -1,7 +1,9 @@
 using System;
+using Avalonia.Metadata;
 
 namespace Avalonia.Input.Raw
 {
+    [PrivateApi]
     public class RawTouchEventArgs : RawPointerEventArgs
     {
         public RawTouchEventArgs(IInputDevice device, ulong timestamp, IInputRoot root,

src/Avalonia.Base/Media/Brush.cs

@@ -118,7 +118,7 @@ void ICompositionRenderResource.AddRefOnCompositor(Compositor c)
                 OnReferencedFromCompositor(c);
         }
 
-        protected virtual void OnReferencedFromCompositor(Compositor c)
+        private protected virtual void OnReferencedFromCompositor(Compositor c)
         {
             if (Transform is ICompositionRenderResource<ITransform> resource)
                 resource.AddRefOnCompositor(c);

src/Avalonia.Base/Media/DrawingBrush.cs

@@ -60,7 +60,7 @@ public Drawing? Drawing
 
         private InlineDictionary<Compositor, CompositionRenderDataSceneBrushContent?> _renderDataDictionary;
 
-        protected override void OnReferencedFromCompositor(Compositor c)
+        private protected override void OnReferencedFromCompositor(Compositor c)
         {
             _renderDataDictionary.Add(c, CreateServerContent(c));
             base.OnReferencedFromCompositor(c);

src/Avalonia.Base/Media/VisualBrush.cs

@@ -64,7 +64,7 @@ public Visual? Visual
 
         private InlineDictionary<Compositor, CompositionRenderDataSceneBrushContent?> _renderDataDictionary;
 
-        protected override void OnReferencedFromCompositor(Compositor c)
+        private protected override void OnReferencedFromCompositor(Compositor c)
         {
             _renderDataDictionary.Add(c, CreateServerContent(c));
             base.OnReferencedFromCompositor(c);

src/Avalonia.Base/Metadata/PrivateApiAttribute.cs

@@ -3,7 +3,7 @@
 namespace Avalonia.Metadata;
 
 [AttributeUsage(AttributeTargets.Interface | AttributeTargets.Class | AttributeTargets.Constructor 
-                | AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Field)]
+                | AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Struct)]
 public sealed class PrivateApiAttribute : Attribute
 {
 

src/Avalonia.Base/Platform/IPlatformThreadingInterface.cs

@@ -8,7 +8,7 @@ namespace Avalonia.Platform
     /// <summary>
     /// Provides platform-specific services relating to threading.
     /// </summary>
-    [Unstable]
+    [PrivateApi]
     public interface IPlatformThreadingInterface
     {
         /// <summary>

src/Avalonia.Base/Platform/IRenderTarget.cs

@@ -1,4 +1,5 @@
 using System;
+using Avalonia.Metadata;
 using Avalonia.Rendering;
 
 namespace Avalonia.Platform
@@ -9,6 +10,7 @@ namespace Avalonia.Platform
     /// <remarks>
     /// The interface used for obtaining drawing context from surfaces you can render on.
     /// </remarks>
+    [PrivateApi]
     public interface IRenderTarget : IDisposable
     {
         /// <summary>

src/Avalonia.Base/Platform/Interop/IDynamicLibraryLoader.cs

@@ -3,7 +3,6 @@
 
 namespace Avalonia.Platform.Interop
 {
-    [Unstable]
     public interface IDynamicLibraryLoader
     {
         IntPtr LoadLibrary(string dll);

src/Avalonia.Base/Platform/Interop/Utf8Buffer.cs

@@ -5,7 +5,7 @@
 
 namespace Avalonia.Platform.Interop
 {
-    public class Utf8Buffer : SafeHandle
+    internal class Utf8Buffer : SafeHandle
     {
         private GCHandle _gcHandle;
         private byte[]? _data;

src/Avalonia.Base/Rendering/DefaultRenderTimer.cs

@@ -1,4 +1,5 @@
 using System;
+using Avalonia.Metadata;
 using Avalonia.Platform;
 
 namespace Avalonia.Rendering
@@ -10,6 +11,7 @@ namespace Avalonia.Rendering
     /// This class may be overridden by platform implementations to use a specialized timer
     /// implementation.
     /// </remarks>
+    [PrivateApi]
     public class DefaultRenderTimer : IRenderTimer
     {
         private IRuntimePlatform? _runtime;