OPCF-Members · opcfoundation-org · Feb 19, 2026 · Feb 18, 2026 · Feb 19, 2026
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.20)
 project(OpcCoreComponents C CXX)
 
-# ---------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 # Require MSVC CRT >= 14.44.35211 (Windows 7 SP1 compatible)
 # MSVC compiler 19.44.x ships CRT 14.44.x — check compiler version.
 # ---------------------------------------------------------------------------
@@ -18,6 +18,9 @@ endif()
 # Enable /Qspectre if Spectre-mitigated libs are installed (VS Individual Components)
 option(OPC_ENABLE_SPECTRE "Enable Spectre v1 mitigation (/Qspectre)" OFF)
 
+# Build the OPC DA test server and client applications
+option(OPC_BUILD_TESTS "Build OPC DA test server and client" ON)
+
 # Include the reusable proxy stub build function
 include(cmake/OpcProxyStub.cmake)
 
@@ -311,6 +314,7 @@ endif() # x64 only
 # OPC DA 2.05a Test Server — both x86 and x64
 # Output: OpcTestServer_x86.exe or OpcTestServer_x64.exe
 # ============================================================================
+if(OPC_BUILD_TESTS)
 
 set(TESTSVR_SRC_DIR  "${CMAKE_SOURCE_DIR}/Source/Test/TestServer")
 set(TESTSVR_BIN_DIR  "${CMAKE_CURRENT_BINARY_DIR}/OpcTestServer")
@@ -483,6 +487,8 @@ set_target_properties(OpcTestClient PROPERTIES
 
 install(TARGETS OpcTestClient RUNTIME DESTINATION bin)
 
+endif() # OPC_BUILD_TESTS
+
 # ============================================================================
 # SDK Headers — install MIDL/MC outputs + source headers/IDLs to include/
 # These are packaged into the merge modules as optional SDK files.

diff --git a/Source/AlarmsAndEvents/ProxyStub/opc_ae.rc b/Source/AlarmsAndEvents/ProxyStub/opc_ae.rc
@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include "../../include/version.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,10,BUILD_VERSION,0
- PRODUCTVERSION 1,10,0,0
+ FILEVERSION MAJOR_VERSION,MINOR_VERSION,REVISION_VERSION,BUILD_VERSION
+ PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,REVISION_VERSION,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,12 +47,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "OPC Foundation"
             VALUE "FileDescription", "OPC Alarms & Events 1.10 Proxy/Stub Library"
-            VALUE "FileVersion", "1.10." FILE_VERSION_TEXT "\0"
+            VALUE "FileVersion", FILE_VERSION_TEXT "\0"
             VALUE "InternalName", "opc_aeps"
             VALUE "LegalCopyright", "Copyright � " COPYRIGHT_DATE " OPC Foundation\0"
             VALUE "OriginalFilename", "opc_aeps.dll"
             VALUE "ProductName", "OPC Alarms & Events 1.10 Proxy/Stub Library"
-            VALUE "ProductVersion", "1.10.0.0\0"
+            VALUE "ProductVersion", PRODUCT_VERSION_TEXT "\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Source/Batch/ProxyStub/opcbc_ps.rc b/Source/Batch/ProxyStub/opcbc_ps.rc
@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include "../../include/version.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,BUILD_VERSION,0
- PRODUCTVERSION 2,0,0,0
+ FILEVERSION MAJOR_VERSION,MINOR_VERSION,REVISION_VERSION,BUILD_VERSION
+ PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,REVISION_VERSION,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,12 +47,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "OPC Foundation"
             VALUE "FileDescription", "OPC Batch Custom 2.00 Proxy/Stub Library"
-            VALUE "FileVersion", "2.00." FILE_VERSION_TEXT "\0"
+            VALUE "FileVersion", FILE_VERSION_TEXT "\0"
             VALUE "InternalName", "opcbc_ps"
             VALUE "LegalCopyright", "Copyright � " COPYRIGHT_DATE " OPC Foundation\0"
             VALUE "OriginalFilename", "opcbc_ps.dll"
             VALUE "ProductName", "OPC Batch Custom 2.00 Proxy/Stub Library"
-            VALUE "ProductVersion", "2.00.0.0\0"
+            VALUE "ProductVersion", PRODUCT_VERSION_TEXT "\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Source/Commands/ProxyStub/OpcCmdPs.rc b/Source/Commands/ProxyStub/OpcCmdPs.rc
@@ -55,8 +55,8 @@ END
 #include "../../include/version.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,BUILD_VERSION,0
- PRODUCTVERSION 1,0,0,0
+ FILEVERSION MAJOR_VERSION,MINOR_VERSION,REVISION_VERSION,BUILD_VERSION
+ PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,REVISION_VERSION,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -73,12 +73,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "OPC Foundation"
             VALUE "FileDescription", "OPC Commands 1.00 Proxy/Stub Library"
-            VALUE "FileVersion", "1.00." FILE_VERSION_TEXT "\0"
+            VALUE "FileVersion", FILE_VERSION_TEXT "\0"
             VALUE "InternalName", "OpcCmdPs"
             VALUE "LegalCopyright", "Copyright � " COPYRIGHT_DATE " OPC Foundation\0"
             VALUE "OriginalFilename", "OpcCmdPs.dll"
             VALUE "ProductName", "OPC Commands 1.00 Proxy/Stub Library"
-            VALUE "ProductVersion", "1.00.0.0\0"
+            VALUE "ProductVersion", PRODUCT_VERSION_TEXT "\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Source/Common/CategoryManager/CategoryManager.rc b/Source/Common/CategoryManager/CategoryManager.rc
@@ -60,8 +60,8 @@ END
 #include "../../include/version.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,0,BUILD_VERSION,0
- PRODUCTVERSION 3,0,0,0
+ FILEVERSION MAJOR_VERSION,MINOR_VERSION,REVISION_VERSION,BUILD_VERSION
+ PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,REVISION_VERSION,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -78,12 +78,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "OPC Foundation"
             VALUE "FileDescription", "OPC Enum x64 Category Manager"
-            VALUE "FileVersion", "3.00." FILE_VERSION_TEXT "\0"
+            VALUE "FileVersion", FILE_VERSION_TEXT "\0"
             VALUE "InternalName", "OpcCategoryManager"
             VALUE "LegalCopyright", "Copyright � " COPYRIGHT_DATE " OPC Foundation\0"
             VALUE "OriginalFilename", "OpcCategoryManager.exe"
             VALUE "ProductName", "OPC Core Components"
-            VALUE "ProductVersion", "3.00.0.0\0"
+            VALUE "ProductVersion", PRODUCT_VERSION_TEXT "\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Source/Common/ProxyStub/opccomn_ps.rc b/Source/Common/ProxyStub/opccomn_ps.rc
@@ -54,8 +54,8 @@ END
 #include "../../include/version.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,10,BUILD_VERSION,0
- PRODUCTVERSION 1,10,0,0
+ FILEVERSION MAJOR_VERSION,MINOR_VERSION,REVISION_VERSION,BUILD_VERSION
+ PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,REVISION_VERSION,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -72,12 +72,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "OPC Foundation"
             VALUE "FileDescription", "OPC Common 1.10 Proxy/Stub"
-			VALUE "FileVersion", "1.10." FILE_VERSION_TEXT "\0"
+			VALUE "FileVersion", FILE_VERSION_TEXT "\0"
             VALUE "InternalName", "opccomn_ps"
 			VALUE "LegalCopyright", "Copyright � " COPYRIGHT_DATE " OPC Foundation\0"
             VALUE "OriginalFilename", "opccomn_ps.dll"
             VALUE "ProductName", "OPC Common 1.10 Proxy/Stub"
-			VALUE "ProductVersion", "1.10.0.0\0"
+			VALUE "ProductVersion", PRODUCT_VERSION_TEXT "\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Source/Common/ServerEnumerator/OpcEnum.rc b/Source/Common/ServerEnumerator/OpcEnum.rc
@@ -54,8 +54,8 @@ END
 #include "../../include/version.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,10,BUILD_VERSION,0
- PRODUCTVERSION 1,10,0,0
+ FILEVERSION MAJOR_VERSION,MINOR_VERSION,REVISION_VERSION,BUILD_VERSION
+ PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,REVISION_VERSION,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -72,12 +72,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "OPC Foundation"
             VALUE "FileDescription", "OPC Server Enumerator 1.10"
-            VALUE "FileVersion", "1.10." FILE_VERSION_TEXT "\0"
+            VALUE "FileVersion", FILE_VERSION_TEXT "\0"
             VALUE "InternalName", "OpcEnum"
             VALUE "LegalCopyright", "Copyright � " COPYRIGHT_DATE " OPC Foundation\0"
             VALUE "OriginalFilename", "OpcEnum.exe"
             VALUE "ProductName", "OPC Server Enumerator 1.10"
-            VALUE "ProductVersion", "1.10.0.0\0"
+            VALUE "ProductVersion", PRODUCT_VERSION_TEXT "\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Source/DataAccess/ProxyStub/opcda_ps.rc b/Source/DataAccess/ProxyStub/opcda_ps.rc
@@ -55,8 +55,8 @@ END
 #include "../../include/version.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,0,BUILD_VERSION,0
- PRODUCTVERSION 3,0,0,0
+ FILEVERSION MAJOR_VERSION,MINOR_VERSION,REVISION_VERSION,BUILD_VERSION
+ PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,REVISION_VERSION,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -73,12 +73,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "OPC Foundation"
             VALUE "FileDescription", "OPC Data Access 3.00 Proxy/Stub"
-            VALUE "FileVersion", "3.00." FILE_VERSION_TEXT "\0"
+            VALUE "FileVersion", FILE_VERSION_TEXT "\0"
             VALUE "InternalName", "opcproxy"
             VALUE "LegalCopyright", "Copyright � " COPYRIGHT_DATE " OPC Foundation\0"
             VALUE "OriginalFilename", "opcproxy.dll"
             VALUE "ProductName", "OPC Data Access 3.00 Proxy/Stub"
-            VALUE "ProductVersion", "3.00.0.0\0"
+            VALUE "ProductVersion", PRODUCT_VERSION_TEXT "\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Source/DataExchange/ProxyStub/OpcDxPs.rc b/Source/DataExchange/ProxyStub/OpcDxPs.rc
@@ -55,8 +55,8 @@ END
 #include "../../include/version.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,BUILD_VERSION,0
- PRODUCTVERSION 1,0,0,0
+ FILEVERSION MAJOR_VERSION,MINOR_VERSION,REVISION_VERSION,BUILD_VERSION
+ PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,REVISION_VERSION,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -73,12 +73,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "OPC Foundation"
             VALUE "FileDescription", "OPC Data eXchange 1.00 Proxy/Stub Library"
-            VALUE "FileVersion", "1.00." FILE_VERSION_TEXT "\0"
+            VALUE "FileVersion", FILE_VERSION_TEXT "\0"
             VALUE "InternalName", "OpcDxPs"
             VALUE "LegalCopyright", "Copyright � " COPYRIGHT_DATE " OPC Foundation\0"
             VALUE "OriginalFilename", "OpcDxPs.dll"
             VALUE "ProductName", "OPC Data eXchange 1.00 Proxy/Stub Library"
-            VALUE "ProductVersion", "1.00.0.0\0"
+            VALUE "ProductVersion", PRODUCT_VERSION_TEXT "\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Source/HistoricalDataAccess/ProxyStub/opchda_ps.rc b/Source/HistoricalDataAccess/ProxyStub/opchda_ps.rc
@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include "../../include/version.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,20,BUILD_VERSION,0
- PRODUCTVERSION 1,20,0,0
+ FILEVERSION MAJOR_VERSION,MINOR_VERSION,REVISION_VERSION,BUILD_VERSION
+ PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,REVISION_VERSION,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,12 +47,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "OPC Foundation"
             VALUE "FileDescription", "OPC Historial Data Access 1.20 Proxy/Stub Library"
-            VALUE "FileVersion", "1.20." FILE_VERSION_TEXT "\0"
+            VALUE "FileVersion", FILE_VERSION_TEXT "\0"
             VALUE "InternalName", "opchda_ps"
             VALUE "LegalCopyright", "Copyright � " COPYRIGHT_DATE " OPC Foundation\0"
             VALUE "OriginalFilename", "opchda_ps.dll"
             VALUE "ProductName", "OPC Historial Data Access 1.20 Proxy/Stub Library"
-            VALUE "ProductVersion", "1.20.0.0\0"
+            VALUE "ProductVersion", PRODUCT_VERSION_TEXT "\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Source/Include/version.h b/Source/Include/version.h
@@ -5,7 +5,11 @@
 #define xstr(s) str(s)
 #define str(s) #s
 
-#define BUILD_VERSION 85
+#define MAJOR_VERSION 3
+#define MINOR_VERSION 1
+#define REVISION_VERSION 1
+#define BUILD_VERSION 88
 
 #define COPYRIGHT_DATE "2026"
-#define FILE_VERSION_TEXT xstr(BUILD_VERSION)
+#define FILE_VERSION_TEXT xstr(MAJOR_VERSION) "." xstr(MINOR_VERSION) "." xstr(REVISION_VERSION) "." xstr(BUILD_VERSION)
+#define PRODUCT_VERSION_TEXT xstr(MAJOR_VERSION) "." xstr(MINOR_VERSION) "." xstr(REVISION_VERSION) ".0"
diff --git a/Source/Security/ProxyStub/opcSec_PS.rc b/Source/Security/ProxyStub/opcSec_PS.rc
@@ -68,8 +68,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #include "../../include/version.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,BUILD_VERSION,0
- PRODUCTVERSION 1,0,0,0
+ FILEVERSION MAJOR_VERSION,MINOR_VERSION,REVISION_VERSION,BUILD_VERSION
+ PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,REVISION_VERSION,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -86,12 +86,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "OPC Foundation"
             VALUE "FileDescription", "OPC Security 1.00 Proxy/Stub Library"
-            VALUE "FileVersion", "1.00." FILE_VERSION_TEXT "\0"
+            VALUE "FileVersion", FILE_VERSION_TEXT "\0"
             VALUE "InternalName", "opcsec_ps"
             VALUE "LegalCopyright", "Copyright � " COPYRIGHT_DATE " OPC Foundation\0"
             VALUE "OriginalFilename", "opcsec_ps.dll"
             VALUE "ProductName", "OPC Security 1.00 Proxy/Stub Library"
-            VALUE "ProductVersion", "1.00.0.0\0"
+            VALUE "ProductVersion", PRODUCT_VERSION_TEXT "\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Source/Test/TestServer/OpcTestServer.rc b/Source/Test/TestServer/OpcTestServer.rc
@@ -60,8 +60,8 @@ END
 #include "../../include/version.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,0,BUILD_VERSION,0
- PRODUCTVERSION 3,0,0,0
+ FILEVERSION MAJOR_VERSION,MINOR_VERSION,REVISION_VERSION,BUILD_VERSION
+ PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,REVISION_VERSION,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -78,12 +78,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "OPC Foundation"
             VALUE "FileDescription", "OPC DA 2.05a Test Server"
-            VALUE "FileVersion", "3.00." FILE_VERSION_TEXT "\0"
+            VALUE "FileVersion", FILE_VERSION_TEXT "\0"
             VALUE "InternalName", "OpcTestServer"
             VALUE "LegalCopyright", "Copyright \251 " COPYRIGHT_DATE " OPC Foundation\0"
             VALUE "OriginalFilename", "OpcTestServer.exe"
             VALUE "ProductName", "OPC Core Components"
-            VALUE "ProductVersion", "3.00.0.0\0"
+            VALUE "ProductVersion", PRODUCT_VERSION_TEXT "\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/WiX/Installer.wxs b/WiX/Installer.wxs
@@ -65,6 +65,7 @@
             <?endif?>
         </StandardDirectory>
 
+        <?ifdef IncludeTests ?>
         <!-- OPC Test Server files installed to Common Files\OPC Foundation\Bin -->
         <?if $(var.Platform) = x86 ?>
         <StandardDirectory Id="CommonFilesFolder">
@@ -171,6 +172,7 @@
                     Condition="?TestServer=3 AND (&amp;TestServer=2 OR REMOVE~=&quot;ALL&quot;)" />
             <?endif?>
         </InstallExecuteSequence>
+        <?endif?>
 
         <!-- Feature tree -->
         <Feature Id="Complete"
@@ -195,6 +197,7 @@
             <?endif?>
         </Feature>
 
+        <?ifdef IncludeTests ?>
         <Feature Id="TestServer"
                  Title="Test Applications"
                  Description="OPC DA 2.05a test server and client for verifying that x86 and x64 COM servers can be discovered across platforms."
@@ -209,6 +212,7 @@
             <ComponentRef Id="comp_OpcTestClient_x86" />
             <?endif?>
         </Feature>
+        <?endif?>
 
         <!-- WixUI dialog set: Feature selection tree so user can opt-in to TestServer -->
         <ui:WixUI Id="WixUI_FeatureTree" />