Update CI to use VS2026.

updates:
- [github.com/pre-commit/mirrors-clang-format: v21.1.2 → v21.1.8](https://github.com/pre-commit/mirrors-clang-format/compare/v21.1.2...v21.1.8)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

.github/workflows/build.yml

@@ -2,15 +2,20 @@ name: Build Mob
 
 on:
   push:
-    branches: master
+    branches: [master]
   pull_request:
     types: [opened, synchronize, reopened]
 
+env:
+  VCPKG_BINARY_SOURCES: ${{ vars.AZ_BLOB_VCPKG_URL != '' && format('clear;x-azblob,{0},{1},readwrite', vars.AZ_BLOB_VCPKG_URL, secrets.AZ_BLOB_SAS) || '' }}
+
 jobs:
   build:
-    runs-on: windows-2022
+    runs-on: windows-2025-vs2026
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Build Mob
         shell: pwsh
-        run: ./bootstrap.ps1 -Verbose
+        run: |
+          $env:VCPKG_ROOT = $env:VCPKG_INSTALLATION_ROOT
+          ./bootstrap.ps1 -Verbose

.github/workflows/linting.yml

@@ -9,7 +9,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - name: Check format
         uses: ModOrganizer2/check-formatting-action@master
         with:

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
         exclude: '^(third-party|licenses)/.*$'
@@ -11,7 +11,7 @@ repos:
       - id: check-case-conflict
         exclude: '^(third-party|licenses)/.*$'
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v19.1.5
+    rev: v21.1.8
     hooks:
     - id: clang-format
       'types_or': [c++, c]

CMakeLists.txt

@@ -1,6 +1,11 @@
 cmake_minimum_required(VERSION 3.16)
 
-project(mob)
+project(mob LANGUAGES CXX)
+
+find_package(clipp CONFIG REQUIRED)
+find_package(nlohmann_json CONFIG REQUIRED)
+find_package(CURL REQUIRED)
+
 add_subdirectory(src)
 
 set_property(DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT mob)

CMakePresets.json

@@ -0,0 +1,28 @@
+{
+  "version": 6,
+  "configurePresets": [
+    {
+      "name": "vs2026-windows",
+      "generator": "Visual Studio 18 2026",
+      "architecture": "x64",
+      "binaryDir": "${sourceDir}/build/",
+      "toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
+      "cacheVariables": {
+        "VCPKG_TARGET_TRIPLET": "x64-windows-static-md",
+        "CMAKE_CONFIGURATION_TYPES": "Debug;Release;RelWithDebInfo"
+      }
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "vs2026-windows",
+      "configurePreset": "vs2026-windows",
+      "nativeToolOptions": [
+        "-m",
+        "-noLogo",
+        "-p:UseMultiToolTask=true",
+        "-p:EnforceProcessCountAcrossBuilds=true"
+      ]
+    }
+  ]
+}

bootstrap.ps1

@@ -11,41 +11,17 @@ if (!$root) {
     $root = "."
 }
 
-$output = if ($Verbose) { "Out-Default" } else { "Out-Null" }
+$logLevel = if ($Verbose) { "STATUS" } else { "ERROR" }
 
-cmake -B $root/build -G "Visual Studio 17 2022" $root | & $output
+cmake --preset vs2026-windows --log-level=$logLevel
 
-$installationPath = & $root\third-party\bin\vswhere.exe -products * -nologo -prerelease -latest -property installationPath
-if (! $?) {
-    Write-Error "vswhere returned $LastExitCode"
-    exit $LastExitCode
+if ($Verbose) {
+    cmake --build --preset vs2026-windows --config $Config --verbose
 }
-
-if (! $installationPath) {
-    Write-Error "Empty installation path"
-    exit 1
+else {
+    cmake --build --preset vs2026-windows --config $Config
 }
 
-$opts = ""
-$opts += " $root\build\mob.sln"
-$opts += " -m"
-$opts += " -p:Configuration=${Config}"
-$opts += " -noLogo"
-$opts += " -p:UseMultiToolTask=true"
-$opts += " -p:EnforceProcessCountAcrossBuilds=true"
-
-if (!$Verbose) {
-    $opts += " -clp:ErrorsOnly;Verbosity=minimal"
-}
-
-$vsDevCmd = "$installationPath\Common7\Tools\VsDevCmd.bat"
-if (!(Test-Path "$vsDevCmd")) {
-    Write-Error "VdDevCmd.bat not found at $vsDevCmd"
-    exit 1
-}
-
-& "${env:COMSPEC}" /c "`"$vsDevCmd`" -no_logo -arch=amd64 -host_arch=amd64 && msbuild $opts"
-
 if (! $?) {
     Write-Error "Build failed"
     exit $LastExitCode

custom-ports/zlib/portfile.cmake

@@ -0,0 +1 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

custom-ports/zlib/vcpkg.json

@@ -0,0 +1,8 @@
+{
+  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
+  "name": "zlib",
+  "version-string": "zlib-ng overlay",
+  "dependencies": [
+    "zlib-ng"
+  ]
+}

custom-triplets/x64-windows-static-md.cmake

@@ -0,0 +1,6 @@
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+set(ZLIB_COMPAT ON)
+set(nlohmann-json_IMPLICIT_CONVERSIONS OFF)

mob.ini

@@ -18,13 +18,9 @@ install_message    = never
 host               =
 
 [aliases]
-super   = cmake_common modorganizer*
+super   = cmake_common modorganizer* githubpp
 plugins = check_fnis bsapacker bsa_extractor diagnose_basic installer_* plugin_python preview_base preview_bsa tool_* game_*
 
-[translations]
-mo2-translations  = organizer uibase plugin_python
-mo2-game-bethesda = game_creation game_enderal game_enderalse game_fallout3 game_fallout4 game_fallout4vr game_falloutNV game_gamebryo game_morrowind game_nehrim game_oblivion game_skyrim game_skyrimse game_skyrimvr game_ttw
-
 [task]
 enabled       = true
 mo_org        = ModOrganizer2
@@ -113,7 +109,6 @@ ss_fallout4_trosski    = v1.11
 third_party          =
 prefix               =
 cache                =
-icons                =
 licenses             =
 build                =
 install              =
@@ -123,7 +118,6 @@ install_libs         =
 install_pdbs         =
 install_dlls         =
 install_plugins      =
-install_extensions   =
 install_stylesheets  =
 install_licenses     =
 install_translations =

readme.md

@@ -33,6 +33,7 @@ check the [ModOrganizer2 Wiki](https://github.com/ModOrganizer2/modorganizer/wik
 ```powershell
 git clone https://github.com/ModOrganizer2/mob
 cd mob
+$env:VCPKG_ROOT = "C:\path\to\vcpkg"
 ./bootstrap
 mob -d c:\somewhere build
 ```
@@ -51,6 +52,21 @@ installing Qt extremely quick and painless, and doesn't require a login.
 Check the [documentation](https://aqtinstall.readthedocs.io/en/latest/installation.html)
 to install **aqt** itself.
 
+> [!IMPORTANT]
+> As of version 3.3.0, **aqt** is unable to install Qt version 6.7.3 on the
+> `win64_msvc2022_64` target architecture due to a non-standard download URL (see:
+> miurahr/aqtinstall#919). The [Holt59/aqtinstall fork](https://github.com/Holt59/aqtinstall)
+> provides a workaround for this issue and can be installed using the following command
+> (requires Python 3.9 or above):
+> ```powershell
+> pip install git+https://github.com/Holt59/aqtinstall.git#egg=aqtinstall
+> ```
+> If you already installed **aqt** before, you first need to uninstall it before
+> installing the fork:
+> ```powershell
+> pip uninstall aqtinstall
+> ```
+
 When using **aqt**, you can choose which modules to install but we recommend installing
 all of them in case of changes.
 
@@ -93,15 +109,32 @@ aqt install-qt --outputdir "C:\Qt" windows desktop ${QT_VERSION} win64_msvc2022_
     - Git for Windows (Skip if you have this already installed outside of the VS installer)
     - CMake tools for Windows (Skip if you have this already installed outside of the VS installer)
 
+### vcpkg
+
+`mob` now uses **vcpkg** to manage its third-party dependencies (like libcurl).
+
+1. **Install vcpkg**: If you don't have it, follow the [official instructions](https://learn.microsoft.com/en-us/vcpkg/get_started/get-started).
+2. **Set Environment Variable**: `mob` requires the `VCPKG_ROOT` environment variable to locate the toolchain.
+
+   ```powershell
+    $env:VCPKG_ROOT = "C:\path\to\vcpkg"
+    $env:PATH = "$env:VCPKG_ROOT;$env:PATH"
+   ```
+
+3. **Static Triplet**: `mob` builds with the `x64-windows-static-md` triplet by default to ensure a standalone executable. The `bootstrap.ps1` script handles this automatically if `VCPKG_ROOT` is set.
+
 ## Setting up MOB
 
 ```powershell
 mkdir C:\dev
 cd C:\dev
 
-# close this repository
+# clone this repository
 git clone https://github.com/ModOrganizer2/mob
 
+# set vcpkg path, or use `vcpkg integrate install` instead
+$env:VCPKG_ROOT = "C:\path\to\your\vcpkg"
+
 # build mob itself - this will create mob.exe in the current directory
 ./bootstrap.ps1
 
@@ -118,7 +151,7 @@ The Visual Studio solution for Mod Organizer itself is `build\modorganizer_super
 `mob` has two ways of setting options: from INI files, the `MOBINI` environment
 variable, or from the command line.
 
-### OVerride options using INI files
+### Override options using INI files
 
 `mob` builds a list of available INI files in order of priority. Higher numbers
 override lower numbers:

src/CMakeLists.txt

@@ -1,22 +1,18 @@
-cmake_minimum_required(VERSION 3.16)
-
-file(GLOB_RECURSE source_files *.cpp)
-file(GLOB_RECURSE header_files *.h)
+file(GLOB_RECURSE source_files CONFIGURE_DEPENDS "*.cpp")
+file(GLOB_RECURSE header_files CONFIGURE_DEPENDS "*.h")
 
 add_executable(mob ${source_files} ${header_files})
-set_target_properties(mob PROPERTIES CXX_STANDARD 23)
 
-target_compile_definitions(mob PUBLIC NOMINMAX)
-target_compile_options(mob PUBLIC "/MT")
-target_include_directories(mob PUBLIC ${CMAKE_SOURCE_DIR}/third-party/include)
-target_link_libraries(mob PUBLIC
-    wsock32 ws2_32 crypt32 wldap32 dbghelp shlwapi version
-    optimized ${CMAKE_SOURCE_DIR}/third-party/lib/libcurl.lib
-    debug ${CMAKE_SOURCE_DIR}/third-party/lib/libcurl-d.lib
-    optimized ${CMAKE_SOURCE_DIR}/third-party/lib/zlib.lib
-    debug ${CMAKE_SOURCE_DIR}/third-party/lib/zlibd.lib)
+target_compile_features(mob PRIVATE cxx_std_20)
 
-source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}
-    PREFIX src
-    FILES ${source_files} ${header_files})
-set_property(DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT mob)
+target_compile_definitions(
+  mob PRIVATE _WIN32_WINNT=0x0A00 NTDDI_VERSION=0x0A000007 WIN32_LEAN_AND_MEAN
+              NOMINMAX NOCOMM)
+
+target_link_libraries(mob PRIVATE clipp::clipp nlohmann_json::nlohmann_json
+                                  CURL::libcurl dbghelp shlwapi version)
+
+source_group(
+  TREE ${CMAKE_CURRENT_SOURCE_DIR}
+  PREFIX src
+  FILES ${source_files} ${header_files})

src/cmd/pr.cpp

@@ -236,7 +236,7 @@ namespace mob {
 
         for (auto&& item : json["items"]) {
             // ex: https://api.github.com/repos/ModOrganizer2/modorganizer-Installer
-            const std::string url = item["repository_url"];
+            const std::string url = item["repository_url"].get<std::string>();
 
             const auto last_slash = url.find_last_of("/");
             if (last_slash == std::string::npos) {
@@ -246,7 +246,7 @@ namespace mob {
 
             const auto repo = url.substr(last_slash + 1);
 
-            pr_info info = {repo, author, branch, item["title"],
+            pr_info info = {repo, author, branch, item["title"].get<std::string>(),
                             std::to_string(item["number"].get<int>())};
 
             if (!repos.emplace(repo, info).second) {
@@ -287,9 +287,10 @@ namespace mob {
         const auto output = dl.steal_output();
         json              = nlohmann::json::parse(output);
 
-        const std::string repo   = json["head"]["repo"]["name"];
-        const std::string author = json["head"]["repo"]["user"]["login"];
-        const std::string branch = json["head"]["ref"];
+        const std::string repo = json["head"]["repo"]["name"].get<std::string>();
+        const std::string author =
+            json["head"]["repo"]["user"]["login"].get<std::string>();
+        const std::string branch = json["head"]["ref"].get<std::string>();
 
         return {repo, author, branch};
     }

src/core/conf.cpp

@@ -51,32 +51,24 @@ namespace mob::details {
 
     // returns a string from conf, bails out if it doesn't exist
     //
-    std::string get_string(std::string_view section, std::string_view key,
-                           std::optional<std::string> default_)
+    std::string get_string(std::string_view section, std::string_view key)
     {
         auto sitor = g_conf.find(section);
         if (sitor == g_conf.end())
             gcx().bail_out(context::conf, "[{}] doesn't exist", section);
 
         auto kitor = sitor->second.find(key);
-        if (kitor == sitor->second.end()) {
-            if (!default_.has_value()) {
-                gcx().bail_out(context::conf, "no key '{}' in [{}]", key, section);
-            }
-            return *default_;
-        }
+        if (kitor == sitor->second.end())
+            gcx().bail_out(context::conf, "no key '{}' in [{}]", key, section);
 
         return kitor->second;
     }
 
     // calls get_string(), converts to int
     //
-    int get_int(std::string_view section, std::string_view key,
-                std::optional<int> default_)
+    int get_int(std::string_view section, std::string_view key)
     {
-        const auto s = get_string(section, key, default_.transform([](auto v) {
-            return std::to_string(v);
-        }));
+        const auto s = get_string(section, key);
 
         try {
             return std::stoi(s);
@@ -88,12 +80,9 @@ namespace mob::details {
 
     // calls get_string(), converts to bool
     //
-    bool get_bool(std::string_view section, std::string_view key,
-                  std::optional<bool> default_)
+    bool get_bool(std::string_view section, std::string_view key)
     {
-        const auto s = get_string(section, key, default_.transform([](auto v) {
-            return v ? "true" : "false";
-        }));
+        const auto s = get_string(section, key);
         return bool_from_string(s);
     }
 
@@ -439,8 +428,13 @@ namespace mob {
 
                 MOB_ASSERT(!tasks.empty());
 
-                for (auto& t : tasks)
+                for (auto& t : tasks) {
+                    if (t->name() != task &&
+                        details::find_string_for_task(t->name(), key)) {
+                        continue;
+                    }
                     details::set_string_for_task(t->name(), key, value);
+                }
             }
             else {
                 // global task option
@@ -518,7 +512,6 @@ namespace mob {
         set_path_if_empty("vcpkg", find_vcpkg);  // set after vs as it will use the VS
         set_path_if_empty("qt_install", find_qt);
         set_path_if_empty("temp_dir", find_temp_dir);
-        set_path_if_empty("icons", find_in_root("icons"));
         set_path_if_empty("licenses", find_in_root("licenses"));
         set_path_if_empty("qt_bin", qt::installation_path() / "bin");
         set_path_if_empty("qt_translations", qt::installation_path() / "translations");
@@ -544,7 +537,6 @@ namespace mob {
         resolve_path("install_licenses", p.install_bin(), "licenses");
         resolve_path("install_stylesheets", p.install_bin(), "stylesheets");
         resolve_path("install_translations", p.install_bin(), "translations");
-        resolve_path("install_extensions", p.install_bin(), "extensions");
 
         // finally, resolve the tools that are unlikely to be in PATH; all the
         // other tools (7z, jom, patch, etc.) are assumed to be in PATH (which
@@ -690,11 +682,6 @@ namespace mob {
         return {};
     }
 
-    conf_translations conf::translation()
-    {
-        return {};
-    }
-
     conf_versions conf::version()
     {
         return {};
@@ -783,8 +770,6 @@ namespace mob {
 
     conf_build_types::conf_build_types() : conf_section("build-types") {}
 
-    conf_translations::conf_translations() : conf_section("translations") {}
-
     conf_prebuilt::conf_prebuilt() : conf_section("prebuilt") {}
 
     conf_paths::conf_paths() : conf_section("paths") {}

src/core/conf.h

@@ -9,8 +9,7 @@ namespace mob::details {
 
     // returns an option named `key` from the given `section`
     //
-    std::string get_string(std::string_view section, std::string_view key,
-                           std::optional<std::string> default_ = {});
+    std::string get_string(std::string_view section, std::string_view key);
 
     // convert a string to the given type
     template <class T>
@@ -26,13 +25,11 @@ namespace mob::details {
 
     // calls get_string(), converts to bool
     //
-    bool get_bool(std::string_view section, std::string_view key,
-                  std::optional<bool> default_ = {});
+    bool get_bool(std::string_view section, std::string_view key);
 
     // calls get_string(), converts to in
     //
-    int get_int(std::string_view section, std::string_view key,
-                std::optional<int> default_ = {});
+    int get_int(std::string_view section, std::string_view key);
 
     // sets the given option, bails out if the option doesn't exist
     //
@@ -63,17 +60,9 @@ namespace mob {
     template <class DefaultType>
     class conf_section {
     public:
-        DefaultType get(std::string_view key,
-                        std::optional<DefaultType> default_ = {}) const
+        DefaultType get(std::string_view key) const
         {
-            const auto value = [=] {
-                if constexpr (std::is_same_v<DefaultType, std::string>) {
-                    return details::get_string(name_, key, default_);
-                }
-                else {
-                    return details::get_string(name_, key);
-                }
-            }();
+            const auto value = details::get_string(name_, key);
 
             if constexpr (std::is_convertible_v<std::string, DefaultType>) {
                 return value;
@@ -85,18 +74,18 @@ namespace mob {
 
         // undefined
         template <class T>
-        T get(std::string_view key, std::optional<T> default_ = {}) const;
+        T get(std::string_view key) const;
 
         template <>
-        bool get<bool>(std::string_view key, std::optional<bool> default_) const
+        bool get<bool>(std::string_view key) const
         {
-            return details::get_bool(name_, key, default_);
+            return details::get_bool(name_, key);
         }
 
         template <>
-        int get<int>(std::string_view key, std::optional<int> default_) const
+        int get<int>(std::string_view key) const
         {
-            return details::get_int(name_, key, default_);
+            return details::get_int(name_, key);
         }
 
         void set(std::string_view key, std::string_view value)
@@ -234,13 +223,6 @@ namespace mob {
         conf_build_types();
     };
 
-    // options in [translations]
-    //
-    class conf_translations : public conf_section<std::string> {
-    public:
-        conf_translations();
-    };
-
     // options in [prebuilt]
     //
     class conf_prebuilt : public conf_section<std::string> {
@@ -263,7 +245,6 @@ namespace mob {
         VALUE(third_party);
         VALUE(prefix);
         VALUE(cache);
-        VALUE(icons);
         VALUE(licenses);
         VALUE(build);
 
@@ -274,7 +255,7 @@ namespace mob {
         VALUE(install_pdbs);
 
         VALUE(install_dlls);
-        VALUE(install_extensions);
+        VALUE(install_plugins);
         VALUE(install_stylesheets);
         VALUE(install_licenses);
         VALUE(install_translations);
@@ -302,7 +283,6 @@ namespace mob {
         conf_cmake cmake();
         conf_tools tool();
         conf_transifex transifex();
-        conf_translations translation();
         conf_prebuilt prebuilt();
         conf_versions version();
         conf_build_types build_types();

src/core/op.cpp

@@ -116,30 +116,6 @@ namespace mob::op {
         }
     }
 
-    void delete_file_glob_recurse(const context& cx, const fs::path& directory,
-                                  const fs::path& glob, flags f)
-    {
-        cx.trace(context::fs, "deleting glob {}", glob);
-
-        const auto native = glob.native();
-
-        if (!fs::exists(directory))
-            return;
-
-        for (auto&& e : fs::recursive_directory_iterator(directory)) {
-            const auto p    = e.path();
-            const auto name = p.filename().native();
-
-            if (!PathMatchSpecW(name.c_str(), native.c_str())) {
-                cx.trace(context::fs, "{} did not match {}; skipping", name, glob);
-
-                continue;
-            }
-
-            delete_file(cx, p, f);
-        }
-    }
-
     void remove_readonly(const context& cx, const fs::path& dir, flags f)
     {
         cx.trace(context::fs, "removing read-only from {}", dir);

src/core/op.h

@@ -65,11 +65,6 @@ namespace mob::op {
     //
     void delete_file_glob(const context& cx, const fs::path& glob, flags f = noflags);
 
-    // deletes all files matching the glob in the given directory and its subdirectories
-    //
-    void delete_file_glob_recurse(const context& cx, const fs::path& directory,
-                                  const fs::path& glob, flags f = noflags);
-
     // removes the readonly flag for all files in `dir`, recursive
     //
     void remove_readonly(const context& cx, const fs::path& dir, flags f = noflags);

src/main.cpp

@@ -23,6 +23,7 @@ namespace mob {
         //
         // mob doesn't have a concept of task dependencies, just task ordering, so
         // if a task depends on another, it has to be earlier in the order
+
         // super tasks
 
         using mo = modorganizer;
@@ -41,12 +42,13 @@ namespace mob {
             .add_task<mo>("modorganizer-bsatk")
             .add_task<mo>("modorganizer-nxmhandler")
             .add_task<mo>("modorganizer-helper")
-            .add_task<mo>({"modorganizer-bsapacker", "bsa_packer"})
-            .add_task<mo>("modorganizer-preview_bsa")
             .add_task<mo>("modorganizer-game_bethesda");
 
         add_task<parallel_tasks>()
+            .add_task<mo>({"modorganizer-bsapacker", "bsa_packer"})
             .add_task<mo>({"modorganizer-tool_inieditor", "inieditor"})
+            .add_task<mo>({"modorganizer-tool_inibakery", "inibakery"})
+            .add_task<mo>("modorganizer-preview_bsa")
             .add_task<mo>("modorganizer-preview_base")
             .add_task<mo>("modorganizer-diagnose_basic")
             .add_task<mo>("modorganizer-check_fnis")

src/pch.h

@@ -1,3 +1,5 @@
+#pragma once
+
 // global warnings
 #pragma warning(disable : 4464)  // relative include path
 #pragma warning(disable : 4820)  // padding added
@@ -62,10 +64,12 @@
 #include <thread>
 #include <vector>
 
-#include <Shlobj.h>
+#include <windows.h>
+
+#include <dbghelp.h>
 #include <fcntl.h>
-#include <imagehlp.h>
 #include <io.h>
+#include <shlobj.h>
 #include <shlwapi.h>
 
 #include <clipp.h>