Merge branch 'master' into fixes/focus-on-click-only-button-down

5 years ago · e08ac56b38
70 changed files with 400 additions and 151 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/build/SourceLink.props
+++ b/build/SourceLink.props
@ -3,7 +3,7 @@
    <PublishRepositoryUrl>true</PublishRepositoryUrl>
    <IncludeSymbols>false</IncludeSymbols>
    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <DebugType>embedded</DebugType>
+    <DebugType>full</DebugType>
    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
  </PropertyGroup>
  
--- 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/native/Avalonia.Native/src/OSX/window.mm
+++ b/native/Avalonia.Native/src/OSX/window.mm
@ -206,7 +206,11 @@ public:
                auto window = Window;
                Window = nullptr;
                
-                [window close];
+                try{
+                    // Seems to throw sometimes on application exit.
+                    [window close];
+                }
+                catch(NSException*){}
            }
            
            return S_OK;
@ -724,6 +728,7 @@ private:
            if (cparent->WindowState() == Minimized)
                cparent->SetWindowState(Normal);
            
+            [Window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary];
            [cparent->Window addChildWindow:Window ordered:NSWindowAbove];
            
            UpdateStyle();
@ -2398,11 +2403,18 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
        {
            case NSEventTypeLeftMouseDown:
            {
-                auto avnPoint = [AvnView toAvnPoint:[event locationInWindow]];
-                auto point = [self translateLocalPoint:avnPoint];
-                AvnVector delta;
+                AvnView* view = _parent->View;
+                NSPoint windowPoint = [event locationInWindow];
+                NSPoint viewPoint = [view convertPoint:windowPoint fromView:nil];
                
-                _parent->BaseEvents->RawMouseEvent(NonClientLeftButtonDown, [event timestamp] * 1000, AvnInputModifiersNone, point, delta);
+                if (!NSPointInRect(viewPoint, view.bounds))
+                {
+                    auto avnPoint = [AvnView toAvnPoint:windowPoint];
+                    auto point = [self translateLocalPoint:avnPoint];
+                    AvnVector delta;
+                   
+                    _parent->BaseEvents->RawMouseEvent(NonClientLeftButtonDown, [event timestamp] * 1000, AvnInputModifiersNone, point, delta);
+                }
            }
            break;
                
--- 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/packages/Avalonia/AvaloniaBuildTasks.targets
+++ b/packages/Avalonia/AvaloniaBuildTasks.targets
@ -88,6 +88,7 @@
      <AvaloniaXamlReferencesTemporaryFilePath Condition="'$(AvaloniaXamlReferencesTemporaryFilePath)' == ''">$(IntermediateOutputPath)/Avalonia/references</AvaloniaXamlReferencesTemporaryFilePath>
      <AvaloniaXamlOriginalCopyFilePath Condition="'$(AvaloniaXamlOriginalCopyFilePath)' == ''">$(IntermediateOutputPath)/Avalonia/original.dll</AvaloniaXamlOriginalCopyFilePath>
      <AvaloniaXamlIlVerifyIl Condition="'$(AvaloniaXamlIlVerifyIl)' == ''">false</AvaloniaXamlIlVerifyIl>
+      <AvaloniaXamlIlDebuggerLaunch Condition="'$(AvaloniaXamlIlDebuggerLaunch)' == ''">false</AvaloniaXamlIlDebuggerLaunch> 
    </PropertyGroup>
    <WriteLinesToFile
      Condition="'$(_AvaloniaForceInternalMSBuild)' != 'true'"
@ -107,6 +108,7 @@
      DelaySign="$(DelaySign)"
      EnableComInteropPatching="$(_AvaloniaPatchComInterop)"
      SkipXamlCompilation="$(_AvaloniaSkipXamlCompilation)"
+      DebuggerLaunch="$(AvaloniaXamlIlDebuggerLaunch)"
    />
    <Exec
      Condition="'$(_AvaloniaUseExternalMSBuild)' == 'true'"
--- a/readme.md
+++ b/readme.md
@ -93,7 +93,8 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
 <a href="https://opencollective.com/Avalonia/sponsor/6/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/6/avatar.svg"></a>
 <a href="https://opencollective.com/Avalonia/sponsor/7/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/7/avatar.svg"></a>
 <a href="https://opencollective.com/Avalonia/sponsor/8/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/8/avatar.svg"></a>
-<a href="https://opencollective.com/Avalonia/sponsor/9/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/9/avatar.svg"></a> 
+<a href="https://opencollective.com/Avalonia/sponsor/9/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/9/avatar.svg"></a>
+<a href="https://baseheadinc.com/" target="_blank"><img height="50" src="https://baseheadinc.com/wp-content/uploads/2020/09/BH-Logo-for-Site-Header-New.png"></a>

 ## .NET Foundation

--- a/samples/BindingDemo/BindingDemo.csproj
+++ b/samples/BindingDemo/BindingDemo.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
--- a/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj
+++ b/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
  </PropertyGroup>

--- a/samples/PlatformSanityChecks/PlatformSanityChecks.csproj
+++ b/samples/PlatformSanityChecks/PlatformSanityChecks.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
--- a/samples/Previewer/Previewer.csproj
+++ b/samples/Previewer/Previewer.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
    <Compile Update="**\*.xaml.cs">
--- a/samples/RemoteDemo/RemoteDemo.csproj
+++ b/samples/RemoteDemo/RemoteDemo.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
--- a/samples/RenderDemo/RenderDemo.csproj
+++ b/samples/RenderDemo/RenderDemo.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\..\src\Avalonia.Visuals\Rendering\SceneGraph\LineBoundsHelper.cs" Link="LineBoundsHelper.cs" />
--- a/samples/Sandbox/Sandbox.csproj
+++ b/samples/Sandbox/Sandbox.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
  </PropertyGroup>

--- a/samples/VirtualizationDemo/VirtualizationDemo.csproj
+++ b/samples/VirtualizationDemo/VirtualizationDemo.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
--- a/src/Avalonia.Animation/Animation.cs
+++ b/src/Avalonia.Animation/Animation.cs
@ -353,6 +353,12 @@ namespace Avalonia.Animation
            return new CompositeDisposable(subscriptions);
        }

