From b56e464efb632c97e04e604fe478b6e26731f236 Mon Sep 17 00:00:00 2001 From: Erich Barnstedt Date: Thu, 29 Jun 2017 06:03:51 -0700 Subject: [PATCH 1/2] Upgrade COM IOP project. --- .../Common/OPC Sample Utility Classes.vcxproj | 7 +- ComIOP/Wrapper/Common/OpcXmlType.h | 2 +- .../ProxyServer/UA COM Proxy Server.vcxproj | 13 +- ComIOP/Wrapper/ProxyServer/app.rc | 101 ----------- UA COM Interop.sln | 160 ++++++++---------- 5 files changed, 83 insertions(+), 200 deletions(-) delete mode 100644 ComIOP/Wrapper/ProxyServer/app.rc diff --git a/ComIOP/Wrapper/Common/OPC Sample Utility Classes.vcxproj b/ComIOP/Wrapper/Common/OPC Sample Utility Classes.vcxproj index 95446f4f33..a031377bd1 100644 --- a/ComIOP/Wrapper/Common/OPC Sample Utility Classes.vcxproj +++ b/ComIOP/Wrapper/Common/OPC Sample Utility Classes.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -14,17 +14,18 @@ UA COM Server Class Library {268AE545-D614-4B66-AEF3-C5B85919AD9D} OPC Sample Utility Classes + 10.0.15063.0 StaticLibrary - v140 + v141 false Unicode StaticLibrary - v140 + v141 false Unicode diff --git a/ComIOP/Wrapper/Common/OpcXmlType.h b/ComIOP/Wrapper/Common/OpcXmlType.h index 0b36abee72..99cd72a35c 100644 --- a/ComIOP/Wrapper/Common/OpcXmlType.h +++ b/ComIOP/Wrapper/Common/OpcXmlType.h @@ -78,7 +78,7 @@ typedef FILETIME DateTime; // ENUM: Type // PURPOSE: Defines the set of possible XML data types. -typedef enum Type +enum Type { XML_EMPTY = 0x0000, XML_BOOLEAN = 0x0001, diff --git a/ComIOP/Wrapper/ProxyServer/UA COM Proxy Server.vcxproj b/ComIOP/Wrapper/ProxyServer/UA COM Proxy Server.vcxproj index caeb32759e..41d1f3278c 100644 --- a/ComIOP/Wrapper/ProxyServer/UA COM Proxy Server.vcxproj +++ b/ComIOP/Wrapper/ProxyServer/UA COM Proxy Server.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -18,20 +18,20 @@ Application - v140 + v141 Unicode true true Application - v140 + v141 Unicode true - v4.6 - 8.1 + v4.6.1 + 10.0.15063.0 @@ -176,9 +176,6 @@ rem echo Registered Server at "$(TargetPath)" - - - copy "%(Filename)%(Extension)" "$(TargetPath).config" diff --git a/ComIOP/Wrapper/ProxyServer/app.rc b/ComIOP/Wrapper/ProxyServer/app.rc deleted file mode 100644 index 35161bf3b5..0000000000 --- a/ComIOP/Wrapper/ProxyServer/app.rc +++ /dev/null @@ -1,101 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" -#include "..\Include\Version.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -1 ICON "app.ico" - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" - "\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION SDK_FILEVERSION - PRODUCTVERSION SDK_VERSION - FILEFLAGSMASK 0x17L -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "OPC Foundation" - VALUE "FileDescription", "OPC UA COM Proxy Server" - VALUE "FileVersion", SDK_FILEVERSION_STR - VALUE "InternalName", "Opc.Ua.ComProxyServer" - VALUE "LegalCopyright", SDK_COPYRIGHT_NOTICE - VALUE "OriginalFilename", "Opc.Ua.ComProxyServer.exe" - VALUE "ProductName", "OPC UA COM Proxy Server" - VALUE "ProductVersion", SDK_VERSION_STR - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - -CONFIG BIN DISCARDABLE "InstallConfig.xml" diff --git a/UA COM Interop.sln b/UA COM Interop.sln index 15f74e5632..72dcd798fa 100644 --- a/UA COM Interop.sln +++ b/UA COM Interop.sln @@ -1,51 +1,37 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.14 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UA COM Server Wrapper", "ComIOP\Wrapper\ServerWrapper\UA COM Server Wrapper.csproj", "{F4805912-A3F9-4045-BC63-01F34A216EE7}" - ProjectSection(ProjectDependencies) = postProject - {24D3C616-ED4C-4AF9-B529-7B418EC8ACC4} = {24D3C616-ED4C-4AF9-B529-7B418EC8ACC4} - {C444E219-EED3-4775-B399-B81FF2B900AF} = {C444E219-EED3-4775-B399-B81FF2B900AF} - {6C449A1E-244E-4515-9949-A7E22012537C} = {6C449A1E-244E-4515-9949-A7E22012537C} - {99A94D4A-810D-49EF-B043-7F560E654A41} = {99A94D4A-810D-49EF-B043-7F560E654A41} - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4} = {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4} - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UA COM Interop Library", "ComIOP\Common\UA COM Interop Library.csproj", "{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}" - ProjectSection(ProjectDependencies) = postProject - {C444E219-EED3-4775-B399-B81FF2B900AF} = {C444E219-EED3-4775-B399-B81FF2B900AF} - {6C449A1E-244E-4515-9949-A7E22012537C} = {6C449A1E-244E-4515-9949-A7E22012537C} - {99A94D4A-810D-49EF-B043-7F560E654A41} = {99A94D4A-810D-49EF-B043-7F560E654A41} - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4} = {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UA COM Proxy Server", "ComIOP\Wrapper\ProxyServer\UA COM Proxy Server.vcxproj", "{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}" - ProjectSection(ProjectDependencies) = postProject - {24D3C616-ED4C-4AF9-B529-7B418EC8ACC4} = {24D3C616-ED4C-4AF9-B529-7B418EC8ACC4} - {C444E219-EED3-4775-B399-B81FF2B900AF} = {C444E219-EED3-4775-B399-B81FF2B900AF} - {6C449A1E-244E-4515-9949-A7E22012537C} = {6C449A1E-244E-4515-9949-A7E22012537C} - {268AE545-D614-4B66-AEF3-C5B85919AD9D} = {268AE545-D614-4B66-AEF3-C5B85919AD9D} - {99A94D4A-810D-49EF-B043-7F560E654A41} = {99A94D4A-810D-49EF-B043-7F560E654A41} - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4} = {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UA COM Server Class Library", "ComIOP\Wrapper\Common\OPC Sample Utility Classes.vcxproj", "{268AE545-D614-4B66-AEF3-C5B85919AD9D}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Opc.Ua.Core", "Stack\Opc.Ua.Core\Opc.Ua.Core.xproj", "{99A94D4A-810D-49EF-B043-7F560E654A41}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Opc.Ua.Client", "SampleApplications\SDK\Opc.Ua.Client\Opc.Ua.Client.xproj", "{ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Opc.Ua.Configuration", "SampleApplications\SDK\Opc.Ua.Configuration\Opc.Ua.Configuration.xproj", "{C444E219-EED3-4775-B399-B81FF2B900AF}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Opc.Ua.Server", "SampleApplications\SDK\Opc.Ua.Server\Opc.Ua.Server.xproj", "{6C449A1E-244E-4515-9949-A7E22012537C}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FCC27D39-586F-4F1E-8373-4FB3C58333BC}" ProjectSection(SolutionItems) = preProject .gitattributes = .gitattributes .gitignore = .gitignore EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UA COM Server Wrapper", "ComIOP\Wrapper\ServerWrapper\UA COM Server Wrapper.csproj", "{F4805912-A3F9-4045-BC63-01F34A216EE7}" + ProjectSection(ProjectDependencies) = postProject + {24D3C616-ED4C-4AF9-B529-7B418EC8ACC4} = {24D3C616-ED4C-4AF9-B529-7B418EC8ACC4} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UA COM Interop Library", "ComIOP\Common\UA COM Interop Library.csproj", "{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UA COM Proxy Server", "ComIOP\Wrapper\ProxyServer\UA COM Proxy Server.vcxproj", "{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}" + ProjectSection(ProjectDependencies) = postProject + {24D3C616-ED4C-4AF9-B529-7B418EC8ACC4} = {24D3C616-ED4C-4AF9-B529-7B418EC8ACC4} + {268AE545-D614-4B66-AEF3-C5B85919AD9D} = {268AE545-D614-4B66-AEF3-C5B85919AD9D} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UA COM Server Class Library", "ComIOP\Wrapper\Common\OPC Sample Utility Classes.vcxproj", "{268AE545-D614-4B66-AEF3-C5B85919AD9D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Opc.Ua.Core", "Stack\Opc.Ua.Core\Opc.Ua.Core.csproj", "{23EBD274-7FCE-4166-A817-825DD6853EA0}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Opc.Ua.Client", "SampleApplications\SDK\Opc.Ua.Client\Opc.Ua.Client.csproj", "{F12C886C-234D-4C11-B7FC-55CC8A290937}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Opc.Ua.Configuration", "SampleApplications\SDK\Opc.Ua.Configuration\Opc.Ua.Configuration.csproj", "{1EB627CE-2A5B-429B-9325-64C3382A0741}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Opc.Ua.Server", "SampleApplications\SDK\Opc.Ua.Server\Opc.Ua.Server.csproj", "{EAA09C07-35D2-4172-BD4A-C4C8F255D6B5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -96,54 +82,54 @@ Global {268AE545-D614-4B66-AEF3-C5B85919AD9D}.Release|Mixed Platforms.Build.0 = Release|Win32 {268AE545-D614-4B66-AEF3-C5B85919AD9D}.Release|Win32.ActiveCfg = Release|Win32 {268AE545-D614-4B66-AEF3-C5B85919AD9D}.Release|Win32.Build.0 = Release|Win32 - {99A94D4A-810D-49EF-B043-7F560E654A41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99A94D4A-810D-49EF-B043-7F560E654A41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99A94D4A-810D-49EF-B043-7F560E654A41}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {99A94D4A-810D-49EF-B043-7F560E654A41}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {99A94D4A-810D-49EF-B043-7F560E654A41}.Debug|Win32.ActiveCfg = Debug|Any CPU - {99A94D4A-810D-49EF-B043-7F560E654A41}.Debug|Win32.Build.0 = Debug|Any CPU - {99A94D4A-810D-49EF-B043-7F560E654A41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99A94D4A-810D-49EF-B043-7F560E654A41}.Release|Any CPU.Build.0 = Release|Any CPU - {99A94D4A-810D-49EF-B043-7F560E654A41}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {99A94D4A-810D-49EF-B043-7F560E654A41}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {99A94D4A-810D-49EF-B043-7F560E654A41}.Release|Win32.ActiveCfg = Release|Any CPU - {99A94D4A-810D-49EF-B043-7F560E654A41}.Release|Win32.Build.0 = Release|Any CPU - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4}.Debug|Win32.ActiveCfg = Debug|Any CPU - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4}.Debug|Win32.Build.0 = Debug|Any CPU - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4}.Release|Any CPU.Build.0 = Release|Any CPU - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4}.Release|Win32.ActiveCfg = Release|Any CPU - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4}.Release|Win32.Build.0 = Release|Any CPU - {C444E219-EED3-4775-B399-B81FF2B900AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C444E219-EED3-4775-B399-B81FF2B900AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C444E219-EED3-4775-B399-B81FF2B900AF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C444E219-EED3-4775-B399-B81FF2B900AF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {C444E219-EED3-4775-B399-B81FF2B900AF}.Debug|Win32.ActiveCfg = Debug|Any CPU - {C444E219-EED3-4775-B399-B81FF2B900AF}.Debug|Win32.Build.0 = Debug|Any CPU - {C444E219-EED3-4775-B399-B81FF2B900AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C444E219-EED3-4775-B399-B81FF2B900AF}.Release|Any CPU.Build.0 = Release|Any CPU - {C444E219-EED3-4775-B399-B81FF2B900AF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {C444E219-EED3-4775-B399-B81FF2B900AF}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {C444E219-EED3-4775-B399-B81FF2B900AF}.Release|Win32.ActiveCfg = Release|Any CPU - {C444E219-EED3-4775-B399-B81FF2B900AF}.Release|Win32.Build.0 = Release|Any CPU - {6C449A1E-244E-4515-9949-A7E22012537C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C449A1E-244E-4515-9949-A7E22012537C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C449A1E-244E-4515-9949-A7E22012537C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {6C449A1E-244E-4515-9949-A7E22012537C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {6C449A1E-244E-4515-9949-A7E22012537C}.Debug|Win32.ActiveCfg = Debug|Any CPU - {6C449A1E-244E-4515-9949-A7E22012537C}.Debug|Win32.Build.0 = Debug|Any CPU - {6C449A1E-244E-4515-9949-A7E22012537C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C449A1E-244E-4515-9949-A7E22012537C}.Release|Any CPU.Build.0 = Release|Any CPU - {6C449A1E-244E-4515-9949-A7E22012537C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {6C449A1E-244E-4515-9949-A7E22012537C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {6C449A1E-244E-4515-9949-A7E22012537C}.Release|Win32.ActiveCfg = Release|Any CPU - {6C449A1E-244E-4515-9949-A7E22012537C}.Release|Win32.Build.0 = Release|Any CPU + {23EBD274-7FCE-4166-A817-825DD6853EA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {23EBD274-7FCE-4166-A817-825DD6853EA0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {23EBD274-7FCE-4166-A817-825DD6853EA0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {23EBD274-7FCE-4166-A817-825DD6853EA0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {23EBD274-7FCE-4166-A817-825DD6853EA0}.Debug|Win32.ActiveCfg = Debug|Any CPU + {23EBD274-7FCE-4166-A817-825DD6853EA0}.Debug|Win32.Build.0 = Debug|Any CPU + {23EBD274-7FCE-4166-A817-825DD6853EA0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {23EBD274-7FCE-4166-A817-825DD6853EA0}.Release|Any CPU.Build.0 = Release|Any CPU + {23EBD274-7FCE-4166-A817-825DD6853EA0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {23EBD274-7FCE-4166-A817-825DD6853EA0}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {23EBD274-7FCE-4166-A817-825DD6853EA0}.Release|Win32.ActiveCfg = Release|Any CPU + {23EBD274-7FCE-4166-A817-825DD6853EA0}.Release|Win32.Build.0 = Release|Any CPU + {F12C886C-234D-4C11-B7FC-55CC8A290937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F12C886C-234D-4C11-B7FC-55CC8A290937}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F12C886C-234D-4C11-B7FC-55CC8A290937}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {F12C886C-234D-4C11-B7FC-55CC8A290937}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {F12C886C-234D-4C11-B7FC-55CC8A290937}.Debug|Win32.ActiveCfg = Debug|Any CPU + {F12C886C-234D-4C11-B7FC-55CC8A290937}.Debug|Win32.Build.0 = Debug|Any CPU + {F12C886C-234D-4C11-B7FC-55CC8A290937}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F12C886C-234D-4C11-B7FC-55CC8A290937}.Release|Any CPU.Build.0 = Release|Any CPU + {F12C886C-234D-4C11-B7FC-55CC8A290937}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {F12C886C-234D-4C11-B7FC-55CC8A290937}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {F12C886C-234D-4C11-B7FC-55CC8A290937}.Release|Win32.ActiveCfg = Release|Any CPU + {F12C886C-234D-4C11-B7FC-55CC8A290937}.Release|Win32.Build.0 = Release|Any CPU + {1EB627CE-2A5B-429B-9325-64C3382A0741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1EB627CE-2A5B-429B-9325-64C3382A0741}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1EB627CE-2A5B-429B-9325-64C3382A0741}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {1EB627CE-2A5B-429B-9325-64C3382A0741}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {1EB627CE-2A5B-429B-9325-64C3382A0741}.Debug|Win32.ActiveCfg = Debug|Any CPU + {1EB627CE-2A5B-429B-9325-64C3382A0741}.Debug|Win32.Build.0 = Debug|Any CPU + {1EB627CE-2A5B-429B-9325-64C3382A0741}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1EB627CE-2A5B-429B-9325-64C3382A0741}.Release|Any CPU.Build.0 = Release|Any CPU + {1EB627CE-2A5B-429B-9325-64C3382A0741}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {1EB627CE-2A5B-429B-9325-64C3382A0741}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {1EB627CE-2A5B-429B-9325-64C3382A0741}.Release|Win32.ActiveCfg = Release|Any CPU + {1EB627CE-2A5B-429B-9325-64C3382A0741}.Release|Win32.Build.0 = Release|Any CPU + {EAA09C07-35D2-4172-BD4A-C4C8F255D6B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EAA09C07-35D2-4172-BD4A-C4C8F255D6B5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EAA09C07-35D2-4172-BD4A-C4C8F255D6B5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {EAA09C07-35D2-4172-BD4A-C4C8F255D6B5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {EAA09C07-35D2-4172-BD4A-C4C8F255D6B5}.Debug|Win32.ActiveCfg = Debug|Any CPU + {EAA09C07-35D2-4172-BD4A-C4C8F255D6B5}.Debug|Win32.Build.0 = Debug|Any CPU + {EAA09C07-35D2-4172-BD4A-C4C8F255D6B5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EAA09C07-35D2-4172-BD4A-C4C8F255D6B5}.Release|Any CPU.Build.0 = Release|Any CPU + {EAA09C07-35D2-4172-BD4A-C4C8F255D6B5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {EAA09C07-35D2-4172-BD4A-C4C8F255D6B5}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {EAA09C07-35D2-4172-BD4A-C4C8F255D6B5}.Release|Win32.ActiveCfg = Release|Any CPU + {EAA09C07-35D2-4172-BD4A-C4C8F255D6B5}.Release|Win32.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 9bad4a301ab066c260541119a58b681c173deb9f Mon Sep 17 00:00:00 2001 From: Erich Barnstedt Date: Thu, 29 Jun 2017 07:51:04 -0700 Subject: [PATCH 2/2] Upgrade other solutions and fix travis issues. --- .travis.yml | 10 +- ComIOP/Common/Proxy/OpcProxyUtils.cs | 9 +- ComIOP/Common/UA COM Interop Library.csproj | 54 +- ComIOP/Common/packages.config | 8 + ComIOP/Rcw/OPC COM RCW Library.csproj | 10 +- .../UA COM Interop.sln | 157 +-- .../OPC Sample Utility Classes (VC8).vcproj | 963 ----------------- .../Common/OPC Sample Utility Classes.vcproj | 967 ------------------ .../ProxyServer/UA COM Proxy Server.vcproj | 459 --------- .../ProxyServer/UA COM Proxy Server.vcxproj | 29 +- ComIOP/Wrapper/ServerWrapper/App.config | 2 +- .../Properties/Settings.Designer.cs | 2 +- .../UA COM Server Wrapper.csproj | 42 +- ComIOP/Wrapper/ServerWrapper/app.manifest | 18 - .../UA Client Controls.csproj | 4 - .../Samples/Controls.Net4/ClientForm.cs | 2 +- .../Controls.Net4/UA Sample Controls.csproj | 6 +- .../UA Server Controls.csproj | 6 +- .../Client/Aggregation Client.csproj | 28 +- .../Workshop/Aggregation/Client/App.config | 2 +- .../Client/Properties/Settings.Designer.cs | 2 +- .../ConsoleAggregationServer.csproj | 8 +- .../ConsoleAggregationServer.xproj | 19 - .../ConsoleAggregationServer/project.json | 40 - .../Server/Aggregation Server.csproj | 40 +- .../Workshop/Aggregation/Server/App.config | 2 +- .../Server/Properties/Settings.Designer.cs | 2 +- .../Workshop/Aggregation/Server/app.manifest | 18 - .../Aggregation/Server/packages.config | 4 + .../Workshop/Aggregation/UA Aggregation.sln | 75 +- .../Workshop/Reference/Client/App.config | 18 +- .../Client/Properties/Settings.Designer.cs | 2 +- .../Reference/Client/Reference Client.csproj | 38 +- .../ConsoleReferenceServer.csproj | 5 +- .../ConsoleReferenceServer.xproj | 19 - .../ConsoleReferenceServer/project.json | 28 - .../Workshop/Reference/Server/App.config | 24 +- .../Server/Properties/Settings.Designer.cs | 2 +- .../Reference/Server/Reference Server.csproj | 36 +- .../Workshop/Reference/Server/app.manifest | 18 - .../Workshop/Reference/UA Reference.sln | 66 +- 41 files changed, 359 insertions(+), 2885 deletions(-) create mode 100644 ComIOP/Common/packages.config rename UA COM Interop.sln => ComIOP/UA COM Interop.sln (51%) delete mode 100644 ComIOP/Wrapper/Common/OPC Sample Utility Classes (VC8).vcproj delete mode 100644 ComIOP/Wrapper/Common/OPC Sample Utility Classes.vcproj delete mode 100644 ComIOP/Wrapper/ProxyServer/UA COM Proxy Server.vcproj delete mode 100644 SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.xproj delete mode 100644 SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/project.json create mode 100644 SampleApplications/Workshop/Aggregation/Server/packages.config delete mode 100644 SampleApplications/Workshop/Reference/ConsoleReferenceServer/ConsoleReferenceServer.xproj delete mode 100644 SampleApplications/Workshop/Reference/ConsoleReferenceServer/project.json diff --git a/.travis.yml b/.travis.yml index 2a1416fadb..4b9db48a9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,18 +11,14 @@ install: - sudo apt-get update - sudo apt-get install dotnet-dev-1.0.4 -y script: - - echo "========== build all .Net Standard samples ============" + - echo "========== build all .Net Core samples ============" - dotnet restore - dotnet build -c Debug -f netcoreapp1.1 SampleApplications/Samples/NetCoreConsoleClient - dotnet build -c Debug -f netcoreapp1.1 SampleApplications/Samples/NetCoreConsoleServer - - dotnet build -c Debug -f netcoreapp1.1 SampleApplications/Workshop/Aggregation/ConsoleAggregationServer - - dotnet build -c Debug -f netcoreapp1.1 SampleApplications/Workshop/Reference/ConsoleReferenceServer - dotnet build -c Release -f netcoreapp1.1 SampleApplications/Samples/NetCoreConsoleClient - dotnet build -c Release -f netcoreapp1.1 SampleApplications/Samples/NetCoreConsoleServer - - dotnet build -c Release -f netcoreapp1.1 SampleApplications/Workshop/Aggregation/ConsoleAggregationServer - - dotnet build -c Release -f netcoreapp1.1 SampleApplications/Workshop/Reference/ConsoleReferenceServer + after_script: - echo "========== build done ============" - - pwd - - ls -al + diff --git a/ComIOP/Common/Proxy/OpcProxyUtils.cs b/ComIOP/Common/Proxy/OpcProxyUtils.cs index 7f996c33f9..d05ee7e822 100644 --- a/ComIOP/Common/Proxy/OpcProxyUtils.cs +++ b/ComIOP/Common/Proxy/OpcProxyUtils.cs @@ -76,13 +76,18 @@ namespace Opc.Ua.Com certificate = CertificateFactory.CreateCertificate( id.StoreType, id.StorePath, + null, configuration.ApplicationUri, configuration.ApplicationName, subjectName, hostNames, 2048, + DateTime.UtcNow - TimeSpan.FromHours(1), 120, - 256); + 256, + false, + null, + null); // update and save the configuration file. id.Certificate = certificate; @@ -105,7 +110,7 @@ namespace Opc.Ua.Com } // tell the certificate validator about the new certificate. - configuration.CertificateValidator.Update(configuration.SecurityConfiguration); + configuration.CertificateValidator.Update(configuration.SecurityConfiguration).Wait(); } diff --git a/ComIOP/Common/UA COM Interop Library.csproj b/ComIOP/Common/UA COM Interop Library.csproj index cf46c6d4f0..a44f583b2a 100644 --- a/ComIOP/Common/UA COM Interop Library.csproj +++ b/ComIOP/Common/UA COM Interop Library.csproj @@ -19,7 +19,7 @@ true - v4.6 + v4.6.1 http://localhost/Opc.Ua.ComInterop/ true Web @@ -62,22 +62,6 @@ false - - False - ..\..\SampleApplications\SDK\Opc.Ua.Client\bin\Debug\net46\Opc.Ua.Client.dll - - - False - ..\..\SampleApplications\SDK\Opc.Ua.Configuration\bin\Debug\net46\Opc.Ua.Configuration.dll - - - False - ..\..\Stack\Opc.Ua.Core\bin\Debug\net46\Opc.Ua.Core.dll - - - False - ..\..\SampleApplications\SDK\Opc.Ua.Server\bin\Debug\net46\Opc.Ua.Server.dll - @@ -86,9 +70,24 @@ + + ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll + + + ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + + + ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + + + ..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll + @@ -271,6 +270,27 @@ + + + {8906c833-3c21-45b7-b103-1f27aa945075} + Opc.Ua.Client + + + {9cde220b-7614-42c4-99b0-7b4713ab2931} + Opc.Ua.Configuration + + + {15aeee57-3aae-4333-b69f-777f6573d8a4} + Opc.Ua.Server + + + {31ec9480-617b-48c4-a5be-1d159a278d1d} + Opc.Ua.Core + + + + + - - - - diff --git a/SampleApplications/Samples/ClientControls.Net4/UA Client Controls.csproj b/SampleApplications/Samples/ClientControls.Net4/UA Client Controls.csproj index b9f0d13a96..2dbcbc052f 100644 --- a/SampleApplications/Samples/ClientControls.Net4/UA Client Controls.csproj +++ b/SampleApplications/Samples/ClientControls.Net4/UA Client Controls.csproj @@ -1033,10 +1033,6 @@ {a39614ca-8ebe-4408-a9d2-38c7e5ae2a1d} Opc.Ua.Configuration - - {bcb915b6-b5c3-45bc-9c8b-f43008df0c14} - Opc.Ua.Sample - - - - - diff --git a/SampleApplications/Workshop/Aggregation/Server/packages.config b/SampleApplications/Workshop/Aggregation/Server/packages.config new file mode 100644 index 0000000000..07534f75ec --- /dev/null +++ b/SampleApplications/Workshop/Aggregation/Server/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/SampleApplications/Workshop/Aggregation/UA Aggregation.sln b/SampleApplications/Workshop/Aggregation/UA Aggregation.sln index 564040a108..d73acf8d0c 100644 --- a/SampleApplications/Workshop/Aggregation/UA Aggregation.sln +++ b/SampleApplications/Workshop/Aggregation/UA Aggregation.sln @@ -1,71 +1,34 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.14 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Opc.Ua.Core", "..\..\..\Stack\Opc.Ua.Core\Opc.Ua.Core.xproj", "{99A94D4A-810D-49EF-B043-7F560E654A41}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Opc.Ua.Server", "..\..\SDK\Opc.Ua.Server\Opc.Ua.Server.xproj", "{6C449A1E-244E-4515-9949-A7E22012537C}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Opc.Ua.Configuration", "..\..\SDK\Opc.Ua.Configuration\Opc.Ua.Configuration.xproj", "{C444E219-EED3-4775-B399-B81FF2B900AF}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Opc.Ua.Client", "..\..\SDK\Opc.Ua.Client\Opc.Ua.Client.xproj", "{ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UA Client Controls", "..\..\Samples\ClientControls.Net4\UA Client Controls.csproj", "{A247D2EE-14FC-463D-A9BA-6CFF1EF22B7A}" - ProjectSection(ProjectDependencies) = postProject - {C444E219-EED3-4775-B399-B81FF2B900AF} = {C444E219-EED3-4775-B399-B81FF2B900AF} - {99A94D4A-810D-49EF-B043-7F560E654A41} = {99A94D4A-810D-49EF-B043-7F560E654A41} - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4} = {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4} - EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UA Server Controls", "..\..\Samples\ServerControls.Net4\UA Server Controls.csproj", "{80056988-44E7-4EF4-9F59-50BCF215CB03}" - ProjectSection(ProjectDependencies) = postProject - {C444E219-EED3-4775-B399-B81FF2B900AF} = {C444E219-EED3-4775-B399-B81FF2B900AF} - {6C449A1E-244E-4515-9949-A7E22012537C} = {6C449A1E-244E-4515-9949-A7E22012537C} - {99A94D4A-810D-49EF-B043-7F560E654A41} = {99A94D4A-810D-49EF-B043-7F560E654A41} - EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aggregation Client", "Client\Aggregation Client.csproj", "{F866F577-1EE0-447C-B47F-30180313B4C6}" - ProjectSection(ProjectDependencies) = postProject - {C444E219-EED3-4775-B399-B81FF2B900AF} = {C444E219-EED3-4775-B399-B81FF2B900AF} - {99A94D4A-810D-49EF-B043-7F560E654A41} = {99A94D4A-810D-49EF-B043-7F560E654A41} - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4} = {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4} - EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aggregation Server", "Server\Aggregation Server.csproj", "{41A9D2F0-BFE0-4FFB-94F0-57AAC2C26899}" - ProjectSection(ProjectDependencies) = postProject - {C444E219-EED3-4775-B399-B81FF2B900AF} = {C444E219-EED3-4775-B399-B81FF2B900AF} - {6C449A1E-244E-4515-9949-A7E22012537C} = {6C449A1E-244E-4515-9949-A7E22012537C} - {99A94D4A-810D-49EF-B043-7F560E654A41} = {99A94D4A-810D-49EF-B043-7F560E654A41} - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4} = {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4} - EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ConsoleAggregationServer", "ConsoleAggregationServer\ConsoleAggregationServer.xproj", "{F64EA66B-B3E5-4887-8001-EB5F9359FDF3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleAggregationServer", "ConsoleAggregationServer\ConsoleAggregationServer.csproj", "{F64EA66B-B3E5-4887-8001-EB5F9359FDF3}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UA Sample Controls", "..\..\Samples\Controls.Net4\UA Sample Controls.csproj", "{92AE819B-4938-4502-AC32-67063F9893CD}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Opc.Ua.Core", "..\..\..\Stack\Opc.Ua.Core\Opc.Ua.Core.csproj", "{3CE98776-35AF-48D4-B6E0-B716AD1DB889}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Opc.Ua.Client", "..\..\SDK\Opc.Ua.Client\Opc.Ua.Client.csproj", "{79CB842C-8C1C-414E-A9C1-84FA5205AB40}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Opc.Ua.Configuration", "..\..\SDK\Opc.Ua.Configuration\Opc.Ua.Configuration.csproj", "{7289B366-D72A-4AAD-9024-EF5F74B3025D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Opc.Ua.Server", "..\..\SDK\Opc.Ua.Server\Opc.Ua.Server.csproj", "{54E066C7-E4B0-4911-8B90-D7FD88D9304F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {99A94D4A-810D-49EF-B043-7F560E654A41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99A94D4A-810D-49EF-B043-7F560E654A41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99A94D4A-810D-49EF-B043-7F560E654A41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99A94D4A-810D-49EF-B043-7F560E654A41}.Release|Any CPU.Build.0 = Release|Any CPU - {6C449A1E-244E-4515-9949-A7E22012537C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C449A1E-244E-4515-9949-A7E22012537C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C449A1E-244E-4515-9949-A7E22012537C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C449A1E-244E-4515-9949-A7E22012537C}.Release|Any CPU.Build.0 = Release|Any CPU - {C444E219-EED3-4775-B399-B81FF2B900AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C444E219-EED3-4775-B399-B81FF2B900AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C444E219-EED3-4775-B399-B81FF2B900AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C444E219-EED3-4775-B399-B81FF2B900AF}.Release|Any CPU.Build.0 = Release|Any CPU - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4}.Release|Any CPU.Build.0 = Release|Any CPU {A247D2EE-14FC-463D-A9BA-6CFF1EF22B7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A247D2EE-14FC-463D-A9BA-6CFF1EF22B7A}.Debug|Any CPU.Build.0 = Debug|Any CPU {A247D2EE-14FC-463D-A9BA-6CFF1EF22B7A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -90,6 +53,22 @@ Global {92AE819B-4938-4502-AC32-67063F9893CD}.Debug|Any CPU.Build.0 = Debug|Any CPU {92AE819B-4938-4502-AC32-67063F9893CD}.Release|Any CPU.ActiveCfg = Release|Any CPU {92AE819B-4938-4502-AC32-67063F9893CD}.Release|Any CPU.Build.0 = Release|Any CPU + {3CE98776-35AF-48D4-B6E0-B716AD1DB889}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3CE98776-35AF-48D4-B6E0-B716AD1DB889}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3CE98776-35AF-48D4-B6E0-B716AD1DB889}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3CE98776-35AF-48D4-B6E0-B716AD1DB889}.Release|Any CPU.Build.0 = Release|Any CPU + {79CB842C-8C1C-414E-A9C1-84FA5205AB40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {79CB842C-8C1C-414E-A9C1-84FA5205AB40}.Debug|Any CPU.Build.0 = Debug|Any CPU + {79CB842C-8C1C-414E-A9C1-84FA5205AB40}.Release|Any CPU.ActiveCfg = Release|Any CPU + {79CB842C-8C1C-414E-A9C1-84FA5205AB40}.Release|Any CPU.Build.0 = Release|Any CPU + {7289B366-D72A-4AAD-9024-EF5F74B3025D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7289B366-D72A-4AAD-9024-EF5F74B3025D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7289B366-D72A-4AAD-9024-EF5F74B3025D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7289B366-D72A-4AAD-9024-EF5F74B3025D}.Release|Any CPU.Build.0 = Release|Any CPU + {54E066C7-E4B0-4911-8B90-D7FD88D9304F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {54E066C7-E4B0-4911-8B90-D7FD88D9304F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {54E066C7-E4B0-4911-8B90-D7FD88D9304F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {54E066C7-E4B0-4911-8B90-D7FD88D9304F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SampleApplications/Workshop/Reference/Client/App.config b/SampleApplications/Workshop/Reference/Client/App.config index 19fa0604a9..cb08eebd7e 100644 --- a/SampleApplications/Workshop/Reference/Client/App.config +++ b/SampleApplications/Workshop/Reference/Client/App.config @@ -1,7 +1,7 @@ - + -
+
- + - - + + @@ -59,20 +59,20 @@ Quickstarts.ReferenceServer.Config.xml - + - - + + - - + + - - + + diff --git a/SampleApplications/Workshop/Reference/Server/Properties/Settings.Designer.cs b/SampleApplications/Workshop/Reference/Server/Properties/Settings.Designer.cs index 6d4a8e7bd0..f31a6b4f37 100644 --- a/SampleApplications/Workshop/Reference/Server/Properties/Settings.Designer.cs +++ b/SampleApplications/Workshop/Reference/Server/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace Quickstarts.ReferenceServer.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.1.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/SampleApplications/Workshop/Reference/Server/Reference Server.csproj b/SampleApplications/Workshop/Reference/Server/Reference Server.csproj index 4ec59aabb4..943b4afc83 100644 --- a/SampleApplications/Workshop/Reference/Server/Reference Server.csproj +++ b/SampleApplications/Workshop/Reference/Server/Reference Server.csproj @@ -4,13 +4,15 @@ Debug AnyCPU 9.0.30729 + PackageReference + true 2.0 {42EF4F25-29BF-4AB7-B403-8523694A3B36} WinExe Properties Quickstarts.ReferenceServer Quickstarts.ReferenceServer - v4.6 + v4.6.1 512 App.ico app.manifest @@ -61,18 +63,6 @@ Always - - ..\..\..\SDK\Opc.Ua.Client\bin\Debug\net46\Opc.Ua.Client.dll - - - ..\..\..\SDK\Opc.Ua.Configuration\bin\Debug\net46\Opc.Ua.Configuration.dll - - - ..\..\..\..\Stack\Opc.Ua.Core\bin\Debug\net46\Opc.Ua.Core.dll - - - ..\..\..\SDK\Opc.Ua.Server\bin\Debug\net46\Opc.Ua.Server.dll - @@ -96,10 +86,6 @@ - - Always - - MonitoredItemEventLogDlg.cs @@ -147,10 +133,26 @@ + + {4aa5224f-afa4-4367-b8b1-9103c594f41a} + Opc.Ua.Core + {80056988-44E7-4EF4-9F59-50BCF215CB03} UA Server Controls + + {ef4ae519-5065-4e2f-a3c7-93b8cde4ebe5} + Opc.Ua.Client + + + {e0657832-597a-4eaa-b026-dc54a0a2928d} + Opc.Ua.Configuration + + + {251c2bd9-33f5-4eb1-903d-8463c8fd16f0} + Opc.Ua.Server + diff --git a/SampleApplications/Workshop/Reference/Server/app.manifest b/SampleApplications/Workshop/Reference/Server/app.manifest index 08f910bcd5..7b7fe720b9 100644 --- a/SampleApplications/Workshop/Reference/Server/app.manifest +++ b/SampleApplications/Workshop/Reference/Server/app.manifest @@ -1,22 +1,4 @@  - - - - - - - - diff --git a/SampleApplications/Workshop/Reference/UA Reference.sln b/SampleApplications/Workshop/Reference/UA Reference.sln index 1340a44a37..2e1f8eb7c6 100644 --- a/SampleApplications/Workshop/Reference/UA Reference.sln +++ b/SampleApplications/Workshop/Reference/UA Reference.sln @@ -1,40 +1,28 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.14 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Reference Client", "Client\Reference Client.csproj", "{9C1E7F15-2EE3-440D-8E17-00C38073822A}" - ProjectSection(ProjectDependencies) = postProject - {C444E219-EED3-4775-B399-B81FF2B900AF} = {C444E219-EED3-4775-B399-B81FF2B900AF} - {6C449A1E-244E-4515-9949-A7E22012537C} = {6C449A1E-244E-4515-9949-A7E22012537C} - {99A94D4A-810D-49EF-B043-7F560E654A41} = {99A94D4A-810D-49EF-B043-7F560E654A41} - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4} = {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4} - EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Reference Server", "Server\Reference Server.csproj", "{42EF4F25-29BF-4AB7-B403-8523694A3B36}" - ProjectSection(ProjectDependencies) = postProject - {C444E219-EED3-4775-B399-B81FF2B900AF} = {C444E219-EED3-4775-B399-B81FF2B900AF} - {6C449A1E-244E-4515-9949-A7E22012537C} = {6C449A1E-244E-4515-9949-A7E22012537C} - {99A94D4A-810D-49EF-B043-7F560E654A41} = {99A94D4A-810D-49EF-B043-7F560E654A41} - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4} = {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4} - EndProjectSection -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Opc.Ua.Core", "..\..\..\Stack\Opc.Ua.Core\Opc.Ua.Core.xproj", "{99A94D4A-810D-49EF-B043-7F560E654A41}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Opc.Ua.Server", "..\..\SDK\Opc.Ua.Server\Opc.Ua.Server.xproj", "{6C449A1E-244E-4515-9949-A7E22012537C}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Opc.Ua.Configuration", "..\..\SDK\Opc.Ua.Configuration\Opc.Ua.Configuration.xproj", "{C444E219-EED3-4775-B399-B81FF2B900AF}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Opc.Ua.Client", "..\..\SDK\Opc.Ua.Client\Opc.Ua.Client.xproj", "{ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UA Client Controls", "..\..\Samples\ClientControls.Net4\UA Client Controls.csproj", "{A247D2EE-14FC-463D-A9BA-6CFF1EF22B7A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UA Server Controls", "..\..\Samples\ServerControls.Net4\UA Server Controls.csproj", "{80056988-44E7-4EF4-9F59-50BCF215CB03}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ConsoleReferenceServer", "ConsoleReferenceServer\ConsoleReferenceServer.xproj", "{F64EA66B-B3E5-4887-8001-EB5F9359FDF3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleReferenceServer", "ConsoleReferenceServer\ConsoleReferenceServer.csproj", "{F64EA66B-B3E5-4887-8001-EB5F9359FDF3}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UA Sample Controls", "..\..\Samples\Controls.Net4\UA Sample Controls.csproj", "{92AE819B-4938-4502-AC32-67063F9893CD}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Opc.Ua.Core", "..\..\..\Stack\Opc.Ua.Core\Opc.Ua.Core.csproj", "{4AA5224F-AFA4-4367-B8B1-9103C594F41A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Opc.Ua.Client", "..\..\SDK\Opc.Ua.Client\Opc.Ua.Client.csproj", "{EF4AE519-5065-4E2F-A3C7-93B8CDE4EBE5}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Opc.Ua.Configuration", "..\..\SDK\Opc.Ua.Configuration\Opc.Ua.Configuration.csproj", "{E0657832-597A-4EAA-B026-DC54A0A2928D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Opc.Ua.Server", "..\..\SDK\Opc.Ua.Server\Opc.Ua.Server.csproj", "{251C2BD9-33F5-4EB1-903D-8463C8FD16F0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -49,22 +37,6 @@ Global {42EF4F25-29BF-4AB7-B403-8523694A3B36}.Debug|Any CPU.Build.0 = Debug|Any CPU {42EF4F25-29BF-4AB7-B403-8523694A3B36}.Release|Any CPU.ActiveCfg = Release|Any CPU {42EF4F25-29BF-4AB7-B403-8523694A3B36}.Release|Any CPU.Build.0 = Release|Any CPU - {99A94D4A-810D-49EF-B043-7F560E654A41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99A94D4A-810D-49EF-B043-7F560E654A41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99A94D4A-810D-49EF-B043-7F560E654A41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99A94D4A-810D-49EF-B043-7F560E654A41}.Release|Any CPU.Build.0 = Release|Any CPU - {6C449A1E-244E-4515-9949-A7E22012537C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C449A1E-244E-4515-9949-A7E22012537C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C449A1E-244E-4515-9949-A7E22012537C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C449A1E-244E-4515-9949-A7E22012537C}.Release|Any CPU.Build.0 = Release|Any CPU - {C444E219-EED3-4775-B399-B81FF2B900AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C444E219-EED3-4775-B399-B81FF2B900AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C444E219-EED3-4775-B399-B81FF2B900AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C444E219-EED3-4775-B399-B81FF2B900AF}.Release|Any CPU.Build.0 = Release|Any CPU - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4}.Release|Any CPU.Build.0 = Release|Any CPU {A247D2EE-14FC-463D-A9BA-6CFF1EF22B7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A247D2EE-14FC-463D-A9BA-6CFF1EF22B7A}.Debug|Any CPU.Build.0 = Debug|Any CPU {A247D2EE-14FC-463D-A9BA-6CFF1EF22B7A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -81,6 +53,22 @@ Global {92AE819B-4938-4502-AC32-67063F9893CD}.Debug|Any CPU.Build.0 = Debug|Any CPU {92AE819B-4938-4502-AC32-67063F9893CD}.Release|Any CPU.ActiveCfg = Release|Any CPU {92AE819B-4938-4502-AC32-67063F9893CD}.Release|Any CPU.Build.0 = Release|Any CPU + {4AA5224F-AFA4-4367-B8B1-9103C594F41A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4AA5224F-AFA4-4367-B8B1-9103C594F41A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4AA5224F-AFA4-4367-B8B1-9103C594F41A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4AA5224F-AFA4-4367-B8B1-9103C594F41A}.Release|Any CPU.Build.0 = Release|Any CPU + {EF4AE519-5065-4E2F-A3C7-93B8CDE4EBE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EF4AE519-5065-4E2F-A3C7-93B8CDE4EBE5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EF4AE519-5065-4E2F-A3C7-93B8CDE4EBE5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EF4AE519-5065-4E2F-A3C7-93B8CDE4EBE5}.Release|Any CPU.Build.0 = Release|Any CPU + {E0657832-597A-4EAA-B026-DC54A0A2928D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E0657832-597A-4EAA-B026-DC54A0A2928D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E0657832-597A-4EAA-B026-DC54A0A2928D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E0657832-597A-4EAA-B026-DC54A0A2928D}.Release|Any CPU.Build.0 = Release|Any CPU + {251C2BD9-33F5-4EB1-903D-8463C8FD16F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {251C2BD9-33F5-4EB1-903D-8463C8FD16F0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {251C2BD9-33F5-4EB1-903D-8463C8FD16F0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {251C2BD9-33F5-4EB1-903D-8463C8FD16F0}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE