From d9f14c0a86b3b48328f5009a1df42e04aa320aa8 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Sun, 30 Aug 2026 00:13:03 +0200
Subject: [PATCH 1/2] Update macOS actions to to .NET 10

---
 .github/workflows/build_ios.yml | 4 ++--
 .github/workflows/cooking.yml   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_ios.yml b/.github/workflows/build_ios.yml
index 4e4291167..a83cd2233 100644
--- a/.github/workflows/build_ios.yml
+++ b/.github/workflows/build_ios.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
     - name: Setup .NET Workload
       run: |
         dotnet workload install ios
@@ -33,4 +33,4 @@ jobs:
         git lfs pull
     - name: Build
       run: |
-        ./Development/Scripts/Mac/CallBuildTool.sh -build -log -dotnet=9 -arch=ARM64 -platform=iOS -configuration=Release -buildtargets=FlaxGame
+        ./Development/Scripts/Mac/CallBuildTool.sh -build -log -dotnet=10 -arch=ARM64 -platform=iOS -configuration=Release -buildtargets=FlaxGame
diff --git a/.github/workflows/cooking.yml b/.github/workflows/cooking.yml
index 8c957bda1..5c6e1af6f 100644
--- a/.github/workflows/cooking.yml
+++ b/.github/workflows/cooking.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 10.0.x
     - name: Setup .NET Workload
       run: |
         dotnet workload install ios
@@ -42,7 +42,7 @@ jobs:
         cp ".github/data/Build Settings.json" "FlaxSamples/MaterialsFeaturesTour/Content/Settings"
     - name: Build Editor
       run: |
-        ./Development/Scripts/Mac/CallBuildTool.sh -build -log -printSDKs -dotnet=8 -arch=ARM64 -platform=Mac -configuration=Development -buildtargets=FlaxEditor
+        ./Development/Scripts/Mac/CallBuildTool.sh -build -log -printSDKs -dotnet=10 -arch=ARM64 -platform=Mac -configuration=Development -buildtargets=FlaxEditor
     - name: Cook Game (iOS)
       run: |
         ./Binaries/Editor/Mac/Development/FlaxEditor -std -headless -mute -null -project "FlaxSamples/MaterialsFeaturesTour" -build "Development.iOS"

From ec1f4a9a4ba6884f5ec0a11bdc32fb47af5e7e1e Mon Sep 17 00:00:00 2001
From: Withaust <withaust@gmail.com>
Date: Sun, 30 Aug 2026 10:48:35 +0300
Subject: [PATCH 2/2] Fix headless editor & Roslyn analyzer include resolution

---
 Source/Editor/Windows/GameWindow.cs                        | 7 ++++---
 .../Projects/VisualStudio/CSSDKProjectGenerator.cs         | 4 +---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Source/Editor/Windows/GameWindow.cs b/Source/Editor/Windows/GameWindow.cs
index d351147cb..4032e0aff 100644
--- a/Source/Editor/Windows/GameWindow.cs
+++ b/Source/Editor/Windows/GameWindow.cs
@@ -672,9 +672,10 @@ namespace FlaxEditor.Windows
             IsBorderless = false;
             Cursor = CursorType.Default;
             Screen.CursorLock = CursorLockMode.None;
-            if (Screen.MainWindow.IsMouseTracking)
-                Screen.MainWindow.EndTrackingMouse();
-            RootControl.GameRoot.EndMouseCapture();
+            var mainWindow = Screen.MainWindow;
+            if (mainWindow != null && mainWindow.IsMouseTracking)
+                mainWindow.EndTrackingMouse();
+            RootControl.GameRoot?.EndMouseCapture();
         }
 
         /// <inheritdoc />
diff --git a/Source/Tools/Flax.Build/Projects/VisualStudio/CSSDKProjectGenerator.cs b/Source/Tools/Flax.Build/Projects/VisualStudio/CSSDKProjectGenerator.cs
index ffc95e047..e99b5b328 100644
--- a/Source/Tools/Flax.Build/Projects/VisualStudio/CSSDKProjectGenerator.cs
+++ b/Source/Tools/Flax.Build/Projects/VisualStudio/CSSDKProjectGenerator.cs
@@ -330,9 +330,7 @@ namespace Flax.Build.Projects.VisualStudio
             foreach (var analyzer in configuration.TargetBuildOptions.ScriptingAPI.Analyzers)
             {
                 csProjectFileContent.AppendLine(string.Format("  <ItemGroup Condition=\" '$(Configuration)|$(Platform)' == '{0}' \">", configuration.Name));
-                csProjectFileContent.AppendLine(string.Format("    <Analyzer Include=\"{0}\">", Path.GetFileNameWithoutExtension(analyzer)));
-                csProjectFileContent.AppendLine(string.Format("      <HintPath>{0}</HintPath>", Utilities.MakePathRelativeTo(analyzer, projectDirectory).Replace('/', '\\')));
-                csProjectFileContent.AppendLine("    </Analyzer>");
+                csProjectFileContent.AppendLine(string.Format("    <Analyzer Include=\"{0}\" />", Utilities.MakePathRelativeTo(analyzer, projectDirectory).Replace('/', '\\')));
                 csProjectFileContent.AppendLine("  </ItemGroup>");
             }