From 7598c9a155da14d4ba978d65a398a07af3b4213b Mon Sep 17 00:00:00 2001
From: Arci <Arcidev@users.noreply.github.com>
Date: Thu, 7 Jun 2018 20:37:14 +0200
Subject: [PATCH] Removed explicit target frameworks and created .Net Standard
 2.0 instead

---
 .../Arci.Networking.NetCore.csproj            |  38 -----
 .../Properties/AssemblyInfo.cs                |  19 ---
 .../Arci.Networking.Tests.NetCore.csproj      |  12 +-
 .../Arci.Networking.Tests.UAP.csproj          |  43 +++--
 ...Arci.Networking.Tests.UAP_TemporaryKey.pfx | Bin 2452 -> 2512 bytes
 .../BuilderTests/PacketBuilderTests.cs        |  42 +++++
 .../EncryptionTests/AesTests.cs               |   4 +-
 .../EncryptionTests/RsaTests.cs               |   4 +-
 .../Package.appxmanifest                      |  13 +-
 .../Properties/AssemblyInfo.cs                |  18 +-
 Arci.Networking.Tests.UAP/project.json        |  18 --
 .../Arci.Networking.Tests.csproj              |   2 +-
 .../Properties/AssemblyInfo.cs                |   4 +-
 .../Arci.Networking.UAP.csproj                | 161 ------------------
 .../Properties/Arci.Networking.UAP.rd.xml     |  33 ----
 .../Properties/AssemblyInfo.cs                |  29 ----
 Arci.Networking.UAP/project.json              |  17 --
 Arci.Networking.sln                           | 117 +++++--------
 Arci.Networking/Arci.Networking.csproj        | 109 ++++--------
 Arci.Networking/Properties/AssemblyInfo.cs    |  36 ----
 ClientSample/ClientSample.csproj              |   2 +-
 ClientSample/Program.cs                       |   2 -
 README.md                                     |   5 +-
 ServerSample/ServerSample.csproj              |   2 +-
 24 files changed, 167 insertions(+), 563 deletions(-)
 delete mode 100644 Arci.Networking.NetCore/Arci.Networking.NetCore.csproj
 delete mode 100644 Arci.Networking.NetCore/Properties/AssemblyInfo.cs
 create mode 100644 Arci.Networking.Tests.UAP/BuilderTests/PacketBuilderTests.cs
 delete mode 100644 Arci.Networking.Tests.UAP/project.json
 delete mode 100644 Arci.Networking.UAP/Arci.Networking.UAP.csproj
 delete mode 100644 Arci.Networking.UAP/Properties/Arci.Networking.UAP.rd.xml
 delete mode 100644 Arci.Networking.UAP/Properties/AssemblyInfo.cs
 delete mode 100644 Arci.Networking.UAP/project.json
 delete mode 100644 Arci.Networking/Properties/AssemblyInfo.cs

