Merge & Fix Build of Thetis SDR (VS2022) — C# WinForms + C++ Interop

I need an experienced Windows developer to merge two Thetis SDR Console code lines and deliver a clean, building VS2022 solution (Release x64) with zero compile/link errors and correctly working Thetis software.

You’ll finish the merge, fix the build, and document your changes.

Repositories & branches
Please review these before bidding; they contain everything needed to estimate the work.

Source rep mi0bot and ramdor.
URL: https://github.com/ramdor/Thetis/releases/tag/v2.10.3.8 (ramdor - main branch)
Branch/Tag:v2.10.3.8
and
URL: https://github.com/mi0bot/OpenHPSDR-Thetis/releases/tag/v2.10.3.8 (mi0bot - fork)
Branch/Tag:v2.10.3.8
Both are the same software, but your task is to figure out de diffs between v2.10.3.8 ramdor and mi0bot

Let me explain more clearly what these are all about. Ramdor develops a version of the software for a radio called ANAN radio's. Mi0bot develops a version of the software for a Hermes Lite 2 radio. There are diffs between both versions of the Thetis software, but they are both for 99,9% the same.
Your task is to pull out the diffs and insert them in the newest version of Thetis, version v2.10.3.11

Target repo (ramdor)
URL: https://github.com/ramdor/Thetis/releases/tag/v2.10.3.11
Branch/Tag: v2.10.3.11 (or commit: <hash>)
Solution: Thetis_VS2022.sln

So basically, you will have to take the Target repo (ramdor) and apply the differences from the two versions of v2.10.3.8 and integrate all differences into the newest version.


Access:
Repos are public/open source.

Current build setup
IDE: Visual Studio 2022 (17.x) with .NET desktop and Desktop development with C++ workloads
Platform/Config: x64 | Release
Projects: Console (C# WinForms), ChannelMaster (C++ native)

Location of C# code: Project Files/Source/Console/…


If you have any questions, please contact me for more info.