Merge branch 'master' into rndr4

tests/Avalonia.Benchmarks/Program.cs

@@ -1,6 +1,8 @@
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Running;
 
 namespace Avalonia.Benchmarks
@@ -19,7 +21,17 @@ namespace Avalonia.Benchmarks
                 .ThenBy(t => t.Name)
                 .ToArray();
             var benchmarkSwitcher = new BenchmarkSwitcher(benchmarks);
-            benchmarkSwitcher.Run(args);
+            IConfig config = null;
+
+            if (args.Contains("--debug"))
+            {
+                config = new DebugInProcessConfig();
+                var a = new List<string>(args);
+                a.Remove("--debug");
+                args = a.ToArray();
+            }
+
+            benchmarkSwitcher.Run(args, config);
         }
     }
 }

tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh

@@ -3,6 +3,8 @@
 SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
 cd "$SCRIPT_DIR"/../.. || exit
 git clean -xdf
+pkill node
+appium &
 pkill IntegrationTestApp
 ./build.sh CompileNative
 ./samples/IntegrationTestApp/bundle.sh
@@ -10,3 +12,4 @@ open -n ./samples/IntegrationTestApp/bin/Debug/net6.0/osx-arm64/publish/Integrat
 pkill IntegrationTestApp
 dotnet test tests/Avalonia.IntegrationTests.Appium/ -l "console;verbosity=detailed"
 pkill IntegrationTestApp
+pkill node