Merge pull request #11 from technosoftware/master

Updated DLL examples to VS 2022 Version 17.4.1
technosoftware-gmbh · Nov 27, 2022 · 4c08ca5 · 4c08ca5
2 parents e773369 + 21a27fb
commit 4c08ca5
Show file tree

Hide file tree

Showing 17 changed files with 42 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 This is the changelog file for the OPC DA/AE Server Solution.
 
+## OPC DA/AE Server Solution - 3.0.0 (Work in Progress)
+- Updated C++ examples to VS 2022 Version 17.4.1
+- Updated DLL examples to VS 2022 Version 17.4.1
+
 ## OPC DA/AE Server Solution - 2.0.0
 - Refactored several parts of the server and removed a lot of warnings
 

diff --git a/examples/c++/DaAeSampleServer/OpcDaAeServer.rc b/examples/c++/DaAeSampleServer/OpcDaAeServer.rc
diff --git a/examples/c++/DaSampleServer/OpcDaServer.rc b/examples/c++/DaSampleServer/OpcDaServer.rc
@@ -83,8 +83,8 @@ VS_VERSION_INFO$(_OPC_WIN32) VERSIONINFO
 #else
 VS_VERSION_INFO VERSIONINFO
 #endif
- FILEVERSION 2,0,0,0
- PRODUCTVERSION 2,0,0,0
+ FILEVERSION 3,0,0,0
+ PRODUCTVERSION 3,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

diff --git a/examples/dll/DaAeSampleServer/ClassicNodeManager.cpp b/examples/dll/DaAeSampleServer/ClassicNodeManager.cpp
@@ -399,6 +399,7 @@ unsigned __stdcall RefreshThread(LPVOID pAttr)
 
  for (;;) { // Thread Loop
 
+ CoFileTimeNow(&time_stamp);
  if (gDeviceItem_NumberItems != NULL) {
  V_I4(&value) = gNumberItems;
  V_VT(&value) = VT_I4;
@@ -1262,13 +1263,13 @@ DLLEXP ClassicServerDefinition* DLLCALL OnGetDaServerDefinition(void)
  // Version independent Prog.Id. 
  L"OpcDllDaAe.DaSample",
  // Prog.Id. of current Server
- L"OpcDllDaAe.DaSample.90",
+ L"OpcDllDaAe.DaSample.30",
  // Friendly name of server
  L"OPC Server SDK DLL DA Sample Server",
  // Friendly name of current server version
- L"OPC Server SDK DLL DA Sample Server V9.0",
- // Companmy Name
- L"Technosoftware GmbH"
+ L"OPC Server SDK DLL DA Sample Server V3.0",
+ // Company Name
+ L"SampleCompany"
  };
 
  return &DaServerDefinition;
@@ -1310,13 +1311,13 @@ DLLEXP ClassicServerDefinition* DLLCALL OnGetAeServerDefinition(void)
  // Version independent Prog.Id. (must be same as DA)
  L"OpcDllDaAe.AeSample",
  // Prog.Id. of current Server
- L"OpcDllDaAe.AeSample.90",
+ L"OpcDllDaAe.AeSample.30",
  // Friendly name of server
  L"OPC Server SDK DLL AE Sample Server",
  // Friendly name of current server version
- L"OPC Server SDK DLL AE Sample Server V9.0",
- // Companmy Name
- L"Technosoftware GmbH"
+ L"OPC Server SDK DLL AE Sample Server V3.0",
+ // Company Name
+ L"SampleCompany"
  };
 
  return &AeServerDefinition;

diff --git a/examples/dll/DaAeSampleServer/ServerPlugin.rc b/examples/dll/DaAeSampleServer/ServerPlugin.rc
diff --git a/.../DaAeSampleServer/ServerPlugin.vs2019.sln → ...les/dll/DaAeSampleServer/ServerPlugin.sln b/.../DaAeSampleServer/ServerPlugin.vs2019.sln → ...les/dll/DaAeSampleServer/ServerPlugin.sln
@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.452
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32228.430
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ServerPlugin", "ServerPlugin.vs2019.vcxproj", "{C77D9ECA-4FF9-43A6-8D2E-CA1A1EB14CC9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ServerPlugin", "ServerPlugin.vcxproj", "{C77D9ECA-4FF9-43A6-8D2E-CA1A1EB14CC9}"
 EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/...eSampleServer/ServerPlugin.vs2019.vcxproj → ...dll/DaAeSampleServer/ServerPlugin.vcxproj b/...eSampleServer/ServerPlugin.vs2019.vcxproj → ...dll/DaAeSampleServer/ServerPlugin.vcxproj
@@ -27,25 +27,25 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
  <ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
  <UseOfMfc>false</UseOfMfc>
  <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
  <ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
  <UseOfMfc>false</UseOfMfc>
  <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
  <ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
  <UseOfMfc>false</UseOfMfc>
  <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
  <ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
  <UseOfMfc>false</UseOfMfc>
  <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>

diff --git a/...erver/ServerPlugin.vs2019.vcxproj.filters → ...SampleServer/ServerPlugin.vcxproj.filters b/...erver/ServerPlugin.vs2019.vcxproj.filters → ...SampleServer/ServerPlugin.vcxproj.filters
diff --git a/examples/dll/DaSampleServer/ClassicNodeManager.cpp b/examples/dll/DaSampleServer/ClassicNodeManager.cpp
@@ -919,13 +919,13 @@ DLLEXP ClassicServerDefinition* DLLCALL OnGetDaServerDefinition( void )
  // Version independent Prog.Id. 
  L"OpcDllDaAe.DaSimpleSample",
  // Prog.Id. of current Server
- L"OpcDllDaAe.DaSimpleSample.90",
+ L"OpcDllDaAe.DaSimpleSample.30",
  // Friendly name of server
  L"OPC Server SDK DLL DA Simple Sample Server",
  // Friendly name of current server version
- L"OPC Server SDK DLL DA Simple Sample Server V9.0",
- // Companmy Name
- L"Technosoftware GmbH"
+ L"OPC Server SDK DLL DA Simple Sample Server V3.0",
+ // Company Name
+ L"SampleCompany"
  };
 
  return &DaServerDefinition;