+        /// <inheritdoc/>
+        public Task RunAsync(Animatable control, IClock clock = null)
+        {
+            return RunAsync(control, clock, default);
+        }
+
        /// <inheritdoc/>
        public Task RunAsync(Animatable control, IClock clock = null, CancellationToken cancellationToken = default)
        {
--- a/src/Avalonia.Animation/Animators/Animator`1.cs
+++ b/src/Avalonia.Animation/Animators/Animator`1.cs
@ -79,15 +79,15 @@ namespace Avalonia.Animation.Animators

            T oldValue, newValue;

-            if (firstKeyframe.isNeutral)
-                oldValue = neutralValue;
+            if (!firstKeyframe.isNeutral && firstKeyframe.Value is T firstKeyframeValue)
+                oldValue = firstKeyframeValue;
            else
-                oldValue = (T)firstKeyframe.Value;
+                oldValue = neutralValue;

-            if (lastKeyframe.isNeutral)
-                newValue = neutralValue;
+            if (!lastKeyframe.isNeutral && lastKeyframe.Value is T lastKeyframeValue)
+                newValue = lastKeyframeValue;
            else
-                newValue = (T)lastKeyframe.Value;
+                newValue = neutralValue;

            if (lastKeyframe.KeySpline != null)
                progress = lastKeyframe.KeySpline.GetSplineProgress(progress);
--- a/src/Avalonia.Animation/ApiCompatBaseline.txt
+++ b/src/Avalonia.Animation/ApiCompatBaseline.txt
@ -1,6 +1,5 @@
 Compat issues with assembly Avalonia.Animation:
-MembersMustExist : Member 'public System.Threading.Tasks.Task Avalonia.Animation.Animation.RunAsync(Avalonia.Animation.Animatable, Avalonia.Animation.IClock)' does not exist in the implementation but it does exist in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public System.Threading.Tasks.Task Avalonia.Animation.IAnimation.RunAsync(Avalonia.Animation.Animatable, Avalonia.Animation.IClock)' is present in the contract but not in the implementation.
 MembersMustExist : Member 'public System.Threading.Tasks.Task Avalonia.Animation.IAnimation.RunAsync(Avalonia.Animation.Animatable, Avalonia.Animation.IClock)' does not exist in the implementation but it does exist in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public System.Threading.Tasks.Task Avalonia.Animation.IAnimation.RunAsync(Avalonia.Animation.Animatable, Avalonia.Animation.IClock, System.Threading.CancellationToken)' is present in the implementation but not in the contract.
-Total Issues: 4
+Total Issues: 3
--- a/src/Avalonia.Base/Data/Converters/MethodToCommandConverter.cs
+++ b/src/Avalonia.Base/Data/Converters/MethodToCommandConverter.cs
@ -140,18 +140,9 @@ namespace Avalonia.Data.Converters
                    );

            }
-            Action<object> action = null;
-            try
-            {
-                action = Expression
-                   .Lambda<Action<object>>(body, parameter)
-                   .Compile();
-            }
-            catch (Exception ex)
-            {
-                throw ex;
-            }
-            return action;
+            return Expression
+                .Lambda<Action<object>>(body, parameter)
+                .Compile();
        }

        static Func<object, bool> CreateCanExecute(object target
--- a/src/Avalonia.Build.Tasks/CompileAvaloniaXamlTask.cs
+++ b/src/Avalonia.Build.Tasks/CompileAvaloniaXamlTask.cs
@ -1,9 +1,6 @@
 using System;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Reflection;
-using System.Threading;
 using Microsoft.Build.Framework;

 namespace Avalonia.Build.Tasks
@ -41,7 +38,7 @@ namespace Avalonia.Build.Tasks
                File.ReadAllLines(ReferencesFilePath).Where(l => !string.IsNullOrWhiteSpace(l)).ToArray(),
                ProjectDirectory, OutputPath, VerifyIl, outputImportance,
                (SignAssembly && !DelaySign) ? AssemblyOriginatorKeyFile : null,
-                EnableComInteropPatching, SkipXamlCompilation);
+                EnableComInteropPatching, SkipXamlCompilation, DebuggerLaunch);
            if (!res.Success)
                return false;
            if (!res.WrittenFile)
@ -87,5 +84,7 @@ namespace Avalonia.Build.Tasks

        public IBuildEngine BuildEngine { get; set; }
        public ITaskHost HostObject { get; set; }
+
+        public bool DebuggerLaunch { get; set; }
    }
 }
--- a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
+++ b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
@ -1,13 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Avalonia.Markup.Xaml.XamlIl.CompilerExtensions;
 using Microsoft.Build.Framework;
 using Mono.Cecil;
-using Avalonia.Utilities;
 using Mono.Cecil.Cil;
 using Mono.Cecil.Rocks;
 using XamlX;
@ -44,16 +41,23 @@ namespace Avalonia.Build.Tasks
            string projectDirectory,
            string output, bool verifyIl, MessageImportance logImportance, string strongNameKey, bool patchCom,
            bool skipXamlCompilation)