diff --git a/Arci.Networking.NetCore/Arci.Networking.NetCore.csproj b/Arci.Networking.NetCore/Arci.Networking.NetCore.csproj
deleted file mode 100644
index f5d575e..0000000
--- a/Arci.Networking.NetCore/Arci.Networking.NetCore.csproj
+++ /dev/null
@@ -1,38 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <VersionPrefix>1.4.2</VersionPrefix>
-    <TargetFrameworks>netstandard1.6;netcoreapp1.0</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AssemblyName>Arci.Networking.NetCore</AssemblyName>
-    <PackageId>Arci.Networking.NetCore</PackageId>
-    <NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <Version>1.5.0</Version>
-    <Copyright>Copyright ©  2018</Copyright>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="..\Arci.Networking\Builder\PacketBuilder.cs" Link="Builder\PacketBuilder.cs" />
-    <Compile Include="..\Arci.Networking\Builder\PacketBuilderTemplate.cs" Link="Builder\PacketBuilderTemplate.cs" />
-    <Compile Include="..\Arci.Networking\Client.cs" Link="Client.cs" />
-    <Compile Include="..\Arci.Networking\Data\ByteBuffer.cs" Link="Data\ByteBuffer.cs" />
-    <Compile Include="..\Arci.Networking\Data\ByteBufferGenericTemplate.cs" Link="Data\ByteBufferGenericTemplate.cs" />
-    <Compile Include="..\Arci.Networking\Data\Packet.cs" Link="Data\Packet.cs" />
-    <Compile Include="..\Arci.Networking\Data\PacketGuid.cs" Link="Data\PacketGuid.cs" />
-    <Compile Include="..\Arci.Networking\Security\AesEncryptor.cs" Link="Security\AesEncryptor.cs" />
-    <Compile Include="..\Arci.Networking\Security\AesOptions\AesEncryptionType.cs" Link="Security\AesOptions\AesEncryptionType.cs" />
-    <Compile Include="..\Arci.Networking\Security\ISymmetricEncryptor.cs" Link="Security\ISymmetricEncryptor.cs" />
-    <Compile Include="..\Arci.Networking\Security\RsaEncryptor.cs" Link="Security\RsaEncryptor.cs" />
-    <Compile Include="..\Arci.Networking\Server.cs" Link="Server.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Data\" />
-    <Folder Include="Builder\" />
-    <Folder Include="Security\AesOptions\" />
-  </ItemGroup>
-
-</Project>
diff --git a/Arci.Networking.NetCore/Properties/AssemblyInfo.cs b/Arci.Networking.NetCore/Properties/AssemblyInfo.cs
deleted file mode 100644
index f8b0336..0000000
--- a/Arci.Networking.NetCore/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Arci.Networking.NetCore")]
-[assembly: AssemblyTrademark("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("7b311fdf-f482-4e76-8c3f-1c99b2dccb13")]
diff --git a/Arci.Networking.Tests.NetCore/Arci.Networking.Tests.NetCore.csproj b/Arci.Networking.Tests.NetCore/Arci.Networking.Tests.NetCore.csproj
index a867520..cd04669 100644
--- a/Arci.Networking.Tests.NetCore/Arci.Networking.Tests.NetCore.csproj
+++ b/Arci.Networking.Tests.NetCore/Arci.Networking.Tests.NetCore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>1.4.2</VersionPrefix>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>Arci.Networking.Tests.NetCore</AssemblyName>
     <PackageId>Arci.Networking.Tests.NetCore</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -10,20 +10,20 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <Version>1.5.0</Version>
+    <Version>1.6.0</Version>
     <Copyright>Copyright ©  2018</Copyright>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Arci.Networking.NetCore\Arci.Networking.NetCore.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
     <PackageReference Include="xunit" Version="2.2.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Arci.Networking\Arci.Networking.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
diff --git a/Arci.Networking.Tests.UAP/Arci.Networking.Tests.UAP.csproj b/Arci.Networking.Tests.UAP/Arci.Networking.Tests.UAP.csproj
index f9351d6..ce495a9 100644
--- a/Arci.Networking.Tests.UAP/Arci.Networking.Tests.UAP.csproj
+++ b/Arci.Networking.Tests.UAP/Arci.Networking.Tests.UAP.csproj
@@ -4,20 +4,20 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{A12A315E-5108-4B08-AA79-82BEBE9832AD}</ProjectGuid>
+    <ProjectGuid>{8EE20DE3-C2B0-43A9-9638-F17BB22AB139}</ProjectGuid>
     <OutputType>AppContainerExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Arci.Networking.Tests.UAP</RootNamespace>
     <AssemblyName>Arci.Networking.Tests.UAP</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
+    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
+    <MinimumVisualStudioVersion>15</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <PackageCertificateKeyFile>Arci.Networking.Tests.UAP_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">14.0</UnitTestPlatformVersion>
+    <UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">$(VisualStudioVersion)</UnitTestPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -88,16 +88,14 @@
     <Prefer32Bit>true</Prefer32Bit>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
+  <PropertyGroup>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+  </PropertyGroup>
   <ItemGroup>
-    <!--A reference to the entire .Net Framework and Windows SDK are automatically included-->
-    <None Include="project.json" />
-    <SDKReference Include="MSTestFramework.Universal, Version=$(UnitTestPlatformVersion)" />
     <SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Arci.Networking.Tests\BuilderTests\PacketBuilderTests.cs">
-      <Link>BuilderTests\PacketBuilderTests.cs</Link>
-    </Compile>
+    <Compile Include="BuilderTests\PacketBuilderTests.cs" />
     <Compile Include="EncryptionTests\AesTests.cs" />
     <Compile Include="EncryptionTests\RsaTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -129,16 +127,25 @@
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Arci.Networking.UAP\Arci.Networking.UAP.csproj">
-      <Project>{7cc530c7-a1e3-4f09-b782-75849ff52b72}</Project>
-      <Name>Arci.Networking.UAP</Name>
-    </ProjectReference>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.1.5</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestAdapter">
+      <Version>1.3.2</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestFramework">
+      <Version>1.3.2</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+    <ProjectReference Include="..\Arci.Networking\Arci.Networking.csproj">
+      <Project>{1F9C6F0F-358B-4487-83D8-40677D6FC3AB}</Project>
+      <Name>Arci.Networking</Name>
+    </ProjectReference>
   </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
-    <VisualStudioVersion>14.0</VisualStudioVersion>
+  <ItemGroup />
+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0' ">
+    <VisualStudioVersion>15.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Arci.Networking.Tests.UAP/Arci.Networking.Tests.UAP_TemporaryKey.pfx b/Arci.Networking.Tests.UAP/Arci.Networking.Tests.UAP_TemporaryKey.pfx
index 5cb7ce9fd39a823682f1cfca11fef1e2b785a9e9..ef2fb4e04f5d194d0e3a1752c501b45f9d1b9c39 100644
GIT binary patch
delta 2351
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
V$>jkkug$~1?z4jGHUk0z2he6{V^aVC

delta 2290
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
Fe*t3@)m8ui

diff --git a/Arci.Networking.Tests.UAP/BuilderTests/PacketBuilderTests.cs b/Arci.Networking.Tests.UAP/BuilderTests/PacketBuilderTests.cs
new file mode 100644
index 0000000..cc23eb0
--- /dev/null
+++ b/Arci.Networking.Tests.UAP/BuilderTests/PacketBuilderTests.cs
@@ -0,0 +1,42 @@
+using Arci.Networking.Data;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Linq;
+
+namespace Arci.Networking.Tests.UAP.BuilderTests
+{
+    [TestClass]
+    public class PacketBuilderTests
+    {
+        [TestMethod]
+        public void TestPacketBuild()
+        {
+            var buildedPacket = new Packet(0).Builder()
+                .WriteBit(false).WriteBit(true).WriteBit(9).FlushBits()
+                .WriteGuidBitStreamInOrder(123456, 1, 2, 3, 4, 5, 6, 7, 0)
+                .Write((byte)1).Write((UInt16)2).Write((UInt32)3).Write((sbyte)4).Write((Int16)5).Write(6)
+                .Write(new byte[] { 7, 8, 9 })
+                .WriteGuidByteStreamInOrder(123456, 1, 2, 3, 4, 5, 6, 7, 0)
+                .Build();
+
+            var packet = new Packet(0);
+            packet.WriteBit(false);
+            packet.WriteBit(true);
+            packet.WriteBit(9);
+            packet.FlushBits();
+            packet.WriteGuidBitStreamInOrder(123456, 1, 2, 3, 4, 5, 6, 7, 0);
+            packet.Write((byte)1);
+            packet.Write((UInt16)2);
+            packet.Write((UInt32)3);
+            packet.Write((sbyte)4);
+            packet.Write((Int16)5);
+            packet.Write(6);
+            packet.Write(new byte[] { 7, 8, 9 });
+            packet.WriteGuidByteStreamInOrder(123456, 1, 2, 3, 4, 5, 6, 7, 0);
+
+            Assert.IsTrue(buildedPacket.Data.SequenceEqual(packet.Data));
+            buildedPacket.Dispose();
+            packet.Dispose();
+        }
+    }
+}
diff --git a/Arci.Networking.Tests.UAP/EncryptionTests/AesTests.cs b/Arci.Networking.Tests.UAP/EncryptionTests/AesTests.cs
index b34beef..2d9e5f0 100644
--- a/Arci.Networking.Tests.UAP/EncryptionTests/AesTests.cs
+++ b/Arci.Networking.Tests.UAP/EncryptionTests/AesTests.cs
@@ -1,12 +1,12 @@
 using Arci.Networking.Data;
 using Arci.Networking.Security;
 using Arci.Networking.Security.AesOptions;
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 
-namespace Arci.Networking.Tests.EncryptionTests
+namespace Arci.Networking.Tests.UAP.EncryptionTests
 {
     [TestClass]
     public class AesTests
diff --git a/Arci.Networking.Tests.UAP/EncryptionTests/RsaTests.cs b/Arci.Networking.Tests.UAP/EncryptionTests/RsaTests.cs
index 659b760..5241077 100644
--- a/Arci.Networking.Tests.UAP/EncryptionTests/RsaTests.cs
+++ b/Arci.Networking.Tests.UAP/EncryptionTests/RsaTests.cs
@@ -1,10 +1,10 @@
 using Arci.Networking.Security;
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Shared;
 using System.Linq;
 using System.Text;
 
-namespace Arci.Networking.Tests.EncryptionTests
+namespace Arci.Networking.Tests.UAP.EncryptionTests
 {
     [TestClass]
     public class RsaTests
diff --git a/Arci.Networking.Tests.UAP/Package.appxmanifest b/Arci.Networking.Tests.UAP/Package.appxmanifest
index 71c925b..e067626 100644
--- a/Arci.Networking.Tests.UAP/Package.appxmanifest
+++ b/Arci.Networking.Tests.UAP/Package.appxmanifest
@@ -5,18 +5,18 @@
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
   IgnorableNamespaces="uap mp">
 
-  <Identity Name="39469f35-5924-46a4-9268-b6b12bd54c62"
+  <Identity Name="1899f8dc-e4f5-45b6-9cbe-b9923616707d"
             Publisher="CN=Andrej"
             Version="1.0.0.0" />
 
-  <mp:PhoneIdentity PhoneProductId="39469f35-5924-46a4-9268-b6b12bd54c62" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+  <mp:PhoneIdentity PhoneProductId="1899f8dc-e4f5-45b6-9cbe-b9923616707d" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
   <Properties>
     <DisplayName>Arci.Networking.Tests.UAP</DisplayName>
     <PublisherDisplayName>Andrej</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
-  
+
   <Dependencies>
     <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
   </Dependencies>
@@ -25,7 +25,7 @@
     <Resource Language="x-generate" />
   </Resources>
   <Applications>
-    <Application Id="vstest.executionengine.universal.App" 
+    <Application Id="vstest.executionengine.universal.App"
         Executable="$targetnametoken$.exe"
         EntryPoint="Arci.Networking.Tests.UAP.App">
       <uap:VisualElements
@@ -40,6 +40,7 @@
     </Application>
   </Applications>
   <Capabilities>
-    <Capability Name="internetClient" />
-  </Capabilities> 
+    <Capability Name="internetClientServer" />
+    <Capability Name="privateNetworkClientServer" />
+  </Capabilities>
 </Package>
\ No newline at end of file
diff --git a/Arci.Networking.Tests.UAP/Properties/AssemblyInfo.cs b/Arci.Networking.Tests.UAP/Properties/AssemblyInfo.cs
index 706e5ab..98d5ca0 100644
--- a/Arci.Networking.Tests.UAP/Properties/AssemblyInfo.cs
+++ b/Arci.Networking.Tests.UAP/Properties/AssemblyInfo.cs
@@ -1,10 +1,7 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 [assembly: AssemblyTitle("Arci.Networking.Tests.UAP")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
@@ -15,16 +12,7 @@
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyMetadata("TargetPlatform","UAP")]
 
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Arci.Networking.Tests.UAP/project.json b/Arci.Networking.Tests.UAP/project.json
deleted file mode 100644
index cf437d4..0000000
--- a/Arci.Networking.Tests.UAP/project.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
-    "MSTest.TestAdapter": "1.1.12",
-    "MSTest.TestFramework": "1.1.11"
-  },
-  "frameworks": {
-    "uap10.0": {}
-  },
-  "runtimes": {
-    "win10-arm": {},
-    "win10-arm-aot": {},
-    "win10-x86": {},
-    "win10-x86-aot": {},
-    "win10-x64": {},
-    "win10-x64-aot": {}
-  }
-}
\ No newline at end of file
diff --git a/Arci.Networking.Tests/Arci.Networking.Tests.csproj b/Arci.Networking.Tests/Arci.Networking.Tests.csproj
index 0c13062..c9a4288 100644
--- a/Arci.Networking.Tests/Arci.Networking.Tests.csproj
+++ b/Arci.Networking.Tests/Arci.Networking.Tests.csproj
@@ -62,7 +62,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Arci.Networking\Arci.Networking.csproj">
-      <Project>{ed123dc2-0a2c-4b87-b723-23aad065d518}</Project>
+      <Project>{1f9c6f0f-358b-4487-83d8-40677d6fc3ab}</Project>
       <Name>Arci.Networking</Name>
     </ProjectReference>
     <ProjectReference Include="..\Shared\Shared.csproj">
diff --git a/Arci.Networking.Tests/Properties/AssemblyInfo.cs b/Arci.Networking.Tests/Properties/AssemblyInfo.cs
index 92ff49b..ffff7eb 100644
--- a/Arci.Networking.Tests/Properties/AssemblyInfo.cs
+++ b/Arci.Networking.Tests/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/Arci.Networking.UAP/Arci.Networking.UAP.csproj b/Arci.Networking.UAP/Arci.Networking.UAP.csproj
deleted file mode 100644
index 5569222..0000000
--- a/Arci.Networking.UAP/Arci.Networking.UAP.csproj
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7CC530C7-A1E3-4F09-B782-75849FF52B72}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Arci.Networking.UAP</RootNamespace>
-    <AssemblyName>Arci.Networking.UAP</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Arci.Networking.UAP.XML</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <PlatformTarget>x86</PlatformTarget>
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <PlatformTarget>ARM</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <PlatformTarget>ARM</PlatformTarget>
-    <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <None Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Arci.Networking\Builder\PacketBuilder.cs">
-      <Link>Builder\PacketBuilder.cs</Link>
-    </Compile>
-    <Compile Include="..\Arci.Networking\Builder\PacketBuilderTemplate.cs">
-      <Link>Builder\PacketBuilderTemplate.cs</Link>
-    </Compile>
-    <Compile Include="..\Arci.Networking\Client.cs">
-      <Link>Client.cs</Link>
-    </Compile>
-    <Compile Include="..\Arci.Networking\Data\ByteBuffer.cs">
-      <Link>Data\ByteBuffer.cs</Link>
-    </Compile>
-    <Compile Include="..\Arci.Networking\Data\ByteBufferGenericTemplate.cs">
-      <Link>Data\ByteBufferGenericTemplate.cs</Link>
-    </Compile>
-    <Compile Include="..\Arci.Networking\Data\Packet.cs">
-      <Link>Data\Packet.cs</Link>
-    </Compile>
-    <Compile Include="..\Arci.Networking\Data\PacketGuid.cs">
-      <Link>Data\PacketGuid.cs</Link>
-    </Compile>
-    <Compile Include="..\Arci.Networking\Security\AesEncryptor.cs">
-      <Link>Security\AesEncryptor.cs</Link>
-    </Compile>
-    <Compile Include="..\Arci.Networking\Security\AesOptions\AesEncryptionType.cs">
-      <Link>Security\AesOptions\AesEncryptionType.cs</Link>
-    </Compile>
-    <Compile Include="..\Arci.Networking\Security\ISymmetricEncryptor.cs">
-      <Link>Security\ISymmetricEncryptor.cs</Link>
-    </Compile>
-    <Compile Include="..\Arci.Networking\Security\RsaEncryptor.cs">
-      <Link>Security\RsaEncryptor.cs</Link>
-    </Compile>
-    <Compile Include="..\Arci.Networking\Server.cs">
-      <Link>Server.cs</Link>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Properties\Arci.Networking.UAP.rd.xml" />
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
-    <VisualStudioVersion>14.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/Arci.Networking.UAP/Properties/Arci.Networking.UAP.rd.xml b/Arci.Networking.UAP/Properties/Arci.Networking.UAP.rd.xml
deleted file mode 100644
index 1bd01e1..0000000
--- a/Arci.Networking.UAP/Properties/Arci.Networking.UAP.rd.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file contains Runtime Directives, specifications about types your application accesses
-    through reflection and other dynamic code patterns. Runtime Directives are used to control the
-    .NET Native optimizer and ensure that it does not remove code accessed by your library. If your
-    library does not do any reflection, then you generally do not need to edit this file. However,
-    if your library reflects over types, especially types passed to it or derived from its types,
-    then you should write Runtime Directives.
-
-    The most common use of reflection in libraries is to discover information about types passed
-    to the library. Runtime Directives have three ways to express requirements on types passed to
-    your library.
-
-    1.  Parameter, GenericParameter, TypeParameter, TypeEnumerableParameter
-        Use these directives to reflect over types passed as a parameter.
-
-    2.  SubTypes
-        Use a SubTypes directive to reflect over types derived from another type.
-
-    3.  AttributeImplies
-        Use an AttributeImplies directive to indicate that your library needs to reflect over
-        types or methods decorated with an attribute.
-
-    For more information on writing Runtime Directives for libraries, please visit
-    http://go.microsoft.com/fwlink/?LinkID=391919
--->
-<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Library Name="Arci.Networking.UAP">
-
-  	<!-- add directives for your library here -->
-
-  </Library>
-</Directives>
diff --git a/Arci.Networking.UAP/Properties/AssemblyInfo.cs b/Arci.Networking.UAP/Properties/AssemblyInfo.cs
deleted file mode 100644
index 0b4de6c..0000000
--- a/Arci.Networking.UAP/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Arci.Networking.UAP")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Arci.Networking.UAP")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Arci.Networking.UAP/project.json b/Arci.Networking.UAP/project.json
deleted file mode 100644
index 33cf3fc..0000000
--- a/Arci.Networking.UAP/project.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
-    "System.Security.Cryptography.Algorithms": "4.3.0"
-  },
-  "frameworks": {
-    "uap10.0": {}
-  },
-  "runtimes": {
-    "win10-arm": {},
-    "win10-arm-aot": {},
-    "win10-x86": {},
-    "win10-x86-aot": {},
-    "win10-x64": {},
-    "win10-x64-aot": {}
-  }
-}
\ No newline at end of file
diff --git a/Arci.Networking.sln b/Arci.Networking.sln
index b996c38..01c2195 100644
--- a/Arci.Networking.sln
+++ b/Arci.Networking.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arci.Networking", "Arci.Networking\Arci.Networking.csproj", "{ED123DC2-0A2C-4B87-B723-23AAD065D518}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClientSample", "ClientSample\ClientSample.csproj", "{0E9D98C8-667E-4790-AF3C-2D485EBECAE5}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerSample", "ServerSample\ServerSample.csproj", "{6699AA72-7048-4CAD-9E71-EB71425003EF}"
@@ -13,13 +11,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared", "Shared\Shared.csp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arci.Networking.Tests", "Arci.Networking.Tests\Arci.Networking.Tests.csproj", "{D62482C6-AF88-4BD9-97CB-CC22BDF1EA12}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Arci.Networking.NetCore", "Arci.Networking.NetCore\Arci.Networking.NetCore.csproj", "{7B311FDF-F482-4E76-8C3F-1C99B2DCCB13}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arci.Networking.UAP", "Arci.Networking.UAP\Arci.Networking.UAP.csproj", "{7CC530C7-A1E3-4F09-B782-75849FF52B72}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Arci.Networking.Tests.NetCore", "Arci.Networking.Tests.NetCore\Arci.Networking.Tests.NetCore.csproj", "{8D88C09F-D395-4B7D-9ED1-CA3C8235FDA4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arci.Networking.Tests.UAP", "Arci.Networking.Tests.UAP\Arci.Networking.Tests.UAP.csproj", "{A12A315E-5108-4B08-AA79-82BEBE9832AD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Arci.Networking", "Arci.Networking\Arci.Networking.csproj", "{1F9C6F0F-358B-4487-83D8-40677D6FC3AB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arci.Networking.Tests.UAP", "Arci.Networking.Tests.UAP\Arci.Networking.Tests.UAP.csproj", "{8EE20DE3-C2B0-43A9-9638-F17BB22AB139}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -33,22 +29,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{ED123DC2-0A2C-4B87-B723-23AAD065D518}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED123DC2-0A2C-4B87-B723-23AAD065D518}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED123DC2-0A2C-4B87-B723-23AAD065D518}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{ED123DC2-0A2C-4B87-B723-23AAD065D518}.Debug|ARM.Build.0 = Debug|Any CPU
-		{ED123DC2-0A2C-4B87-B723-23AAD065D518}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ED123DC2-0A2C-4B87-B723-23AAD065D518}.Debug|x64.Build.0 = Debug|Any CPU
-		{ED123DC2-0A2C-4B87-B723-23AAD065D518}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{ED123DC2-0A2C-4B87-B723-23AAD065D518}.Debug|x86.Build.0 = Debug|Any CPU
-		{ED123DC2-0A2C-4B87-B723-23AAD065D518}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ED123DC2-0A2C-4B87-B723-23AAD065D518}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ED123DC2-0A2C-4B87-B723-23AAD065D518}.Release|ARM.ActiveCfg = Release|Any CPU
-		{ED123DC2-0A2C-4B87-B723-23AAD065D518}.Release|ARM.Build.0 = Release|Any CPU
-		{ED123DC2-0A2C-4B87-B723-23AAD065D518}.Release|x64.ActiveCfg = Release|Any CPU
-		{ED123DC2-0A2C-4B87-B723-23AAD065D518}.Release|x64.Build.0 = Release|Any CPU
-		{ED123DC2-0A2C-4B87-B723-23AAD065D518}.Release|x86.ActiveCfg = Release|Any CPU
-		{ED123DC2-0A2C-4B87-B723-23AAD065D518}.Release|x86.Build.0 = Release|Any CPU
 		{0E9D98C8-667E-4790-AF3C-2D485EBECAE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0E9D98C8-667E-4790-AF3C-2D485EBECAE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0E9D98C8-667E-4790-AF3C-2D485EBECAE5}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -113,38 +93,6 @@ Global
 		{D62482C6-AF88-4BD9-97CB-CC22BDF1EA12}.Release|x64.Build.0 = Release|Any CPU
 		{D62482C6-AF88-4BD9-97CB-CC22BDF1EA12}.Release|x86.ActiveCfg = Release|Any CPU
 		{D62482C6-AF88-4BD9-97CB-CC22BDF1EA12}.Release|x86.Build.0 = Release|Any CPU
