diff --git a/SampleApplications/SDK/Opc.Ua.Client/Opc.Ua.Client.csproj b/SampleApplications/SDK/Opc.Ua.Client/Opc.Ua.Client.csproj
index 783ec43207..599cb3157b 100644
--- a/SampleApplications/SDK/Opc.Ua.Client/Opc.Ua.Client.csproj
+++ b/SampleApplications/SDK/Opc.Ua.Client/Opc.Ua.Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard1.4;netstandard2.0</TargetFrameworks>
     <AssemblyName>Opc.Ua.Client</AssemblyName>
     <PackageId>Opc.Ua.Client</PackageId>
   </PropertyGroup>
diff --git a/SampleApplications/SDK/Opc.Ua.Configuration/Opc.Ua.Configuration.csproj b/SampleApplications/SDK/Opc.Ua.Configuration/Opc.Ua.Configuration.csproj
index 992886920c..51a1473c3d 100644
--- a/SampleApplications/SDK/Opc.Ua.Configuration/Opc.Ua.Configuration.csproj
+++ b/SampleApplications/SDK/Opc.Ua.Configuration/Opc.Ua.Configuration.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard1.4;netstandard2.0</TargetFrameworks>
     <AssemblyName>Opc.Ua.Configuration</AssemblyName>
     <PackageId>Opc.Ua.Configuration</PackageId>
   </PropertyGroup>
diff --git a/SampleApplications/SDK/Opc.Ua.Server/Opc.Ua.Server.csproj b/SampleApplications/SDK/Opc.Ua.Server/Opc.Ua.Server.csproj
index b39c4479e4..0fc13e4959 100644
--- a/SampleApplications/SDK/Opc.Ua.Server/Opc.Ua.Server.csproj
+++ b/SampleApplications/SDK/Opc.Ua.Server/Opc.Ua.Server.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard1.4;netstandard2.0</TargetFrameworks>
+    <DefineConstants Condition="'$(TargetFramework)' == 'netstandard2.0'">$(DefineConstants);NO_HTTPS</DefineConstants>
     <AssemblyName>Opc.Ua.Server</AssemblyName>
     <PackageId>Opc.Ua.Server</PackageId>
   </PropertyGroup>
diff --git a/SampleApplications/Samples/Client/Opc.Ua.SampleClient.csproj b/SampleApplications/Samples/Client/Opc.Ua.SampleClient.csproj
index 2842beae37..2e8c12fa5f 100644
--- a/SampleApplications/Samples/Client/Opc.Ua.SampleClient.csproj
+++ b/SampleApplications/Samples/Client/Opc.Ua.SampleClient.csproj
@@ -172,7 +172,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>5.3.3</Version>
+      <Version>5.4.0</Version>
     </PackageReference>
     <PackageReference Include="System.Xml.XmlDocument">
       <Version>4.3.0</Version>
diff --git a/SampleApplications/Samples/NetCoreConsoleClient/NetCoreConsoleClient.csproj b/SampleApplications/Samples/NetCoreConsoleClient/NetCoreConsoleClient.csproj
index 27e1c5dc57..5071ca0b09 100644
--- a/SampleApplications/Samples/NetCoreConsoleClient/NetCoreConsoleClient.csproj
+++ b/SampleApplications/Samples/NetCoreConsoleClient/NetCoreConsoleClient.csproj
@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>NetCoreConsoleClient</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>NetCoreConsoleClient</PackageId>
-    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/SampleApplications/Samples/NetCoreConsoleServer/NetCoreConsoleServer.csproj b/SampleApplications/Samples/NetCoreConsoleServer/NetCoreConsoleServer.csproj
index 3f86e4ac42..fedaca0e5a 100644
--- a/SampleApplications/Samples/NetCoreConsoleServer/NetCoreConsoleServer.csproj
+++ b/SampleApplications/Samples/NetCoreConsoleServer/NetCoreConsoleServer.csproj
@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>NetCoreConsoleServer</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>NetCoreConsoleServer</PackageId>
-    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/SampleApplications/Samples/Opc.Ua.Sample/Opc.Ua.Sample.csproj b/SampleApplications/Samples/Opc.Ua.Sample/Opc.Ua.Sample.csproj
index f7633ed3a8..1801472e66 100644
--- a/SampleApplications/Samples/Opc.Ua.Sample/Opc.Ua.Sample.csproj
+++ b/SampleApplications/Samples/Opc.Ua.Sample/Opc.Ua.Sample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.4</TargetFramework>
+    <TargetFrameworks>net46;netstandard1.4;netstandard2.0</TargetFrameworks>
     <AssemblyName>Opc.Ua.Sample</AssemblyName>
     <PackageId>Opc.Ua.Sample</PackageId>
   </PropertyGroup>
diff --git a/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj b/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj
index 5ec5f56dbe..39e1a20e62 100644
--- a/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj
+++ b/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj
@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>ConsoleAggregationServer</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>ConsoleAggregationServer</PackageId>
-    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
diff --git a/SampleApplications/Workshop/Reference/ConsoleReferenceServer/ConsoleReferenceServer.csproj b/SampleApplications/Workshop/Reference/ConsoleReferenceServer/ConsoleReferenceServer.csproj
index b1b1352f1b..cb9528bea5 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.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>ConsoleReferenceServer</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>ConsoleReferenceServer</PackageId>
diff --git a/Stack/Opc.Ua.Core/Opc.Ua.Core.csproj b/Stack/Opc.Ua.Core/Opc.Ua.Core.csproj
index 264fadc21b..6f58d16035 100644
--- a/Stack/Opc.Ua.Core/Opc.Ua.Core.csproj
+++ b/Stack/Opc.Ua.Core/Opc.Ua.Core.csproj
@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net46;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard1.4;netstandard2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
+    <DefineConstants Condition="'$(TargetFramework)' == 'netstandard2.0'">$(DefineConstants);NO_HTTPS</DefineConstants>
     <AssemblyName>Opc.Ua.Core</AssemblyName>
     <PackageId>Opc.Ua.Core</PackageId>
   </PropertyGroup>
@@ -13,13 +14,23 @@
 
   <ItemGroup>
     <PackageReference Include="Portable.BouncyCastle" Version="1.8.1.3" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="System.Data.Common" Version="4.3.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
     <PackageReference Include="System.Private.ServiceModel" Version="4.3.0" />
     <PackageReference Include="System.ServiceModel.Primitives" Version="4.3.0" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="1.1.2" />
   </ItemGroup>
+  
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="System.Private.ServiceModel" Version="4.4.0" />
+    <PackageReference Include="System.ServiceModel.Primitives" Version="4.4.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.0.0" />
+  </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net451'">
     <Reference Include="System.IdentityModel" />