ethanmoffat · do4k · Jun 19, 2025 · Dec 19, 2025 · Dec 19, 2025 · Dec 19, 2025
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,9 +9,9 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build-client-linux",
-            "program": "${workspaceFolder}/bin/Debug/client/net8.0/EndlessClient",
+            "program": "${workspaceFolder}/bin/Debug/client/net10.0/EndlessClient",
             "args": [],
-            "cwd": "${workspaceFolder}/bin/Debug/client/net8.0",
+            "cwd": "${workspaceFolder}/bin/Debug/client/net10.0",
             "console": "internalConsole",
             "stopAtEntry": false
         },
@@ -20,9 +20,9 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build-eobot-linux",
-            "program": "${workspaceFolder}/bin/Debug/utils/EOBot/net8.0/EOBot",
+            "program": "${workspaceFolder}/bin/Debug/utils/EOBot/net10.0/EOBot",
             "args": [],
-            "cwd": "${workspaceFolder}/bin/Debug/utils/EOBot/net8.0",
+            "cwd": "${workspaceFolder}/bin/Debug/utils/EOBot/net10.0",
             "console": "internalConsole",
             "stopAtEntry": false
         },
@@ -31,9 +31,9 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build-client-windows",
-            "program": "${workspaceFolder}/bin/Debug/client/net8.0-windows/EndlessClient.exe",
+            "program": "${workspaceFolder}/bin/Debug/client/net10.0-windows/EndlessClient.exe",
             "args": [],
-            "cwd": "${workspaceFolder}/bin/Debug/client/net8.0-windows",
+            "cwd": "${workspaceFolder}/bin/Debug/client/net10.0-windows",
             "console": "internalConsole",
             "stopAtEntry": false
         },
@@ -42,9 +42,9 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build-client-mac-arm",
-            "program": "${workspaceFolder}/bin/Debug/client/net8.0-macos/osx-arm64/EndlessClient.app/Contents/MacOS/EndlessClient",
+            "program": "${workspaceFolder}/bin/Debug/client/net10.0-macos/osx-arm64/EndlessClient.app/Contents/MacOS/EndlessClient",
             "args": [],
-            "cwd": "${workspaceFolder}/bin/Debug/client/net8.0-macos/osx-arm64/EndlessClient.app",
+            "cwd": "${workspaceFolder}/bin/Debug/client/net10.0-macos/osx-arm64/EndlessClient.app",
             "console": "internalConsole",
             "stopAtEntry": false
         },

diff --git a/BatchMap/BatchMap.csproj b/BatchMap/BatchMap.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <OutputPath>..\bin\$(Configuration)\utils\BatchMap</OutputPath>

diff --git a/EOBot.Test/EOBot.Test.csproj b/EOBot.Test/EOBot.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <OutputPath>..\bin\$(Configuration)\test\</OutputPath>

diff --git a/EOBot/EOBot.csproj b/EOBot/EOBot.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <OutputPath>..\bin\$(Configuration)\utils\EOBot\</OutputPath>

diff --git a/EOLib.Config.Test/EOLib.Config.Test.csproj b/EOLib.Config.Test/EOLib.Config.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <OutputPath>..\bin\$(Configuration)\test\</OutputPath>

diff --git a/EOLib.Graphics.Test/EOLib.Graphics.Test.csproj b/EOLib.Graphics.Test/EOLib.Graphics.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <OutputPath>..\bin\$(Configuration)\test\</OutputPath>

diff --git a/EOLib.Graphics/EOLib.Graphics.csproj b/EOLib.Graphics/EOLib.Graphics.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../common.targets" />
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <OutputType>Library</OutputType>
     <OutputPath>..\bin\$(Configuration)\lib\</OutputPath>
     <Description>Library for interacting with Endless Online gfx files</Description>

diff --git a/EOLib.IO.Test/EOLib.IO.Test.csproj b/EOLib.IO.Test/EOLib.IO.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <OutputPath>..\bin\$(Configuration)\test\</OutputPath>

diff --git a/EOLib.Localization.Test/EOLib.Localization.Test.csproj b/EOLib.Localization.Test/EOLib.Localization.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <OutputPath>..\bin\$(Configuration)\test\</OutputPath>

diff --git a/EOLib.Test/EOLib.Test.csproj b/EOLib.Test/EOLib.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <OutputPath>..\bin\$(Configuration)\test\</OutputPath>
   </PropertyGroup>

diff --git a/EndlessClient/EndlessClient.csproj b/EndlessClient/EndlessClient.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net10.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
     <MonoGamePlatform>Windows</MonoGamePlatform>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
   </PropertyGroup>
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Linux'))">
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <DefineConstants>$(DefineConstants);LINUX</DefineConstants>
     <MonoGamePlatform>Linux</MonoGamePlatform>
   </PropertyGroup>
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">
-    <TargetFramework>net8.0-macos</TargetFramework>
+    <TargetFramework>net10.0-macos</TargetFramework>
     <OutputType>Exe</OutputType>
     <DefineConstants>$(DefineConstants);OSX</DefineConstants>
     <MonoGamePlatform>MacOSX</MonoGamePlatform>

diff --git a/EndlessClient/HUD/Panels/InventoryPanel.cs b/EndlessClient/HUD/Panels/InventoryPanel.cs
@@ -450,7 +450,7 @@ private void HandleItemDoneDragging(object sender, DragCompletedEventArgs<EIFRec
                                 break;
                             case TradeDialog: _inventoryController.TradeItem(item.Data, item.InventoryItem); break;
                             default: return false;
-                        };
+                        }
 
                         return true;
                     },

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -21,18 +21,18 @@ strategy:
     linux:
       imageName: "ubuntu-22.04"
       friendlyPlatform: "Linux"
-      dropDir: net8.0
-      dotnetVersion: 8.0.x
+      dropDir: net10.0
+      dotnetVersion: 10.0.x
     windows:
       imageName: "windows-2022"
       friendlyPlatform: "Windows"
-      dropDir: net8.0-windows
-      dotnetVersion: 8.0.x
+      dropDir: net10.0-windows
+      dotnetVersion: 10.0.x
     macos:
       imageName: "macos-15"
       friendlyPlatform: "macOS"
-      dropDir: net8.0-macos
-      dotnetVersion: "8.0.204"
+      dropDir: net10.0-macos
+      dotnetVersion: "10.0.100"
 
 pool:
   vmImage: $(imageName)
@@ -44,7 +44,7 @@ steps:
 - checkout: self
   persistCredentials: true
 - task: UseDotNet@2
-  displayName: 'Install .Net 8 runtime/sdk'
+  displayName: 'Install .Net 10 runtime/sdk'
   inputs:
     version: $(dotnetVersion)
 - script: |
@@ -154,7 +154,7 @@ steps:
 - task: ArchiveFiles@2
   displayName: 'ZIP EOBot'
   inputs:
-    rootFolderOrFile: $(Build.SourcesDirectory)/bin/$(buildConfiguration)/utils/EOBot/net8.0/
+    rootFolderOrFile: $(Build.SourcesDirectory)/bin/$(buildConfiguration)/utils/EOBot/net10.0/
     archiveFile: $(Build.ArtifactStagingDirectory)/zip/EOBot.$(friendlyPlatform).zip
 # EndlessClient archive (macOS multi-target)
 - task: ArchiveFiles@2

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.204",
+    "version": "10.0.100",
     "rollForward": "latestFeature"
   }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                                     break;
                                 case TradeDialog: _inventoryController.TradeItem(item.Data, item.InventoryItem); break;
                                 default: return false;
-                            };
+                            }
                             return true;
                         },
@@ Expand Down @@