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 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <IsWebBootstrapper>true</IsWebBootstrapper>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <PublishUrl>http://localhost/Opc.Ua.ComInterop/</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
@@ -62,22 +62,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Opc.Ua.Client, Version=1.3.340.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\SampleApplications\SDK\Opc.Ua.Client\bin\Debug\net46\Opc.Ua.Client.dll</HintPath>
-    </Reference>
-    <Reference Include="Opc.Ua.Configuration, Version=1.3.340.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\SampleApplications\SDK\Opc.Ua.Configuration\bin\Debug\net46\Opc.Ua.Configuration.dll</HintPath>
-    </Reference>
-    <Reference Include="Opc.Ua.Core, Version=1.3.340.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Stack\Opc.Ua.Core\bin\Debug\net46\Opc.Ua.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Opc.Ua.Server, Version=1.3.340.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\SampleApplications\SDK\Opc.Ua.Server\bin\Debug\net46\Opc.Ua.Server.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Core">
@@ -86,9 +70,24 @@
     <Reference Include="System.Data" />
     <Reference Include="System.IdentityModel" />
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
+    </Reference>
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Client\Ae\ComAeClient.cs" />
@@ -271,6 +270,27 @@
   <ItemGroup>
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\SampleApplications\SDK\Opc.Ua.Client\Opc.Ua.Client.csproj">
+      <Project>{8906c833-3c21-45b7-b103-1f27aa945075}</Project>
+      <Name>Opc.Ua.Client</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\SampleApplications\SDK\Opc.Ua.Configuration\Opc.Ua.Configuration.csproj">
+      <Project>{9cde220b-7614-42c4-99b0-7b4713ab2931}</Project>
+      <Name>Opc.Ua.Configuration</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\SampleApplications\SDK\Opc.Ua.Server\Opc.Ua.Server.csproj">
+      <Project>{15aeee57-3aae-4333-b69f-777f6573d8a4}</Project>
+      <Name>Opc.Ua.Server</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Stack\Opc.Ua.Core\Opc.Ua.Core.csproj">
+      <Project>{31ec9480-617b-48c4-a5be-1d159a278d1d}</Project>
+      <Name>Opc.Ua.Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ComIOP/Common/packages.config b/ComIOP/Common/packages.config
new file mode 100644
index 0000000000..b37e43b5d6
--- /dev/null
+++ b/ComIOP/Common/packages.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net461" />
+  <package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
+</packages>
\ No newline at end of file
diff --git a/ComIOP/Rcw/OPC COM RCW Library.csproj b/ComIOP/Rcw/OPC COM RCW Library.csproj
index aa3ab03dd6..744903530a 100644
--- a/ComIOP/Rcw/OPC COM RCW Library.csproj	
+++ b/ComIOP/Rcw/OPC COM RCW Library.csproj	
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,10 +10,11 @@
     <RootNamespace>OpcRcw</RootNamespace>
     <AssemblyName>Opc.Ua.ComRcw</AssemblyName>
     <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>OPC Key Pair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