-		{7B311FDF-F482-4E76-8C3F-1C99B2DCCB13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B311FDF-F482-4E76-8C3F-1C99B2DCCB13}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B311FDF-F482-4E76-8C3F-1C99B2DCCB13}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{7B311FDF-F482-4E76-8C3F-1C99B2DCCB13}.Debug|ARM.Build.0 = Debug|Any CPU
-		{7B311FDF-F482-4E76-8C3F-1C99B2DCCB13}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7B311FDF-F482-4E76-8C3F-1C99B2DCCB13}.Debug|x64.Build.0 = Debug|Any CPU
-		{7B311FDF-F482-4E76-8C3F-1C99B2DCCB13}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7B311FDF-F482-4E76-8C3F-1C99B2DCCB13}.Debug|x86.Build.0 = Debug|Any CPU
-		{7B311FDF-F482-4E76-8C3F-1C99B2DCCB13}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7B311FDF-F482-4E76-8C3F-1C99B2DCCB13}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7B311FDF-F482-4E76-8C3F-1C99B2DCCB13}.Release|ARM.ActiveCfg = Release|Any CPU
-		{7B311FDF-F482-4E76-8C3F-1C99B2DCCB13}.Release|ARM.Build.0 = Release|Any CPU
-		{7B311FDF-F482-4E76-8C3F-1C99B2DCCB13}.Release|x64.ActiveCfg = Release|Any CPU
-		{7B311FDF-F482-4E76-8C3F-1C99B2DCCB13}.Release|x64.Build.0 = Release|Any CPU
-		{7B311FDF-F482-4E76-8C3F-1C99B2DCCB13}.Release|x86.ActiveCfg = Release|Any CPU
-		{7B311FDF-F482-4E76-8C3F-1C99B2DCCB13}.Release|x86.Build.0 = Release|Any CPU
-		{7CC530C7-A1E3-4F09-B782-75849FF52B72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7CC530C7-A1E3-4F09-B782-75849FF52B72}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7CC530C7-A1E3-4F09-B782-75849FF52B72}.Debug|ARM.ActiveCfg = Debug|ARM
-		{7CC530C7-A1E3-4F09-B782-75849FF52B72}.Debug|ARM.Build.0 = Debug|ARM
-		{7CC530C7-A1E3-4F09-B782-75849FF52B72}.Debug|x64.ActiveCfg = Debug|x64
-		{7CC530C7-A1E3-4F09-B782-75849FF52B72}.Debug|x64.Build.0 = Debug|x64
-		{7CC530C7-A1E3-4F09-B782-75849FF52B72}.Debug|x86.ActiveCfg = Debug|x86
-		{7CC530C7-A1E3-4F09-B782-75849FF52B72}.Debug|x86.Build.0 = Debug|x86
-		{7CC530C7-A1E3-4F09-B782-75849FF52B72}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7CC530C7-A1E3-4F09-B782-75849FF52B72}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7CC530C7-A1E3-4F09-B782-75849FF52B72}.Release|ARM.ActiveCfg = Release|ARM
-		{7CC530C7-A1E3-4F09-B782-75849FF52B72}.Release|ARM.Build.0 = Release|ARM
-		{7CC530C7-A1E3-4F09-B782-75849FF52B72}.Release|x64.ActiveCfg = Release|x64
-		{7CC530C7-A1E3-4F09-B782-75849FF52B72}.Release|x64.Build.0 = Release|x64
-		{7CC530C7-A1E3-4F09-B782-75849FF52B72}.Release|x86.ActiveCfg = Release|x86
-		{7CC530C7-A1E3-4F09-B782-75849FF52B72}.Release|x86.Build.0 = Release|x86
 		{8D88C09F-D395-4B7D-9ED1-CA3C8235FDA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8D88C09F-D395-4B7D-9ED1-CA3C8235FDA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8D88C09F-D395-4B7D-9ED1-CA3C8235FDA4}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -161,28 +109,47 @@ Global
 		{8D88C09F-D395-4B7D-9ED1-CA3C8235FDA4}.Release|x64.Build.0 = Release|Any CPU
 		{8D88C09F-D395-4B7D-9ED1-CA3C8235FDA4}.Release|x86.ActiveCfg = Release|Any CPU
 		{8D88C09F-D395-4B7D-9ED1-CA3C8235FDA4}.Release|x86.Build.0 = Release|Any CPU