+        {
+            return Compile(engine, input, references, projectDirectory, output, verifyIl, logImportance, strongNameKey, patchCom, skipXamlCompilation, debuggerLaunch:false);
+        }
+
+        internal static CompileResult Compile(IBuildEngine engine, string input, string[] references,
+            string projectDirectory,
+            string output, bool verifyIl, MessageImportance logImportance, string strongNameKey, bool patchCom, bool skipXamlCompilation, bool debuggerLaunch)
        {
            var typeSystem = new CecilTypeSystem(references
                .Where(r => !r.ToLowerInvariant().EndsWith("avalonia.build.tasks.dll"))
                .Concat(new[] { input }), input);
-            
+
            var asm = typeSystem.TargetAssemblyDefinition;

            if (!skipXamlCompilation)
            {
-                var compileRes = CompileCore(engine, typeSystem, projectDirectory, verifyIl, logImportance);
+                var compileRes = CompileCore(engine, typeSystem, projectDirectory, verifyIl, logImportance, debuggerLaunch);
                if (compileRes == null && !patchCom)
                    return new CompileResult(true);
                if (compileRes == false)
@ -62,7 +66,7 @@ namespace Avalonia.Build.Tasks

            if (patchCom)
                ComInteropHelper.PatchAssembly(asm, typeSystem);
-            
+
            var writerParameters = new WriterParameters { WriteSymbols = asm.MainModule.HasSymbols };
            if (!string.IsNullOrWhiteSpace(strongNameKey))
                writerParameters.StrongNameKeyBlob = File.ReadAllBytes(strongNameKey);
@ -70,13 +74,43 @@ namespace Avalonia.Build.Tasks
            asm.Write(output, writerParameters);

            return new CompileResult(true, true);
-            
+
        }
-        
+
        static bool? CompileCore(IBuildEngine engine, CecilTypeSystem typeSystem,
            string projectDirectory, bool verifyIl, 
-            MessageImportance logImportance)
+            MessageImportance logImportance
+            , bool debuggerLaunch = false)
        {
+            if (debuggerLaunch)
+            {
+                // According this https://docs.microsoft.com/en-us/dotnet/api/system.diagnostics.debugger.launch?view=net-6.0#remarks
+                // documentation, on not windows platform Debugger.Launch() always return true without running a debugger.
+                if (System.Diagnostics.Debugger.Launch())
+                {
+                    // Set timeout at 1 minut.
+                    var time = new System.Diagnostics.Stopwatch();
+                    var timeout = TimeSpan.FromMinutes(1);
+                    time.Start();
+
+                    // wait for the debugger to be attacked or timeout.
+                    while (!System.Diagnostics.Debugger.IsAttached && time.Elapsed < timeout)
+                    {
+                        engine.LogMessage($"[PID:{System.Diagnostics.Process.GetCurrentProcess().Id}] Wating attach debugger. Elapsed {time.Elapsed}...", MessageImportance.High);
+                        System.Threading.Thread.Sleep(100);
+                    }
+
+                    time.Stop();                    
+                    if (time.Elapsed >= timeout)
+                    {
+                        engine.LogMessage("Wating attach debugger timeout.", MessageImportance.Normal);
+                    }
+                }
+                else
+                {
+                    engine.LogMessage("Debugging cancelled.", MessageImportance.Normal);
+                }
+            }
            var asm = typeSystem.TargetAssemblyDefinition;
            var emres = new EmbeddedResources(asm);
            var avares = new AvaloniaResources(asm, projectDirectory);
--- a/src/Avalonia.Controls/MenuItem.cs
+++ b/src/Avalonia.Controls/MenuItem.cs
@ -387,7 +387,7 @@ namespace Avalonia.Controls
                parent = parent.Parent;
            }

-            _isEmbeddedInMenu = parent is IMenu;
+            _isEmbeddedInMenu = parent.FindLogicalAncestorOfType<IMenu>(true) != null;
        }

        protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
--- a/src/Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs
+++ b/src/Avalonia.Controls/Platform/InternalPlatformThreadingInterface.cs
@ -85,7 +85,9 @@ namespace Avalonia.Controls.Platform

        public bool CurrentThreadIsLoopThread => TlsCurrentThreadIsLoopThread;
        public event Action<DispatcherPriority?> Signaled;
+#pragma warning disable CS0067
        public event Action<TimeSpan> Tick;
+#pragma warning restore CS0067

    }
 }
--- a/src/Avalonia.Controls/Platform/PlatformManager.cs
+++ b/src/Avalonia.Controls/Platform/PlatformManager.cs
@ -29,7 +29,7 @@ namespace Avalonia.Controls.Platform

            if (platform == null)
            {
-                throw new Exception("Could not CreateWindow(): IWindowingPlatform is not registered.");
+                throw new Exception("Could not CreateTrayIcon(): IWindowingPlatform is not registered.");
            }

            return s_designerMode ? null : platform.CreateTrayIcon();
@ -45,7 +45,7 @@ namespace Avalonia.Controls.Platform
                throw new Exception("Could not CreateWindow(): IWindowingPlatform is not registered.");
            }

-            return s_designerMode ? (IWindowImpl)platform.CreateEmbeddableWindow() : platform.CreateWindow();
+            return s_designerMode ? platform.CreateEmbeddableWindow() : platform.CreateWindow();
        }

        public static IWindowImpl CreateEmbeddableWindow()
