Merge branch 'master' into feature/ui-automation

4 years ago · dab63d346f
13 changed files with 71 additions and 35 deletions
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@ -1,3 +1,6 @@
+variables:
+    MSBuildEnableWorkloadResolver: 'false'
+
 jobs:
 - job: Linux
  pool:
@ -9,9 +12,9 @@ jobs:
      version: 3.1.414

  - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 5.0.402'
+    displayName: 'Use .NET Core SDK 6.0.100'
    inputs:
-      version: 5.0.402
+      version: 6.0.100

  - task: CmdLine@2
    displayName: 'Run Build'
@ -40,9 +43,9 @@ jobs:
      version: 3.1.414

  - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 5.0.402'
+    displayName: 'Use .NET Core SDK 6.0.100'
    inputs:
-      version: 5.0.402
+      version: 6.0.100
      
  - task: CmdLine@2
    displayName: 'Install Mono 5.18'
@ -56,7 +59,7 @@ jobs:
    inputs:
      script: |
        export PATH="`pwd`/sdk:$PATH"
-        cd src/tools/MicroComGenerator; dotnet run -i ../../Avalonia.Native/avn.idl --cpp ../../../native/Avalonia.Native/inc/avalonia-native.h
+        cd src/tools/MicroComGenerator; dotnet run -f net6.0 -i ../../Avalonia.Native/avn.idl --cpp ../../../native/Avalonia.Native/inc/avalonia-native.h

  - task: Xcode@5
    inputs:
@ -110,9 +113,9 @@ jobs:
      version: 3.1.414

  - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 5.0.402'
+    displayName: 'Use .NET Core SDK 6.0.100'
    inputs:
-      version: 5.0.402
+      version: 6.0.100

  - task: CmdLine@2
    displayName: 'Install Nuke'
--- a/build/HarfBuzzSharp.props
+++ b/build/HarfBuzzSharp.props
@ -1,6 +1,6 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
-    <PackageReference Include="HarfBuzzSharp" Version="2.6.1.7" />
-    <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.Linux" Version="2.6.1.7" />
+    <PackageReference Include="HarfBuzzSharp" Version="2.8.2-preview.155" />
+    <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.Linux" Version="2.8.2-preview.155" />
  </ItemGroup>
 </Project>
--- a/build/MicroCom.targets
+++ b/build/MicroCom.targets
@ -15,7 +15,7 @@
          Inputs="@(AvnComIdl);$(MSBuildThisFileDirectory)../src/tools/MicroComGenerator/**/*.cs"
          Outputs="%(AvnComIdl.OutputFile)">
    <Message Importance="high" Text="Generating file %(AvnComIdl.OutputFile) from @(AvnComIdl)" />
-    <Exec Command="dotnet &quot;$(MSBuildThisFileDirectory)../src/tools/MicroComGenerator/bin/$(Configuration)/netcoreapp3.1/MicroComGenerator.dll&quot; -i @(AvnComIdl) --cs %(AvnComIdl.OutputFile)" 
+    <Exec Command="dotnet &quot;$(MSBuildThisFileDirectory)../src/tools/MicroComGenerator/bin/$(Configuration)/net6.0/MicroComGenerator.dll&quot; -i @(AvnComIdl) --cs %(AvnComIdl.OutputFile)" 
          LogStandardErrorAsError="true" />
    <ItemGroup>
      <!-- Remove and re-add generated file, this is needed for the clean build -->
--- a/build/SkiaSharp.props
+++ b/build/SkiaSharp.props
@ -1,6 +1,6 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.80.2" />
-    <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="SkiaSharp.NativeAssets.Linux" Version="2.80.2" />
+    <PackageReference Include="SkiaSharp" Version="2.88.0-preview.155" />
+    <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="SkiaSharp.NativeAssets.Linux" Version="2.88.0-preview.155" />
  </ItemGroup>
 </Project>
