Make some protected internal members internal.

src/Avalonia.Base/Interactivity/Interactive.cs

@@ -17,7 +17,7 @@ namespace Avalonia.Interactivity
         /// <summary>
         /// Gets the interactive parent of the object for bubbling and tunneling events.
         /// </summary>
-        protected internal virtual Interactive? InteractiveParent => VisualParent as Interactive;
+        internal virtual Interactive? InteractiveParent => VisualParent as Interactive;
 
         /// <summary>
         /// Adds a handler for the specified routed event.

src/Avalonia.Base/Media/ArcSegment.cs

@@ -95,7 +95,7 @@ namespace Avalonia.Media
             set { SetValue(SweepDirectionProperty, value); }
         }
 
-        protected internal override void ApplyTo(StreamGeometryContext ctx)
+        internal override void ApplyTo(StreamGeometryContext ctx)
         {
             ctx.ArcTo(Point, Size, RotationAngle, IsLargeArc, SweepDirection);
         }

src/Avalonia.Base/Media/BezierSegment .cs

@@ -56,7 +56,7 @@ namespace Avalonia.Media
             set { SetValue(Point3Property, value); }
         }
 
-        protected internal override void ApplyTo(StreamGeometryContext ctx)
+        internal override void ApplyTo(StreamGeometryContext ctx)
         {
             ctx.CubicBezierTo(Point1, Point2, Point3);
         }

src/Avalonia.Base/Media/Imaging/Bitmap.cs

@@ -173,7 +173,7 @@ namespace Avalonia.Media.Imaging
 
         public virtual PixelFormat? Format => (PlatformImpl.Item as IReadableBitmapImpl)?.Format;
 
-        protected internal unsafe void CopyPixelsCore(PixelRect sourceRect, IntPtr buffer, int bufferSize, int stride,
+        private protected unsafe void CopyPixelsCore(PixelRect sourceRect, IntPtr buffer, int bufferSize, int stride,
             ILockedFramebuffer fb)
         {
             if ((sourceRect.Width <= 0 || sourceRect.Height <= 0) && (sourceRect.X != 0 || sourceRect.Y != 0))

src/Avalonia.Base/Media/Immutable/ImmutableTileBrush.cs

@@ -21,7 +21,7 @@ namespace Avalonia.Media.Immutable
         /// How the source rectangle will be stretched to fill the destination rect.
         /// </param>
         /// <param name="tileMode">The tile mode.</param>
-        protected internal ImmutableTileBrush(
+        private protected ImmutableTileBrush(
             AlignmentX alignmentX,
             AlignmentY alignmentY,
             RelativeRect destinationRect,

src/Avalonia.Base/Media/LineSegment.cs

@@ -22,7 +22,7 @@ namespace Avalonia.Media
             set { SetValue(PointProperty, value); }
         }
 
-        protected internal override void ApplyTo(StreamGeometryContext ctx)
+        internal override void ApplyTo(StreamGeometryContext ctx)
         {
             ctx.LineTo(Point);
         }

src/Avalonia.Base/Media/PathSegment.cs

@@ -2,6 +2,6 @@ namespace Avalonia.Media
 {
     public abstract class PathSegment : AvaloniaObject
     {
-        protected internal abstract void ApplyTo(StreamGeometryContext ctx);
+        internal abstract void ApplyTo(StreamGeometryContext ctx);
     }
-}
+}

src/Avalonia.Base/Media/PolyLineSegment.cs

@@ -44,7 +44,7 @@ namespace Avalonia.Media
             Points = new Points(points);
         }
 
-        protected internal override void ApplyTo(StreamGeometryContext ctx)
+        internal override void ApplyTo(StreamGeometryContext ctx)
         {
             var points = Points;
             if (points.Count > 0)

src/Avalonia.Base/Media/QuadraticBezierSegment .cs

@@ -40,7 +40,7 @@ namespace Avalonia.Media
             set { SetValue(Point2Property, value); }
         }
 
-        protected internal override void ApplyTo(StreamGeometryContext ctx)
+        internal override void ApplyTo(StreamGeometryContext ctx)
         {
             ctx.QuadraticBezierTo(Point1, Point2);
         }

src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs

@@ -302,7 +302,7 @@ namespace Avalonia.Controls.Presenters
         /// <remarks>
         /// This method is automatically called when the control is attached to a visual tree.
         /// </remarks>
-        protected internal virtual void AttachToScrollViewer()
+        internal void AttachToScrollViewer()
         {
             var owner = this.FindAncestorOfType<ScrollViewer>();
 

src/Avalonia.Controls/Primitives/AccessText.cs

@@ -60,7 +60,7 @@ namespace Avalonia.Controls.Primitives
         /// Renders the <see cref="AccessText"/> to a drawing context.
         /// </summary>
         /// <param name="context">The drawing context.</param>
-        protected internal override void RenderCore(DrawingContext context)
+        private protected override void RenderCore(DrawingContext context)
         {
             base.RenderCore(context);
             int underscore = Text?.IndexOf('_') ?? -1;

src/Avalonia.Controls/Primitives/OverlayPopupHost.cs

@@ -51,7 +51,7 @@ namespace Avalonia.Controls.Primitives
         }
 
         /// <inheritdoc />
-        protected internal override Interactive? InteractiveParent => Parent as Interactive;
+        internal override Interactive? InteractiveParent => Parent as Interactive;
 
         /// <inheritdoc />
         public void Dispose() => Hide();

src/Avalonia.Controls/Primitives/PopupRoot.cs

@@ -72,7 +72,7 @@ namespace Avalonia.Controls.Primitives
         /// <remarks>
         /// Popup events are passed to their parent window. This facilitates this.
         /// </remarks>
-        protected internal override Interactive? InteractiveParent => (Interactive?)Parent;
+        internal override Interactive? InteractiveParent => (Interactive?)Parent;
 
         /// <summary>
         /// Gets the control that is hosting the popup root.

src/Avalonia.Controls/Primitives/ScrollBar.cs

@@ -200,7 +200,7 @@ namespace Avalonia.Controls.Primitives
         /// <remarks>
         /// This method is automatically called when the control is attached to a visual tree.
         /// </remarks>
-        protected internal virtual void AttachToScrollViewer()
+        internal void AttachToScrollViewer()
         {
             var owner = this.FindAncestorOfType<ScrollViewer>();
 

src/Avalonia.Controls/TextBlock.cs

@@ -555,7 +555,7 @@ namespace Avalonia.Controls
         }
 
         // Workaround to seal Render method, we need to make so because AccessText was overriding Render method which is sealed now.
-        internal protected virtual void RenderCore(DrawingContext context)
+        private protected virtual void RenderCore(DrawingContext context)
         {
             var background = Background;
 

src/Avalonia.Controls/Viewbox.cs

@@ -82,7 +82,7 @@ namespace Avalonia.Controls
         /// Gets or sets the transform applied to the container visual that
         /// hosts the child of the Viewbox
         /// </summary>
-        protected internal ITransform? InternalTransform
+        internal ITransform? InternalTransform
         {
             get => _containerVisual.RenderTransform;
             set => _containerVisual.RenderTransform = value;