-		{A12A315E-5108-4B08-AA79-82BEBE9832AD}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{A12A315E-5108-4B08-AA79-82BEBE9832AD}.Debug|ARM.ActiveCfg = Debug|ARM
-		{A12A315E-5108-4B08-AA79-82BEBE9832AD}.Debug|ARM.Build.0 = Debug|ARM
-		{A12A315E-5108-4B08-AA79-82BEBE9832AD}.Debug|ARM.Deploy.0 = Debug|ARM
-		{A12A315E-5108-4B08-AA79-82BEBE9832AD}.Debug|x64.ActiveCfg = Debug|x64
-		{A12A315E-5108-4B08-AA79-82BEBE9832AD}.Debug|x64.Build.0 = Debug|x64
-		{A12A315E-5108-4B08-AA79-82BEBE9832AD}.Debug|x64.Deploy.0 = Debug|x64
-		{A12A315E-5108-4B08-AA79-82BEBE9832AD}.Debug|x86.ActiveCfg = Debug|x86
-		{A12A315E-5108-4B08-AA79-82BEBE9832AD}.Debug|x86.Build.0 = Debug|x86
-		{A12A315E-5108-4B08-AA79-82BEBE9832AD}.Debug|x86.Deploy.0 = Debug|x86
-		{A12A315E-5108-4B08-AA79-82BEBE9832AD}.Release|Any CPU.ActiveCfg = Release|x86
-		{A12A315E-5108-4B08-AA79-82BEBE9832AD}.Release|ARM.ActiveCfg = Release|ARM
-		{A12A315E-5108-4B08-AA79-82BEBE9832AD}.Release|ARM.Build.0 = Release|ARM
-		{A12A315E-5108-4B08-AA79-82BEBE9832AD}.Release|ARM.Deploy.0 = Release|ARM
-		{A12A315E-5108-4B08-AA79-82BEBE9832AD}.Release|x64.ActiveCfg = Release|x64
-		{A12A315E-5108-4B08-AA79-82BEBE9832AD}.Release|x64.Build.0 = Release|x64
-		{A12A315E-5108-4B08-AA79-82BEBE9832AD}.Release|x64.Deploy.0 = Release|x64
-		{A12A315E-5108-4B08-AA79-82BEBE9832AD}.Release|x86.ActiveCfg = Release|x86
-		{A12A315E-5108-4B08-AA79-82BEBE9832AD}.Release|x86.Build.0 = Release|x86
-		{A12A315E-5108-4B08-AA79-82BEBE9832AD}.Release|x86.Deploy.0 = Release|x86
+		{1F9C6F0F-358B-4487-83D8-40677D6FC3AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F9C6F0F-358B-4487-83D8-40677D6FC3AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F9C6F0F-358B-4487-83D8-40677D6FC3AB}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{1F9C6F0F-358B-4487-83D8-40677D6FC3AB}.Debug|ARM.Build.0 = Debug|Any CPU
+		{1F9C6F0F-358B-4487-83D8-40677D6FC3AB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1F9C6F0F-358B-4487-83D8-40677D6FC3AB}.Debug|x64.Build.0 = Debug|Any CPU
+		{1F9C6F0F-358B-4487-83D8-40677D6FC3AB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1F9C6F0F-358B-4487-83D8-40677D6FC3AB}.Debug|x86.Build.0 = Debug|Any CPU
+		{1F9C6F0F-358B-4487-83D8-40677D6FC3AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F9C6F0F-358B-4487-83D8-40677D6FC3AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F9C6F0F-358B-4487-83D8-40677D6FC3AB}.Release|ARM.ActiveCfg = Release|Any CPU
+		{1F9C6F0F-358B-4487-83D8-40677D6FC3AB}.Release|ARM.Build.0 = Release|Any CPU
+		{1F9C6F0F-358B-4487-83D8-40677D6FC3AB}.Release|x64.ActiveCfg = Release|Any CPU
+		{1F9C6F0F-358B-4487-83D8-40677D6FC3AB}.Release|x64.Build.0 = Release|Any CPU
+		{1F9C6F0F-358B-4487-83D8-40677D6FC3AB}.Release|x86.ActiveCfg = Release|Any CPU
+		{1F9C6F0F-358B-4487-83D8-40677D6FC3AB}.Release|x86.Build.0 = Release|Any CPU
+		{8EE20DE3-C2B0-43A9-9638-F17BB22AB139}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{8EE20DE3-C2B0-43A9-9638-F17BB22AB139}.Debug|ARM.ActiveCfg = Debug|ARM
+		{8EE20DE3-C2B0-43A9-9638-F17BB22AB139}.Debug|ARM.Build.0 = Debug|ARM
+		{8EE20DE3-C2B0-43A9-9638-F17BB22AB139}.Debug|ARM.Deploy.0 = Debug|ARM
+		{8EE20DE3-C2B0-43A9-9638-F17BB22AB139}.Debug|x64.ActiveCfg = Debug|x64
+		{8EE20DE3-C2B0-43A9-9638-F17BB22AB139}.Debug|x64.Build.0 = Debug|x64
+		{8EE20DE3-C2B0-43A9-9638-F17BB22AB139}.Debug|x64.Deploy.0 = Debug|x64
+		{8EE20DE3-C2B0-43A9-9638-F17BB22AB139}.Debug|x86.ActiveCfg = Debug|x86
+		{8EE20DE3-C2B0-43A9-9638-F17BB22AB139}.Debug|x86.Build.0 = Debug|x86
+		{8EE20DE3-C2B0-43A9-9638-F17BB22AB139}.Debug|x86.Deploy.0 = Debug|x86
+		{8EE20DE3-C2B0-43A9-9638-F17BB22AB139}.Release|Any CPU.ActiveCfg = Release|x86
+		{8EE20DE3-C2B0-43A9-9638-F17BB22AB139}.Release|ARM.ActiveCfg = Release|ARM
+		{8EE20DE3-C2B0-43A9-9638-F17BB22AB139}.Release|ARM.Build.0 = Release|ARM
+		{8EE20DE3-C2B0-43A9-9638-F17BB22AB139}.Release|ARM.Deploy.0 = Release|ARM
+		{8EE20DE3-C2B0-43A9-9638-F17BB22AB139}.Release|x64.ActiveCfg = Release|x64
+		{8EE20DE3-C2B0-43A9-9638-F17BB22AB139}.Release|x64.Build.0 = Release|x64
+		{8EE20DE3-C2B0-43A9-9638-F17BB22AB139}.Release|x64.Deploy.0 = Release|x64
+		{8EE20DE3-C2B0-43A9-9638-F17BB22AB139}.Release|x86.ActiveCfg = Release|x86
+		{8EE20DE3-C2B0-43A9-9638-F17BB22AB139}.Release|x86.Build.0 = Release|x86
+		{8EE20DE3-C2B0-43A9-9638-F17BB22AB139}.Release|x86.Deploy.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {B7769AC6-7029-4014-819E-AE8B02CB42AE}
+	EndGlobalSection
 EndGlobal
