diff --git a/JabberNet.sln b/JabberNet.sln
index f015f75..aebcd81 100644
--- a/JabberNet.sln
+++ b/JabberNet.sln
@@ -7,18 +7,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{BFD2D7
 		paket.dependencies = paket.dependencies
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JabberNet.Test", "tests\JabberNet.Test\JabberNet.Test.csproj", "{76F923A3-5D99-45B9-9327-FBE56648A39F}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JabberNet.Muzzle", "src\JabberNet.Muzzle\JabberNet.Muzzle.csproj", "{071A79A9-E23F-418F-A6B7-63D3A3E59EEB}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JabberNet.Example", "examples\JabberNet.Example\JabberNet.Example.csproj", "{F7208FC2-C9FF-4019-96D8-E0F5001FDBFD}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JabberNet.ConsoleClient", "examples\JabberNet.ConsoleClient\JabberNet.ConsoleClient.csproj", "{049FB855-89C4-4539-9E5E-0996834D6A0E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JabberNet", "src\JabberNet\JabberNet.csproj", "{6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JabberNet.Netlib.Dns", "src\JabberNet.Netlib.Dns\JabberNet.Netlib.Dns.csproj", "{40AC7A7C-D3E5-46DF-B740-06BD9D2A00E1}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{BBF059F0-722F-4DCC-AF7F-82054E8EF9F4}"
 	ProjectSection(SolutionItems) = preProject
 		Scripts\Build-Docs.ps1 = Scripts\Build-Docs.ps1
@@ -71,16 +65,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Readme.md = Readme.md
 	EndProjectSection
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JabberNet.Netlib.Dns", "src\JabberNet.Netlib.Dns\JabberNet.Netlib.Dns.xproj", "{E978BE1A-5654-4AE9-B5D3-8BE1A0056F1F}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JabberNet", "src\JabberNet\JabberNet.xproj", "{30CF5F13-7CF2-4DAC-A549-EE49BDEC4C08}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "JabberNet.Test", "tests\JabberNet.Test\JabberNet.Test.xproj", "{3F7B322B-BD5D-4DB7-8528-08A4FFE9E199}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{76F923A3-5D99-45B9-9327-FBE56648A39F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76F923A3-5D99-45B9-9327-FBE56648A39F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76F923A3-5D99-45B9-9327-FBE56648A39F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76F923A3-5D99-45B9-9327-FBE56648A39F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{071A79A9-E23F-418F-A6B7-63D3A3E59EEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{071A79A9-E23F-418F-A6B7-63D3A3E59EEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{071A79A9-E23F-418F-A6B7-63D3A3E59EEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -93,18 +89,22 @@ Global
 		{049FB855-89C4-4539-9E5E-0996834D6A0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{049FB855-89C4-4539-9E5E-0996834D6A0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{049FB855-89C4-4539-9E5E-0996834D6A0E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{40AC7A7C-D3E5-46DF-B740-06BD9D2A00E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{40AC7A7C-D3E5-46DF-B740-06BD9D2A00E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{40AC7A7C-D3E5-46DF-B740-06BD9D2A00E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{40AC7A7C-D3E5-46DF-B740-06BD9D2A00E1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B5086B0D-C448-450F-945D-5DBE681F2EE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B5086B0D-C448-450F-945D-5DBE681F2EE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B5086B0D-C448-450F-945D-5DBE681F2EE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B5086B0D-C448-450F-945D-5DBE681F2EE7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E978BE1A-5654-4AE9-B5D3-8BE1A0056F1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E978BE1A-5654-4AE9-B5D3-8BE1A0056F1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E978BE1A-5654-4AE9-B5D3-8BE1A0056F1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E978BE1A-5654-4AE9-B5D3-8BE1A0056F1F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30CF5F13-7CF2-4DAC-A549-EE49BDEC4C08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30CF5F13-7CF2-4DAC-A549-EE49BDEC4C08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30CF5F13-7CF2-4DAC-A549-EE49BDEC4C08}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30CF5F13-7CF2-4DAC-A549-EE49BDEC4C08}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F7B322B-BD5D-4DB7-8528-08A4FFE9E199}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F7B322B-BD5D-4DB7-8528-08A4FFE9E199}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F7B322B-BD5D-4DB7-8528-08A4FFE9E199}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F7B322B-BD5D-4DB7-8528-08A4FFE9E199}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/examples/JabberNet.ConsoleClient/JabberNet.ConsoleClient.csproj b/examples/JabberNet.ConsoleClient/JabberNet.ConsoleClient.csproj
index ee21e9f..d5094fd 100644
--- a/examples/JabberNet.ConsoleClient/JabberNet.ConsoleClient.csproj
+++ b/examples/JabberNet.ConsoleClient/JabberNet.ConsoleClient.csproj
@@ -106,11 +106,6 @@
     <Reference Include="System.Xml">
       <Name>System.XML</Name>
     </Reference>
-    <ProjectReference Include="..\..\src\JabberNet\JabberNet.csproj">
-      <Name>JabberNet</Name>
-      <Project>{6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="App.ico" />
@@ -141,6 +136,12 @@
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\JabberNet\JabberNet.xproj">
+      <Project>{30cf5f13-7cf2-4dac-a549-ee49bdec4c08}</Project>
+      <Name>JabberNet</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>
diff --git a/examples/JabberNet.Example/JabberNet.Example.csproj b/examples/JabberNet.Example/JabberNet.Example.csproj
index 6926d3a..bfc65dc 100644
--- a/examples/JabberNet.Example/JabberNet.Example.csproj
+++ b/examples/JabberNet.Example/JabberNet.Example.csproj
@@ -175,10 +175,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\JabberNet\JabberNet.csproj">
-      <Project>{6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5}</Project>
-      <Name>JabberNet</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\JabberNet.Muzzle\JabberNet.Muzzle.csproj">
       <Project>{071A79A9-E23F-418F-A6B7-63D3A3E59EEB}</Project>
       <Name>JabberNet.Muzzle</Name>
diff --git a/examples/JabberNet.VbExample/JabberNet.VbExample.vbproj b/examples/JabberNet.VbExample/JabberNet.VbExample.vbproj
index 9281758..e654e81 100644
--- a/examples/JabberNet.VbExample/JabberNet.VbExample.vbproj
+++ b/examples/JabberNet.VbExample/JabberNet.VbExample.vbproj
@@ -157,10 +157,6 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\JabberNet\JabberNet.csproj">
-      <Project>{6cae854a-f202-4d2b-b10e-e8d8e81e5ef5}</Project>
-      <Name>JabberNet</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\JabberNet.Muzzle\JabberNet.Muzzle.csproj">
       <Project>{071a79a9-e23f-418f-a6b7-63d3a3e59eeb}</Project>
       <Name>JabberNet.Muzzle</Name>
diff --git a/src/JabberNet.Muzzle/JabberNet.Muzzle.csproj b/src/JabberNet.Muzzle/JabberNet.Muzzle.csproj
index 4c8c047..85961c3 100644
--- a/src/JabberNet.Muzzle/JabberNet.Muzzle.csproj
+++ b/src/JabberNet.Muzzle/JabberNet.Muzzle.csproj
@@ -113,11 +113,6 @@
     <Reference Include="System.Xml">
       <Name>System.XML</Name>
     </Reference>
-    <ProjectReference Include="..\JabberNet\JabberNet.csproj">
-      <Name>JabberNet</Name>
-      <Project>{6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs">
diff --git a/src/JabberNet.Netlib.Dns/JabberNet.Netlib.Dns.csproj b/src/JabberNet.Netlib.Dns/JabberNet.Netlib.Dns.csproj
deleted file mode 100644
index 32c9b1d..0000000
--- a/src/JabberNet.Netlib.Dns/JabberNet.Netlib.Dns.csproj
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{40AC7A7C-D3E5-46DF-B740-06BD9D2A00E1}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>JabberNet.Netlib.Dns</RootNamespace>
-    <AssemblyName>JabberNet.Netlib.Dns</AssemblyName>
-    <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\JabberNet.Netlib.Dns.xml</DocumentationFile>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </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>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Release\JabberNet.Netlib.Dns.xml</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="dns.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/JabberNet.Netlib.Dns/JabberNet.Netlib.Dns.xproj b/src/JabberNet.Netlib.Dns/JabberNet.Netlib.Dns.xproj
new file mode 100644
index 0000000..b501dc4
--- /dev/null
+++ b/src/JabberNet.Netlib.Dns/JabberNet.Netlib.Dns.xproj
@@ -0,0 +1,19 @@
+<?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>e978be1a-5654-4ae9-b5d3-8be1a0056f1f</ProjectGuid>
+    <RootNamespace>JabberNet.Netlib.Dns</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+  </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/src/JabberNet/JabberNet.csproj b/src/JabberNet/JabberNet.csproj
deleted file mode 100644
index bf4415d..0000000
--- a/src/JabberNet/JabberNet.csproj
+++ /dev/null
@@ -1,507 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
-  <PropertyGroup Condition="'$(BuildMono)'==''">
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>jabber-net</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>
-    </RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' AND '$(BuildMono)'==''">
-    <OutputPath>bin5\Debug\</OutputPath>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-    <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants Condition="'$(BuildMono)'==''">TRACE;DEBUG;NET20 NO_SRV</DefineConstants>
-    <DefineConstants Condition="'$(BuildMono)'=='true'">TRACE;DEBUG;NO_SRV</DefineConstants>
-    <DocumentationFile>2005-jabber-net.xml</DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' AND '$(BuildMono)'==''">
-    <OutputPath>bin5\Release\</OutputPath>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-    <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants Condition="'$(BuildMono)'==''">TRACE;NET20 NO_SRV</DefineConstants>
-    <DefineConstants Condition="'$(BuildMono)'=='true'">TRACE;NO_SRV</DefineConstants>
-    <DocumentationFile>2005-jabber-net.xml</DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DefineConstants Condition="'$(BuildMono)'==''">TRACE;DEBUG;NET20</DefineConstants>
-    <DefineConstants Condition="'$(BuildMono)'=='true'">TRACE;DEBUG</DefineConstants>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>bin\Debug\JabberNet.xml</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DefineConstants>TRACE</DefineConstants>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DocumentationFile>bin\Release\JabberNet.xml</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyName>JabberNet</AssemblyName>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup>
-    <RootNamespace>JabberNet</RootNamespace>
-  </PropertyGroup>
-  <ItemGroup Condition="'$(BuildMono)'==''">
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Security" />
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\collections\ByteStack.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\collections\GraphNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\collections\IndexedTrie.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\collections\ISet.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\collections\LinkedList.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\collections\Set.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\collections\SkipList.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\collections\StringSet.cs" />
-    <Compile Include="bedrock\collections\Tree.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\collections\Trie.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\collections\TrieNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\Delegates.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\io\BufferAggregate.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\net\UnixDnsResolver.cs" />
-    <Compile Include="jabber\client\BookmarkManager.cs" />
-    <Compile Include="jabber\connection\FileMap.cs" />
-    <Compile Include="bedrock\io\ReadEventStream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\io\ZlibStream.cs" />
-    <Compile Include="bedrock\net\Address.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\net\AsyncSocket.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\net\BaseSocket.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\net\Exceptions.cs" />
-    <Compile Include="bedrock\net\HttpSocket.cs" />
-    <Compile Include="bedrock\net\IHttpSocket.cs" />
-    <Compile Include="bedrock\net\ProxySocket.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\net\ShttpProxy.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\net\SocketEventListener.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\net\SocketWatcher.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\net\Socks4Proxy.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\net\Socks5Proxy.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\net\XEP124Socket.cs" />
-    <Compile Include="bedrock\net\XEP25Socket.cs" />
-    <Compile Include="bedrock\util\ConfigFile.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\util\GetOptBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\connection\BindingStanzaStream.cs" />
-    <Compile Include="jabber\connection\CapsManager.cs" />
-    <Compile Include="jabber\connection\ConferenceManager.cs" />
-    <Compile Include="jabber\connection\DiscoManager.cs" />
-    <Compile Include="jabber\client\JabberClient.cs" />
-    <Compile Include="jabber\client\PresenceManager.cs" />
-    <Compile Include="jabber\client\RosterManager.cs" />
-    <Compile Include="jabber\connection\HttpStanzaStream.cs" />
-    <Compile Include="jabber\connection\HttpUploader.cs" />
-    <Compile Include="jabber\connection\IQTracker.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\connection\PollingStanzaStream.cs" />
-    <Compile Include="jabber\connection\PubSubManager.cs" />
-    <Compile Include="jabber\connection\sasl\AnonymousProcessor.cs" />
-    <Compile Include="jabber\connection\sasl\ExternalProcessor.cs" />
-    <Compile Include="jabber\connection\sasl\KerbProcessor.cs" />
-    <Compile Include="jabber\connection\sasl\MD5Processor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\connection\sasl\PlainProcessor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\connection\sasl\SASLProcessor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\connection\StreamComponent.cs" />
-    <Compile Include="jabber\connection\XmppStream.cs" />
-    <Compile Include="jabber\connection\SocketStanzaStream.cs" />
-    <Compile Include="jabber\connection\StanzaStream.cs" />
-    <Compile Include="jabber\connection\States.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\JID.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\accept\Factory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\accept\Handshake.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\accept\Log.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\accept\Route.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\accept\Xdb.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\AsynchElementStream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\client\Error.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\client\Factory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\client\IQ.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\client\Message.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\client\Presence.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\client\ProtocolException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\Element.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\ElementFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\ElementList.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\ElementStream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\EnumParser.cs" />
-    <Compile Include="jabber\protocol\iq\Agents.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\iq\Auth.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\iq\Bookmarks.cs" />
-    <Compile Include="jabber\protocol\iq\Browse.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\iq\Disco.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\iq\Factory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\iq\GeoLoc.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\iq\Last.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\iq\MUC.cs">
-    </Compile>
-    <Compile Include="jabber\protocol\iq\OOB.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\iq\Private.cs" />
-    <Compile Include="jabber\protocol\iq\PubSub.cs" />
-    <Compile Include="jabber\protocol\iq\PubSubErrors.cs" />
-    <Compile Include="jabber\protocol\iq\PubSubEvent.cs" />
-    <Compile Include="jabber\protocol\iq\PubSubOwner.cs" />
-    <Compile Include="jabber\protocol\iq\Register.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\iq\Roster.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\iq\Time.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\iq\VCard.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\iq\Version.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\NS.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\Packet.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\stream\Bind.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\stream\Compression.cs" />
-    <Compile Include="jabber\protocol\stream\Error.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\stream\Factory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\stream\Features.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\stream\HttpBind.cs" />
-    <Compile Include="jabber\protocol\stream\SASL.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\stream\Session.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\stream\StartTLS.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\stream\Stream.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\URI.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\x\Caps.cs" />
-    <Compile Include="jabber\protocol\x\Data.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\x\Delay.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\x\Event.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\x\Factory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\server\JabberService.cs" />
-    <Compile Include="jabber\server\XdbTracker.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="stringprep\Nameprep.cs" />
-    <Compile Include="stringprep\Plain.cs" />
-    <Compile Include="stringprep\Profile.cs" />
-    <Compile Include="stringprep\steps\BidiStep.cs" />
-    <Compile Include="stringprep\steps\MapStep.cs" />
-    <Compile Include="stringprep\steps\NFKCStep.cs" />
-    <Compile Include="stringprep\steps\ProfileStep.cs" />
-    <Compile Include="stringprep\steps\ProhibitStep.cs" />
-    <Compile Include="stringprep\steps\RFC3454.cs" />
-    <Compile Include="stringprep\unicode\Combining.cs" />
-    <Compile Include="stringprep\unicode\CombiningData.cs" />
-    <Compile Include="stringprep\unicode\Compose.cs" />
-    <Compile Include="stringprep\unicode\ComposeData.cs" />
-    <Compile Include="stringprep\unicode\Decompose.cs" />
-    <Compile Include="stringprep\unicode\DecomposeData.cs" />
-    <Compile Include="stringprep\XmppNode.cs" />
-    <Compile Include="stringprep\XmppResource.cs" />
-    <Compile Include="xpnet\ContentToken.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="xpnet\Encoding.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="xpnet\Exceptions.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="xpnet\Position.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="xpnet\Token.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="xpnet\UTF8Encoding.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <EmbeddedResource Include="jabber\client\RosterManager.resx">
-      <DependentUpon>RosterManager.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="jabber-net.nuspec" />
-    <None Include="paket.references" />
-    <None Include="stringprep\steps\gen-stringprep-tables.pl" />
-    <None Include="stringprep\unicode\gen-unicode-tables.pl" />
-    <None Include="stringprep\unicode\gen.bat" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Condition="'$(BuildMono)'==''" Include="..\JabberNet.Netlib.Dns\JabberNet.Netlib.Dns.csproj">
-      <Project>{40AC7A7C-D3E5-46DF-B740-06BD9D2A00E1}</Project>
-      <Name>JabberNet.Netlib.Dns</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Data" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="stringprep\steps\rfc3454.txt" />
-    <None Include="stringprep\unicode\CaseFolding-3.2.0.txt" />
-    <None Include="stringprep\unicode\CompositionExclusions-3.2.0.txt" />
-    <None Include="stringprep\unicode\LineBreak-3.2.0.txt" />
-    <None Include="stringprep\unicode\SpecialCasing-3.2.0.txt" />
-    <None Include="stringprep\unicode\UnicodeData-3.2.0.txt" />
-  </ItemGroup>
-  <Import Condition="'$(BuildMono)'==''" Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-    <SignAssembly>false</SignAssembly>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
-      <ItemGroup>
-        <Reference Include="zlib.net">
-          <HintPath>..\..\packages\zlib.net\lib\zlib.net.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-</Project>
\ No newline at end of file
diff --git a/src/JabberNet/JabberNet.xproj b/src/JabberNet/JabberNet.xproj
new file mode 100644
index 0000000..f4f9d7d
--- /dev/null
+++ b/src/JabberNet/JabberNet.xproj
@@ -0,0 +1,19 @@
+<?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>30cf5f13-7cf2-4dac-a549-ee49bdec4c08</ProjectGuid>
+    <RootNamespace>JabberNet</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+  </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/src/JabberNet/project.lock.json b/src/JabberNet/project.lock.json
index deb8754..d20c9d6 100644
--- a/src/JabberNet/project.lock.json
+++ b/src/JabberNet/project.lock.json
@@ -1,15 +1,26 @@
 {
   "locked": false,
-  "version": 1,
+  "version": 2,
   "targets": {
     ".NETFramework,Version=v4.0": {
       "zlib.net/1.0.4": {
+        "type": "package",
         "compile": {
           "lib/zlib.net.dll": {}
         },
         "runtime": {
           "lib/zlib.net.dll": {}
         }
+      },
+      "JabberNet.Netlib.Dns/2.1.2": {
+        "type": "project",
+        "framework": ".NETFramework,Version=v4.0",
+        "compile": {
+          "net40/JabberNet.Netlib.Dns.dll": {}
+        },
+        "runtime": {
+          "net40/JabberNet.Netlib.Dns.dll": {}
+        }
       }
     }
   },
@@ -23,6 +34,11 @@
         "zlib.net.1.0.4.nupkg.sha512",
         "zlib.net.nuspec"
       ]
+    },
+    "JabberNet.Netlib.Dns/2.1.2": {
+      "type": "project",
+      "path": "../JabberNet.Netlib.Dns/project.json",
+      "msbuildProject": "../JabberNet.Netlib.Dns/JabberNet.Netlib.Dns.xproj"
     }
   },
   "projectFileDependencyGroups": {
@@ -35,5 +51,7 @@
       "System.Security >= 4.0.0",
       "System.Xml >= 4.0.0"
     ]
-  }
+  },
+  "tools": {},
+  "projectFileToolGroups": {}
 }
\ No newline at end of file
diff --git a/tests/JabberNet.Test/JabberNet.Test.csproj b/tests/JabberNet.Test/JabberNet.Test.csproj
deleted file mode 100644
index 1d73ecd..0000000
--- a/tests/JabberNet.Test/JabberNet.Test.csproj
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{76F923A3-5D99-45B9-9327-FBE56648A39F}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>JabberNet.Test</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>JabberNet.Test</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-    <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-    <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-    <ProjectReference Include="..\..\src\JabberNet\JabberNet.csproj">
-      <Name>JabberNet</Name>
-      <Project>{6CAE854A-F202-4D2B-B10E-E8D8E81E5EF5}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\collections\ByteStackTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\collections\SetTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\collections\SkipListTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\collections\StringSet.cs" />
-    <Compile Include="bedrock\collections\TreeTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\collections\TrieNodeTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\collections\TrieTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\net\HttpSocketTest.cs" />
-    <Compile Include="jabber\connection\FileMap.cs" />
-    <Compile Include="bedrock\io\ZlibStream.cs" />
-    <Compile Include="bedrock\net\AsyncSocketTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\net\HttpUploadTest.cs" />
-    <Compile Include="bedrock\net\SSLAsyncSocketTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="bedrock\util\GetOptBaseTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\client\PresenceManagerTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\client\RosterManagerTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\connection\CapsManagerTest.cs" />
-    <Compile Include="jabber\connection\ConferenceManagerTest.cs" />
-    <Compile Include="jabber\connection\DiscoManagerTest.cs" />
-    <Compile Include="jabber\connection\PubSubManagerTest.cs" />
-    <Compile Include="jabber\connection\sasl\MD5Processor.cs" />
-    <Compile Include="jabber\JIDTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\accept\RouteTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\client\IQTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\client\MessageTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\client\PresenceTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\ElementListTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\ElementStreamTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\EnumParserTest.cs" />
-    <Compile Include="jabber\protocol\iq\AgentTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\iq\AuthTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\iq\PubSubTest.cs" />
-    <Compile Include="jabber\protocol\iq\RegisterTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\iq\RosterTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\iq\TimeTest.cs" />
-    <Compile Include="jabber\protocol\PacketTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\stream\FactoryTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\stream\StreamTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\x\DataTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="jabber\protocol\x\EventTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="stringprep\TestDraft.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="stringprep\TestNameprep.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="stringprep\TestNFKC.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="stringprep\TestNodeprep.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="stringprep\TestResourceprep.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="paket.references" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
-      <ItemGroup>
-        <Reference Include="nunit.framework">
-          <HintPath>..\..\packages\NUnit\lib\net40\nunit.framework.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
-      <ItemGroup>
-        <Reference Include="nunit.framework">
-          <HintPath>..\..\packages\NUnit\lib\net45\nunit.framework.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
-      <ItemGroup>
-        <Reference Include="Rhino.Mocks">
-          <HintPath>..\..\packages\RhinoMocks\lib\net\Rhino.Mocks.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-</Project>
\ No newline at end of file
diff --git a/tests/JabberNet.Test/JabberNet.Test.xproj b/tests/JabberNet.Test/JabberNet.Test.xproj
new file mode 100644
index 0000000..bb4a44a
--- /dev/null
+++ b/tests/JabberNet.Test/JabberNet.Test.xproj
@@ -0,0 +1,19 @@
+<?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>3f7b322b-bd5d-4db7-8528-08a4ffe9e199</ProjectGuid>
+    <RootNamespace>JabberNet.Test</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
\ No newline at end of file