--- a/src/Avalonia.Controls/Remote/RemoteServer.cs
+++ b/src/Avalonia.Controls/Remote/RemoteServer.cs
@ -15,9 +15,6 @@ namespace Avalonia.Controls.Remote
            public EmbeddableRemoteServerTopLevelImpl(IAvaloniaRemoteTransportConnection transport) : base(transport)
            {
            }
-#pragma warning disable 67
-            public Action LostFocus { get; set; }
-
        }
        
        public RemoteServer(IAvaloniaRemoteTransportConnection transport)
--- a/src/Avalonia.Controls/TextBoxTextInputMethodClient.cs
+++ b/src/Avalonia.Controls/TextBoxTextInputMethodClient.cs
@ -18,7 +18,7 @@ namespace Avalonia.Controls

        public bool SupportsSurroundingText => false;
        public TextInputMethodSurroundingText SurroundingText => throw new NotSupportedException();
-        public event EventHandler SurroundingTextChanged;
+        public event EventHandler SurroundingTextChanged { add { } remove { } }
        public string TextBeforeCursor => null;
        public string TextAfterCursor => null;

--- a/src/Avalonia.DesignerSupport/Remote/FileWatcherTransport.cs
+++ b/src/Avalonia.DesignerSupport/Remote/FileWatcherTransport.cs
@ -59,7 +59,7 @@ namespace Avalonia.DesignerSupport.Remote
            remove { _onMessage -= value; }
        }