diff --git a/Arci.Networking/Arci.Networking.csproj b/Arci.Networking/Arci.Networking.csproj
index 4564e97..a0b76d4 100644
--- a/Arci.Networking/Arci.Networking.csproj
+++ b/Arci.Networking/Arci.Networking.csproj
@@ -1,90 +1,45 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{ED123DC2-0A2C-4B87-B723-23AAD065D518}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Arci.Networking</RootNamespace>
-    <AssemblyName>Arci.Networking</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Version>1.6.0</Version>
+    <AssemblyVersion>1.6.0.0</AssemblyVersion>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DocumentationFile>bin\Debug\netstandard2.0\Arci.Networking.xml</DocumentationFile>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <DocumentationFile>bin\Release\Arci.Networking.XML</DocumentationFile>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DocumentationFile>bin\Release\netstandard2.0\Arci.Networking.xml</DocumentationFile>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
+    <None Update="Builder\PacketBuilderTemplate.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>PacketBuilderTemplate.cs</LastGenOutput>
+    </None>
+    <None Update="Data\ByteBufferGenericTemplate.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>ByteBufferGenericTemplate.cs</LastGenOutput>
+    </None>
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="Client.cs" />
-    <Compile Include="Builder\PacketBuilderTemplate.cs">
-      <DependentUpon>PacketBuilderTemplate.tt</DependentUpon>
-      <AutoGen>True</AutoGen>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Builder\PacketBuilderTemplate.cs">
       <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Data\ByteBufferGenericTemplate.cs">
       <AutoGen>True</AutoGen>