--- a/global.json
+++ b/global.json
@ -1,7 +1,7 @@
 {
-	"sdk": {
-		"version": "5.0.402"
-	},
+    "sdk": {
+        "version": "6.0.100"
+    },
    "msbuild-sdks": {
        "Microsoft.Build.Traversal": "1.0.43",
        "MSBuild.Sdk.Extras": "2.0.54",
--- a/nukebuild/_build.csproj
+++ b/nukebuild/_build.csproj
@ -15,6 +15,7 @@
    <PackageReference Include="JetBrains.dotMemoryUnit" Version="3.0.20171219.105559" />
    <PackageReference Include="vswhere" Version="2.6.7" Condition=" '$(OS)' == 'Windows_NT' " />
    <PackageReference Include="ILRepack.NETStandard" Version="2.0.4" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.7.0" />
    <!-- Keep in sync with Avalonia.Build.Tasks -->
    <PackageReference Include="Mono.Cecil" Version="0.11.2" />
  </ItemGroup>
@ -36,10 +37,10 @@
    <None Include="..\GitVersion.yml" Condition="Exists('..\GitVersion.yml')" />
    <Compile Remove="Numerge/**/*.*" />
    <Compile Include="Numerge/Numerge/**/*.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\src\tools\MicroComGenerator\MicroComGenerator.csproj" />
+    <Compile Include="..\src\tools\MicroComGenerator\**\*.cs" Exclude="..\src\tools\MicroComGenerator\obj\**">
+      <Link>MicroComGenerator\%(Filename)%(Extension)</Link>
+    </Compile>
+    <Compile Remove="..\src\tools\MicroComGenerator\Program.cs" />
  </ItemGroup>

 </Project>
--- a/src/Avalonia.Input/Gestures.cs
+++ b/src/Avalonia.Input/Gestures.cs
@ -30,7 +30,7 @@ namespace Avalonia.Input
                "ScrollGestureEnded", RoutingStrategies.Bubble, typeof(Gestures));

 #pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
-        private static WeakReference<IInteractive> s_lastPress = new WeakReference<IInteractive>(null);
+        private static readonly WeakReference<IInteractive> s_lastPress = new WeakReference<IInteractive>(null);
 #pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.

        static Gestures()
@ -86,16 +86,15 @@ namespace Avalonia.Input
 #pragma warning restore CS0618 // Type or member is obsolete
                if (clickCount <= 1)
                {
-                    s_lastPress = new WeakReference<IInteractive>(ev.Source);
+                    s_lastPress.SetTarget(ev.Source);
                }
-                else if (s_lastPress != null && clickCount == 2 && e.GetCurrentPoint(visual).Properties.IsLeftButtonPressed)
+                else if (clickCount == 2 && e.GetCurrentPoint(visual).Properties.IsLeftButtonPressed)
                {
                    if (s_lastPress.TryGetTarget(out var target) && target == e.Source)
                    {
                        e.Source.RaiseEvent(new TappedEventArgs(DoubleTappedEvent, e));
                    }
                }
-
            }
        }

--- a/src/Avalonia.Input/InputElement.cs
+++ b/src/Avalonia.Input/InputElement.cs
@ -632,7 +632,7 @@ namespace Avalonia.Input
            }
            else if (change.Property == IsKeyboardFocusWithinProperty)
            {
-                PseudoClasses.Set(":focus-within", _isKeyboardFocusWithin);
+                PseudoClasses.Set(":focus-within", change.NewValue.GetValueOrDefault<bool>());
            }
        }

--- a/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
@ -20,6 +20,7 @@ namespace Avalonia.Rendering
    {
        private readonly IVisual _root;
        private readonly IRenderRoot _renderRoot;
+        private bool _updateTransformedBounds = true;
        private IRenderTarget _renderTarget;

        /// <summary>
@ -34,6 +35,13 @@ namespace Avalonia.Rendering
            _renderRoot = root as IRenderRoot;
        }

+        private ImmediateRenderer(IVisual root, bool updateTransformedBounds)
+        {
+            _root = root ?? throw new ArgumentNullException(nameof(root));
+            _renderRoot = root as IRenderRoot;
+            _updateTransformedBounds = updateTransformedBounds;
+        }
+
        /// <inheritdoc/>
        public bool DrawFps { get; set; }

