From c0e3b06215e8f223a7ff2a470406598456a7e8f4 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Sat, 5 Apr 2025 11:55:21 -0400
Subject: [PATCH 1/4] Fix LogoGenerator project not referencing common SDK
 point

---
 .../Tgstation.Server.LogoGenerator.csproj                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/Tgstation.Server.LogoGenerator/Tgstation.Server.LogoGenerator.csproj b/tools/Tgstation.Server.LogoGenerator/Tgstation.Server.LogoGenerator.csproj
index 0ff46e12ad..5616ec05ed 100644
--- a/tools/Tgstation.Server.LogoGenerator/Tgstation.Server.LogoGenerator.csproj
+++ b/tools/Tgstation.Server.LogoGenerator/Tgstation.Server.LogoGenerator.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(TgsFrameworkVersion)</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

From bb9e36aeb975a64e3ca165c1d87c1960db56879d Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Sat, 5 Apr 2025 14:20:40 -0400
Subject: [PATCH 2/4] Fix process usage measuring bug

---
 src/Tgstation.Server.Host/System/Process.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Tgstation.Server.Host/System/Process.cs b/src/Tgstation.Server.Host/System/Process.cs
index 09ad4aa3af..db56c59218 100644
--- a/src/Tgstation.Server.Host/System/Process.cs
+++ b/src/Tgstation.Server.Host/System/Process.cs
@@ -169,7 +169,8 @@ namespace Tgstation.Server.Host.System
 				DefaultIOManager.BlockingTaskCreationOptions,
 				TaskScheduler.Current);
 
-			MeasureProcessorTimeDelta();
+			lastProcessorUsageTime = handle.TotalProcessorTime;
+			lastProcessorMeasureTime = DateTimeOffset.UtcNow;
 
 			logger.LogTrace("Created process ID: {pid}", Id);
 		}

From fad07c6a45021439f7668f864b8c552734076a07 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Sat, 5 Apr 2025 14:53:56 -0400
Subject: [PATCH 3/4] This shouldn't be needed anymore

---
 src/Tgstation.Server.Host/Tgstation.Server.Host.csproj | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
index 4d0a20afb7..095015eabb 100644
--- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
+++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
@@ -163,8 +163,6 @@
     <PackageReference Include="System.DirectoryServices.AccountManagement" Version="9.0.3" />
     <!-- Usage: Identifying owning user of Windows Process objects -->
     <PackageReference Include="System.Management" Version="9.0.3" />
-    <!-- Usage: Temporary resolution to compatibility issues with EFCore 7 and .NET 8 -->
-    <PackageReference Include="System.Security.Permissions" Version="9.0.3" />
   </ItemGroup>
 
   <ItemGroup>

From 8fdef4b426e6f56ff03c81a17960c39e0f5dd7e4 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Sat, 5 Apr 2025 22:16:28 -0400
Subject: [PATCH 4/4] Fix edge case

---
 src/Tgstation.Server.Host/System/Process.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Tgstation.Server.Host/System/Process.cs b/src/Tgstation.Server.Host/System/Process.cs
index db56c59218..de155572cd 100644
--- a/src/Tgstation.Server.Host/System/Process.cs
+++ b/src/Tgstation.Server.Host/System/Process.cs
@@ -169,7 +169,16 @@ namespace Tgstation.Server.Host.System
 				DefaultIOManager.BlockingTaskCreationOptions,
 				TaskScheduler.Current);
 
-			lastProcessorUsageTime = handle.TotalProcessorTime;
+			try
+			{
+				lastProcessorUsageTime = handle.TotalProcessorTime;
+			}
+			catch (Exception ex)
+			{
+				logger.LogTrace(ex, "Failed to measure initial process time.");
+				lastProcessorUsageTime = TimeSpan.Zero;
+			}
+
 			lastProcessorMeasureTime = DateTimeOffset.UtcNow;
 
 			logger.LogTrace("Created process ID: {pid}", Id);