From 7940e88f927281baf9b2cc4874bfac9f2951906d Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 19 Jun 2025 19:43:33 +0100 Subject: [PATCH 1/4] use net8.0 as launch options --- .vscode/launch.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 2ef6dd03..27e876b5 100644 --- 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/net6.0/EndlessClient", + "program": "${workspaceFolder}/bin/Debug/client/net8.0/EndlessClient", "args": [], - "cwd": "${workspaceFolder}/bin/Debug/client/net6.0", + "cwd": "${workspaceFolder}/bin/Debug/client/net8.0", "console": "internalConsole", "stopAtEntry": false }, @@ -20,9 +20,9 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build-eobot-linux", - "program": "${workspaceFolder}/bin/Debug/utils/EOBot/net6.0/EOBot", + "program": "${workspaceFolder}/bin/Debug/utils/EOBot/net8.0/EOBot", "args": [], - "cwd": "${workspaceFolder}/bin/Debug/utils/EOBot/net6.0", + "cwd": "${workspaceFolder}/bin/Debug/utils/EOBot/net8.0", "console": "internalConsole", "stopAtEntry": false }, @@ -31,9 +31,9 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build-client-windows", - "program": "${workspaceFolder}/bin/Debug/client/net6.0-windows/EndlessClient.exe", + "program": "${workspaceFolder}/bin/Debug/client/net8.0-windows/EndlessClient.exe", "args": [], - "cwd": "${workspaceFolder}/bin/Debug/client/net6.0-windows", + "cwd": "${workspaceFolder}/bin/Debug/client/net8.0-windows", "console": "internalConsole", "stopAtEntry": false }, From 93c5ee793c1a97ac8144d552d54fc15cb6a8553d Mon Sep 17 00:00:00 2001 From: Dan Oak Date: Fri, 19 Dec 2025 17:15:36 +0000 Subject: [PATCH 2/4] upgrade to .net 10 --- BatchMap/BatchMap.csproj | 2 +- EOBot.Test/EOBot.Test.csproj | 2 +- EOBot/EOBot.csproj | 2 +- EOLib.Config.Test/EOLib.Config.Test.csproj | 2 +- EOLib.Graphics.Test/EOLib.Graphics.Test.csproj | 2 +- EOLib.Graphics/EOLib.Graphics.csproj | 2 +- EOLib.IO.Test/EOLib.IO.Test.csproj | 2 +- EOLib.Localization.Test/EOLib.Localization.Test.csproj | 2 +- EOLib.Test/EOLib.Test.csproj | 2 +- EndlessClient/EndlessClient.csproj | 6 +++--- global.json | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/BatchMap/BatchMap.csproj b/BatchMap/BatchMap.csproj index f95bc177..195baf98 100644 --- a/BatchMap/BatchMap.csproj +++ b/BatchMap/BatchMap.csproj @@ -1,6 +1,6 @@  - net8.0 + net10.0 Exe false ..\bin\$(Configuration)\utils\BatchMap diff --git a/EOBot.Test/EOBot.Test.csproj b/EOBot.Test/EOBot.Test.csproj index 577c70a8..3b03773c 100644 --- a/EOBot.Test/EOBot.Test.csproj +++ b/EOBot.Test/EOBot.Test.csproj @@ -1,6 +1,6 @@  - net8.0 + net10.0 Library false ..\bin\$(Configuration)\test\ diff --git a/EOBot/EOBot.csproj b/EOBot/EOBot.csproj index 2817e653..1fe81608 100644 --- a/EOBot/EOBot.csproj +++ b/EOBot/EOBot.csproj @@ -1,6 +1,6 @@  - net8.0 + net10.0 Exe false ..\bin\$(Configuration)\utils\EOBot\ diff --git a/EOLib.Config.Test/EOLib.Config.Test.csproj b/EOLib.Config.Test/EOLib.Config.Test.csproj index 5f0283e2..4002e436 100644 --- a/EOLib.Config.Test/EOLib.Config.Test.csproj +++ b/EOLib.Config.Test/EOLib.Config.Test.csproj @@ -1,6 +1,6 @@  - net8.0 + net10.0 Library false ..\bin\$(Configuration)\test\ diff --git a/EOLib.Graphics.Test/EOLib.Graphics.Test.csproj b/EOLib.Graphics.Test/EOLib.Graphics.Test.csproj index 0ec79c0f..a412236e 100644 --- a/EOLib.Graphics.Test/EOLib.Graphics.Test.csproj +++ b/EOLib.Graphics.Test/EOLib.Graphics.Test.csproj @@ -1,6 +1,6 @@  - net8.0 + net10.0 Library false ..\bin\$(Configuration)\test\ diff --git a/EOLib.Graphics/EOLib.Graphics.csproj b/EOLib.Graphics/EOLib.Graphics.csproj index d9ea4b27..c4b3ab2b 100644 --- a/EOLib.Graphics/EOLib.Graphics.csproj +++ b/EOLib.Graphics/EOLib.Graphics.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 Library ..\bin\$(Configuration)\lib\ Library for interacting with Endless Online gfx files diff --git a/EOLib.IO.Test/EOLib.IO.Test.csproj b/EOLib.IO.Test/EOLib.IO.Test.csproj index e0dd713c..92ad4ea4 100644 --- a/EOLib.IO.Test/EOLib.IO.Test.csproj +++ b/EOLib.IO.Test/EOLib.IO.Test.csproj @@ -1,6 +1,6 @@  - net8.0 + net10.0 Library false ..\bin\$(Configuration)\test\ diff --git a/EOLib.Localization.Test/EOLib.Localization.Test.csproj b/EOLib.Localization.Test/EOLib.Localization.Test.csproj index 208237db..9c7c518f 100644 --- a/EOLib.Localization.Test/EOLib.Localization.Test.csproj +++ b/EOLib.Localization.Test/EOLib.Localization.Test.csproj @@ -1,6 +1,6 @@  - net8.0 + net10.0 Library false ..\bin\$(Configuration)\test\ diff --git a/EOLib.Test/EOLib.Test.csproj b/EOLib.Test/EOLib.Test.csproj index 987557e9..303a962a 100644 --- a/EOLib.Test/EOLib.Test.csproj +++ b/EOLib.Test/EOLib.Test.csproj @@ -1,6 +1,6 @@  - net8.0 + net10.0 false ..\bin\$(Configuration)\test\ diff --git a/EndlessClient/EndlessClient.csproj b/EndlessClient/EndlessClient.csproj index 3fd20d40..9d199302 100644 --- a/EndlessClient/EndlessClient.csproj +++ b/EndlessClient/EndlessClient.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net10.0-windows WinExe Windows true @@ -8,13 +8,13 @@ true - net8.0 + net10.0 Exe $(DefineConstants);LINUX Linux - net8.0-macos + net10.0-macos Exe $(DefineConstants);OSX MacOSX diff --git a/global.json b/global.json index 0650fccd..512142d2 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.204", + "version": "10.0.100", "rollForward": "latestFeature" } } From 63f5fb4701960c1f2ee543480e3387179e639c58 Mon Sep 17 00:00:00 2001 From: Dan Oak Date: Fri, 19 Dec 2025 17:19:29 +0000 Subject: [PATCH 3/4] Update launch configurations and Azure pipeline for .NET 10 --- .vscode/launch.json | 16 ++++++++-------- azure-pipelines.yml | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 27e876b5..29826826 100644 --- 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/azure-pipelines.yml b/azure-pipelines.yml index abe1463e..3fc7610f 100644 --- 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 From 5b59cda9d50af588faa18e965d6a5d8f54e65e22 Mon Sep 17 00:00:00 2001 From: Dan Oak Date: Fri, 19 Dec 2025 17:21:39 +0000 Subject: [PATCH 4/4] Fix syntax in HandleItemDoneDragging method --- EndlessClient/HUD/Panels/InventoryPanel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EndlessClient/HUD/Panels/InventoryPanel.cs b/EndlessClient/HUD/Panels/InventoryPanel.cs index e03d4ad9..75efd24c 100644 --- a/EndlessClient/HUD/Panels/InventoryPanel.cs +++ b/EndlessClient/HUD/Panels/InventoryPanel.cs @@ -450,7 +450,7 @@ private void HandleItemDoneDragging(object sender, DragCompletedEventArgs