@ -98,7 +106,7 @@ namespace Avalonia.Rendering
        /// <param name="target">The render target.</param>
        public static void Render(IVisual visual, IRenderTarget target)
        {
-            using (var renderer = new ImmediateRenderer(visual))
+            using (var renderer = new ImmediateRenderer(visual, updateTransformedBounds: false))
            using (var context = new DrawingContext(target.CreateDrawingContext(renderer)))
            {
                renderer.Render(context, visual, visual.Bounds);
@ -112,7 +120,7 @@ namespace Avalonia.Rendering
        /// <param name="context">The drawing context.</param>
        public static void Render(IVisual visual, DrawingContext context)
        {
-            using (var renderer = new ImmediateRenderer(visual))
+            using (var renderer = new ImmediateRenderer(visual, updateTransformedBounds: false))
            {
                renderer.Render(context, visual, visual.Bounds);
            }
@ -193,6 +201,12 @@ namespace Avalonia.Rendering
            Render(new DrawingContext(context), visual, visual.Bounds);
        }

+        internal static void Render(IVisual visual, DrawingContext context, bool updateTransformedBounds)
+        {
+            using var renderer = new ImmediateRenderer(visual, updateTransformedBounds);
+            renderer.Render(context, visual, visual.Bounds);
+        }
+
        private static void ClearTransformedBounds(IVisual visual)
        {
            foreach (var e in visual.GetSelfAndVisualDescendants())
@ -308,7 +322,8 @@ namespace Avalonia.Rendering
                        new TransformedBounds(bounds, new Rect(), context.CurrentContainerTransform);
 #pragma warning restore 0618

-                    visual.TransformedBounds = transformed;
+                    if (_updateTransformedBounds)
+                        visual.TransformedBounds = transformed;

                    foreach (var child in visual.VisualChildren.OrderBy(x => x, ZIndexComparer.Instance))
                    {
@ -321,7 +336,7 @@ namespace Avalonia.Rendering
                                : clipRect;
                            Render(context, child, childClipRect);
                        }
-                        else
+                        else if (_updateTransformedBounds)
                        {
                            ClearTransformedBounds(child);
                        }
@ -329,7 +344,7 @@ namespace Avalonia.Rendering
                }
            }

-            if (!visual.IsVisible)
+            if (!visual.IsVisible && _updateTransformedBounds)
            {
                ClearTransformedBounds(visual);
            }
--- a/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs
+++ b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs
@ -25,7 +25,7 @@ namespace Avalonia.Skia
                    GRGlInterface.CreateOpenGl(proc => context.GlInterface.GetProcAddress(proc)) :
                    GRGlInterface.CreateGles(proc => context.GlInterface.GetProcAddress(proc)))
                {
-                    _grContext = GRContext.CreateGl(iface);
+                    _grContext = GRContext.CreateGl(iface, new GRContextOptions { AvoidStencilBuffers = true });
                    if (maxResourceBytes.HasValue)
                    {
                        _grContext.SetResourceCacheLimit(maxResourceBytes.Value);
--- a/src/tools/MicroComGenerator/MicroComGenerator.csproj
+++ b/src/tools/MicroComGenerator/MicroComGenerator.csproj
@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
-    </PropertyGroup>
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="CommandLineParser" Version="2.8.0" />
    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.7.0" />
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests.cs
@ -291,6 +291,24 @@ namespace Avalonia.Visuals.UnitTests.Rendering
            }
        }

+        [Fact]
+        public void Static_Render_Method_Does_Not_Update_TransformedBounds()
+        {
+            using (UnitTestApplication.Start(TestServices.MockPlatformRenderInterface))
+            {
+                var target = new Border();
+                var expected = new TransformedBounds(new Rect(1, 2, 3, 4), new Rect(4, 5, 6, 7), Matrix.CreateRotation(0.8));
+
+                ((IVisual)target).TransformedBounds = expected;
+
+                var renderTarget = Mock.Of<IRenderTarget>(x => 
+                    x.CreateDrawingContext(It.IsAny<IVisualBrushRenderer>()) == Mock.Of<IDrawingContextImpl>());
+                ImmediateRenderer.Render(target, renderTarget);
+
+                Assert.Equal(expected, target.TransformedBounds);
+            }
+        }
+
        private class TestControl : Control
        {
            public bool Rendered { get; private set; }
--- a/tests/Avalonia.Visuals.UnitTests/VisualTree/TransformedBoundsTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/VisualTree/TransformedBoundsTests.cs
@ -40,7 +40,7 @@ namespace Avalonia.Visuals.UnitTests.VisualTree

                tree.Measure(Size.Infinity);
                tree.Arrange(new Rect(0, 0, 100, 100));
-                ImmediateRenderer.Render(tree, context);
+                ImmediateRenderer.Render(tree, context, true);

                var track = control.GetObservable(Visual.TransformedBoundsProperty);
                var results = new List<TransformedBounds?>();