diff --git a/examples/dll/DaSampleServer/ServerPlugin.rc b/examples/dll/DaSampleServer/ServerPlugin.rc
diff --git a/...ll/DaSampleServer/ServerPlugin.vs2019.sln → examples/dll/DaSampleServer/ServerPlugin.sln b/...ll/DaSampleServer/ServerPlugin.vs2019.sln → examples/dll/DaSampleServer/ServerPlugin.sln
@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.452
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32228.430
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ServerPlugin", "ServerPlugin.vs2019.vcxproj", "{C77D9ECA-4FF9-43A6-8D2E-CA1A1EB14CC9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ServerPlugin", "ServerPlugin.vcxproj", "{C77D9ECA-4FF9-43A6-8D2E-CA1A1EB14CC9}"
 EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/...aSampleServer/ServerPlugin.vs2019.vcxproj → ...s/dll/DaSampleServer/ServerPlugin.vcxproj b/...aSampleServer/ServerPlugin.vs2019.vcxproj → ...s/dll/DaSampleServer/ServerPlugin.vcxproj
@@ -27,25 +27,25 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
  <ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
  <UseOfMfc>false</UseOfMfc>
  <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
  <ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
  <UseOfMfc>false</UseOfMfc>
  <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
  <ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
  <UseOfMfc>false</UseOfMfc>
  <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
  <ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
  <UseOfMfc>false</UseOfMfc>
  <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>

diff --git a/...erver/ServerPlugin.vs2019.vcxproj.filters → ...SampleServer/ServerPlugin.vcxproj.filters b/...erver/ServerPlugin.vs2019.vcxproj.filters → ...SampleServer/ServerPlugin.vcxproj.filters
diff --git a/...ClassicServer/OpcDllDaAeServer.vs2019.sln → ...Server/ClassicServer/OpcDllDaAeServer.sln b/...ClassicServer/OpcDllDaAeServer.vs2019.sln → ...Server/ClassicServer/OpcDllDaAeServer.sln
@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29102.190
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32228.430
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpcDllDaAeServer", "OpcDllDaAeServer.vs2019.vcxproj", "{A25CED39-DBFD-47C1-AC29-D3D07D70BF9B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpcDllDaAeServer", "OpcDllDaAeServer.vcxproj", "{A25CED39-DBFD-47C1-AC29-D3D07D70BF9B}"
 EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/...sicServer/OpcDllDaAeServer.vs2019.vcxproj → ...er/ClassicServer/OpcDllDaAeServer.vcxproj b/...sicServer/OpcDllDaAeServer.vs2019.vcxproj → ...er/ClassicServer/OpcDllDaAeServer.vcxproj
@@ -35,37 +35,37 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DAOnly|Win32'" Label="Configuration">
  <ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
  <UseOfMfc>false</UseOfMfc>
  <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
  <ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
  <UseOfMfc>false</UseOfMfc>
  <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
  <ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
  <UseOfMfc>false</UseOfMfc>
  <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DAOnly|x64'" Label="Configuration">
  <ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
  <UseOfMfc>false</UseOfMfc>
  <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
  <ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
  <UseOfMfc>false</UseOfMfc>
  <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
  <ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
  <UseOfMfc>false</UseOfMfc>
  <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>

diff --git a/...r/OpcDllDaAeServer.vs2019.vcxproj.filters → ...icServer/OpcDllDaAeServer.vcxproj.filters b/...r/OpcDllDaAeServer.vs2019.vcxproj.filters → ...icServer/OpcDllDaAeServer.vcxproj.filters
diff --git a/src/Technosoftware/Server/ClassicServer/OpcNetDaAeServer.rc b/src/Technosoftware/Server/ClassicServer/OpcNetDaAeServer.rc