@@ -53,9 +54,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\AssemblyVersionInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="OPC Key Pair.snk" />
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ComIOP/UA COM Interop.sln b/ComIOP/UA COM Interop.sln
new file mode 100644
index 0000000000..ddbffcd426
--- /dev/null
+++ b/ComIOP/UA COM Interop.sln	
@@ -0,0 +1,148 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.14
+MinimumVisualStudioVersion = 10.0.40219.1
+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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Opc.Ua.Client", "..\SampleApplications\SDK\Opc.Ua.Client\Opc.Ua.Client.csproj", "{8906C833-3C21-45B7-B103-1F27AA945075}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Opc.Ua.Configuration", "..\SampleApplications\SDK\Opc.Ua.Configuration\Opc.Ua.Configuration.csproj", "{9CDE220B-7614-42C4-99B0-7B4713AB2931}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Opc.Ua.Server", "..\SampleApplications\SDK\Opc.Ua.Server\Opc.Ua.Server.csproj", "{15AEEE57-3AAE-4333-B69F-777F6573D8A4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Opc.Ua.Core", "..\Stack\Opc.Ua.Core\Opc.Ua.Core.csproj", "{31EC9480-617B-48C4-A5BE-1D159A278D1D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UA COM Interop Library", "Common\UA COM Interop Library.csproj", "{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UA COM Proxy Server", "Wrapper\ProxyServer\UA COM Proxy Server.vcxproj", "{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UA COM Server Wrapper", "Wrapper\ServerWrapper\UA COM Server Wrapper.csproj", "{F4805912-A3F9-4045-BC63-01F34A216EE7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OPC COM RCW Library", "Rcw\OPC COM RCW Library.csproj", "{D9A35B29-E6A9-4A71-A2C2-424E87BB5E50}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UA COM Server Class Library", "Wrapper\Common\OPC Sample Utility Classes.vcxproj", "{268AE545-D614-4B66-AEF3-C5B85919AD9D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|Win32 = Debug|Win32
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8906C833-3C21-45B7-B103-1F27AA945075}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8906C833-3C21-45B7-B103-1F27AA945075}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8906C833-3C21-45B7-B103-1F27AA945075}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8906C833-3C21-45B7-B103-1F27AA945075}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8906C833-3C21-45B7-B103-1F27AA945075}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{8906C833-3C21-45B7-B103-1F27AA945075}.Debug|Win32.Build.0 = Debug|Any CPU
+		{8906C833-3C21-45B7-B103-1F27AA945075}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8906C833-3C21-45B7-B103-1F27AA945075}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8906C833-3C21-45B7-B103-1F27AA945075}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{8906C833-3C21-45B7-B103-1F27AA945075}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{8906C833-3C21-45B7-B103-1F27AA945075}.Release|Win32.ActiveCfg = Release|Any CPU
+		{8906C833-3C21-45B7-B103-1F27AA945075}.Release|Win32.Build.0 = Release|Any CPU
+		{9CDE220B-7614-42C4-99B0-7B4713AB2931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CDE220B-7614-42C4-99B0-7B4713AB2931}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9CDE220B-7614-42C4-99B0-7B4713AB2931}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9CDE220B-7614-42C4-99B0-7B4713AB2931}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9CDE220B-7614-42C4-99B0-7B4713AB2931}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{9CDE220B-7614-42C4-99B0-7B4713AB2931}.Debug|Win32.Build.0 = Debug|Any CPU
+		{9CDE220B-7614-42C4-99B0-7B4713AB2931}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9CDE220B-7614-42C4-99B0-7B4713AB2931}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9CDE220B-7614-42C4-99B0-7B4713AB2931}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9CDE220B-7614-42C4-99B0-7B4713AB2931}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9CDE220B-7614-42C4-99B0-7B4713AB2931}.Release|Win32.ActiveCfg = Release|Any CPU
+		{9CDE220B-7614-42C4-99B0-7B4713AB2931}.Release|Win32.Build.0 = Release|Any CPU
+		{15AEEE57-3AAE-4333-B69F-777F6573D8A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15AEEE57-3AAE-4333-B69F-777F6573D8A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15AEEE57-3AAE-4333-B69F-777F6573D8A4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{15AEEE57-3AAE-4333-B69F-777F6573D8A4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{15AEEE57-3AAE-4333-B69F-777F6573D8A4}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{15AEEE57-3AAE-4333-B69F-777F6573D8A4}.Debug|Win32.Build.0 = Debug|Any CPU
+		{15AEEE57-3AAE-4333-B69F-777F6573D8A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15AEEE57-3AAE-4333-B69F-777F6573D8A4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15AEEE57-3AAE-4333-B69F-777F6573D8A4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{15AEEE57-3AAE-4333-B69F-777F6573D8A4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{15AEEE57-3AAE-4333-B69F-777F6573D8A4}.Release|Win32.ActiveCfg = Release|Any CPU
+		{15AEEE57-3AAE-4333-B69F-777F6573D8A4}.Release|Win32.Build.0 = Release|Any CPU
+		{31EC9480-617B-48C4-A5BE-1D159A278D1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31EC9480-617B-48C4-A5BE-1D159A278D1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31EC9480-617B-48C4-A5BE-1D159A278D1D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{31EC9480-617B-48C4-A5BE-1D159A278D1D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{31EC9480-617B-48C4-A5BE-1D159A278D1D}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{31EC9480-617B-48C4-A5BE-1D159A278D1D}.Debug|Win32.Build.0 = Debug|Any CPU
+		{31EC9480-617B-48C4-A5BE-1D159A278D1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{31EC9480-617B-48C4-A5BE-1D159A278D1D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31EC9480-617B-48C4-A5BE-1D159A278D1D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{31EC9480-617B-48C4-A5BE-1D159A278D1D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{31EC9480-617B-48C4-A5BE-1D159A278D1D}.Release|Win32.ActiveCfg = Release|Any CPU
+		{31EC9480-617B-48C4-A5BE-1D159A278D1D}.Release|Win32.Build.0 = Release|Any CPU
+		{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Debug|Win32.Build.0 = Debug|Any CPU
+		{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Release|Win32.ActiveCfg = Release|Any CPU
+		{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Release|Win32.Build.0 = Release|Any CPU
+		{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}.Debug|Win32.Build.0 = Debug|Win32
+		{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}.Release|Any CPU.ActiveCfg = Release|Win32
+		{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}.Release|Win32.ActiveCfg = Release|Win32
+		{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}.Release|Win32.Build.0 = Release|Win32
+		{F4805912-A3F9-4045-BC63-01F34A216EE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4805912-A3F9-4045-BC63-01F34A216EE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4805912-A3F9-4045-BC63-01F34A216EE7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F4805912-A3F9-4045-BC63-01F34A216EE7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F4805912-A3F9-4045-BC63-01F34A216EE7}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{F4805912-A3F9-4045-BC63-01F34A216EE7}.Debug|Win32.Build.0 = Debug|Any CPU
+		{F4805912-A3F9-4045-BC63-01F34A216EE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4805912-A3F9-4045-BC63-01F34A216EE7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4805912-A3F9-4045-BC63-01F34A216EE7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F4805912-A3F9-4045-BC63-01F34A216EE7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F4805912-A3F9-4045-BC63-01F34A216EE7}.Release|Win32.ActiveCfg = Release|Any CPU
+		{F4805912-A3F9-4045-BC63-01F34A216EE7}.Release|Win32.Build.0 = Release|Any CPU
+		{D9A35B29-E6A9-4A71-A2C2-424E87BB5E50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D9A35B29-E6A9-4A71-A2C2-424E87BB5E50}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D9A35B29-E6A9-4A71-A2C2-424E87BB5E50}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D9A35B29-E6A9-4A71-A2C2-424E87BB5E50}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D9A35B29-E6A9-4A71-A2C2-424E87BB5E50}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{D9A35B29-E6A9-4A71-A2C2-424E87BB5E50}.Debug|Win32.Build.0 = Debug|Any CPU
+		{D9A35B29-E6A9-4A71-A2C2-424E87BB5E50}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D9A35B29-E6A9-4A71-A2C2-424E87BB5E50}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D9A35B29-E6A9-4A71-A2C2-424E87BB5E50}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{D9A35B29-E6A9-4A71-A2C2-424E87BB5E50}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{D9A35B29-E6A9-4A71-A2C2-424E87BB5E50}.Release|Win32.ActiveCfg = Release|Any CPU
+		{D9A35B29-E6A9-4A71-A2C2-424E87BB5E50}.Release|Win32.Build.0 = Release|Any CPU
+		{268AE545-D614-4B66-AEF3-C5B85919AD9D}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{268AE545-D614-4B66-AEF3-C5B85919AD9D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{268AE545-D614-4B66-AEF3-C5B85919AD9D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{268AE545-D614-4B66-AEF3-C5B85919AD9D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{268AE545-D614-4B66-AEF3-C5B85919AD9D}.Debug|Win32.Build.0 = Debug|Win32
+		{268AE545-D614-4B66-AEF3-C5B85919AD9D}.Release|Any CPU.ActiveCfg = Release|Win32
+		{268AE545-D614-4B66-AEF3-C5B85919AD9D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{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
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/ComIOP/Wrapper/Common/OPC Sample Utility Classes (VC8).vcproj b/ComIOP/Wrapper/Common/OPC Sample Utility Classes (VC8).vcproj
deleted file mode 100644
index b1e8247eee..0000000000
--- a/ComIOP/Wrapper/Common/OPC Sample Utility Classes (VC8).vcproj	
+++ /dev/null
@@ -1,963 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="OPC Sample Utility Classes"
-	ProjectGUID="{268AE545-D614-4B66-AEF3-C5B85919AD9D}"
-	RootNamespace="OPC Sample Utility Classes"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include;&quot;$(CommonProgramFiles)\OPC Foundation\Include&quot;"
-				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_WIN32_DCOM;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
-				StringPooling="true"
-				EnableFunctionLevelLinking="true"
-				ForceConformanceInForLoopScope="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="StdAfx.h"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/OpcUtils.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\Include;&quot;$(CommonProgramFiles)\OPC Foundation\Include&quot;"
-				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_WIN32_DCOM;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				ForceConformanceInForLoopScope="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="StdAfx.h"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/OpcUtils.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath=".\COpcBrowseElement.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcClassFactory.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcComModule.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcCommon.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcConnectionPoint.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcCPContainer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcEnumCPs.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcEnumString.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcEnumUnknown.cpp"
-				>
-			</File>
-			<File
-				RelativePath="COpcFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcSecurity.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcString.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcText.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcTextReader.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcThread.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcThreadPool.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcVariant.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcXmlAnyType.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcXmlAttribute.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcXmlDocument.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcXmlElement.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\OpcCategory.cpp"
-				>
-			</File>
-			<File
-				RelativePath="OpcMatch.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\OpcRegistry.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\OpcUtils.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\OpcXmlType.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\StdAfx.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath=".\COpcArray.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcBrowseElement.h"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcClassFactory.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcComModule.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcCommon.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcComObject.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcConnectionPoint.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcCPContainer.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcCriticalSection.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcEnumCPs.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcEnumString.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcEnumUnknown.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="COpcFile.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcList.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcMap.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcSecurity.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcSortedArray.h"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcString.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcText.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcTextReader.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcThread.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcThreadPool.h"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcVariant.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcXmlAnyType.h"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcXmlAttribute.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcXmlDocument.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcXmlElement.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\OpcCategory.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\OpcDefs.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="OpcMatch.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\OpcRegistry.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\OpcUtils.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\OpcXmlType.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\StdAfx.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/ComIOP/Wrapper/Common/OPC Sample Utility Classes.vcproj b/ComIOP/Wrapper/Common/OPC Sample Utility Classes.vcproj
deleted file mode 100644
index 42adf3d7fe..0000000000
--- a/ComIOP/Wrapper/Common/OPC Sample Utility Classes.vcproj	
+++ /dev/null
@@ -1,967 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="UA COM Server Class Library"
-	ProjectGUID="{268AE545-D614-4B66-AEF3-C5B85919AD9D}"
-	RootNamespace="OPC Sample Utility Classes"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\bin\Release"
-			IntermediateDirectory="$(OutDir)\intermediate\$(ProjectName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include;..\..\..\Include;&quot;$(CommonProgramFiles)\OPC Foundation\Include&quot;"
-				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_WIN32_DCOM;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
-				StringPooling="true"
-				EnableFunctionLevelLinking="true"
-				ForceConformanceInForLoopScope="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="StdAfx.h"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/OpcComServer.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\bin\Debug"
-			IntermediateDirectory="$(OutDir)\intermediate\$(ProjectName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\Include;..\..\..\Include;$(OutDir)"
-				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_WIN32_DCOM;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				ForceConformanceInForLoopScope="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="StdAfx.h"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/OpcComServer.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-				OutputDocumentFile="$(OutDir)\docs\$(TargetName).xml"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath=".\COpcBrowseElement.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcClassFactory.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcComModule.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcCommon.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcConnectionPoint.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcCPContainer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcEnumCPs.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcEnumString.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcEnumUnknown.cpp"
-				>
-			</File>
-			<File
-				RelativePath="COpcFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcSecurity.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcString.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcText.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcTextReader.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcThread.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcThreadPool.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcVariant.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcXmlAnyType.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcXmlAttribute.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcXmlDocument.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcXmlElement.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\OpcCategory.cpp"
-				>
-			</File>
-			<File
-				RelativePath="OpcMatch.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\OpcRegistry.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\OpcUtils.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\OpcXmlType.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\StdAfx.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath=".\COpcArray.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcBrowseElement.h"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcClassFactory.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcComModule.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcCommon.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcComObject.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcConnectionPoint.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcCPContainer.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcCriticalSection.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcEnumCPs.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcEnumString.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcEnumUnknown.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="COpcFile.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcList.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcMap.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcSecurity.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcSortedArray.h"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcString.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcText.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcTextReader.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcThread.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcThreadPool.h"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcVariant.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcXmlAnyType.h"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcXmlAttribute.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcXmlDocument.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\COpcXmlElement.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\OpcCategory.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\OpcDefs.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="OpcMatch.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\OpcRegistry.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\OpcUtils.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\OpcXmlType.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine=""
-						Outputs=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\StdAfx.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -14,17 +14,18 @@
     <ProjectName>UA COM Server Class Library</ProjectName>
     <ProjectGuid>{268AE545-D614-4B66-AEF3-C5B85919AD9D}</ProjectGuid>
     <RootNamespace>OPC Sample Utility Classes</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
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.vcproj b/ComIOP/Wrapper/ProxyServer/UA COM Proxy Server.vcproj
deleted file mode 100644
index 3a8ceb448d..0000000000
--- a/ComIOP/Wrapper/ProxyServer/UA COM Proxy Server.vcproj	
+++ /dev/null
@@ -1,459 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="UA COM Proxy Server"
-	ProjectGUID="{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}"
-	RootNamespace="ProxyHost"
-	Keyword="ManagedCProj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\bin\debug"
-			IntermediateDirectory="$(OutDir)\intermediate\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			ManagedExtensions="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine=""
-				Outputs=""
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;..\Common;..\Include;"
-				PreprocessorDefinitions="WIN32;_DEBUG;xOPCUA_NO_DA3_SUPPORT"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="1"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="version.lib rpcrt4.lib"
-				OutputFile="$(OutDir)/Opc.Ua.ComProxyServer.exe"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmtd"
-				GenerateDebugInformation="true"
-				AssemblyDebug="1"
-				SubSystem="2"
-				EntryPointSymbol="main"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if exist &quot;$(TargetPath)&quot; &quot;$(TargetPath)&quot; /UnregServer&#x0D;&#x0A;&quot;$(TargetPath)&quot; /RegServer&#x0D;&#x0A;echo Registered Server at &quot;$(TargetPath)&quot;&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\bin\release"
-			IntermediateDirectory="$(OutDir)\intermediate\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			ManagedExtensions="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine=""
-				Outputs=""
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;..\Common;..\Include;..\..\..\Include;"
-				PreprocessorDefinitions="WIN32;NDEBUG;xOPCUA_NO_DA3_SUPPORT"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="1"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="version.lib rpcrt4.lib"
-				OutputFile="$(OutDir)/Opc.Ua.ComProxyServer.exe"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				EntryPointSymbol="main"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="if exist &quot;$(TargetPath)&quot; &quot;$(TargetPath)&quot; /UnregServer&#x0D;&#x0A;&quot;$(TargetPath)&quot; /RegServer&#x0D;&#x0A;echo Registered Server at &quot;$(TargetPath)&quot;&#x0D;&#x0A;&#x0D;&#x0A;"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-		<AssemblyReference
-			RelativePath="System.dll"
-			AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
-			MinFrameworkVersion="131072"
-		/>
-		<ProjectReference
-			ReferencedProjectIdentifier="{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}"
-			CopyLocalDependencies="false"
-			UseDependenciesInBuild="false"
-			CopyLocalSatelliteAssemblies="false"
-			RelativePathToProject=".\ComInterop\Common\UA COM Interop Library.csproj"
-		/>
-		<AssemblyReference
-			RelativePath="System.XML.dll"
-			AssemblyName="System.Xml, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
-			MinFrameworkVersion="131072"
-		/>
-		<ProjectReference
-			ReferencedProjectIdentifier="{8AB4CB8E-E216-425D-B600-350D0B6B59CD}"
-			CopyLocalDependencies="false"
-			UseDependenciesInBuild="false"
-			CopyLocalSatelliteAssemblies="false"
-			RelativePathToProject=".\SampleApplications\SampleLibraries\Configuration\UA Configuration Library.csproj"
-		/>
-		<ProjectReference
-			ReferencedProjectIdentifier="{7543AFCB-F5AF-44AF-83C9-23164474C1E9}"
-			CopyLocalDependencies="false"
-			UseDependenciesInBuild="false"
-			CopyLocalSatelliteAssemblies="false"
-			RelativePathToProject=".\Stack\Core\UA Core Library.csproj"
-		/>
-		<AssemblyReference
-			RelativePath="System.Windows.Forms.dll"
-			AssemblyName="System.Windows.Forms, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
-			MinFrameworkVersion="131072"
-		/>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\AssemblyInfo.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Ae\COpcEnumStringWrapper.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Hda\COpcHdaTime.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcProxyUtils.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Ae\COpcUaAe2ProxyBrowser.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Ae\COpcUaAe2ProxyEventCallback.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Ae\COpcUaAe2ProxyServer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Ae\COpcUaAe2ProxySubscription.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Da\COpcUaDaProxyEnumItem.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Da\COpcUaDaProxyGroup.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Da\COpcUaDaProxyGroupCallback.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Da\COpcUaDaProxyServer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Hda\COpcUaHdaProxyBrowser.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Hda\COpcUaHdaProxyDataCallback.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Hda\COpcUaHdaProxyServer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Main.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\OpcUaComProxyServer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\OpcUaComProxyServer.idl"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCMIDLTool"
-						AdditionalIncludeDirectories="..\Include;..\..\..\Include"
-						HeaderFileName="$(InputName).h"
-						InterfaceIdentifierFileName="$(InputName)_i.c"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCMIDLTool"
-						AdditionalIncludeDirectories="..\Include;..\..\..\Include"
-						HeaderFileName="$(InputName).h"
-						InterfaceIdentifierFileName="$(InputName)_i.c"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\StdAfx.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\Ae\COpcEnumStringWrapper.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Hda\COpcHdaTime.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Ae\COpcUaAe2ProxyBrowser.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Ae\COpcUaAe2ProxyEventCallback.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Ae\COpcUaAe2ProxyServer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Ae\COpcUaAe2ProxySubscription.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Da\COpcUaDaProxyEnumItem.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Da\COpcUaDaProxyGroup.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Da\COpcUaDaProxyGroupCallback.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Da\COpcUaDaProxyServer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Hda\COpcUaHdaProxyBrowser.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Hda\COpcUaHdaProxyDataCallback.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Hda\COpcUaHdaProxyServer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\COpcUaProxyUtils.h"
-				>
-			</File>
-			<File
-				RelativePath=".\OpcUaComProxyServer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\StdAfx.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\app.ico"
-				>
-			</File>
-			<File
-				RelativePath=".\app.rc"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\app.config"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					CommandLine="copy &quot;$(InputFileName)&quot; &quot;$(TargetPath).config&quot;&#x0D;&#x0A;"
-					Outputs="&quot;$(TargetPath).config&quot;"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					CommandLine="copy &quot;$(InputFileName)&quot; &quot;$(TargetPath).config&quot;&#x0D;&#x0A;"
-					Outputs="&quot;$(TargetPath).config&quot;"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\InstallConfig.xml"
-			>
-		</File>
-		<File
-			RelativePath=".\Opc.Ua.ComProxyServer.Config.xml"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					CommandLine="copy &quot;$(InputFileName)&quot; &quot;$(OutDir)\$(InputFileName)&quot;&#x0D;&#x0A;"
-					Outputs="&quot;$(OutDir)\$(InputFileName)&quot;"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					CommandLine="copy &quot;$(InputFileName)&quot; &quot;$(OutDir)\$(InputFileName)&quot;&#x0D;&#x0A;"
-					Outputs="&quot;$(OutDir)\$(InputFileName)&quot;"
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/ComIOP/Wrapper/ProxyServer/UA COM Proxy Server.vcxproj b/ComIOP/Wrapper/ProxyServer/UA COM Proxy Server.vcxproj
index caeb32759e..4a831ef837 100644
--- a/ComIOP/Wrapper/ProxyServer/UA COM Proxy Server.vcxproj	
+++ b/ComIOP/Wrapper/ProxyServer/UA COM Proxy Server.vcxproj	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -11,6 +11,8 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <ProjectGuid>{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}</ProjectGuid>
     <RootNamespace>ProxyHost</RootNamespace>
     <Keyword>ManagedCProj</Keyword>
@@ -18,20 +20,20 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <CLRSupport>true</CLRSupport>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <CLRSupport>true</CLRSupport>
   </PropertyGroup>
   <PropertyGroup Label="Globals">
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -176,9 +178,6 @@ rem echo Registered Server at "$(TargetPath)"
   <ItemGroup>
     <Image Include="app.ico" />
   </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="app.rc" />
-  </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="app.config">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(Filename)%(Extension)" "$(TargetPath).config"
@@ -201,26 +200,29 @@ rem echo Registered Server at "$(TargetPath)"
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\SampleApplications\SDK\Opc.Ua.Client\Opc.Ua.Client.csproj">
+      <Project>{8906c833-3c21-45b7-b103-1f27aa945075}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\SampleApplications\SDK\Opc.Ua.Configuration\Opc.Ua.Configuration.csproj">
+      <Project>{9cde220b-7614-42c4-99b0-7b4713ab2931}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\SampleApplications\SDK\Opc.Ua.Server\Opc.Ua.Server.csproj">
+      <Project>{15aeee57-3aae-4333-b69f-777f6573d8a4}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Stack\Opc.Ua.Core\Opc.Ua.Core.csproj">
+      <Project>{31ec9480-617b-48c4-a5be-1d159a278d1d}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\Common\UA COM Interop Library.csproj">
       <Project>{24d3c616-ed4c-4af9-b529-7b418ec8acc4}</Project>
     </ProjectReference>
     <ProjectReference Include="..\Common\OPC Sample Utility Classes.vcxproj">
       <Project>{268ae545-d614-4b66-aef3-c5b85919ad9d}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\ServerWrapper\UA COM Server Wrapper.csproj">
+      <Project>{f4805912-a3f9-4045-bc63-01f34a216ee7}</Project>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Opc.Ua.Client">
-      <HintPath>..\..\..\SampleApplications\SDK\Opc.Ua.Client\bin\Debug\net46\Opc.Ua.Client.dll</HintPath>
-    </Reference>
-    <Reference Include="Opc.Ua.Configuration">
-      <HintPath>..\..\..\SampleApplications\SDK\Opc.Ua.Configuration\bin\Debug\net46\Opc.Ua.Configuration.dll</HintPath>
-    </Reference>
-    <Reference Include="Opc.Ua.Core">
-      <HintPath>..\..\..\Stack\Opc.Ua.Core\bin\Debug\net46\Opc.Ua.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Opc.Ua.Server">
-      <HintPath>..\..\..\SampleApplications\SDK\Opc.Ua.Server\bin\Debug\net46\Opc.Ua.Server.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Net" />
     <Reference Include="System.Security" />
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/ComIOP/Wrapper/ServerWrapper/App.config b/ComIOP/Wrapper/ServerWrapper/App.config
index 49b67a94b1..3858f0a713 100644
--- a/ComIOP/Wrapper/ServerWrapper/App.config
+++ b/ComIOP/Wrapper/ServerWrapper/App.config
@@ -70,4 +70,4 @@
     </ConfigurationLocation>
   </Opc.Ua.ComServerWrapper>
   
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
diff --git a/ComIOP/Wrapper/ServerWrapper/Properties/Settings.Designer.cs b/ComIOP/Wrapper/ServerWrapper/Properties/Settings.Designer.cs
index 87fb7ba4e8..2b158354a1 100644
--- a/ComIOP/Wrapper/ServerWrapper/Properties/Settings.Designer.cs
+++ b/ComIOP/Wrapper/ServerWrapper/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace Opc.Ua.ComServerWrapper.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/ComIOP/Wrapper/ServerWrapper/UA COM Server Wrapper.csproj b/ComIOP/Wrapper/ServerWrapper/UA COM Server Wrapper.csproj
index 513492c83c..7168b61764 100644
--- a/ComIOP/Wrapper/ServerWrapper/UA COM Server Wrapper.csproj	
+++ b/ComIOP/Wrapper/ServerWrapper/UA COM Server Wrapper.csproj	
@@ -4,13 +4,15 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F4805912-A3F9-4045-BC63-01F34A216EE7}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Opc.Ua.ComServerWrapper</RootNamespace>
     <AssemblyName>UA COM Server Wrapper</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>App.ico</ApplicationIcon>
     <SignAssembly>false</SignAssembly>
@@ -63,22 +65,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Opc.Ua.Client">
-      <HintPath>..\..\..\SampleApplications\SDK\Opc.Ua.Client\bin\Debug\net46\Opc.Ua.Client.dll</HintPath>
-    </Reference>
-    <Reference Include="Opc.Ua.ComInterop, Version=1.1.334.6, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\bin\Debug\Opc.Ua.ComInterop.dll</HintPath>
-    </Reference>
-    <Reference Include="Opc.Ua.Configuration">
-      <HintPath>..\..\..\SampleApplications\SDK\Opc.Ua.Configuration\bin\Debug\net46\Opc.Ua.Configuration.dll</HintPath>
-    </Reference>
-    <Reference Include="Opc.Ua.Core">
-      <HintPath>..\..\..\Stack\Opc.Ua.Core\bin\Debug\net46\Opc.Ua.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Opc.Ua.Server">
-      <HintPath>..\..\..\SampleApplications\SDK\Opc.Ua.Server\bin\Debug\net46\Opc.Ua.Server.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -163,6 +149,28 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\SampleApplications\SDK\Opc.Ua.Client\Opc.Ua.Client.csproj">
+      <Project>{8906c833-3c21-45b7-b103-1f27aa945075}</Project>
+      <Name>Opc.Ua.Client</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\SampleApplications\SDK\Opc.Ua.Configuration\Opc.Ua.Configuration.csproj">
+      <Project>{9cde220b-7614-42c4-99b0-7b4713ab2931}</Project>
+      <Name>Opc.Ua.Configuration</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\SampleApplications\SDK\Opc.Ua.Server\Opc.Ua.Server.csproj">
+      <Project>{15aeee57-3aae-4333-b69f-777f6573d8a4}</Project>
+      <Name>Opc.Ua.Server</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Stack\Opc.Ua.Core\Opc.Ua.Core.csproj">
+      <Project>{31ec9480-617b-48c4-a5be-1d159a278d1d}</Project>
+      <Name>Opc.Ua.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Common\UA COM Interop Library.csproj">
+      <Project>{24d3c616-ed4c-4af9-b529-7b418ec8acc4}</Project>
+      <Name>UA COM Interop Library</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ComIOP/Wrapper/ServerWrapper/app.manifest b/ComIOP/Wrapper/ServerWrapper/app.manifest
index 08f910bcd5..7b7fe720b9 100644
--- a/ComIOP/Wrapper/ServerWrapper/app.manifest
+++ b/ComIOP/Wrapper/ServerWrapper/app.manifest
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <!-- UAC Manifest Options
-            If you want to change the Windows User Account Control level replace the 
-            requestedExecutionLevel node with one of the following.
-
-        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
-        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
-        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
-
-            If you want to utilize File and Registry Virtualization for backward 
-            compatibility then delete the requestedExecutionLevel node.
-        -->
-        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
 </asmv1:assembly>
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 @@
       <Project>{a39614ca-8ebe-4408-a9d2-38c7e5ae2a1d}</Project>
       <Name>Opc.Ua.Configuration</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Opc.Ua.Sample\Opc.Ua.Sample.csproj">
-      <Project>{bcb915b6-b5c3-45bc-9c8b-f43008df0c14}</Project>
-      <Name>Opc.Ua.Sample</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/SampleApplications/Samples/Controls.Net4/ClientForm.cs b/SampleApplications/Samples/Controls.Net4/ClientForm.cs
index 46e6653a84..014432d82c 100644
--- a/SampleApplications/Samples/Controls.Net4/ClientForm.cs
+++ b/SampleApplications/Samples/Controls.Net4/ClientForm.cs
@@ -452,7 +452,7 @@ namespace Opc.Ua.Sample.Controls
 
                 if (server != null)
                 {
-                    server.RegisterWithDiscoveryServer();
+                    server.RegisterWithDiscoveryServer().Wait();
                 }
             }
             catch (Exception exception)
diff --git a/SampleApplications/Samples/Controls.Net4/UA Sample Controls.csproj b/SampleApplications/Samples/Controls.Net4/UA Sample Controls.csproj
index f4daf7fbec..767a88ecde 100644
--- a/SampleApplications/Samples/Controls.Net4/UA Sample Controls.csproj	
+++ b/SampleApplications/Samples/Controls.Net4/UA Sample Controls.csproj	
@@ -752,17 +752,13 @@
       <Name>Opc.Ua.Configuration</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\SDK\Opc.Ua.Server\Opc.Ua.Server.csproj">
-      <Project>{6c449a1e-244e-4515-9949-a7e22012537c}</Project>
+      <Project>{251c2bd9-33f5-4eb1-903d-8463c8fd16f0}</Project>
       <Name>Opc.Ua.Server</Name>
     </ProjectReference>
     <ProjectReference Include="..\ClientControls.Net4\UA Client Controls.csproj">
       <Project>{A247D2EE-14FC-463D-A9BA-6CFF1EF22B7A}</Project>
       <Name>UA Client Controls</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Opc.Ua.Sample\Opc.Ua.Sample.csproj">
-      <Project>{bcb915b6-b5c3-45bc-9c8b-f43008df0c14}</Project>
-      <Name>Opc.Ua.Sample</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
diff --git a/SampleApplications/Samples/ServerControls.Net4/UA Server Controls.csproj b/SampleApplications/Samples/ServerControls.Net4/UA Server Controls.csproj
index 2f8253ea34..b54e687f83 100644
--- a/SampleApplications/Samples/ServerControls.Net4/UA Server Controls.csproj	
+++ b/SampleApplications/Samples/ServerControls.Net4/UA Server Controls.csproj	
@@ -133,17 +133,13 @@
       <Name>Opc.Ua.Configuration</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\SDK\Opc.Ua.Server\Opc.Ua.Server.csproj">
-      <Project>{6c449a1e-244e-4515-9949-a7e22012537c}</Project>
+      <Project>{251c2bd9-33f5-4eb1-903d-8463c8fd16f0}</Project>
       <Name>Opc.Ua.Server</Name>
     </ProjectReference>
     <ProjectReference Include="..\Controls.Net4\UA Sample Controls.csproj">
       <Project>{92ae819b-4938-4502-ac32-67063f9893cd}</Project>
       <Name>UA Sample Controls</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Opc.Ua.Sample\Opc.Ua.Sample.csproj">
-      <Project>{bcb915b6-b5c3-45bc-9c8b-f43008df0c14}</Project>
-      <Name>Opc.Ua.Sample</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/SampleApplications/Workshop/Aggregation/Client/Aggregation Client.csproj b/SampleApplications/Workshop/Aggregation/Client/Aggregation Client.csproj
index d73431fff8..8f770f0708 100644
--- a/SampleApplications/Workshop/Aggregation/Client/Aggregation Client.csproj	
+++ b/SampleApplications/Workshop/Aggregation/Client/Aggregation Client.csproj	
@@ -4,13 +4,15 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F866F577-1EE0-447C-B47F-30180313B4C6}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AggregationClient</RootNamespace>
     <AssemblyName>AggregationClient</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>App.ico</ApplicationIcon>
     <FileUpgradeFlags>
@@ -42,18 +44,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Opc.Ua.Client, Version=1.3.340.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\SDK\Opc.Ua.Client\bin\Debug\net46\Opc.Ua.Client.dll</HintPath>
-    </Reference>
-    <Reference Include="Opc.Ua.Configuration, Version=1.3.340.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\SDK\Opc.Ua.Configuration\bin\Debug\net46\Opc.Ua.Configuration.dll</HintPath>
-    </Reference>
-    <Reference Include="Opc.Ua.Core, Version=1.3.340.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Stack\Opc.Ua.Core\bin\Debug\net46\Opc.Ua.Core.dll</HintPath>
-    </Reference>
     <Reference Include="Opc.Ua.SampleControls, Version=1.2.336.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\Samples\Controls.Net4\bin\Debug\Opc.Ua.SampleControls.dll</HintPath>
@@ -140,10 +130,22 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Stack\Opc.Ua.Core\Opc.Ua.Core.csproj">
+      <Project>{3ce98776-35af-48d4-b6e0-b716ad1db889}</Project>
+      <Name>Opc.Ua.Core</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Samples\ClientControls.Net4\UA Client Controls.csproj">
       <Project>{a247d2ee-14fc-463d-a9ba-6cff1ef22b7a}</Project>
       <Name>UA Client Controls</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\SDK\Opc.Ua.Client\Opc.Ua.Client.csproj">
+      <Project>{79cb842c-8c1c-414e-a9c1-84fa5205ab40}</Project>
+      <Name>Opc.Ua.Client</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\SDK\Opc.Ua.Configuration\Opc.Ua.Configuration.csproj">
+      <Project>{7289b366-d72a-4aad-9024-ef5f74b3025d}</Project>
+      <Name>Opc.Ua.Configuration</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/SampleApplications/Workshop/Aggregation/Client/App.config b/SampleApplications/Workshop/Aggregation/Client/App.config
index a4ec718a50..b4261bd312 100644
--- a/SampleApplications/Workshop/Aggregation/Client/App.config
+++ b/SampleApplications/Workshop/Aggregation/Client/App.config
@@ -40,4 +40,4 @@
 			<FilePath>Quickstarts.AggregationClient.Config.xml</FilePath>
 		</ConfigurationLocation>
 	</AggregationClient>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
diff --git a/SampleApplications/Workshop/Aggregation/Client/Properties/Settings.Designer.cs b/SampleApplications/Workshop/Aggregation/Client/Properties/Settings.Designer.cs
index 131a6e672c..53ff6015f2 100644
--- a/SampleApplications/Workshop/Aggregation/Client/Properties/Settings.Designer.cs
+++ b/SampleApplications/Workshop/Aggregation/Client/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace AggregationClient.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/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj b/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj
index cca1076b22..5ec5f56dbe 100644
--- a/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj
+++ b/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
     <AssemblyName>ConsoleAggregationServer</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>ConsoleAggregationServer</PackageId>
@@ -19,15 +19,15 @@
   <ItemGroup>
     <Compile Include="..\Server\AggregationNodeManager.cs;..\Server\AggregationServer.cs;..\Server\AggregationServerConfiguration.cs;..\Server\AggregatedTypeCache.cs;..\Server\NamespaceMapper.cs;..\Server\Browser.cs;..\Server\Model\AggregationModel.Classes.cs;..\Server\Model\AggregationModel.Constants.cs;..\Server\Model\AggregationModel.DataTypes.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
     <EmbeddedResource Include="..\Server\Model\AggregationModel.PredefinedNodes.uanodes">
-      <Link>AggregationServer\Model\AggregationModel.PredefinedNodes.uanodes</Link>
+      <Link>AggregationServer/Model/AggregationModel.PredefinedNodes.uanodes</Link>
     </EmbeddedResource>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\SDK\Opc.Ua.Configuration\Opc.Ua.Configuration.csproj" />
     <ProjectReference Include="..\..\..\..\Stack\Opc.Ua.Core\Opc.Ua.Core.csproj" />
-    <ProjectReference Include="..\..\..\SDK\Opc.Ua.Server\Opc.Ua.Server.csproj" />
     <ProjectReference Include="..\..\..\SDK\Opc.Ua.Client\Opc.Ua.Client.csproj" />
+    <ProjectReference Include="..\..\..\SDK\Opc.Ua.Configuration\Opc.Ua.Configuration.csproj" />
+    <ProjectReference Include="..\..\..\SDK\Opc.Ua.Server\Opc.Ua.Server.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.xproj b/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.xproj
deleted file mode 100644
index c7c21117e3..0000000000
--- a/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.xproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>f64ea66b-b3e5-4887-8001-eb5f9359fdf3</ProjectGuid>
-    <RootNamespace>NetCoreConsoleServer</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/project.json b/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/project.json
deleted file mode 100644
index de6e6d73bd..0000000000
--- a/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/project.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "version": "1.0.0-*",
-  "buildOptions": {
-    "emitEntryPoint": true,
-    "compile": {
-      "include": [
-        "../Server/AggregationNodeManager.cs",
-        "../Server/AggregationServer.cs",
-        "../Server/AggregationServerConfiguration.cs",
-        "../Server/AggregatedTypeCache.cs",
-        "../Server/NamespaceMapper.cs",
-        "../Server/Browser.cs",
-        "../Server/Model/AggregationModel.Classes.cs",
-        "../Server/Model/AggregationModel.Constants.cs",
-        "../Server/Model/AggregationModel.DataTypes.cs"
-      ]
-    },
-    "embed": {
-      "mappings": {
-        "AggregationServer/Model/AggregationModel.PredefinedNodes.uanodes": "../Server/Model/AggregationModel.PredefinedNodes.uanodes"
-      }
-    }
-  },
-
-  "dependencies": {
-    "Microsoft.NETCore.App": {
-      "type": "platform",
-      "version": "1.0.0"
-    },
-    "Opc.Ua.Configuration": "1.0.0-*",
-    "Opc.Ua.Core": "1.0.0-*",
-    "Opc.Ua.Server": "1.0.0-*",
-    "Opc.Ua.Client": "1.0.0-*"
-  },
-
-  "frameworks": {
-    "netcoreapp1.0": {}
-  }
-
-}
diff --git a/SampleApplications/Workshop/Aggregation/Server/Aggregation Server.csproj b/SampleApplications/Workshop/Aggregation/Server/Aggregation Server.csproj
index 0ebaeab59d..09bdf4d79e 100644
--- a/SampleApplications/Workshop/Aggregation/Server/Aggregation Server.csproj	
+++ b/SampleApplications/Workshop/Aggregation/Server/Aggregation Server.csproj	
@@ -4,13 +4,15 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{41A9D2F0-BFE0-4FFB-94F0-57AAC2C26899}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AggregationServer</RootNamespace>
     <AssemblyName>AggregationServer</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>App.ico</ApplicationIcon>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -44,22 +46,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Opc.Ua.Client, Version=1.3.340.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\SDK\Opc.Ua.Client\bin\Debug\net46\Opc.Ua.Client.dll</HintPath>
-    </Reference>
-    <Reference Include="Opc.Ua.Configuration, Version=1.3.340.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\SDK\Opc.Ua.Configuration\bin\Debug\net46\Opc.Ua.Configuration.dll</HintPath>
-    </Reference>
-    <Reference Include="Opc.Ua.Core, Version=1.3.340.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Stack\Opc.Ua.Core\bin\Debug\net46\Opc.Ua.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Opc.Ua.Server, Version=1.3.340.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\SDK\Opc.Ua.Server\bin\Debug\net46\Opc.Ua.Server.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -78,6 +64,9 @@
     </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AggregatedTypeCache.cs" />
@@ -113,6 +102,7 @@
     <None Include="BuildDesign.bat" />
     <EmbeddedResource Include="Model\AggregationModel.PredefinedNodes.uanodes" />
     <Content Include="Model\ModelDesign.csv" />
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -124,10 +114,26 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Stack\Opc.Ua.Core\Opc.Ua.Core.csproj">
+      <Project>{3ce98776-35af-48d4-b6e0-b716ad1db889}</Project>
+      <Name>Opc.Ua.Core</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Samples\ServerControls.Net4\UA Server Controls.csproj">
       <Project>{80056988-44e7-4ef4-9f59-50bcf215cb03}</Project>
       <Name>UA Server Controls</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\SDK\Opc.Ua.Client\Opc.Ua.Client.csproj">
+      <Project>{79cb842c-8c1c-414e-a9c1-84fa5205ab40}</Project>
+      <Name>Opc.Ua.Client</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\SDK\Opc.Ua.Configuration\Opc.Ua.Configuration.csproj">
+      <Project>{7289b366-d72a-4aad-9024-ef5f74b3025d}</Project>
+      <Name>Opc.Ua.Configuration</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\SDK\Opc.Ua.Server\Opc.Ua.Server.csproj">
+      <Project>{54e066c7-e4b0-4911-8b90-d7fd88d9304f}</Project>
+      <Name>Opc.Ua.Server</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/SampleApplications/Workshop/Aggregation/Server/App.config b/SampleApplications/Workshop/Aggregation/Server/App.config
index 443c0b6670..d5489a04b2 100644
--- a/SampleApplications/Workshop/Aggregation/Server/App.config
+++ b/SampleApplications/Workshop/Aggregation/Server/App.config
@@ -59,4 +59,4 @@
 			<FilePath>Quickstarts.AggregationServer.Config.xml</FilePath>
 		</ConfigurationLocation>
 	</AggregationServer>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
diff --git a/SampleApplications/Workshop/Aggregation/Server/Properties/Settings.Designer.cs b/SampleApplications/Workshop/Aggregation/Server/Properties/Settings.Designer.cs
index 4f1435819a..8767838803 100644
--- a/SampleApplications/Workshop/Aggregation/Server/Properties/Settings.Designer.cs
+++ b/SampleApplications/Workshop/Aggregation/Server/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace AggregationServer.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/Aggregation/Server/app.manifest b/SampleApplications/Workshop/Aggregation/Server/app.manifest
index 08f910bcd5..7b7fe720b9 100644
--- a/SampleApplications/Workshop/Aggregation/Server/app.manifest
+++ b/SampleApplications/Workshop/Aggregation/Server/app.manifest
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <!-- UAC Manifest Options
-            If you want to change the Windows User Account Control level replace the 
-            requestedExecutionLevel node with one of the following.
-
-        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
-        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
-        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
-
-            If you want to utilize File and Registry Virtualization for backward 
-            compatibility then delete the requestedExecutionLevel node.
-        -->
-        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
 </asmv1:assembly>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
+</packages>
\ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	<configSections>
-		<section name="Quickstarts.ReferenceClient" type="Opc.Ua.ApplicationConfigurationSection,Opc.Ua.Core" />
+		<section name="Quickstarts.ReferenceClient" type="Opc.Ua.ApplicationConfigurationSection,Opc.Ua.Core"/>
 	</configSections>
 	<system.serviceModel>
 		<!--
@@ -40,20 +40,20 @@
 			<FilePath>Quickstarts.ReferenceClient.Config.xml</FilePath>
 		</ConfigurationLocation>
 	</Quickstarts.ReferenceClient>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Win32.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+        <assemblyIdentity name="Microsoft.Win32.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/SampleApplications/Workshop/Reference/Client/Properties/Settings.Designer.cs b/SampleApplications/Workshop/Reference/Client/Properties/Settings.Designer.cs
index afb07a2368..a10459e7cf 100644
--- a/SampleApplications/Workshop/Reference/Client/Properties/Settings.Designer.cs
+++ b/SampleApplications/Workshop/Reference/Client/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace Quickstarts.ReferenceClient.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/Client/Reference Client.csproj b/SampleApplications/Workshop/Reference/Client/Reference Client.csproj
index a39e6d9307..b4f81ad90d 100644
--- a/SampleApplications/Workshop/Reference/Client/Reference Client.csproj	
+++ b/SampleApplications/Workshop/Reference/Client/Reference Client.csproj	
@@ -4,13 +4,15 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9C1E7F15-2EE3-440D-8E17-00C38073822A}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Quickstarts.ReferenceClient</RootNamespace>
     <AssemblyName>Quickstarts.ReferenceClient</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>App.ico</ApplicationIcon>
     <FileUpgradeFlags>
@@ -57,22 +59,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Opc.Ua.Client, Version=1.2.334.6, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\SDK\Opc.Ua.Client\bin\Debug\net46\Opc.Ua.Client.dll</HintPath>
-    </Reference>
-    <Reference Include="Opc.Ua.Configuration, Version=1.2.334.6, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\SDK\Opc.Ua.Configuration\bin\Debug\net46\Opc.Ua.Configuration.dll</HintPath>
-    </Reference>
-    <Reference Include="Opc.Ua.Core, Version=1.2.335.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Stack\Opc.Ua.Core\bin\Debug\net46\Opc.Ua.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Opc.Ua.Server, Version=1.2.334.6, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\SDK\Opc.Ua.Server\bin\Debug\net46\Opc.Ua.Server.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
@@ -131,14 +117,30 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Stack\Opc.Ua.Core\Opc.Ua.Core.csproj">
+      <Project>{4aa5224f-afa4-4367-b8b1-9103c594f41a}</Project>
+      <Name>Opc.Ua.Core</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Samples\ClientControls.Net4\UA Client Controls.csproj">
-      <Project>{A247D2EE-14FC-463D-A9BA-6CFF1EF22B7A}</Project>
+      <Project>{a247d2ee-14fc-463d-a9ba-6cff1ef22b7a}</Project>
       <Name>UA Client Controls</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Samples\Controls.Net4\UA Sample Controls.csproj">
       <Project>{92ae819b-4938-4502-ac32-67063f9893cd}</Project>
       <Name>UA Sample Controls</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\SDK\Opc.Ua.Client\Opc.Ua.Client.csproj">
+      <Project>{ef4ae519-5065-4e2f-a3c7-93b8cde4ebe5}</Project>
+      <Name>Opc.Ua.Client</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\SDK\Opc.Ua.Configuration\Opc.Ua.Configuration.csproj">
+      <Project>{e0657832-597a-4eaa-b026-dc54a0a2928d}</Project>
+      <Name>Opc.Ua.Configuration</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\SDK\Opc.Ua.Server\Opc.Ua.Server.csproj">
+      <Project>{251c2bd9-33f5-4eb1-903d-8463c8fd16f0}</Project>
+      <Name>Opc.Ua.Server</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
diff --git a/SampleApplications/Workshop/Reference/ConsoleReferenceServer/ConsoleReferenceServer.csproj b/SampleApplications/Workshop/Reference/ConsoleReferenceServer/ConsoleReferenceServer.csproj
index ab85258374..dea189443f 100644
--- a/SampleApplications/Workshop/Reference/ConsoleReferenceServer/ConsoleReferenceServer.csproj
+++ b/SampleApplications/Workshop/Reference/ConsoleReferenceServer/ConsoleReferenceServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
     <AssemblyName>ConsoleReferenceServer</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>ConsoleReferenceServer</PackageId>
@@ -16,8 +16,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\SDK\Opc.Ua.Configuration\Opc.Ua.Configuration.csproj" />
     <ProjectReference Include="..\..\..\..\Stack\Opc.Ua.Core\Opc.Ua.Core.csproj" />
+    <ProjectReference Include="..\..\..\SDK\Opc.Ua.Client\Opc.Ua.Client.csproj" />
+    <ProjectReference Include="..\..\..\SDK\Opc.Ua.Configuration\Opc.Ua.Configuration.csproj" />
     <ProjectReference Include="..\..\..\SDK\Opc.Ua.Server\Opc.Ua.Server.csproj" />
   </ItemGroup>
 
diff --git a/SampleApplications/Workshop/Reference/ConsoleReferenceServer/ConsoleReferenceServer.xproj b/SampleApplications/Workshop/Reference/ConsoleReferenceServer/ConsoleReferenceServer.xproj
deleted file mode 100644
index c7c21117e3..0000000000
--- a/SampleApplications/Workshop/Reference/ConsoleReferenceServer/ConsoleReferenceServer.xproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>f64ea66b-b3e5-4887-8001-eb5f9359fdf3</ProjectGuid>
-    <RootNamespace>NetCoreConsoleServer</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/SampleApplications/Workshop/Reference/ConsoleReferenceServer/project.json b/SampleApplications/Workshop/Reference/ConsoleReferenceServer/project.json
deleted file mode 100644
index 4fe7fa5cad..0000000000
--- a/SampleApplications/Workshop/Reference/ConsoleReferenceServer/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "version": "1.0.0-*",
-  "buildOptions": {
-    "emitEntryPoint": true,
-    "compile": {
-      "include": [
-        "../Server/ReferenceNodeManager.cs",
-        "../Server/ReferenceServer.cs",
-        "../Server/ReferenceServerConfiguration.cs"
-      ]
-    }
-  },
-
-  "dependencies": {
-    "Microsoft.NETCore.App": {
-      "type": "platform",
-      "version": "1.0.0"
-    },
-    "Opc.Ua.Configuration": "1.0.0-*",
-    "Opc.Ua.Core": "1.0.0-*",
-    "Opc.Ua.Server": "1.0.0-*"
-  },
-
-  "frameworks": {
-    "netcoreapp1.0": {}
-  }
-
-}
diff --git a/SampleApplications/Workshop/Reference/Server/App.config b/SampleApplications/Workshop/Reference/Server/App.config
index 846289af75..e4bebf31d7 100644
--- a/SampleApplications/Workshop/Reference/Server/App.config
+++ b/SampleApplications/Workshop/Reference/Server/App.config
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	<configSections>
-		<section name="Quickstarts.ReferenceServer" type="Opc.Ua.ApplicationConfigurationSection,Opc.Ua.Core" />
+		<section name="Quickstarts.ReferenceServer" type="Opc.Ua.ApplicationConfigurationSection,Opc.Ua.Core"/>
 	</configSections>
 	<system.serviceModel>
 		<!-- 
@@ -11,15 +11,15 @@
     -->
 		<services>
 			<service name="Opc.Ua.SessionEndpoint" behaviorConfiguration="Opc.Ua.SessionEndpoint.Behavior">
-				<endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
+				<endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
 			</service>
 		</services>
 		<!-- Servers deployed in production environments should turn the httpGetEnabled and includeExceptionDetailInFaults options off -->
 		<behaviors>
 			<serviceBehaviors>
 				<behavior name="Opc.Ua.SessionEndpoint.Behavior">
-					<serviceMetadata httpGetEnabled="true" />
-					<serviceDebug includeExceptionDetailInFaults="true" />
+					<serviceMetadata httpGetEnabled="true"/>
+					<serviceDebug includeExceptionDetailInFaults="true"/>
 				</behavior>
 			</serviceBehaviors>
 		</behaviors>
@@ -59,20 +59,20 @@
 			<FilePath>Quickstarts.ReferenceServer.Config.xml</FilePath>
 		</ConfigurationLocation>
 	</Quickstarts.ReferenceServer>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Win32.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+        <assemblyIdentity name="Microsoft.Win32.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
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 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{42EF4F25-29BF-4AB7-B403-8523694A3B36}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Quickstarts.ReferenceServer</RootNamespace>
     <AssemblyName>Quickstarts.ReferenceServer</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>App.ico</ApplicationIcon>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -61,18 +63,6 @@
     <RunPostBuildEvent>Always</RunPostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Opc.Ua.Client">
-      <HintPath>..\..\..\SDK\Opc.Ua.Client\bin\Debug\net46\Opc.Ua.Client.dll</HintPath>
-    </Reference>
-    <Reference Include="Opc.Ua.Configuration">
-      <HintPath>..\..\..\SDK\Opc.Ua.Configuration\bin\Debug\net46\Opc.Ua.Configuration.dll</HintPath>
-    </Reference>
-    <Reference Include="Opc.Ua.Core">
-      <HintPath>..\..\..\..\Stack\Opc.Ua.Core\bin\Debug\net46\Opc.Ua.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Opc.Ua.Server">
-      <HintPath>..\..\..\SDK\Opc.Ua.Server\bin\Debug\net46\Opc.Ua.Server.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -96,10 +86,6 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ReferenceServerUtils.cs" />
-    <Content Include="libuv.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Readme.htm" />
     <Content Include="Resources\OPCFoundation.jpg" />
     <EmbeddedResource Include="MonitoredItemEventLogDlg.resx">
       <DependentUpon>MonitoredItemEventLogDlg.cs</DependentUpon>
@@ -147,10 +133,26 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Stack\Opc.Ua.Core\Opc.Ua.Core.csproj">
+      <Project>{4aa5224f-afa4-4367-b8b1-9103c594f41a}</Project>
+      <Name>Opc.Ua.Core</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Samples\ServerControls.Net4\UA Server Controls.csproj">
       <Project>{80056988-44E7-4EF4-9F59-50BCF215CB03}</Project>
       <Name>UA Server Controls</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\SDK\Opc.Ua.Client\Opc.Ua.Client.csproj">
+      <Project>{ef4ae519-5065-4e2f-a3c7-93b8cde4ebe5}</Project>
+      <Name>Opc.Ua.Client</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\SDK\Opc.Ua.Configuration\Opc.Ua.Configuration.csproj">
+      <Project>{e0657832-597a-4eaa-b026-dc54a0a2928d}</Project>
+      <Name>Opc.Ua.Configuration</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\SDK\Opc.Ua.Server\Opc.Ua.Server.csproj">
+      <Project>{251c2bd9-33f5-4eb1-903d-8463c8fd16f0}</Project>
+      <Name>Opc.Ua.Server</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <!-- UAC Manifest Options
-            If you want to change the Windows User Account Control level replace the 
-            requestedExecutionLevel node with one of the following.
-
-        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
-        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
-        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
-
-            If you want to utilize File and Registry Virtualization for backward 
-            compatibility then delete the requestedExecutionLevel node.
-        -->
-        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
 </asmv1:assembly>
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
diff --git a/UA COM Interop.sln b/UA COM Interop.sln
deleted file mode 100644
index 15f74e5632..0000000000
--- a/UA COM Interop.sln	
+++ /dev/null
@@ -1,151 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-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
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|Win32 = Debug|Win32
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F4805912-A3F9-4045-BC63-01F34A216EE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F4805912-A3F9-4045-BC63-01F34A216EE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F4805912-A3F9-4045-BC63-01F34A216EE7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F4805912-A3F9-4045-BC63-01F34A216EE7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F4805912-A3F9-4045-BC63-01F34A216EE7}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{F4805912-A3F9-4045-BC63-01F34A216EE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F4805912-A3F9-4045-BC63-01F34A216EE7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F4805912-A3F9-4045-BC63-01F34A216EE7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{F4805912-A3F9-4045-BC63-01F34A216EE7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F4805912-A3F9-4045-BC63-01F34A216EE7}.Release|Win32.ActiveCfg = Release|Any CPU
-		{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Release|Win32.ActiveCfg = Release|Any CPU
-		{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}.Debug|Win32.Build.0 = Debug|Win32
-		{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}.Release|Any CPU.ActiveCfg = Release|Win32
-		{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}.Release|Win32.ActiveCfg = Release|Win32
-		{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}.Release|Win32.Build.0 = Release|Win32
-		{268AE545-D614-4B66-AEF3-C5B85919AD9D}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{268AE545-D614-4B66-AEF3-C5B85919AD9D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{268AE545-D614-4B66-AEF3-C5B85919AD9D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{268AE545-D614-4B66-AEF3-C5B85919AD9D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{268AE545-D614-4B66-AEF3-C5B85919AD9D}.Debug|Win32.Build.0 = Debug|Win32
-		{268AE545-D614-4B66-AEF3-C5B85919AD9D}.Release|Any CPU.ActiveCfg = Release|Win32
-		{268AE545-D614-4B66-AEF3-C5B85919AD9D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{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
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal