mtconnect · wsobel · Oct 3, 2025 · Sep 18, 2025 · Sep 19, 2025 · Sep 20, 2025
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,8 +28,8 @@ on:
 
 jobs:
   build_windows:
-    runs-on: windows-2022
-    name: "Windows 2022 Arch: ${{ matrix.arch }}, Shared: ${{ matrix.shared }}"
+    runs-on: windows-latest
+    name: "Windows latest Arch: ${{ matrix.arch }}, Shared: ${{ matrix.shared }}"
     strategy:
       matrix:
         arch: ["x86", "amd64"]

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@
 set(AGENT_VERSION_MAJOR 2)
 set(AGENT_VERSION_MINOR 6)
 set(AGENT_VERSION_PATCH 0)
-set(AGENT_VERSION_BUILD 2)
+set(AGENT_VERSION_BUILD 3)
 set(AGENT_VERSION_RC "")
 
 # This minimum version is to support Visual Studio 2019 and C++ feature checking and FetchContent
@@ -22,13 +22,14 @@ set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/mtconnect")
 
 message(INFO " Shared build: ${SHARED_AGENT_LIB}")
 
-project(cppagent LANGUAGES C CXX)
-
 # We will define these properties by default for each CMake target to be created.
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
-set(CXX_COMPILE_FEATURES cxx_std_17)
+set(CXX_COMPILE_FEATURES cxx_std_20)
+set(CMAKE_OSX_DEPLOYMENT_TARGET 13.3)
+
+project(cppagent LANGUAGES C CXX)
 
 set(WITH_RUBY ON CACHE STRING "With Ruby Support")
 

diff --git a/agent/cppagent.cpp b/agent/cppagent.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright Copyright 2009-2024, AMT – The Association For Manufacturing Technology (“AMT”)
+// Copyright Copyright 2009-2025, AMT – The Association For Manufacturing Technology (“AMT”)
 // All rights reserved.
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/conan/mqtt_cpp/conanfile.py b/conan/mqtt_cpp/conanfile.py
@@ -4,13 +4,13 @@
 
 class MqttcppConan(ConanFile):
     name = "mqtt_cpp"
-    version = "13.2.1"
+    version = "13.2.2"
     license = "Boost Software License, Version 1.0"
     author = "Takatoshi Kondo [email protected]"
     url = "https://github.com/redboltz/mqtt_cpp"
     description = "MQTT client/server for C++14 based on Boost.Asio"
     topics = ("mqtt")
-    requires = ["boost/1.85.0"]
+    requires = ["boost/1.88.0"]
     no_copy_source = True
     exports_sources = "include/*"
 

diff --git a/conan/mruby/conanfile.py b/conan/mruby/conanfile.py
@@ -155,7 +155,7 @@ def search_header_path(name)
             if is_msvc(self):
                 if self.settings.build_type == 'Debug':
                     f.write("  conf.compilers.each { |c|  c.flags << '/Od' }\n")
-                f.write("  conf.compilers.each { |c| c.flags << '/std:c++17' }\n")
+                f.write("  conf.compilers.each { |c| c.flags << '/std:c++20' }\n")
                 f.write("  conf.compilers.each { |c| c.flags << '/%s' }\n" % msvc_runtime_flag(self))
             else:
                 if self.settings.build_type == 'Debug':

diff --git a/conan/profiles/clang b/conan/profiles/clang
@@ -2,6 +2,7 @@ include(default)
 
 [settings]
 compiler.libcxx=libstdc++11
+compiler.cppstd=20
 
 [env]
 CC=/usr/bin/clang

diff --git a/conan/profiles/docker b/conan/profiles/docker
@@ -2,6 +2,7 @@ include(default)
 
 [settings]
 compiler.libcxx=libstdc++11
+compiler.cppstd=20
 
 [options]
 without_ipv6=True

diff --git a/conan/profiles/gcc b/conan/profiles/gcc
@@ -2,6 +2,7 @@ include(default)
 
 [settings]
 compiler.libcxx=libstdc++11
+compiler.cppstd=20
 
 [system_tools]
 cmake/>3.23.0