+      <DependentUpon>PacketBuilderTemplate.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Data\ByteBufferGenericTemplate.cs">
       <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
       <DependentUpon>ByteBufferGenericTemplate.tt</DependentUpon>
     </Compile>
-    <Compile Include="Builder\PacketBuilder.cs" />
-    <Compile Include="Data\PacketGuid.cs" />
-    <Compile Include="Data\ByteBuffer.cs" />
-    <Compile Include="Data\Packet.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Security\AesEncryptor.cs" />
-    <Compile Include="Security\AesOptions\AesEncryptionType.cs" />
-    <Compile Include="Security\ISymmetricEncryptor.cs" />
-    <Compile Include="Security\RsaEncryptor.cs" />
-    <Compile Include="Server.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Builder\PacketBuilderTemplate.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>PacketBuilderTemplate.cs</LastGenOutput>
-    </Content>
-    <Content Include="Data\ByteBufferGenericTemplate.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>ByteBufferGenericTemplate.cs</LastGenOutput>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/Arci.Networking/Properties/AssemblyInfo.cs b/Arci.Networking/Properties/AssemblyInfo.cs
deleted file mode 100644
index 16d9a5a..0000000
--- a/Arci.Networking/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Arci.Networking")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Arci.Networking")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("ed123dc2-0a2c-4b87-b723-23aad065d518")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
diff --git a/ClientSample/ClientSample.csproj b/ClientSample/ClientSample.csproj
index f5aea37..e7bbd10 100644
--- a/ClientSample/ClientSample.csproj
+++ b/ClientSample/ClientSample.csproj
@@ -52,7 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Arci.Networking\Arci.Networking.csproj">
-      <Project>{ed123dc2-0a2c-4b87-b723-23aad065d518}</Project>
+      <Project>{1f9c6f0f-358b-4487-83d8-40677d6fc3ab}</Project>
       <Name>Arci.Networking</Name>
     </ProjectReference>
     <ProjectReference Include="..\Shared\Shared.csproj">
