Merge

3 days ago · 5612393317
1232 changed files with 81032 additions and 7446 deletions
--- a/.github/workflows/api-diff.yml
+++ b/.github/workflows/api-diff.yml
@ -0,0 +1,181 @@
+name: Output API Diff
+
+on:
+  issue_comment:
+    types: [created]
+
+permissions: {}
+
+concurrency:
+  group: api-diff-${{ github.event.issue.number }}
+  cancel-in-progress: true
+
+jobs:
+  api-diff:
+    name: Output API Diff
+    if: >-
+      github.event.issue.pull_request
+      && contains(github.event.comment.body, '/api-diff')
+      && contains(fromJSON('["OWNER","MEMBER","COLLABORATOR"]'), github.event.comment.author_association)
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      pull-requests: write
+
+    steps:
+      - name: Check maintainer permission
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { data: permLevel } = await github.rest.repos.getCollaboratorPermissionLevel({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              username: context.payload.comment.user.login,
+            });
+            const allowed = ['admin', 'maintain', 'write'];
+            if (!allowed.includes(permLevel.permission)) {
+              core.setFailed(`User @${context.payload.comment.user.login} does not have write access.`);
+            }
+
+      - name: Add reaction to acknowledge command
+        uses: actions/github-script@v7
+        with:
+          script: |
+            await github.rest.reactions.createForIssueComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              comment_id: context.payload.comment.id,
+              content: 'eyes',
+            });
+
+      - name: Get PR branch info
+        id: pr
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { data: pr } = await github.rest.pulls.get({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.issue.number,
+            });
+            if (pr.head.repo.full_name !== `${context.repo.owner}/${context.repo.repo}`) {
+              core.setFailed('Cannot run /api-diff on fork PRs — would execute untrusted code.');
+              return;
+            }
+            core.setOutput('ref', pr.head.ref);
+            core.setOutput('sha', pr.head.sha);
+
+      - name: Checkout PR branch
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ steps.pr.outputs.sha }}
+          submodules: recursive
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          global-json-file: global.json
+
+      - name: Run OutputApiDiff
+        run: dotnet run --project ./nukebuild/_build.csproj -- OutputApiDiff
+
+      - name: Post API diff as PR comment
+        if: always() && steps.pr.outcome == 'success'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const fs = require('fs');
+            const path = require('path');
+
+            const diffDir = path.join(process.env.GITHUB_WORKSPACE, 'artifacts', 'api-diff', 'markdown');
+            const mergedPath = path.join(diffDir, '_diff.md');
+
+            let body;
+            if (fs.existsSync(mergedPath)) {
+              let diff = fs.readFileSync(mergedPath, 'utf8').trim();
+              if (!diff || diff.toLowerCase().includes('no changes')) {
+                body = '### API Diff\n\n✅ No public API changes detected in this PR.';
+              } else {
+                const MAX_COMMENT_LENGTH = 60000; // GitHub comment limit is 65536
+                const header = '### API Diff\n\n';
+                const footer = '\n\n---\n_Generated by `/api-diff` command._';
+                const budget = MAX_COMMENT_LENGTH - header.length - footer.length;
+
+                if (diff.length > budget) {
+                  diff = diff.substring(0, budget) + '\n\n> ⚠️ Output truncated. See the [full workflow run](' +
+                    `${process.env.GITHUB_SERVER_URL}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}` +
+                    ') for complete diff.';
+                }
+
+                body = header + diff + footer;
+              }
+            } else {
+              body = '### API Diff\n\n⚠️ No diff output was produced. Check the [workflow run](' +
+                `${process.env.GITHUB_SERVER_URL}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}` +
+                ') for details.';
+            }
+
+            // Collapse into <details> if large
+            if (body.length > 2000) {
+              const inner = body;
+              body = '<details>\n<summary>📋 API Diff (click to expand)</summary>\n\n' + inner + '\n\n</details>';
+            }
+
+            // Update existing bot comment or create a new one
+            const marker = '<!-- api-diff-bot -->';
+            body = marker + '\n' + body;
+
+            const { data: comments } = await github.rest.issues.listComments({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              per_page: 100,
+            });
+            const existing = comments.find(c => c.body?.includes(marker));
+
+            if (existing) {
+              await github.rest.issues.updateComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                comment_id: existing.id,
+                body,
+              });
+            } else {
+              await github.rest.issues.createComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: context.issue.number,
+                body,
+              });
+            }
+
+      - name: Add success reaction
+        if: success()
+        uses: actions/github-script@v7
+        with:
+          script: |
+            await github.rest.reactions.createForIssueComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              comment_id: context.payload.comment.id,
+              content: 'rocket',
+            });
+
+      - name: Report failure
+        if: failure()
+        uses: actions/github-script@v7
+        with:
+          script: |
+            await github.rest.reactions.createForIssueComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              comment_id: context.payload.comment.id,
+              content: '-1',
+            });
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              body: `❌ \`/api-diff\` failed. [See logs](${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}).`,
+            });
--- a/.github/workflows/update-api.yml
+++ b/.github/workflows/update-api.yml
@ -0,0 +1,124 @@
+name: Update API Suppressions
+
+on:
+  issue_comment:
+    types: [created]
+
+permissions: {}
+
+concurrency:
+  group: update-api-${{ github.event.issue.number }}
+  cancel-in-progress: true
+
+jobs:
+  update-api:
+    name: Update API Suppressions
+    if: >-
+      github.event.issue.pull_request
+      && contains(github.event.comment.body, '/update-api')
+      && contains(fromJSON('["OWNER","MEMBER","COLLABORATOR"]'), github.event.comment.author_association)
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+      pull-requests: write
+
+    steps:
+      - name: Check maintainer permission
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { data: permLevel } = await github.rest.repos.getCollaboratorPermissionLevel({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              username: context.payload.comment.user.login,
+            });
+            const allowed = ['admin', 'maintain', 'write'];
+            if (!allowed.includes(permLevel.permission)) {
+              core.setFailed(`User @${context.payload.comment.user.login} does not have write access.`);
+            }
+
+      - name: Add reaction to acknowledge command
+        uses: actions/github-script@v7
+        with:
+          script: |
+            await github.rest.reactions.createForIssueComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              comment_id: context.payload.comment.id,
+              content: 'eyes',
+            });
+
+      - name: Get PR branch info
+        id: pr
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { data: pr } = await github.rest.pulls.get({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.issue.number,
+            });
+            if (pr.head.repo.full_name !== `${context.repo.owner}/${context.repo.repo}`) {
+              core.setFailed('Cannot run /update-api on fork PRs — would execute untrusted code with write permissions.');
+              return;
+            }
+            core.setOutput('ref', pr.head.ref);
+            core.setOutput('sha', pr.head.sha);
+
+      - name: Checkout PR branch
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ steps.pr.outputs.sha }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          submodules: recursive
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          global-json-file: global.json
+
+      - name: Run ValidateApiDiff
+        run: dotnet run --project ./nukebuild/_build.csproj -- ValidateApiDiff --update-api-suppression true
+
+      - name: Commit and push changes
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git add api/
+          if git diff --cached --quiet; then
+            echo "No API suppression changes to commit."
+          else
+            git commit -m "Update API suppressions"
+            git push origin HEAD:${{ steps.pr.outputs.ref }}
+          fi
+
+      - name: Add success reaction
+        if: success()
+        uses: actions/github-script@v7
+        with:
+          script: |
+            await github.rest.reactions.createForIssueComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              comment_id: context.payload.comment.id,
+              content: 'rocket',
+            });
+
+      - name: Report failure
+        if: failure()
+        uses: actions/github-script@v7
+        with:
+          script: |
+            await github.rest.reactions.createForIssueComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              comment_id: context.payload.comment.id,
+              content: '-1',
+            });
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              body: `❌ \`/update-api\` failed. [See logs](${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}).`,
+            });
--- a/.gitignore
+++ b/.gitignore
@ -219,3 +219,4 @@ src/Browser/Avalonia.Browser.Blazor/wwwroot
 src/Browser/Avalonia.Browser/wwwroot
 api/diff
 src/Browser/Avalonia.Browser/staticwebassets
+.serena
--- a/.gitmodules
+++ b/.gitmodules
@ -1,6 +1,6 @@
-[submodule "Numerge"]
-	path = external/Numerge
-	url = https://github.com/kekekeks/Numerge.git
 [submodule "XamlX"]
 	path = external/XamlX
 	url = https://github.com/kekekeks/XamlX.git
+[submodule "Avalonia.DBus"]
+	path = external/Avalonia.DBus
+	url = https://github.com/AvaloniaUI/Avalonia.DBus.git
--- a/Avalonia.Desktop.slnf
+++ b/Avalonia.Desktop.slnf
@ -8,11 +8,11 @@
      "samples\\ControlCatalog\\ControlCatalog.csproj",
      "samples\\GpuInterop\\GpuInterop.csproj",
      "samples\\IntegrationTestApp\\IntegrationTestApp.csproj",