-        public event Action<IAvaloniaRemoteTransportConnection, Exception> OnException;
+        public event Action<IAvaloniaRemoteTransportConnection, Exception> OnException { add { } remove { } }
        public void Start()
        {
            UpdaterThread();
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
@ -17,16 +17,16 @@ namespace Avalonia.Diagnostics.ViewModels
    internal class ControlDetailsViewModel : ViewModelBase, IDisposable
    {
        private readonly IVisual _control;
-        private IDictionary<object, List<PropertyViewModel>> _propertyIndex;
+        private IDictionary<object, List<PropertyViewModel>>? _propertyIndex;
        private PropertyViewModel? _selectedProperty;
-        private DataGridCollectionView _propertiesView;
+        private DataGridCollectionView? _propertiesView;
        private bool _snapshotStyles;
        private bool _showInactiveStyles;
        private string? _styleStatus;
-        private object _selectedEntity;
+        private object? _selectedEntity;
        private readonly Stack<(string Name,object Entry)> _selectedEntitiesStack = new();
-        private string _selectedEntityName;
-        private string _selectedEntityType;
+        private string? _selectedEntityName;
+        private string? _selectedEntityType;

        public ControlDetailsViewModel(TreePageViewModel treePage, IVisual control)
        {
@ -117,7 +117,7 @@ namespace Avalonia.Diagnostics.ViewModels

        public TreePageViewModel TreePage { get; }

-        public DataGridCollectionView PropertiesView
+        public DataGridCollectionView? PropertiesView
        {
            get => _propertiesView;
            private set => RaiseAndSetIfChanged(ref _propertiesView, value);
@ -127,7 +127,7 @@ namespace Avalonia.Diagnostics.ViewModels

        public ObservableCollection<PseudoClassViewModel> PseudoClasses { get; }

-        public object SelectedEntity
+        public object? SelectedEntity
        {
            get => _selectedEntity;
            set
@ -137,7 +137,7 @@ namespace Avalonia.Diagnostics.ViewModels
            }
        }

-        public string SelectedEntityName
+        public string? SelectedEntityName
        {
            get => _selectedEntityName;
            set
@ -147,7 +147,7 @@ namespace Avalonia.Diagnostics.ViewModels
            }
        }
        
-        public string SelectedEntityType
+        public string? SelectedEntityType
        {
            get => _selectedEntityType;
            set
@ -270,7 +270,7 @@ namespace Avalonia.Diagnostics.ViewModels

        private void ControlPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
        {
-            if (_propertyIndex.TryGetValue(e.Property, out var properties))
+            if (_propertyIndex is { } && _propertyIndex.TryGetValue(e.Property, out var properties))
            {
                foreach (var property in properties)
                {
@ -284,6 +284,7 @@ namespace Avalonia.Diagnostics.ViewModels
        private void ControlPropertyChanged(object? sender, PropertyChangedEventArgs e)
        {
            if (e.PropertyName != null
+                && _propertyIndex is { }
                && _propertyIndex.TryGetValue(e.PropertyName, out var properties))
            {
                foreach (var property in properties)
@ -402,7 +403,7 @@ namespace Avalonia.Diagnostics.ViewModels
            var selectedProperty = SelectedProperty;
            var selectedEntity = SelectedEntity;
            var selectedEntityName = SelectedEntityName;
-            if (selectedProperty == null)
+            if (selectedEntity == null ||  selectedProperty == null)
                return;

            object? property;
@ -419,7 +420,7 @@ namespace Avalonia.Diagnostics.ViewModels
                     ?.GetValue(selectedEntity);
            }
            if (property == null) return;
-            _selectedEntitiesStack.Push((Name:selectedEntityName,Entry:selectedEntity));
+            _selectedEntitiesStack.Push((Name:selectedEntityName!,Entry:selectedEntity));
            NavigateToProperty(property, selectedProperty.Name);
        }

--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreePageViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreePageViewModel.cs
@ -15,7 +15,7 @@ namespace Avalonia.Diagnostics.ViewModels
            Nodes = nodes;

            PropertiesFilter = new FilterViewModel();
-            PropertiesFilter.RefreshFilter += (s, e) => Details?.PropertiesView.Refresh();
+            PropertiesFilter.RefreshFilter += (s, e) => Details?.PropertiesView?.Refresh();

            SettersFilter = new FilterViewModel();
            SettersFilter.RefreshFilter += (s, e) => Details?.UpdateStyleFilters();
--- a/src/Avalonia.FreeDesktop/DBusMenuExporter.cs
+++ b/src/Avalonia.FreeDesktop/DBusMenuExporter.cs
@ -413,10 +413,10 @@ namespace Avalonia.FreeDesktop
            #region Events

            private event Action<((int, IDictionary<string, object>)[] updatedProps, (int, string[])[] removedProps)>
-                ItemsPropertiesUpdated;
+                ItemsPropertiesUpdated { add { } remove { } }
            private event Action<(uint revision, int parent)> LayoutUpdated;
-            private event Action<(int id, uint timestamp)> ItemActivationRequested;
-            private event Action<PropertyChanges> PropertiesChanged;
+            private event Action<(int id, uint timestamp)> ItemActivationRequested { add { } remove { } }
+            private event Action<PropertyChanges> PropertiesChanged { add { } remove { } }

            async Task<IDisposable> IDBusMenu.WatchItemsPropertiesUpdatedAsync(Action<((int, IDictionary<string, object>)[] updatedProps, (int, string[])[] removedProps)> handler, Action<Exception> onError)
            {
--- 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.Native/AvaloniaNativeMenuExporter.cs
+++ b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
@ -44,7 +44,7 @@ namespace Avalonia.Native

        public bool IsNativeMenuExported => _exported;

-        public event EventHandler OnIsNativeMenuExportedChanged;
+        public event EventHandler OnIsNativeMenuExportedChanged { add { } remove { } }

        public void SetNativeMenu(NativeMenu menu)
        {
--- a/src/Avalonia.Themes.Default/Expander.xaml
+++ b/src/Avalonia.Themes.Default/Expander.xaml
@ -15,7 +15,7 @@
                BorderThickness="{TemplateBinding BorderThickness}"
                CornerRadius="{TemplateBinding CornerRadius}">
          <Grid RowDefinitions="Auto,*">
-            <ToggleButton Name="PART_toggle" Grid.Row="0"  Content="{TemplateBinding Header}" IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}" />
+            <ToggleButton Name="PART_toggle" Grid.Row="0" Content="{TemplateBinding Header}" IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}" />
            <ContentPresenter Name="PART_ContentPresenter"
                              Grid.Row="1"
                              IsVisible="{TemplateBinding IsExpanded}"
@ -32,9 +32,12 @@
  <Style Selector="Expander[ExpandDirection=Up]">
    <Setter Property="Template">
      <ControlTemplate>
-        <Border Background="{TemplateBinding Background}">
+        <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
          <Grid RowDefinitions="*,Auto">
-            <ToggleButton Name="PART_toggle" Grid.Row="1"  Content="{TemplateBinding Header}" IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}" />
+            <ToggleButton Name="PART_toggle" Grid.Row="1" Content="{TemplateBinding Header}" IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}" />
            <ContentPresenter Name="PART_ContentPresenter"
                              Grid.Row="0"
                              IsVisible="{TemplateBinding IsExpanded}"
@ -51,9 +54,12 @@
  <Style Selector="Expander[ExpandDirection=Right]">
    <Setter Property="Template">
      <ControlTemplate>
-        <Border Background="{TemplateBinding Background}">
+        <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
          <Grid ColumnDefinitions="Auto,*">
-            <ToggleButton Name="PART_toggle" Grid.Column="0"  Content="{TemplateBinding Header}" IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}" />
+            <ToggleButton Name="PART_toggle" Grid.Column="0" Content="{TemplateBinding Header}" IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}" />
            <ContentPresenter Name="PART_ContentPresenter"
                              Grid.Column="1"
                              IsVisible="{TemplateBinding IsExpanded}"
@ -70,9 +76,12 @@
  <Style Selector="Expander[ExpandDirection=Left]">
    <Setter Property="Template">
      <ControlTemplate>
-        <Border Background="{TemplateBinding Background}">
+        <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
          <Grid ColumnDefinitions="*,Auto">
-            <ToggleButton Name="PART_toggle" Grid.Column="1"  Content="{TemplateBinding Header}" IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}" />
+            <ToggleButton Name="PART_toggle" Grid.Column="1" Content="{TemplateBinding Header}" IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}" />
            <ContentPresenter Name="PART_ContentPresenter"
                              Grid.Column="0"
                              IsVisible="{TemplateBinding IsExpanded}"
--- a/src/Avalonia.Visuals/Matrix.cs
+++ b/src/Avalonia.Visuals/Matrix.cs
@ -215,6 +215,28 @@ namespace Avalonia
            return angle * 0.0174532925;
        }

+        /// <summary>
+        /// Appends another matrix as post-multiplication operation.
+        /// Equivalent to this * value;
+        /// </summary>
+        /// <param name="value">A matrix.</param>
+        /// <returns>Post-multiplied matrix.</returns>
+        public Matrix Append(Matrix value)
+        {
+            return this * value;
+        }
+
+        /// <summary>
+        /// Prpends another matrix as pre-multiplication operation.
+        /// Equivalent to value * this;
+        /// </summary>
+        /// <param name="value">A matrix.</param>
+        /// <returns>Pre-multiplied matrix.</returns>
+        public Matrix Prepend(Matrix value)
+        {
+            return value * this;
+        }
+
        /// <summary>
        /// Calculates the determinant for this matrix.
        /// </summary>