diff --git a/conan/profiles/macos b/conan/profiles/macos
@@ -2,7 +2,7 @@ include(default)
 
 [settings]
 compiler=apple-clang
-compiler.cppstd=gnu17
+compiler.cppstd=20
 
 [system_tools]
 cmake/>3.26.0

diff --git a/conan/profiles/vs32 b/conan/profiles/vs32
@@ -2,11 +2,9 @@ include(default)
 
 [settings]
 compiler=msvc
-compiler.cppstd=17
+compiler.cppstd=20
 arch=x86
 compiler.runtime=static
 compiler.runtime_type=Release
 build_type=Release
 
-[options]
-winver=0x0600
diff --git a/conan/profiles/vs32debug b/conan/profiles/vs32debug
@@ -2,11 +2,8 @@ include(default)
 
 [settings]
 compiler=msvc
-compiler.cppstd=17
+compiler.cppstd=20
 arch=x86
 compiler.runtime=static
 compiler.runtime_type=Debug
 build_type=Debug
-
-[options]
-winver=0x0600
diff --git a/conan/profiles/vs32shared b/conan/profiles/vs32shared
@@ -2,13 +2,9 @@ include(default)
 
 [settings]
 compiler=msvc
-compiler.cppstd=17
+compiler.cppstd=20
 arch=x86
 compiler.runtime=dynamic
 compiler.runtime_type=Release
 build_type=Release
 
-
-[options]
-shared=True
-winver=0x0600
diff --git a/conan/profiles/vs64 b/conan/profiles/vs64
@@ -2,7 +2,7 @@ include(default)
 
 [settings]
 compiler=msvc
-compiler.cppstd=17
+compiler.cppstd=20
 arch=x86_64
 compiler.runtime=static
 compiler.runtime_type=Release

diff --git a/conan/profiles/vs64debug b/conan/profiles/vs64debug
@@ -2,7 +2,7 @@ include(default)
 
 [settings]
 compiler=msvc
-compiler.cppstd=17
+compiler.cppstd=20
 arch=x86_64
 compiler.runtime=static
 compiler.runtime_type=Debug

diff --git a/conan/profiles/vs64shared b/conan/profiles/vs64shared
@@ -2,7 +2,7 @@ include(default)
 
 [settings]
 compiler=msvc
-compiler.cppstd=17
+compiler.cppstd=20
 arch=x86_64
 compiler.runtime=dynamic
 compiler.runtime_type=Release

diff --git a/conan/profiles/vsxp b/conan/profiles/vsxp
diff --git a/conan/profiles/xcode b/conan/profiles/xcode
@@ -1,7 +1,7 @@
 include(default)
 
 [settings]
-compiler.cppstd=17
+compiler.cppstd=20
 
 [platform_tool_requires]
 cmake/3.26.4

diff --git a/conanfile.py b/conanfile.py
@@ -35,7 +35,7 @@ class MTConnectAgentConan(ConanFile):
         "with_ruby": True,
         "development": False,
         "shared": False,
-        "winver": "0x0602",
+        "winver": "0x0A00",
         "with_docs": False,
         "cpack": False,
         "agent_prefix": None,
@@ -84,10 +84,6 @@ def layout(self):
         self.folders.build_folder_vars = ["options.shared", "settings.arch"]
         cmake_layout(self)
 
-    def layout(self):
-        self.folders.build_folder_vars = ["options.shared", "settings.arch"]
-        cmake_layout(self)
-
     def config_options(self):
         if is_msvc(self):
             self.options.rm_safe("fPIC")
@@ -105,6 +101,7 @@ def tool_requires_version(self, package, version):
             self.output.info(f"Version of {package} is {ver}")
         else:
             self.output.info(f"Command: '{command}' returned {res}")
+
         if ver < version:
             ver_text = '.'.join([str(x) for x in version])
             self.output.info(f"Old version of {package}, requesting tool {package}/{ver_text}")
@@ -118,19 +115,19 @@ def build_requirements(self):
             self.tool_requires_version("doxygen", [1, 14, 0])
 
     def requirements(self):