-      "samples\\TextTestApp\\TextTestApp.csproj",
      "samples\\MiniMvvm\\MiniMvvm.csproj",
      "samples\\RenderDemo\\RenderDemo.csproj",
      "samples\\SampleControls\\ControlSamples.csproj",
      "samples\\Sandbox\\Sandbox.csproj",
+      "samples\\TextTestApp\\TextTestApp.csproj",
      "samples\\UnloadableAssemblyLoadContext\\UnloadableAssemblyLoadContextPlug\\UnloadableAssemblyLoadContextPlug.csproj",
      "samples\\UnloadableAssemblyLoadContext\\UnloadableAssemblyLoadContext\\UnloadableAssemblyLoadContext.csproj",
      "samples\\XEmbedSample\\XEmbedSample.csproj",
@ -24,18 +24,20 @@
      "src\\Avalonia.Desktop\\Avalonia.Desktop.csproj",
      "src\\Avalonia.Dialogs\\Avalonia.Dialogs.csproj",
      "src\\Avalonia.Fonts.Inter\\Avalonia.Fonts.Inter.csproj",
+      "src\\Avalonia.FreeDesktop.AtSpi\\Avalonia.FreeDesktop.AtSpi.csproj",
      "src\\Avalonia.FreeDesktop\\Avalonia.FreeDesktop.csproj",
      "src\\Avalonia.Metal\\Avalonia.Metal.csproj",
      "src\\Avalonia.MicroCom\\Avalonia.MicroCom.csproj",
      "src\\Avalonia.Native\\Avalonia.Native.csproj",
      "src\\Avalonia.OpenGL\\Avalonia.OpenGL.csproj",
-      "src\\Avalonia.Vulkan\\Avalonia.Vulkan.csproj",
      "src\\Avalonia.Remote.Protocol\\Avalonia.Remote.Protocol.csproj",
      "src\\Avalonia.Themes.Fluent\\Avalonia.Themes.Fluent.csproj",
      "src\\Avalonia.Themes.Simple\\Avalonia.Themes.Simple.csproj",
+      "src\\Avalonia.Vulkan\\Avalonia.Vulkan.csproj",
      "src\\Avalonia.X11\\Avalonia.X11.csproj",
      "src\\HarfBuzz\\Avalonia.HarfBuzz\\Avalonia.HarfBuzz.csproj",
      "src\\Headless\\Avalonia.Headless.Vnc\\Avalonia.Headless.Vnc.csproj",
+      "src\\Headless\\Avalonia.Headless.XUnit\\Avalonia.Headless.XUnit.csproj",
      "src\\Headless\\Avalonia.Headless\\Avalonia.Headless.csproj",
      "src\\Linux\\Avalonia.LinuxFramebuffer\\Avalonia.LinuxFramebuffer.csproj",
      "src\\Markup\\Avalonia.Markup.Xaml.Loader\\Avalonia.Markup.Xaml.Loader.csproj",
@ -45,6 +47,7 @@
      "src\\tools\\Avalonia.Analyzers.CodeFixes.CSharp\\Avalonia.Analyzers.CodeFixes.CSharp.csproj",
      "src\\tools\\Avalonia.Analyzers.CSharp\\Avalonia.Analyzers.CSharp.csproj",
      "src\\tools\\Avalonia.Analyzers.VisualBasic\\Avalonia.Analyzers.VisualBasic.csproj",
+      "src\\tools\\Avalonia.DBus.Generators\\Avalonia.DBus.Generators.csproj",
      "src\\tools\\Avalonia.Generators\\Avalonia.Generators.csproj",
      "src\\tools\\DevAnalyzers\\DevAnalyzers.csproj",
      "src\\tools\\DevGenerators\\DevGenerators.csproj",
@ -58,7 +61,10 @@
      "tests\\Avalonia.DesignerSupport.TestApp\\Avalonia.DesignerSupport.TestApp.csproj",
      "tests\\Avalonia.DesignerSupport.Tests\\Avalonia.DesignerSupport.Tests.csproj",
      "tests\\Avalonia.Generators.Tests\\Avalonia.Generators.Tests.csproj",
+      "tests\\Avalonia.Headless.XUnit.PerAssembly.UnitTests\\Avalonia.Headless.XUnit.PerAssembly.UnitTests.csproj",
+      "tests\\Avalonia.Headless.XUnit.PerTest.UnitTests\\Avalonia.Headless.XUnit.PerTest.UnitTests.csproj",
      "tests\\Avalonia.IntegrationTests.Appium\\Avalonia.IntegrationTests.Appium.csproj",
+      "tests\\Avalonia.IntegrationTests.Win32\\Avalonia.IntegrationTests.Win32.csproj",
      "tests\\Avalonia.LeakTests\\Avalonia.LeakTests.csproj",
      "tests\\Avalonia.Markup.UnitTests\\Avalonia.Markup.UnitTests.csproj",
      "tests\\Avalonia.Markup.Xaml.UnitTests\\Avalonia.Markup.Xaml.UnitTests.csproj",
@ -69,4 +75,4 @@
      "tests\\TestFiles\\BuildTasks\\PInvoke\\PInvoke.csproj"
    ]
  }
-}
+}
--- a/Avalonia.sln
+++ b/Avalonia.sln
@ -83,21 +83,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1
 		build\AnalyzerProject.targets = build\AnalyzerProject.targets
 		build\AvaloniaPublicKey.props = build\AvaloniaPublicKey.props
 		build\Base.props = build\Base.props
-		build\Binding.props = build\Binding.props
 		build\CoreLibraries.props = build\CoreLibraries.props
 		build\DevAnalyzers.props = build\DevAnalyzers.props
 		build\EmbedXaml.props = build\EmbedXaml.props
 		build\HarfBuzzSharp.props = build\HarfBuzzSharp.props
-		build\ImageSharp.props = build\ImageSharp.props
-		build\Microsoft.CSharp.props = build\Microsoft.CSharp.props
-		build\Microsoft.Reactive.Testing.props = build\Microsoft.Reactive.Testing.props
-		build\Moq.props = build\Moq.props
 		build\NetAnalyzers.props = build\NetAnalyzers.props
-		build\NetCore.props = build\NetCore.props
-		build\NetFX.props = build\NetFX.props
 		build\NullableEnable.props = build\NullableEnable.props
 		build\ReferenceCoreLibraries.props = build\ReferenceCoreLibraries.props
-		build\Rx.props = build\Rx.props
 		build\SampleApp.props = build\SampleApp.props
 		build\SharedVersion.props = build\SharedVersion.props
 		build\SkiaSharp.props = build\SkiaSharp.props