--- a/src/Avalonia.Visuals/Media/Transformation/InterpolationUtilities.cs
+++ b/src/Avalonia.Visuals/Media/Transformation/InterpolationUtilities.cs
@ -18,11 +18,11 @@ namespace Avalonia.Media.Transformation
        public static Matrix ComposeTransform(Matrix.Decomposed decomposed)
        {
            // According to https://www.w3.org/TR/css-transforms-1/#recomposing-to-a-2d-matrix
-
-            return Matrix.CreateTranslation(decomposed.Translate) *
-                   Matrix.CreateRotation(decomposed.Angle) *
-                   Matrix.CreateSkew(decomposed.Skew.X, decomposed.Skew.Y) *
-                   Matrix.CreateScale(decomposed.Scale);
+            return Matrix.Identity
+                .Prepend(Matrix.CreateTranslation(decomposed.Translate))
+                .Prepend(Matrix.CreateRotation(decomposed.Angle))
+                .Prepend(Matrix.CreateSkew(decomposed.Skew.X, decomposed.Skew.Y))
+                .Prepend(Matrix.CreateScale(decomposed.Scale));
        }

        public static Matrix.Decomposed InterpolateDecomposedTransforms(ref Matrix.Decomposed from, ref Matrix.Decomposed to, double progress)
--- a/src/Avalonia.Visuals/Media/Transformation/TransformOperation.cs
+++ b/src/Avalonia.Visuals/Media/Transformation/TransformOperation.cs
@ -86,6 +86,8 @@ namespace Avalonia.Media.Transformation

            if (fromIdentity && toIdentity)
            {
+                result.Matrix = Matrix.Identity;
+
                return true;
            }

@ -179,7 +181,8 @@ namespace Avalonia.Media.Transformation
                }
                case OperationType.Identity:
                {
-                    // Do nothing.
+                    result.Matrix = Matrix.Identity;
+
                    break;
                }
            }
--- 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/Avalonia.X11/X11Window.Xim.cs
+++ b/src/Avalonia.X11/X11Window.Xim.cs
@ -112,8 +112,8 @@ namespace Avalonia.X11
            public ValueTask<bool> HandleEventAsync(RawKeyEventArgs args, int keyVal, int keyCode) =>
                new ValueTask<bool>(false);

-            public event Action<string> Commit;
-            public event Action<X11InputMethodForwardedKey> ForwardKey;
+            public event Action<string> Commit { add { } remove { } }
+            public event Action<X11InputMethodForwardedKey> ForwardKey { add { } remove { } }

        }
        
--- a/src/Avalonia.X11/X11Window.cs
+++ b/src/Avalonia.X11/X11Window.cs
@ -1026,6 +1026,7 @@ namespace Avalonia.X11
            if (string.IsNullOrEmpty(title))
            {
                XDeleteProperty(_x11.Display, _handle, _x11.Atoms._NET_WM_NAME);
+                XDeleteProperty(_x11.Display, _handle, _x11.Atoms.XA_WM_NAME);
            }
            else
            {
--- 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.Animation.UnitTests/AnimatableTests.cs
+++ b/tests/Avalonia.Animation.UnitTests/AnimatableTests.cs
@ -1,5 +1,7 @@
 using System;
+using Avalonia.Animation.Animators;
 using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
 using Avalonia.Data;
 using Avalonia.Layout;
 using Avalonia.Media;
@ -100,6 +102,71 @@ namespace Avalonia.Animation.UnitTests
                Times.Never);
        }