-        self.requires("boost/1.85.0", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
-        self.requires("libxml2/2.10.3", headers=True, libs=True, visible=True, transitive_headers=True, transitive_libs=True)
+        self.requires("boost/1.88.0", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
+        self.requires("libxml2/2.14.5", headers=True, libs=True, visible=True, transitive_headers=True, transitive_libs=True)
         self.requires("date/3.0.4", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
-        self.requires("nlohmann_json/3.9.1", headers=True, libs=False, transitive_headers=True, transitive_libs=False)
-        self.requires("openssl/3.0.8", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
-        self.requires("rapidjson/cci.20220822", headers=True, libs=False, transitive_headers=True, transitive_libs=False)
-        self.requires("mqtt_cpp/13.2.1", headers=True, libs=False, transitive_headers=True, transitive_libs=False)
+        self.requires("nlohmann_json/3.12.0", headers=True, libs=False, transitive_headers=True, transitive_libs=False)
+        self.requires("openssl/3.5.4", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
+        self.requires("rapidjson/cci.20230929", headers=True, libs=False, transitive_headers=True, transitive_libs=False)
+        self.requires("mqtt_cpp/13.2.2", headers=True, libs=False, transitive_headers=True, transitive_libs=False)
         self.requires("bzip2/1.0.8", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
 
         if self.options.with_ruby:
             self.requires("mruby/3.2.0", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
 
-        self.requires("gtest/1.10.0", headers=True, libs=True, transitive_headers=True, transitive_libs=True, test=True)
+        self.requires("gtest/1.17.0", headers=True, libs=True, transitive_headers=True, transitive_libs=True, test=True)
 
     def configure(self):
         if self.options.shared:
@@ -143,9 +140,6 @@ def configure(self):
         if is_msvc(self):
             self.options["boost/*"].extra_b2_flags = ("define=BOOST_USE_WINAPI_VERSION=" + str(self.options.winver))
 
-        if is_msvc(self):
-            self.options["boost/*"].extra_b2_flags = ("define=BOOST_USE_WINAPI_VERSION=" + str(self.options.winver))
-
         # Make sure shared builds use shared boost
         if is_msvc(self) and self.options.shared:
             print("**** Making boost, libxml2, gtest, and openssl shared")

diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile
@@ -74,7 +74,7 @@ WORKDIR /root/agent
 COPY . cppagent
 
 ARG WITH_TESTS=false
-ARG WITH_TESTS_ARG=argument
+ARG WITH_TESTS_ARG=
 
 # Build and optionally test. Unpack the dist to reduce overhead in the following release step.
 RUN  if [ -z "$WITH_TESTS" ] || [ "$WITH_TESTS" = "false" ]; then \
@@ -94,7 +94,7 @@ RUN  if [ -z "$WITH_TESTS" ] || [ "$WITH_TESTS" = "false" ]; then \
        -o cpack_name=dist \
        -o cpack_generator=TGZ \
        -pr "$CONAN_PROFILE" \
-       "${WITH_TESTS_ARG}" \
+       ${WITH_TESTS_ARG} \
   && tar xf dist.tar.gz \
   && rm dist.tar.gz
 

diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
@@ -46,13 +46,12 @@ ARG CONAN_CPU_COUNT=2
 ARG WITH_RUBY='True'
 
 # set some variables
-ENV PATH="$HOME/venv3.9/bin:$PATH"
 ENV CONAN_PROFILE='/root/agent/cppagent/conan/profiles/docker'
 
 # update os and add dependencies
 # note: Dockerfiles run as root by default, so don't need sudo
-RUN  apt-get update \
-  && apt-get install -y \
+RUN  apt clean && apt update \
+  && apt install -y \
        autoconf \
        automake \
        build-essential \
@@ -72,7 +71,7 @@ WORKDIR /root/agent
 COPY . cppagent
 
 ARG WITH_TESTS=false
-ARG WITH_TESTS_ARG=argument
+ARG WITH_TESTS_ARG=
 
 # Build and optionally test
 RUN  if [ -z "$WITH_TESTS" ] || [ "$WITH_TESTS" = "false" ]; then \
@@ -91,7 +90,7 @@ RUN  if [ -z "$WITH_TESTS" ] || [ "$WITH_TESTS" = "false" ]; then \
        -o cpack_name=dist \
        -o cpack_generator=TGZ \
        -pr "$CONAN_PROFILE" \
-       "${WITH_TESTS_ARG}" \
+       ${WITH_TESTS_ARG} \
   && tar xf dist.tar.gz \
   && rm dist.tar.gz
 

diff --git a/src/mtconnect/agent.cpp b/src/mtconnect/agent.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright Copyright 2009-2024, AMT – The Association For Manufacturing Technology (“AMT”)
+// Copyright Copyright 2009-2025, AMT – The Association For Manufacturing Technology (“AMT”)
 // All rights reserved.
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
@@ -477,7 +477,7 @@ namespace mtconnect {
       return;
     }
 
-    auto callback = [=](config::AsyncContext &context) {
+    auto callback = [=, this](config::AsyncContext &context) {
       try
       {
         bool changed = false;
@@ -604,7 +604,7 @@ namespace mtconnect {
       createUniqueIds(device);
 
       LOG(info) << "Checking if device " << *uuid << " has changed";
-      if (*device != *oldDev)
+      if (device->different(*oldDev))
       {
         LOG(info) << "Device " << *uuid << " changed, updating model";
 

diff --git a/src/mtconnect/agent.hpp b/src/mtconnect/agent.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright Copyright 2009-2024, AMT – The Association For Manufacturing Technology (“AMT”)
+// Copyright Copyright 2009-2025, AMT – The Association For Manufacturing Technology (“AMT”)
 // All rights reserved.
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/mtconnect/asset/asset.cpp b/src/mtconnect/asset/asset.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright Copyright 2009-2024, AMT – The Association For Manufacturing Technology (“AMT”)
+// Copyright Copyright 2009-2025, AMT – The Association For Manufacturing Technology (“AMT”)
 // All rights reserved.
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/mtconnect/asset/asset.hpp b/src/mtconnect/asset/asset.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright Copyright 2009-2024, AMT – The Association For Manufacturing Technology (“AMT”)
+// Copyright Copyright 2009-2025, AMT – The Association For Manufacturing Technology (“AMT”)
 // All rights reserved.
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/mtconnect/asset/asset_buffer.hpp b/src/mtconnect/asset/asset_buffer.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright Copyright 2009-2024, AMT – The Association For Manufacturing Technology (“AMT”)
+// Copyright Copyright 2009-2025, AMT – The Association For Manufacturing Technology (“AMT”)
 // All rights reserved.
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/mtconnect/asset/asset_storage.hpp b/src/mtconnect/asset/asset_storage.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright Copyright 2009-2024, AMT – The Association For Manufacturing Technology (“AMT”)
+// Copyright Copyright 2009-2025, AMT – The Association For Manufacturing Technology (“AMT”)
 // All rights reserved.
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/mtconnect/asset/component_configuration_parameters.cpp b/src/mtconnect/asset/component_configuration_parameters.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright Copyright 2009-2024, AMT – The Association For Manufacturing Technology (“AMT”)
+// Copyright Copyright 2009-2025, AMT – The Association For Manufacturing Technology (“AMT”)
 // All rights reserved.
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/mtconnect/asset/component_configuration_parameters.hpp b/src/mtconnect/asset/component_configuration_parameters.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright Copyright 2009-2024, AMT – The Association For Manufacturing Technology (“AMT”)
+// Copyright Copyright 2009-2025, AMT – The Association For Manufacturing Technology (“AMT”)
 // All rights reserved.
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/mtconnect/asset/cutting_tool.cpp b/src/mtconnect/asset/cutting_tool.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright Copyright 2009-2024, AMT – The Association For Manufacturing Technology (“AMT”)
+// Copyright Copyright 2009-2025, AMT – The Association For Manufacturing Technology (“AMT”)
 // All rights reserved.
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");