From 847123aa00110e08761d1da9985676053e4b6b77 Mon Sep 17 00:00:00 2001
From: BDisp <bd.bdisp@gmail.com>
Date: Sun, 27 Jul 2025 01:38:44 +0100
Subject: [PATCH 1/3] Fixes #4211. Annoying sporadic
 System.NullReferenceException in NetEvents (#4213)

---
 Terminal.Gui/Drivers/NetDriver/NetEvents.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Terminal.Gui/Drivers/NetDriver/NetEvents.cs b/Terminal.Gui/Drivers/NetDriver/NetEvents.cs
index 65e2faa2d..2dea3a509 100644
--- a/Terminal.Gui/Drivers/NetDriver/NetEvents.cs
+++ b/Terminal.Gui/Drivers/NetDriver/NetEvents.cs
@@ -50,7 +50,7 @@ internal class NetEvents : IDisposable
 
     public InputResult? DequeueInput ()
     {
-        while (!_netEventsDisposed.Token.IsCancellationRequested)
+        while (_netEventsDisposed is { Token.IsCancellationRequested: false })
         {
             _winChange.Set ();
 

From 48d4de2e63e821fc363d457974a96a9c04800639 Mon Sep 17 00:00:00 2001
From: BDisp <bd.bdisp@gmail.com>
Date: Mon, 28 Jul 2025 13:33:55 +0100
Subject: [PATCH 2/3] Fixes #4214. Annoying sporadic
 System.NullReferenceException in WindowsConsole (#4215)

---
 Terminal.Gui/Drivers/WindowsDriver/WindowsConsole.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Terminal.Gui/Drivers/WindowsDriver/WindowsConsole.cs b/Terminal.Gui/Drivers/WindowsDriver/WindowsConsole.cs
index 6153df249..445ba1410 100644
--- a/Terminal.Gui/Drivers/WindowsDriver/WindowsConsole.cs
+++ b/Terminal.Gui/Drivers/WindowsDriver/WindowsConsole.cs
@@ -62,7 +62,7 @@ internal partial class WindowsConsole
         InputRecord inputRecord = default;
         uint numberEventsRead = 0;
 
-        while (!_inputReadyCancellationTokenSource!.IsCancellationRequested)
+        while (_inputReadyCancellationTokenSource is { IsCancellationRequested: false })
         {
             try
             {

From a3399776b712089815247532de41bc1c6a01d5e1 Mon Sep 17 00:00:00 2001
From: BDisp <bd.bdisp@gmail.com>
Date: Fri, 1 Aug 2025 14:37:01 +0100
Subject: [PATCH 3/3] Fixes nuget packages with vulnerabilities (#4218)

* Fixes nuget packages with vulnerabilities

* Using netstandard2.1

* Revert "Using netstandard2.1"

This reverts commit b19317f8c1a445b875cd620fde505a5825caec0b.

* Replacing to 3.11.0 and 4.13.0 versions

* Using 4.12.0 version

* Revert "Using 4.12.0 version"

This reverts commit bb4f9212c49e4f20bfec5d02fec2fe0e6430cad0.

* Change to 4.12.0 version

* Remove unused nuget package
---
 Directory.Packages.props                                       | 3 +--
 .../Terminal.Gui.Analyzers.Tests.csproj                        | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 3d57c73d3..836970b60 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -6,7 +6,6 @@
     <!-- Enable Nuget Source Link for github -->
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="4.11.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.11.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.11.0" />
     <PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.11.0" />
@@ -25,7 +24,7 @@
     <PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.0" />
     <PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
     <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
-    <PackageVersion Include="SixLabors.ImageSharp" Version="[3.1.7,4)" />
+    <PackageVersion Include="SixLabors.ImageSharp" Version="[3.1.11,4)" />
     <PackageVersion Include="CsvHelper" Version="[33.0.1,34)" />
     <PackageVersion Include="Microsoft.DotNet.PlatformAbstractions" Version="[3.1.6,4)" />
     <PackageVersion Include="System.CommandLine" Version="[2.0.0-beta4.22272.1,3)" />
diff --git a/Terminal.Gui.Analyzers.Tests/Terminal.Gui.Analyzers.Tests.csproj b/Terminal.Gui.Analyzers.Tests/Terminal.Gui.Analyzers.Tests.csproj
index a1d8f9a02..37e739d3d 100644
--- a/Terminal.Gui.Analyzers.Tests/Terminal.Gui.Analyzers.Tests.csproj
+++ b/Terminal.Gui.Analyzers.Tests/Terminal.Gui.Analyzers.Tests.csproj
@@ -15,7 +15,6 @@
 		<PackageReference Include="coverlet.collector" />
 		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
 		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
-		<PackageReference Include="Microsoft.CodeAnalysis.Features" />
 		<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" />
 		<PackageReference Include="xunit" />