@ -113,7 +105,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets", "Targets", "{4D6F
 	ProjectSection(SolutionItems) = preProject
 		build\BuildTargets.targets = build\BuildTargets.targets
 		build\DevSingleProject.targets = build\DevSingleProject.targets
-		build\LegacyProject.targets = build\LegacyProject.targets
 		build\UnitTests.NetCore.targets = build\UnitTests.NetCore.targets
 	EndProjectSection
 EndProject
@ -127,14 +118,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Skia.RenderTests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Remote.Protocol", "src\Avalonia.Remote.Protocol\Avalonia.Remote.Protocol.csproj", "{D78A720C-C0C6-478B-8564-F167F9BDD01B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RemoteDemo", "samples\RemoteDemo\RemoteDemo.csproj", "{E2999E4A-9086-401F-898C-AEB0AD38E676}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{4ED8B739-6F4E-4CD4-B993-545E6B5CE637}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Designer.HostApp", "src\tools\Avalonia.Designer.HostApp\Avalonia.Designer.HostApp.csproj", "{050CC912-FF49-4A8B-B534-9544017446DD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Previewer", "samples\Previewer\Previewer.csproj", "{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Skia.UnitTests", "tests\Avalonia.Skia.UnitTests\Avalonia.Skia.UnitTests.csproj", "{E1240B49-7B4B-4371-A00E-068778C5CF0B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.OpenGL", "src\Avalonia.OpenGL\Avalonia.OpenGL.csproj", "{7CCAEFC4-135D-401D-BDDD-896B9B7D3569}"
@ -220,6 +207,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		NOTICE.md = NOTICE.md
 		NuGet.Config = NuGet.Config
 		readme.md = readme.md
+		Directory.Packages.props = Directory.Packages.props
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Generators", "src\tools\Avalonia.Generators\Avalonia.Generators.csproj", "{DDA28789-C21A-4654-86CE-D01E81F095C5}"
@ -292,6 +280,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Analyzers.CodeFixe
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Analyzers.VisualBasic", "src\tools\Avalonia.Analyzers.VisualBasic\Avalonia.Analyzers.VisualBasic.csproj", "{A7644C3B-B843-44F1-9940-560D56CB0936}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.FreeDesktop.AtSpi", "src\Avalonia.FreeDesktop.AtSpi\Avalonia.FreeDesktop.AtSpi.csproj", "{742C3613-514C-4D6B-804A-2A7925F278F3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.DBus.Generators", "src\tools\Avalonia.DBus.Generators\Avalonia.DBus.Generators.csproj", "{98A16FFD-0C99-4665-AC64-DC17E86879A2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -412,18 +404,10 @@ Global
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D78A720C-C0C6-478B-8564-F167F9BDD01B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E2999E4A-9086-401F-898C-AEB0AD38E676}.Release|Any CPU.Build.0 = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{050CC912-FF49-4A8B-B534-9544017446DD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E1240B49-7B4B-4371-A00E-068778C5CF0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -670,14 +654,22 @@ Global
 		{11522B0D-BF31-42D5-8FC5-41E58F319AF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{11522B0D-BF31-42D5-8FC5-41E58F319AF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{11522B0D-BF31-42D5-8FC5-41E58F319AF9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A7644C3B-B843-44F1-9940-560D56CB0936}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A7644C3B-B843-44F1-9940-560D56CB0936}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A7644C3B-B843-44F1-9940-560D56CB0936}.Debug|Any CPU.ActiveCfg = Release|Any CPU
-		{A7644C3B-B843-44F1-9940-560D56CB0936}.Debug|Any CPU.Build.0 = Release|Any CPU
-		{FDFB9C25-552D-420B-9D4A-DB0BB6472239}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FDFB9C25-552D-420B-9D4A-DB0BB6472239}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FDFB9C25-552D-420B-9D4A-DB0BB6472239}.Debug|Any CPU.ActiveCfg = Release|Any CPU
 		{FDFB9C25-552D-420B-9D4A-DB0BB6472239}.Debug|Any CPU.Build.0 = Release|Any CPU
+		{FDFB9C25-552D-420B-9D4A-DB0BB6472239}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDFB9C25-552D-420B-9D4A-DB0BB6472239}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A7644C3B-B843-44F1-9940-560D56CB0936}.Debug|Any CPU.ActiveCfg = Release|Any CPU
+		{A7644C3B-B843-44F1-9940-560D56CB0936}.Debug|Any CPU.Build.0 = Release|Any CPU
+		{A7644C3B-B843-44F1-9940-560D56CB0936}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A7644C3B-B843-44F1-9940-560D56CB0936}.Release|Any CPU.Build.0 = Release|Any CPU
+		{742C3613-514C-4D6B-804A-2A7925F278F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{742C3613-514C-4D6B-804A-2A7925F278F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{742C3613-514C-4D6B-804A-2A7925F278F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{742C3613-514C-4D6B-804A-2A7925F278F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{98A16FFD-0C99-4665-AC64-DC17E86879A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{98A16FFD-0C99-4665-AC64-DC17E86879A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{98A16FFD-0C99-4665-AC64-DC17E86879A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{98A16FFD-0C99-4665-AC64-DC17E86879A2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@ -707,9 +699,7 @@ Global
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9} = {86C53C40-57AA-45B8-AD42-FAE0EFDF0F2B}
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E} = {B39A8919-9F95-48FE-AD7B-76E08B509888}
 		{E1582370-37B3-403C-917F-8209551B1634} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{E2999E4A-9086-401F-898C-AEB0AD38E676} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{050CC912-FF49-4A8B-B534-9544017446DD} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
-		{F40FC0A2-1BC3-401C-BFC1-928EC4D4A9CE} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{E1240B49-7B4B-4371-A00E-068778C5CF0B} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{D49233F8-F29C-47DD-9975-C4C9E4502720} = {E870DCD7-F46A-498D-83FC-D0FD13E0A11C}
 		{3C471044-3640-45E3-B1B2-16D2FF8399EE} = {E870DCD7-F46A-498D-83FC-D0FD13E0A11C}
@ -763,8 +753,10 @@ Global
 		{342D2657-2F84-493C-B74B-9D2CAE5D9DAB} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{26918642-829D-4FA2-B60A-BE8D83F4E063} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{11522B0D-BF31-42D5-8FC5-41E58F319AF9} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
-		{A7644C3B-B843-44F1-9940-560D56CB0936} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
 		{FDFB9C25-552D-420B-9D4A-DB0BB6472239} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
+		{A7644C3B-B843-44F1-9940-560D56CB0936} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
+		{742C3613-514C-4D6B-804A-2A7925F278F3} = {86C53C40-57AA-45B8-AD42-FAE0EFDF0F2B}
+		{98A16FFD-0C99-4665-AC64-DC17E86879A2} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {87366D66-1391-4D90-8999-95A620AD786A}
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@ -0,0 +1,77 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageVersion Include="Appium.WebDriver" Version="5.2.0" />
+    <PackageVersion Include="Avalonia.Angle.Windows.Natives" Version="2.1.25547.20250602" />
+    <PackageVersion Include="Avalonia.BuildServices" Version="11.3.2" />
+    <PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.0-beta2" />
+    <PackageVersion Include="BenchmarkDotNet" Version="0.15.6" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
+    <PackageVersion Include="Dotnet.Bundle" Version="0.9.13" />
+    <PackageVersion Include="GtkSharp" Version="3.24.24.95" />
+    <PackageVersion Include="HarfBuzzSharp" Version="8.3.1.3" />
+    <PackageVersion Include="HarfBuzzSharp.NativeAssets.Linux" Version="8.3.1.3" />
+    <PackageVersion Include="HarfBuzzSharp.NativeAssets.WebAssembly" Version="8.3.1.3" />
+    <PackageVersion Include="MicroCom.CodeGenerator" Version="0.11.0" />
+    <PackageVersion Include="MicroCom.CodeGenerator.MSBuild" Version="0.11.0" />
+    <PackageVersion Include="MicroCom.Runtime" Version="0.11.0" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Build.Framework" Version="18.0.2" />
+    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="15.1.548" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.5.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.5.0" />
+    <PackageVersion Include="Microsoft.CSharp" Version="4.5.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageVersion Include="Microsoft.Reactive.Testing" Version="6.1.0" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.0.2" />
+    <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.257" />
+    <PackageVersion Include="Mono.Cecil" Version="0.11.6" />
+    <PackageVersion Include="MonoMac.NetStandard" Version="0.0.4" />
+    <PackageVersion Include="Moq" Version="4.20.72" />
+    <PackageVersion Include="Nito.AsyncEx.Context" Version="5.1.2" />
+    <PackageVersion Include="NuGet.Protocol" Version="7.0.1" />
+    <PackageVersion Include="Nuke.Common" Version="10.1.0" />
+    <PackageVersion Include="Numerge" Version="1.0.0" />
+    <PackageVersion Include="NUnit" Version="4.4.0" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="6.1.0" />
+    <PackageVersion Include="Quamotion.RemoteViewing" Version="1.1.211" />
+    <PackageVersion Include="SharpCompress" Version="0.41.0" />
+    <PackageVersion Include="Silk.NET.Direct3D.Compilers" Version="2.22.0" />
+    <PackageVersion Include="Silk.NET.Direct3D11" Version="2.22.0" />
+    <PackageVersion Include="Silk.NET.Vulkan" Version="2.22.0" />
+    <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.22.0" />
+    <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.22.0" />
+    <PackageVersion Include="SixLabors.ImageSharp" Version="2.1.12" />
+    <PackageVersion Include="SkiaSharp" Version="3.119.3-preview.1.1" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="3.119.3-preview.1.1" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.WebAssembly" Version="3.119.3-preview.1.1" />
+    <PackageVersion Include="System.ComponentModel.Annotations" Version="4.5.0" />
+    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.10" />
+    <PackageVersion Include="System.Memory" Version="4.5.5" />
+    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
+    <PackageVersion Include="System.Numerics.Vectors" Version="4.6.1" />
+    <PackageVersion Include="System.Reactive" Version="6.1.0" />
+    <PackageVersion Include="System.Reflection.Emit" Version="4.7.0" />
+    <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
+    <PackageVersion Include="System.Text.Json" Version="10.0.0" />
+    <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
+    <PackageVersion Include="Tmds.DBus.Protocol" Version="0.90.3" />
+    <PackageVersion Include="Tmds.DBus.SourceGenerator" Version="0.0.22" />
+    <PackageVersion Include="Xamarin.AndroidX.AppCompat" Version="1.7.1.1" />
+    <PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0" />
+    <PackageVersion Include="Xamarin.AndroidX.Window" Version="1.5.1" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
+    <PackageVersion Include="Xunit.StaFact" Version="3.0.13" />
+    <PackageVersion Include="xunit.v3.extensibility.core" Version="3.2.1" />
+    <PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <GlobalPackageReference Include="Microsoft.VisualStudio.SlnGen" Version="8.5.17" PrivateAssets="all" />
+  </ItemGroup>
+</Project>
--- a/NOTICE.md
+++ b/NOTICE.md
@ -26,30 +26,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

-# SharpDX
-
-https://github.com/sharpdx/SharpDX
-
-Copyright (c) 2010-2014 SharpDX - Alexandre Mutel
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
 # Silverlight Toolkit

 https://github.com/microsoftarchive/SilverlightToolkit
--- a/NuGet.Config
+++ b/NuGet.Config
@ -8,6 +8,12 @@
  </packageSources>
  <packageSourceMapping>
    <clear />
+    <packageSource key="api.nuget.org">
+      <package pattern="*" />
+    </packageSource>
+    <packageSource key="azure-dotnet10-transport">
+      <package pattern="Microsoft.DotNet.ApiDiff.Tool" />
+    </packageSource>
  </packageSourceMapping>
  <auditSources>
    <clear />
--- a/api/Avalonia.LinuxFramebuffer.nupkg.xml
+++ b/api/Avalonia.LinuxFramebuffer.nupkg.xml
@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.LinuxFramebuffer.FbdevOutput.CreateFramebufferRenderTarget</Target>
+    <Left>baseline/Avalonia.LinuxFramebuffer/lib/net10.0/Avalonia.LinuxFramebuffer.dll</Left>
+    <Right>current/Avalonia.LinuxFramebuffer/lib/net10.0/Avalonia.LinuxFramebuffer.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.LinuxFramebuffer.FbdevOutput.Lock</Target>
+    <Left>baseline/Avalonia.LinuxFramebuffer/lib/net10.0/Avalonia.LinuxFramebuffer.dll</Left>
+    <Right>current/Avalonia.LinuxFramebuffer/lib/net10.0/Avalonia.LinuxFramebuffer.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.LinuxFramebuffer.FbdevOutput.CreateFramebufferRenderTarget</Target>
+    <Left>baseline/Avalonia.LinuxFramebuffer/lib/net8.0/Avalonia.LinuxFramebuffer.dll</Left>
+    <Right>current/Avalonia.LinuxFramebuffer/lib/net8.0/Avalonia.LinuxFramebuffer.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.LinuxFramebuffer.FbdevOutput.Lock</Target>
+    <Left>baseline/Avalonia.LinuxFramebuffer/lib/net8.0/Avalonia.LinuxFramebuffer.dll</Left>
+    <Right>current/Avalonia.LinuxFramebuffer/lib/net8.0/Avalonia.LinuxFramebuffer.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0008</DiagnosticId>
+    <Target>T:Avalonia.LinuxFramebuffer.FbdevOutput</Target>
+    <Left>baseline/Avalonia.LinuxFramebuffer/lib/net10.0/Avalonia.LinuxFramebuffer.dll</Left>
+    <Right>current/Avalonia.LinuxFramebuffer/lib/net10.0/Avalonia.LinuxFramebuffer.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0008</DiagnosticId>
+    <Target>T:Avalonia.LinuxFramebuffer.FbdevOutput</Target>
+    <Left>baseline/Avalonia.LinuxFramebuffer/lib/net8.0/Avalonia.LinuxFramebuffer.dll</Left>
+    <Right>current/Avalonia.LinuxFramebuffer/lib/net8.0/Avalonia.LinuxFramebuffer.dll</Right>
+  </Suppression>
+</Suppressions>
--- a/api/Avalonia.Skia.nupkg.xml
+++ b/api/Avalonia.Skia.nupkg.xml
@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
 <Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:Avalonia.Skia.ISkiaGpu</Target>
+    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
+    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
+  </Suppression>
  <Suppression>
    <DiagnosticId>CP0001</DiagnosticId>
    <Target>T:Avalonia.Skia.ISkiaGpuRenderTarget2</Target>
@ -13,6 +19,12 @@
    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:Avalonia.Skia.ISkiaGpu</Target>
+    <Left>baseline/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Left>
+    <Right>current/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Right>
+  </Suppression>
  <Suppression>
    <DiagnosticId>CP0001</DiagnosticId>
    <Target>T:Avalonia.Skia.ISkiaGpuRenderTarget2</Target>
@ -25,24 +37,72 @@
    <Left>baseline/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Left>
    <Right>current/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Right>
  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Skia.Helpers.DrawingContextHelper.WrapSkiaCanvas(SkiaSharp.SKCanvas,Avalonia.Vector)</Target>
+    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
+    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Skia.ISkiaGpu.TryCreateRenderTarget(System.Collections.Generic.IEnumerable{System.Object})</Target>
+    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
+    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
+  </Suppression>
  <Suppression>
    <DiagnosticId>CP0002</DiagnosticId>
    <Target>M:Avalonia.Skia.ISkiaGpuRenderTarget.BeginRenderingSession</Target>
    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Skia.ISkiaGpuRenderTarget.BeginRenderingSession(System.Nullable{Avalonia.PixelSize})</Target>
+    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
+    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Skia.Helpers.DrawingContextHelper.WrapSkiaCanvas(SkiaSharp.SKCanvas,Avalonia.Vector)</Target>
+    <Left>baseline/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Left>
+    <Right>current/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Skia.ISkiaGpu.TryCreateRenderTarget(System.Collections.Generic.IEnumerable{System.Object})</Target>
+    <Left>baseline/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Left>
+    <Right>current/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Right>
+  </Suppression>
  <Suppression>
    <DiagnosticId>CP0002</DiagnosticId>
    <Target>M:Avalonia.Skia.ISkiaGpuRenderTarget.BeginRenderingSession</Target>
    <Left>baseline/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Left>
    <Right>current/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Right>
  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Skia.ISkiaGpuRenderTarget.BeginRenderingSession(System.Nullable{Avalonia.PixelSize})</Target>
+    <Left>baseline/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Left>
+    <Right>current/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0006</DiagnosticId>
+    <Target>M:Avalonia.Skia.ISkiaGpu.TryCreateRenderTarget(System.Collections.Generic.IEnumerable{Avalonia.Platform.Surfaces.IPlatformRenderSurface})</Target>
+    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
+    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
+  </Suppression>
  <Suppression>
    <DiagnosticId>CP0006</DiagnosticId>
    <Target>M:Avalonia.Skia.ISkiaGpu.TryGetGrContext</Target>
    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0006</DiagnosticId>
+    <Target>M:Avalonia.Skia.ISkiaGpuRenderTarget.BeginRenderingSession(Avalonia.Platform.IRenderTarget.RenderTargetSceneInfo)</Target>
+    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
+    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
+  </Suppression>
  <Suppression>
    <DiagnosticId>CP0006</DiagnosticId>
    <Target>M:Avalonia.Skia.ISkiaGpuRenderTarget.BeginRenderingSession(System.Nullable{Avalonia.PixelSize})</Target>
@ -55,12 +115,24 @@
    <Left>baseline/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Left>
    <Right>current/Avalonia.Skia/lib/net10.0/Avalonia.Skia.dll</Right>
  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0006</DiagnosticId>
+    <Target>M:Avalonia.Skia.ISkiaGpu.TryCreateRenderTarget(System.Collections.Generic.IEnumerable{Avalonia.Platform.Surfaces.IPlatformRenderSurface})</Target>
+    <Left>baseline/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Left>
+    <Right>current/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Right>
+  </Suppression>
  <Suppression>
    <DiagnosticId>CP0006</DiagnosticId>
    <Target>M:Avalonia.Skia.ISkiaGpu.TryGetGrContext</Target>
    <Left>baseline/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Left>
    <Right>current/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Right>
  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0006</DiagnosticId>
+    <Target>M:Avalonia.Skia.ISkiaGpuRenderTarget.BeginRenderingSession(Avalonia.Platform.IRenderTarget.RenderTargetSceneInfo)</Target>
+    <Left>baseline/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Left>
+    <Right>current/Avalonia.Skia/lib/net8.0/Avalonia.Skia.dll</Right>
+  </Suppression>
  <Suppression>
    <DiagnosticId>CP0006</DiagnosticId>
    <Target>M:Avalonia.Skia.ISkiaGpuRenderTarget.BeginRenderingSession(System.Nullable{Avalonia.PixelSize})</Target>
--- a/api/Avalonia.nupkg.xml
+++ b/api/Avalonia.nupkg.xml
--- a/build/AnalyzerProject.targets
+++ b/build/AnalyzerProject.targets
@ -8,7 +8,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all"/>
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all"/>
  </ItemGroup>

 </Project>
--- a/build/Base.props
+++ b/build/Base.props
@ -1,8 +1,8 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <!-- '!NET8_0_OR_GREATER' equivalent -->
  <ItemGroup Condition="!('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '8.0')))">
-    <PackageReference Include="System.Memory" Version="4.5.5" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.10" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.10" />
+    <PackageReference Include="System.Memory" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" />
  </ItemGroup>
 </Project>
--- a/build/Binding.props
+++ b/build/Binding.props
@ -1,5 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
-  </ItemGroup>
-</Project>
--- a/build/HarfBuzzSharp.props
+++ b/build/HarfBuzzSharp.props
@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
-    <PackageReference Include="HarfBuzzSharp" Version="8.3.1.2" />
-    <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.Linux" Version="8.3.1.2" />
-    <PackageReference Condition="'$(IncludeWasmSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.WebAssembly" Version="8.3.1.2" />
+    <PackageReference Include="HarfBuzzSharp" />
+    <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.Linux" />
+    <PackageReference Condition="'$(IncludeWasmSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.WebAssembly" />
  </ItemGroup>
 </Project>
--- a/build/ImageSharp.props
+++ b/build/ImageSharp.props
@ -1,5 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.12" />
-  </ItemGroup>
-</Project>
--- a/build/LegacyProject.targets
+++ b/build/LegacyProject.targets
@ -1,3 +0,0 @@
-<Project>
-  <Target Name="Pack" />
-</Project>
--- a/build/Microsoft.CSharp.props
+++ b/build/Microsoft.CSharp.props
@ -1,5 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
-  </ItemGroup>
-</Project>
--- a/build/Microsoft.Reactive.Testing.props
+++ b/build/Microsoft.Reactive.Testing.props
@ -1,5 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Reactive.Testing" Version="6.1.0" />
-  </ItemGroup>
-</Project>
--- a/build/Moq.props
+++ b/build/Moq.props
@ -1,5 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageReference Include="Moq" Version="4.20.72" />
-  </ItemGroup>
-</Project>
--- a/build/NetCore.props
+++ b/build/NetCore.props
@ -1,4 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-  </ItemGroup>
-</Project>
--- a/build/NetFX.props
+++ b/build/NetFX.props
@ -1,6 +0,0 @@
-<Project>
-
-  <ItemGroup>
-  </ItemGroup>
-
-</Project>
--- a/build/Rx.props
+++ b/build/Rx.props
@ -1,5 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageReference Include="System.Reactive" Version="6.1.0" />
-  </ItemGroup>
-</Project>
--- a/build/SampleApp.props
+++ b/build/SampleApp.props
@ -14,7 +14,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="AvaloniaUI.DiagnosticsSupport" Version="2.1.1" />
+    <PackageReference Include="AvaloniaUI.DiagnosticsSupport" />
  </ItemGroup>

  <Target Name="GatherReferences" AfterTargets="CoreCompile">
--- a/build/SharedVersion.props
+++ b/build/SharedVersion.props
@ -8,7 +8,7 @@
    <PackageProjectUrl>https://avaloniaui.net/?utm_source=nuget&amp;utm_medium=referral&amp;utm_content=project_homepage_link</PackageProjectUrl>
    <RepositoryUrl>https://github.com/AvaloniaUI/Avalonia/</RepositoryUrl>
    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <NoWarn>$(NoWarn);CS1591;NU5104</NoWarn>
    <PackageLicenseExpression>MIT</PackageLicenseExpression>
    <PackageIcon>Icon.png</PackageIcon>
    <PackageDescription>Avalonia is a cross-platform UI framework for .NET providing a flexible styling system and supporting a wide range of Operating Systems such as Windows, Linux, macOS and with experimental support for Android, iOS and WebAssembly.</PackageDescription>
--- a/build/SharpDX.props
+++ b/build/SharpDX.props
@ -1,14 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <SharpDXPackageVersion>4.0.1</SharpDXPackageVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="SharpDX" Version="$(SharpDXPackageVersion)" />
-    <PackageReference Include="SharpDX.Direct2D1" Version="$(SharpDXPackageVersion)" />
-    <PackageReference Include="SharpDX.Direct3D11" Version="$(SharpDXPackageVersion)" />
-    <PackageReference Include="SharpDX.DXGI" Version="$(SharpDXPackageVersion)" />
-    <PackageReference Include="SharpDX.Direct3D9" Version="$(SharpDXPackageVersion)" Condition="'$(UseDirect3D9)' == 'true'" />
-    <PackageReference Include="SharpDX.D3DCompiler" Version="$(SharpDXPackageVersion)" Condition="'$(UseD3DCompiler)' == 'true'" />
-    <PackageReference Include="SharpDX.Mathematics" Version="$(SharpDXPackageVersion)" Condition="'$(UseSharpDXMathematics)' == 'true'" />
-  </ItemGroup>
-</Project>
--- a/build/SkiaSharp.props
+++ b/build/SkiaSharp.props
@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="3.119.1" />
-    <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="SkiaSharp.NativeAssets.Linux" Version="3.119.1" />
-    <PackageReference Condition="'$(IncludeWasmSkia)' == 'true'" Include="SkiaSharp.NativeAssets.WebAssembly" Version="3.119.1" />
+    <PackageReference Include="SkiaSharp" />
+    <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="SkiaSharp.NativeAssets.Linux" />
+    <PackageReference Condition="'$(IncludeWasmSkia)' == 'true'" Include="SkiaSharp.NativeAssets.WebAssembly" />
  </ItemGroup>
 </Project>
--- a/build/UnitTests.NetFX.props
+++ b/build/UnitTests.NetFX.props
@ -1,5 +1,4 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildThisFileDirectory)/NetFX.props" />	
  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
    <Content Include="$(MSBuildThisFileDirectory)/xunit.runner.mono.json" Link="xunit.runner.json" >
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
--- a/build/XUnit.props
+++ b/build/XUnit.props
@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  <ItemGroup>
-    <PackageReference Include="xunit.v3.mtp-v2" Version="3.2.1" />
+    <PackageReference Include="xunit.v3.mtp-v2" />
  </ItemGroup>

  <PropertyGroup>
--- a/build/readme.md
+++ b/build/readme.md
@ -4,12 +4,6 @@
 <Import Project="..\..\build\JetBrains.Annotations.props" />
 <Import Project="..\..\build\JetBrains.dotMemoryUnit.props" />
 <Import Project="..\..\build\Magick.NET-Q16-AnyCPU.props" />
-<Import Project="..\..\build\Microsoft.CSharp.props" />
-<Import Project="..\..\build\Microsoft.Reactive.Testing.props" />
-<Import Project="..\..\build\Moq.props" />
-<Import Project="..\..\build\NetCore.props" />
-<Import Project="..\..\build\Rx.props" />
-<Import Project="..\..\build\SharpDX.props" />
 <Import Project="..\..\build\SkiaSharp.Desktop.props" />
 <Import Project="..\..\build\SkiaSharp.props" />
 <Import Project="..\..\build\Splat.props" />
--- a/dirs.proj
+++ b/dirs.proj
@ -22,7 +22,4 @@
    <ProjectReference Remove="src/iOS/**/*.*proj" />
  </ItemGroup>

-  <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.SlnGen" Version="8.5.17" PrivateAssets="all" />
-  </ItemGroup>
 </Project>
--- a/external/Avalonia.DBus
+++ b/external/Avalonia.DBus
@ -0,0 +1 @@
+Subproject commit f91a822c258476f185e51112388775591e6ef9d6
--- a/external/Numerge
+++ b/external/Numerge
@ -1 +1 @@
-Subproject commit 9738c6121fdd143c78d3e25686a7e4e13c00f586
+Subproject commit 5530e1cbe9e105ff4ebc9da1f4af3253a8756754
--- a/external/XamlX
+++ b/external/XamlX
@ -1 +1 @@
-Subproject commit c32d3040e536ae9768233ea5a445697632578bd0
+Subproject commit 009d4815470cf4bf71d1adbb633a5d81dcb2bb52
--- a/global.json
+++ b/global.json
@ -1,6 +1,6 @@
 {
  "sdk": {
-    "version": "10.0.101",
+    "version": "10.0.201",
    "rollForward": "latestFeature"
  },
  "test": {
--- a/native/Avalonia.Native/src/OSX/StorageProvider.mm
+++ b/native/Avalonia.Native/src/OSX/StorageProvider.mm
@ -148,8 +148,23 @@ public:
            [fileUri stopAccessingSecurityScopedResource];
        }
    }
+    
+    static NSWindow* GetEffectiveNSWindow(IAvnTopLevel* topLevel)
+    {
+        auto windowHolder = dynamic_cast<INSWindowHolder*>(topLevel);
+        if (windowHolder != nullptr)
+            return windowHolder->GetNSWindow();
+        
+        auto viewHolder = dynamic_cast<INSViewHolder*>(topLevel);
+        if (viewHolder != nullptr) {
+            auto view = (NSView*)viewHolder->GetNSView();
+            return [view window];
+        }
+        
+        return nullptr;
+    }

-    virtual void SelectFolderDialog (IAvnWindow* parentWindowHandle,
+    virtual void SelectFolderDialog (IAvnTopLevel* parentTopLevel,
                                     IAvnSystemDialogEvents* events,
                                     bool allowMultiple,
                                     const char* title,
@ -176,6 +191,8 @@ public:
                panel.directoryURL = [NSURL URLWithString:directoryString];
            }
            
+            auto parentWindow = GetEffectiveNSWindow(parentTopLevel);
+            
            auto handler = ^(NSModalResponse result) {
                if(result == NSFileHandlingPanelOKButton)
                {
@ -188,10 +205,9 @@ public:
    
                        [panel orderOut:panel];
                        
-                        if(parentWindowHandle != nullptr)
+                        if (parentWindow != nullptr)
                        {
-                            auto windowHolder = dynamic_cast<INSWindowHolder*>(parentWindowHandle);
-                            [windowHolder->GetNSWindow() makeKeyAndOrderFront:windowHolder->GetNSWindow()];
+                            [parentWindow makeKeyAndOrderFront:parentWindow];
                        }
                        
                        return;
@ -202,11 +218,9 @@ public:
                
            };
            
-            if(parentWindowHandle != nullptr)
+            if (parentWindow != nullptr)
            {
-                auto windowBase = dynamic_cast<INSWindowHolder*>(parentWindowHandle);
-                
-                [panel beginSheetModalForWindow:windowBase->GetNSWindow() completionHandler:handler];
+                [panel beginSheetModalForWindow:parentWindow completionHandler:handler];
            }
            else
            {
@ -215,7 +229,7 @@ public:
        }
    }
    
-    virtual void OpenFileDialog (IAvnWindow* parentWindowHandle,
+    virtual void OpenFileDialog (IAvnTopLevel* parentTopLevel,
                                 IAvnSystemDialogEvents* events,
                                 bool allowMultiple,
                                 const char* title,
@ -249,6 +263,8 @@ public:
                panel.directoryURL = [NSURL URLWithString:directoryString];
            }
            
+            auto parentWindow = GetEffectiveNSWindow(parentTopLevel);
+            
            auto handler = ^(NSModalResponse result) {
                if(result == NSFileHandlingPanelOKButton)
                {
@ -261,10 +277,9 @@ public:

                        [panel orderOut:panel];
                        
-                        if(parentWindowHandle != nullptr)
+                        if (parentWindow != nullptr)
                        {
-                            auto windowHolder = dynamic_cast<INSWindowHolder*>(parentWindowHandle);
-                            [windowHolder->GetNSWindow() makeKeyAndOrderFront:windowHolder->GetNSWindow()];
+                            [parentWindow makeKeyAndOrderFront:parentWindow];
                        }
                        
                        return;
@ -275,11 +290,9 @@ public:
                
            };
            
-            if(parentWindowHandle != nullptr)
+            if (parentWindow != nullptr)
            {
-                auto windowHolder = dynamic_cast<INSWindowHolder*>(parentWindowHandle);
-                
-                [panel beginSheetModalForWindow:windowHolder->GetNSWindow() completionHandler:handler];
+                [panel beginSheetModalForWindow:parentWindow completionHandler:handler];
            }
            else
            {
@ -288,7 +301,7 @@ public:
        }
    }
    
-    virtual void SaveFileDialog (IAvnWindow* parentWindowHandle,
+    virtual void SaveFileDialog (IAvnTopLevel* parentTopLevel,
                                 IAvnSystemDialogEvents* events,
                                 const char* title,
                                 const char* initialDirectory,
@ -319,6 +332,8 @@ public:
                panel.directoryURL = [NSURL URLWithString:directoryString];
            }
            
+            auto parentWindow = GetEffectiveNSWindow(parentTopLevel);
+            
            auto handler = ^(NSModalResponse result) {
                int selectedIndex = -1;
                if (panel.accessoryView != nil)
@ -339,10 +354,9 @@ public:

                    [panel orderOut:panel];
                    
-                    if(parentWindowHandle != nullptr)
+                    if (parentWindow != nullptr)
                    {
-                        auto windowHolder = dynamic_cast<INSWindowHolder*>(parentWindowHandle);
-                        [windowHolder->GetNSWindow() makeKeyAndOrderFront:windowHolder->GetNSWindow()];
+                        [parentWindow makeKeyAndOrderFront:parentWindow];
                    }
                    
                    return;
@ -352,11 +366,9 @@ public:
                
            };
            
-            if(parentWindowHandle != nullptr)
+            if (parentWindow != nullptr)
            {
-                auto windowBase = dynamic_cast<INSWindowHolder*>(parentWindowHandle);
-                
-                [panel beginSheetModalForWindow:windowBase->GetNSWindow() completionHandler:handler];
+                [panel beginSheetModalForWindow:parentWindow completionHandler:handler];
            }
            else
            {
--- a/native/Avalonia.Native/src/OSX/WindowImpl.h
+++ b/native/Avalonia.Native/src/OSX/WindowImpl.h
@ -62,8 +62,6 @@ BEGIN_INTERFACE_MAP()

    virtual HRESULT SetExtendClientArea (bool enable) override;

-    virtual HRESULT SetExtendClientAreaHints (AvnExtendClientAreaChromeHints hints) override;
-
    virtual HRESULT GetExtendTitleBarHeight (double*ret) override;

    virtual HRESULT SetExtendTitleBarHeight (double value) override;
@ -110,7 +108,6 @@ private:
    NSRect _preZoomSize;
    bool _transitioningWindowState;
    bool _isClientAreaExtended;
-    AvnExtendClientAreaChromeHints _extendClientHints;
    bool _isModal;
 };

--- a/native/Avalonia.Native/src/OSX/WindowImpl.mm
+++ b/native/Avalonia.Native/src/OSX/WindowImpl.mm
@ -13,7 +13,6 @@
 WindowImpl::WindowImpl(IAvnWindowEvents *events) : TopLevelImpl(events), WindowBaseImpl(events, false) {
    _isEnabled = true;
    _isClientAreaExtended = false;
-    _extendClientHints = AvnDefaultChrome;
    _fullScreenActive = false;
    _canResize = true;
    _canMinimize = true;
@ -153,20 +152,11 @@ void WindowImpl::WindowStateChanged() {
            if (_isClientAreaExtended) {
                if (_lastWindowState == FullScreen) {
                    // we exited fs.
-                    if (_extendClientHints & AvnOSXThickTitleBar) {
-                        Window.toolbar = [NSToolbar new];
-                        Window.toolbar.showsBaselineSeparator = false;
-                    }
-
                    [Window setTitlebarAppearsTransparent:true];

                    [StandardContainer setFrameSize:StandardContainer.frame.size];
                } else if (state == FullScreen) {
                    // we entered fs.
-                    if (_extendClientHints & AvnOSXThickTitleBar) {
-                        Window.toolbar = nullptr;
-                    }
-
                    [Window setTitlebarAppearsTransparent:false];

                    [StandardContainer setFrameSize:StandardContainer.frame.size];
@ -240,6 +230,10 @@ HRESULT WindowImpl::SetDecorations(SystemDecorations value) {

        UpdateAppearance();

+        if (_isClientAreaExtended) {
+            [StandardContainer ShowTitleBar:_decorations == SystemDecorationsFull];
+        }
+
        switch (_decorations) {
            case SystemDecorationsNone:
                [Window setHasShadow:NO];
@ -391,20 +385,9 @@ HRESULT WindowImpl::SetExtendClientArea(bool enable) {

                [Window setTitlebarAppearsTransparent:true];

-                auto wantsTitleBar = (_extendClientHints & AvnSystemChrome) || (_extendClientHints & AvnPreferSystemChrome);
-
-                if (wantsTitleBar) {
-                    [StandardContainer ShowTitleBar:true];
-                } else {
-                    [StandardContainer ShowTitleBar:false];
-                }
+                [StandardContainer ShowTitleBar:_decorations == SystemDecorationsFull];

-                if (_extendClientHints & AvnOSXThickTitleBar) {
-                    Window.toolbar = [NSToolbar new];
-                    Window.toolbar.showsBaselineSeparator = false;
-                } else {
-                    Window.toolbar = nullptr;
-                }
+                Window.toolbar = nullptr;
            } else {
                Window.titleVisibility = NSWindowTitleVisible;
                Window.toolbar = nullptr;
@ -420,17 +403,6 @@ HRESULT WindowImpl::SetExtendClientArea(bool enable) {
    }
 }

-HRESULT WindowImpl::SetExtendClientAreaHints(AvnExtendClientAreaChromeHints hints) {
-    START_COM_CALL;
-
-    @autoreleasepool {
-        _extendClientHints = hints;
-
-        SetExtendClientArea(_isClientAreaExtended);
-        return S_OK;
-    }
-}
-
 HRESULT WindowImpl::GetExtendTitleBarHeight(double *ret) {
    START_COM_CALL;

@ -591,6 +563,10 @@ NSWindowStyleMask WindowImpl::CalculateStyleMask() {

        case SystemDecorationsBorderOnly:
            s = s | NSWindowStyleMaskTitled | NSWindowStyleMaskFullSizeContentView;
+            
+            if (_canResize && _isEnabled) {
+                s = s | NSWindowStyleMaskResizable;
+            }
            break;

        case SystemDecorationsFull:
@ -619,9 +595,7 @@ void WindowImpl::UpdateAppearance() {
        return;
    }

-    bool wantsChrome = (_extendClientHints & AvnSystemChrome) || (_extendClientHints & AvnPreferSystemChrome);
-    bool hasTrafficLights = (_decorations == SystemDecorationsFull) &&
-        (_isClientAreaExtended ? wantsChrome : true);
+    bool hasTrafficLights = (_decorations == SystemDecorationsFull);
    
    NSButton* closeButton = [Window standardWindowButton:NSWindowCloseButton];
    NSButton* miniaturizeButton = [Window standardWindowButton:NSWindowMiniaturizeButton];
--- a/native/Avalonia.Native/src/OSX/metal.mm
+++ b/native/Avalonia.Native/src/OSX/metal.mm
@ -87,11 +87,12 @@ public:
        return (__bridge void*) queue;
    }
    
-    HRESULT ImportIOSurface(void *handle, AvnPixelFormat pixelFormat, IAvnMetalTexture **ppv) override { 
+    HRESULT ImportIOSurface(void *handle, AvnPixelFormat pixelFormat, IAvnMetalTexture **ppv) override {
+        START_COM_ARP_CALL;
        auto surf = (IOSurfaceRef)handle;
        auto width = IOSurfaceGetWidth(surf);
        auto height = IOSurfaceGetHeight(surf);
-        
+
        auto desc = [MTLTextureDescriptor new];
        if(pixelFormat == kAvnRgba8888)
            desc.pixelFormat = MTLPixelFormatRGBA8Unorm;
@ -106,13 +107,12 @@ public:
        desc.mipmapLevelCount = 1;
        desc.sampleCount = 1;
        desc.usage = MTLTextureUsageShaderRead | MTLTextureUsageRenderTarget;
-        
+
        auto texture = [device newTextureWithDescriptor:desc iosurface:surf plane:0];
        if(texture == nullptr)
            return E_FAIL;
        *ppv = new AvnMetalTexture(texture);
        return S_OK;
-        
    }
    
    HRESULT ImportSharedEvent(void *mtlSharedEventInstance, IAvnMTLSharedEvent**ppv) override {
@ -132,11 +132,12 @@ public:
    
    HRESULT SignalOrWait(IAvnMTLSharedEvent *ev, uint64_t value, bool wait)
    {
+        START_ARP_CALL;
        if (@available(macOS 12.0, *))
        {
            auto e = dynamic_cast<AvnMTLSharedEvent*>(ev);
            if(e == nullptr)
-                return E_FAIL;;
+                return E_FAIL;
            auto buf = [queue commandBuffer];
            if(wait)
                [buf encodeWaitForEvent:e->GetEvent() value:value];
@ -204,6 +205,7 @@ public:

    ~AvnMetalRenderSession()
    {
+        START_ARP_CALL;
        auto buffer = [_queue commandBuffer];
        [buffer presentDrawable: _drawable];
        [buffer commit];
@ -227,6 +229,7 @@ public:
    }

    HRESULT BeginDrawing(IAvnMetalRenderingSession **ret) override {
+        START_COM_ARP_CALL;
        if([NSThread isMainThread])
        {
            // Flush all existing rendering
@ -289,7 +292,7 @@ class AvnMetalDisplay : public ComSingleObject<IAvnMetalDisplay, &IID_IAvnMetalD
 public:
    FORWARD_IUNKNOWN()
    HRESULT CreateDevice(IAvnMetalDevice **ret) override {
-
+        START_COM_ARP_CALL;
        auto device = MTLCreateSystemDefaultDevice();
        if(device == nil) {
            ret = nil;
--- a/nukebuild/_build.csproj
+++ b/nukebuild/_build.csproj
@ -10,12 +10,13 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="10.1.0" />
-    <PackageReference Include="MicroCom.CodeGenerator" Version="0.11.0" />
+    <PackageReference Include="Nuke.Common" />
+    <PackageReference Include="MicroCom.CodeGenerator" />
+    <PackageReference Include="Numerge" />
    <!-- Keep in sync with Avalonia.Build.Tasks -->
-    <PackageReference Include="Mono.Cecil" Version="0.11.6" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="18.0.2" PrivateAssets="All" />
-    <PackageReference Include="NuGet.Protocol" Version="7.0.1" />
+    <PackageReference Include="Mono.Cecil" />
+    <PackageReference Include="Microsoft.Build.Framework" PrivateAssets="All" />
+    <PackageReference Include="NuGet.Protocol" />
    <PackageDownload Include="Microsoft.DotNet.ApiCompat.Tool" Version="[10.0.100]" />
    <PackageDownload Include="Microsoft.DotNet.ApiDiff.Tool" Version="[10.0.100-rtm.25531.102]" />
    <PackageDownload Include="dotnet-ilrepack" Version="[2.0.44]" />
@ -24,11 +25,6 @@
  <ItemGroup>
    <NukeMetadata Include="**\*.json" Exclude="bin\**;obj\**" />
    <NukeExternalFiles Include="**\*.*.ext" Exclude="bin\**;obj\**" />
-
-    <!-- Common build related files -->
-    <Compile Include="../external/Numerge/Numerge/**/*.cs"
-             Exclude="../external/Numerge/Numerge/obj/**/*.cs"
-             LinkBase="Numerge" />
    <EmbeddedResource Include="../build/avalonia.snk" />
  </ItemGroup>

--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@ -5,7 +5,7 @@
  </PropertyGroup>

  <ItemGroup>
-      <PackageReference Include="Avalonia.BuildServices" Version="11.3.2" />
+      <PackageReference Include="Avalonia.BuildServices" />
      <ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" />
      <ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj"
                        PrivateAssets="all" />
@ -71,7 +71,6 @@
    </Content>
  </ItemGroup>
  <Import Project="..\..\build\SharedVersion.props" />
-  <Import Project="..\..\build\NetFX.props" />
  <Import Project="..\..\build\CoreLibraries.props" />
  <Import Project="..\..\build\SourceLink.props" Condition="'$(DisableSourceLink)' == ''" />

--- a/samples/BindingDemo/BindingDemo.csproj
+++ b/samples/BindingDemo/BindingDemo.csproj
@ -10,10 +10,11 @@
    <ProjectReference Include="..\..\src\Linux\Avalonia.LinuxFramebuffer\Avalonia.LinuxFramebuffer.csproj" />
    <ProjectReference Include="..\MiniMvvm\MiniMvvm.csproj" />
  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Reactive" />
+  </ItemGroup>
  <Import Project="..\..\build\SampleApp.props" />
  <Import Project="..\..\build\EmbedXaml.props" />
-  <Import Project="..\..\build\Rx.props" />
-  <Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\build\NetFX.props" />
  <Import Project="..\..\build\ReferenceCoreLibraries.props" />
  <Import Project="..\..\build\BuildTargets.targets" />
 </Project>
--- a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
+++ b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
@ -25,7 +25,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0" />
+    <PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" />
  </ItemGroup>

  <ItemGroup>
--- a/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
+++ b/samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
@ -26,7 +26,7 @@
    <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
    <ProjectReference Include="..\..\src\Avalonia.X11\Avalonia.X11.csproj" />
    <!-- For native controls test -->
-    <PackageReference Include="MonoMac.NetStandard" Version="0.0.4" />
+    <PackageReference Include="MonoMac.NetStandard" />
  </ItemGroup>

  <PropertyGroup>
--- a/samples/ControlCatalog/Assets/CurvedHeader/avatar.jpg
+++ b/samples/ControlCatalog/Assets/CurvedHeader/avatar.jpg
--- a/samples/ControlCatalog/Assets/CurvedHeader/featured.jpg
+++ b/samples/ControlCatalog/Assets/CurvedHeader/featured.jpg
--- a/samples/ControlCatalog/Assets/CurvedHeader/product1.jpg
+++ b/samples/ControlCatalog/Assets/CurvedHeader/product1.jpg
--- a/samples/ControlCatalog/Assets/CurvedHeader/product2.jpg
+++ b/samples/ControlCatalog/Assets/CurvedHeader/product2.jpg
--- a/samples/ControlCatalog/Assets/CurvedHeader/product3.jpg
+++ b/samples/ControlCatalog/Assets/CurvedHeader/product3.jpg
--- a/samples/ControlCatalog/Assets/CurvedHeader/update1.jpg
+++ b/samples/ControlCatalog/Assets/CurvedHeader/update1.jpg
--- a/samples/ControlCatalog/Assets/CurvedHeader/update2.jpg
+++ b/samples/ControlCatalog/Assets/CurvedHeader/update2.jpg
--- a/samples/ControlCatalog/Assets/CurvedHeader/update3.jpg
+++ b/samples/ControlCatalog/Assets/CurvedHeader/update3.jpg
--- a/samples/ControlCatalog/Assets/ModernApp/avatar.jpg
+++ b/samples/ControlCatalog/Assets/ModernApp/avatar.jpg
--- a/samples/ControlCatalog/Assets/ModernApp/dest_alps.jpg
+++ b/samples/ControlCatalog/Assets/ModernApp/dest_alps.jpg
--- a/samples/ControlCatalog/Assets/ModernApp/dest_forest.jpg
+++ b/samples/ControlCatalog/Assets/ModernApp/dest_forest.jpg
--- a/samples/ControlCatalog/Assets/ModernApp/dest_norway.jpg
+++ b/samples/ControlCatalog/Assets/ModernApp/dest_norway.jpg
--- a/samples/ControlCatalog/Assets/ModernApp/exp_angkor.jpg
+++ b/samples/ControlCatalog/Assets/ModernApp/exp_angkor.jpg
--- a/samples/ControlCatalog/Assets/ModernApp/exp_tokyo.jpg
+++ b/samples/ControlCatalog/Assets/ModernApp/exp_tokyo.jpg
--- a/samples/ControlCatalog/Assets/ModernApp/gallery_alpine.jpg
+++ b/samples/ControlCatalog/Assets/ModernApp/gallery_alpine.jpg
--- a/samples/ControlCatalog/Assets/ModernApp/gallery_bay.jpg
+++ b/samples/ControlCatalog/Assets/ModernApp/gallery_bay.jpg
--- a/samples/ControlCatalog/Assets/ModernApp/gallery_city.jpg
+++ b/samples/ControlCatalog/Assets/ModernApp/gallery_city.jpg
--- a/samples/ControlCatalog/Assets/ModernApp/gallery_paris.jpg
+++ b/samples/ControlCatalog/Assets/ModernApp/gallery_paris.jpg
--- a/samples/ControlCatalog/Assets/ModernApp/gallery_tropical.jpg
+++ b/samples/ControlCatalog/Assets/ModernApp/gallery_tropical.jpg
--- a/samples/ControlCatalog/Assets/ModernApp/gallery_venice.jpg
+++ b/samples/ControlCatalog/Assets/ModernApp/gallery_venice.jpg
--- a/samples/ControlCatalog/Assets/ModernApp/story1.jpg
+++ b/samples/ControlCatalog/Assets/ModernApp/story1.jpg
--- a/samples/ControlCatalog/Assets/ModernApp/story2.jpg
+++ b/samples/ControlCatalog/Assets/ModernApp/story2.jpg
--- a/samples/ControlCatalog/Assets/ModernApp/story3.jpg
+++ b/samples/ControlCatalog/Assets/ModernApp/story3.jpg
--- a/samples/ControlCatalog/Assets/Movies/cast1.jpg
+++ b/samples/ControlCatalog/Assets/Movies/cast1.jpg
--- a/samples/ControlCatalog/Assets/Movies/cast2.jpg
+++ b/samples/ControlCatalog/Assets/Movies/cast2.jpg
--- a/samples/ControlCatalog/Assets/Movies/continue1.jpg
+++ b/samples/ControlCatalog/Assets/Movies/continue1.jpg
--- a/samples/ControlCatalog/Assets/Movies/hero.jpg
+++ b/samples/ControlCatalog/Assets/Movies/hero.jpg
--- a/samples/ControlCatalog/Assets/Movies/morelike1.jpg
+++ b/samples/ControlCatalog/Assets/Movies/morelike1.jpg
--- a/samples/ControlCatalog/Assets/Movies/search1.jpg
+++ b/samples/ControlCatalog/Assets/Movies/search1.jpg
--- a/samples/ControlCatalog/Assets/Movies/toprated1.jpg
+++ b/samples/ControlCatalog/Assets/Movies/toprated1.jpg
--- a/samples/ControlCatalog/Assets/Movies/toprated2.jpg
+++ b/samples/ControlCatalog/Assets/Movies/toprated2.jpg
--- a/samples/ControlCatalog/Assets/Movies/toprated3.jpg
+++ b/samples/ControlCatalog/Assets/Movies/toprated3.jpg
--- a/samples/ControlCatalog/Assets/Movies/toprated4.jpg
+++ b/samples/ControlCatalog/Assets/Movies/toprated4.jpg
--- a/samples/ControlCatalog/Assets/Movies/trending1.jpg
+++ b/samples/ControlCatalog/Assets/Movies/trending1.jpg
--- a/samples/ControlCatalog/Assets/Movies/trending2.jpg
+++ b/samples/ControlCatalog/Assets/Movies/trending2.jpg
--- a/samples/ControlCatalog/Assets/Pulse/cat_hiit.jpg
+++ b/samples/ControlCatalog/Assets/Pulse/cat_hiit.jpg
--- a/samples/ControlCatalog/Assets/Pulse/cat_strength.jpg
+++ b/samples/ControlCatalog/Assets/Pulse/cat_strength.jpg
--- a/samples/ControlCatalog/Assets/Pulse/cat_yoga.jpg
+++ b/samples/ControlCatalog/Assets/Pulse/cat_yoga.jpg
--- a/samples/ControlCatalog/Assets/Pulse/ex_bench.jpg
+++ b/samples/ControlCatalog/Assets/Pulse/ex_bench.jpg
--- a/samples/ControlCatalog/Assets/Pulse/ex_deadlifts.jpg
+++ b/samples/ControlCatalog/Assets/Pulse/ex_deadlifts.jpg
--- a/samples/ControlCatalog/Assets/Pulse/ex_overhead.jpg
+++ b/samples/ControlCatalog/Assets/Pulse/ex_overhead.jpg
--- a/samples/ControlCatalog/Assets/Pulse/ex_pullups.jpg
+++ b/samples/ControlCatalog/Assets/Pulse/ex_pullups.jpg
--- a/samples/ControlCatalog/Assets/Pulse/ex_squats.jpg
+++ b/samples/ControlCatalog/Assets/Pulse/ex_squats.jpg
--- a/samples/ControlCatalog/Assets/Pulse/profile_avatar.jpg
+++ b/samples/ControlCatalog/Assets/Pulse/profile_avatar.jpg
--- a/samples/ControlCatalog/Assets/Pulse/rec_fullbody.jpg
+++ b/samples/ControlCatalog/Assets/Pulse/rec_fullbody.jpg
--- a/samples/ControlCatalog/Assets/Pulse/rec_mobility.jpg
+++ b/samples/ControlCatalog/Assets/Pulse/rec_mobility.jpg
--- a/samples/ControlCatalog/Assets/Pulse/rec_powercore.jpg
+++ b/samples/ControlCatalog/Assets/Pulse/rec_powercore.jpg
--- a/samples/ControlCatalog/Assets/Pulse/workout_hero.jpg
+++ b/samples/ControlCatalog/Assets/Pulse/workout_hero.jpg
--- a/samples/ControlCatalog/Assets/Restaurant/dish1.jpg
+++ b/samples/ControlCatalog/Assets/Restaurant/dish1.jpg
--- a/samples/ControlCatalog/Assets/Restaurant/dish2.jpg
+++ b/samples/ControlCatalog/Assets/Restaurant/dish2.jpg
--- a/samples/ControlCatalog/Assets/Restaurant/dish3.jpg
+++ b/samples/ControlCatalog/Assets/Restaurant/dish3.jpg
--- a/samples/ControlCatalog/Assets/Restaurant/dish4.jpg
+++ b/samples/ControlCatalog/Assets/Restaurant/dish4.jpg
--- a/samples/ControlCatalog/Assets/Restaurant/featured_dish.jpg
+++ b/samples/ControlCatalog/Assets/Restaurant/featured_dish.jpg
--- a/samples/ControlCatalog/Assets/Restaurant/user_avatar.jpg
+++ b/samples/ControlCatalog/Assets/Restaurant/user_avatar.jpg
--- a/samples/ControlCatalog/Assets/RetroGaming/cyber_city.jpg
+++ b/samples/ControlCatalog/Assets/RetroGaming/cyber_city.jpg
			`@ -0,0 +1 @@`
			`Subproject commit f91a822c258476f185e51112388775591e6ef9d6`