+
+        [Theory]
+        [InlineData(null)] //null value
+        [InlineData("stringValue")] //string value
+        public void Invalid_Values_In_Animation_Should_Not_Crash_Animations(object invalidValue)
+        {
+            var keyframe1 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Layoutable.WidthProperty, 1d),
+                },
+                KeyTime = TimeSpan.FromSeconds(0)
+            };
+
+            var keyframe2 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Layoutable.WidthProperty, 2d),
+                },
+                KeyTime = TimeSpan.FromSeconds(2),
+            };
+
+            var keyframe3 = new KeyFrame()
+            {
+                Setters =
+                {
+                    new Setter(Layoutable.WidthProperty, invalidValue),
+                },
+                KeyTime = TimeSpan.FromSeconds(3),
+            };
+
+            var animation = new Animation()
+            {
+                Duration = TimeSpan.FromSeconds(3),
+                Children =
+                {
+                    keyframe1,
+                    keyframe2,
+                    keyframe3
+                },
+                IterationCount = new IterationCount(5),
+                PlaybackDirection = PlaybackDirection.Alternate,
+            };
+
+            var rect = new Rectangle()
+            {
+                Width = 11,
+            };
+
+            var originalValue = rect.Width;
+
+            var clock = new TestClock();
+            var animationRun = animation.RunAsync(rect, clock);
+
+            clock.Step(TimeSpan.Zero);
+            Assert.Equal(rect.Width, 1);
+            clock.Step(TimeSpan.FromSeconds(2));
+            Assert.Equal(rect.Width, 2);
+            clock.Step(TimeSpan.FromSeconds(3));
+            //here we have invalid value so value should be expected and set to initial original value
+            Assert.Equal(rect.Width, originalValue);
+        }
+
        [Fact]
        public void Transition_Is_Not_Applied_When_StyleTrigger_Changes_With_LocalValue_Present()
        {
--- a/tests/Avalonia.Animation.UnitTests/Avalonia.Animation.UnitTests.csproj
+++ b/tests/Avalonia.Animation.UnitTests/Avalonia.Animation.UnitTests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net47</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
    <OutputType>Library</OutputType>
    <IsTestProject>true</IsTestProject>
  </PropertyGroup>
--- a/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
+++ b/tests/Avalonia.Base.UnitTests/Avalonia.Base.UnitTests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net47</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
    <OutputType>Library</OutputType>
    <IsTestProject>true</IsTestProject>
    <LangVersion>latest</LangVersion>
--- a/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
+++ b/tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <OutputType>Exe</OutputType>
    <IsPackable>false</IsPackable>
  </PropertyGroup>
--- a/tests/Avalonia.Controls.DataGrid.UnitTests/Avalonia.Controls.DataGrid.UnitTests.csproj
+++ b/tests/Avalonia.Controls.DataGrid.UnitTests/Avalonia.Controls.DataGrid.UnitTests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net47</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
    <LangVersion>latest</LangVersion>
    <OutputType>Library</OutputType>
    <IsTestProject>true</IsTestProject>
--- a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
+++ b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net47</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
    <LangVersion>latest</LangVersion>
    <OutputType>Library</OutputType>
    <IsTestProject>true</IsTestProject>
--- a/tests/Avalonia.Controls.UnitTests/ItemsSourceViewTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ItemsSourceViewTests.cs
@ -47,7 +47,7 @@ namespace Avalonia.Controls.UnitTests

        private class InvalidCollection : INotifyCollectionChanged, IEnumerable<string>
        {
-            public event NotifyCollectionChangedEventHandler CollectionChanged;
+            public event NotifyCollectionChangedEventHandler CollectionChanged { add { } remove { } }

            public IEnumerator<string> GetEnumerator()
            {
--- a/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj
+++ b/tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <IsPackable>false</IsPackable>
  </PropertyGroup>
  <ItemGroup>
--- a/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj
+++ b/tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
    <OutputType>Library</OutputType>
  </PropertyGroup>
  <Import Project="..\..\build\UnitTests.NetCore.targets" />
@ -18,4 +18,4 @@
  <ItemGroup>
    <Folder Include="Properties\" />
  </ItemGroup>
-</Project>
+</Project>
--- a/tests/Avalonia.DesignerSupport.Tests/DesignerSupportTests.cs
+++ b/tests/Avalonia.DesignerSupport.Tests/DesignerSupportTests.cs
@ -29,25 +29,25 @@ namespace Avalonia.DesignerSupport.Tests

        [SkippableTheory,
         InlineData(
-            @"..\..\..\..\..\tests/Avalonia.DesignerSupport.TestApp/bin/$BUILD/netcoreapp3.1/",
+            @"..\..\..\..\..\tests/Avalonia.DesignerSupport.TestApp/bin/$BUILD/net6.0/",
            "Avalonia.DesignerSupport.TestApp",
            "Avalonia.DesignerSupport.TestApp.dll",
            @"..\..\..\..\..\tests\Avalonia.DesignerSupport.TestApp\MainWindow.xaml",
            "win32"),
         InlineData(
-            @"..\..\..\..\..\samples\ControlCatalog.NetCore\bin\$BUILD\netcoreapp3.1\",
+            @"..\..\..\..\..\samples\ControlCatalog.NetCore\bin\$BUILD\net6.0\",
            "ControlCatalog.NetCore",
            "ControlCatalog.dll",
            @"..\..\..\..\..\samples\ControlCatalog\MainWindow.xaml",
            "win32"),
        InlineData(
-            @"..\..\..\..\..\tests/Avalonia.DesignerSupport.TestApp/bin/$BUILD/netcoreapp3.1/",
+            @"..\..\..\..\..\tests/Avalonia.DesignerSupport.TestApp/bin/$BUILD/net6.0/",
            "Avalonia.DesignerSupport.TestApp",
            "Avalonia.DesignerSupport.TestApp.dll",
            @"..\..\..\..\..\tests\Avalonia.DesignerSupport.TestApp\MainWindow.xaml",
            "avalonia-remote"),
        InlineData(
-            @"..\..\..\..\..\samples\ControlCatalog.NetCore\bin\$BUILD\netcoreapp3.1\",
+            @"..\..\..\..\..\samples\ControlCatalog.NetCore\bin\$BUILD\net6.0\",
            "ControlCatalog.NetCore",
            "ControlCatalog.dll",
            @"..\..\..\..\..\samples\ControlCatalog\MainWindow.xaml",
--- a/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
+++ b/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
    <Compile Include="..\Avalonia.RenderTests\**\*.cs" />
--- a/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj
+++ b/tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>
  <Import Project="..\..\build\UnitTests.NetCore.targets" />
  <Import Project="..\..\build\Moq.props" />
--- a/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj
+++ b/tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net47</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
    <OutputType>Library</OutputType>
    <IsTestProject>true</IsTestProject>
  </PropertyGroup>
--- a/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj
+++ b/tests/Avalonia.Interactivity.UnitTests/Avalonia.Interactivity.UnitTests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net47</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
    <OutputType>Library</OutputType>
    <IsTestProject>true</IsTestProject>
    <LangVersion>latest</LangVersion>
--- a/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj
+++ b/tests/Avalonia.Layout.UnitTests/Avalonia.Layout.UnitTests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
    <OutputType>Library</OutputType>
  </PropertyGroup>
  <Import Project="..\..\build\UnitTests.NetCore.targets" />
--- a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj
+++ b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net47</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
    <OutputType>Library</OutputType>
    <IsTestProject>true</IsTestProject>
  </PropertyGroup>
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net47</TargetFrameworks>
+    <TargetFrameworks>net6.0;net47</TargetFrameworks>
    <OutputType>Library</OutputType>
    <IsTestProject>true</IsTestProject>
    <LangVersion>latest</LangVersion>
@ -25,7 +25,6 @@
    <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj" />
    <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
-    <ProjectReference Include="..\Avalonia.Base.UnitTests\Avalonia.Base.UnitTests.csproj" />
    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
  </ItemGroup>
  <ItemGroup>
--- a/tests/Avalonia.ReactiveUI.UnitTests/Avalonia.ReactiveUI.UnitTests.csproj
+++ b/tests/Avalonia.ReactiveUI.UnitTests/Avalonia.ReactiveUI.UnitTests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <SignAssembly>false</SignAssembly>
  </PropertyGroup>
  <Import Project="..\..\build\UnitTests.NetCore.targets" />
--- a/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj
+++ b/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
    <DefineConstants>AVALONIA_SKIA;AVALONIA_SKIA_SKIP_FAIL</DefineConstants>
  </PropertyGroup>
  <ItemGroup>
--- a/tests/Avalonia.Skia.UnitTests/Avalonia.Skia.UnitTests.csproj
+++ b/tests/Avalonia.Skia.UnitTests/Avalonia.Skia.UnitTests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
    <LangVersion>latest</LangVersion>
  </PropertyGroup>
  <Import Project="..\..\build\UnitTests.NetCore.targets" />
--- a/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj
+++ b/tests/Avalonia.Styling.UnitTests/Avalonia.Styling.UnitTests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net47</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
    <OutputType>Library</OutputType>
    <NoWarn>CS0067</NoWarn>
    <IsTestProject>true</IsTestProject>
--- a/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj
+++ b/tests/Avalonia.Visuals.UnitTests/Avalonia.Visuals.UnitTests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net47</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
    <OutputType>Library</OutputType>
    <IsTestProject>true</IsTestProject>
  </PropertyGroup>
--- a/tests/Avalonia.Visuals.UnitTests/Media/TransformOperationsTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Media/TransformOperationsTests.cs
@ -129,7 +129,7 @@ namespace Avalonia.Visuals.UnitTests.Media

            Assert.Single(operations);
            Assert.Equal(TransformOperation.OperationType.Matrix, operations[0].Type);
-            
+
            var expectedMatrix = new Matrix(1, 2, 3, 4, 5, 6);

            Assert.Equal(expectedMatrix, operations[0].Matrix);
@ -195,7 +195,7 @@ namespace Avalonia.Visuals.UnitTests.Media
        [Theory]
        [InlineData(0d, 10d)]
        [InlineData(0.5d, 15d)]
-        [InlineData(1d,20d)]
+        [InlineData(1d, 20d)]
        public void Can_Interpolate_Rotation(double progress, double angle)
        {
            var from = TransformOperations.Parse("rotate(10deg)");
@ -225,5 +225,73 @@ namespace Avalonia.Visuals.UnitTests.Media
            Assert.Single(operations);
            Assert.Equal(TransformOperation.OperationType.Matrix, operations[0].Type);
        }
+
+        [Fact]
+        public void Order_Of_Operations_Is_Preserved_No_Prefix()
+        {
+            var from = TransformOperations.Parse("scale(1)");
+            var to = TransformOperations.Parse("translate(50px,50px) scale(0.5,0.5)");
+
+            var interpolated_0 = TransformOperations.Interpolate(from, to, 0);
+
+            Assert.True(interpolated_0.IsIdentity);
+
+            var interpolated_50 = TransformOperations.Interpolate(from, to, 0.5);
+
+            AssertMatrix(interpolated_50.Value, scaleX: 0.75, scaleY: 0.75, translateX: 12.5, translateY: 12.5);
+
+            var interpolated_100 = TransformOperations.Interpolate(from, to, 1);
+
+            AssertMatrix(interpolated_100.Value, scaleX: 0.5, scaleY: 0.5, translateX: 25, translateY: 25);
+        }
+
+        [Fact]
+        public void Order_Of_Operations_Is_Preserved_One_Prefix()
+        {
+            var from = TransformOperations.Parse("scale(1)");
+            var to = TransformOperations.Parse("scale(0.5,0.5) translate(50px,50px)");
+
+            var interpolated_0 = TransformOperations.Interpolate(from, to, 0);
+
+            Assert.True(interpolated_0.IsIdentity);
+
+            var interpolated_50 = TransformOperations.Interpolate(from, to, 0.5);
+
+            AssertMatrix(interpolated_50.Value, scaleX: 0.75, scaleY: 0.75, translateX: 25.0, translateY: 25);
+
+            var interpolated_100 = TransformOperations.Interpolate(from, to, 1);
+
+            AssertMatrix(interpolated_100.Value, scaleX: 0.5, scaleY: 0.5, translateX: 50, translateY: 50);
+        }
+
+        private static void AssertMatrix(Matrix matrix, double? angle = null, double? scaleX = null, double? scaleY = null, double? translateX = null, double? translateY = null)
+        {
+            Assert.True(Matrix.TryDecomposeTransform(matrix, out var composed));
+
+            if (angle.HasValue)
+            {
+                Assert.Equal(angle.Value, composed.Angle);
+            }
+
+            if (scaleX.HasValue)
+            {
+                Assert.Equal(scaleX.Value, composed.Scale.X);
+            }
+
+            if (scaleY.HasValue)
+            {
+                Assert.Equal(scaleY.Value, composed.Scale.Y);
+            }
+
+            if (translateX.HasValue)
+            {
+                Assert.Equal(translateX.Value, composed.Translate.X);
+            }
+
+            if (translateY.HasValue)
+            {
+                Assert.Equal(translateY.Value, composed.Translate.Y);
+            }
+        }
    }
 }
--- 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?>();