diff --git a/ClientSample/Program.cs b/ClientSample/Program.cs
index 57931b7..3602ed1 100644
--- a/ClientSample/Program.cs
+++ b/ClientSample/Program.cs
@@ -4,9 +4,7 @@
 using Arci.Networking.Security.AesOptions;
 using Shared;
 using System;
-using System.Collections.Generic;
 using System.Security.Cryptography;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace ClientSample
diff --git a/README.md b/README.md
index 8cca9ba..9ced42f 100644
--- a/README.md
+++ b/README.md
@@ -129,7 +129,4 @@ var rsaDecryptedValue = rsa.Decrypt(rsaEncryptedValue);
 See [Wiki](https://github.com/Arcidev/Arci.Networking/wiki) for a list of changes between versions
 
 ## Supported frameworks
-- .NET 4.6.1
-- .NET Standard 1.6
-- .NET CoreApp 1.0
-- Universal Windows Platform
+- .NET Standard 2.0
diff --git a/ServerSample/ServerSample.csproj b/ServerSample/ServerSample.csproj
index 8d00f12..5901eb1 100644
--- a/ServerSample/ServerSample.csproj
+++ b/ServerSample/ServerSample.csproj
@@ -52,7 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Arci.Networking\Arci.Networking.csproj">
-      <Project>{ed123dc2-0a2c-4b87-b723-23aad065d518}</Project>
+      <Project>{1f9c6f0f-358b-4487-83d8-40677d6fc3ab}</Project>
       <Name>Arci.Networking</Name>
     </ProjectReference>
     <ProjectReference Include="..\Shared\Shared.csproj">