Revert "Revert "remove 3rdParty folder and use nuget package folder i…

…nstead""

This reverts commit 35cf4b5.

Toxy.Test/App.config

@@ -1,6 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <appSettings>
-    <add key="testdataPath" value="..\..\testdata"/>
+    <add key="testdataPath" value="..\..\testdata" />
   </appSettings>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" /></startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.86.0.518" newVersion="0.86.0.518" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

Toxy.Test/Toxy.Test.csproj

@@ -35,8 +35,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ICSharpCode.SharpZipLib">
+      <HintPath>..\packages\NPOI.2.1.3.1\lib\net40\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
     <Reference Include="nunit.framework">
-      <HintPath>..\3rdParty\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
@@ -81,14 +84,15 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ToxyFramework\ToxyFramework.csproj">
+    <ProjectReference Include="..\ToxyFramework\ToxyFramework_dotnet4.csproj">
       <Project>{ccb814a5-a750-4b96-afd3-f7e4d868f231}</Project>
-      <Name>ToxyFramework</Name>
+      <Name>ToxyFramework_dotnet4</Name>
     </ProjectReference>
   </ItemGroup>
   <Choose>

Toxy.Test/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="2.6.4" targetFramework="net40" />
+</packages>

Toxy.Tools/DuplicateContactMerger/DuplicateContactMerger.csproj

@@ -43,10 +43,10 @@
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Thought.vCards">
-      <HintPath>..\..\Build\Net40\Release\Thought.vCards.dll</HintPath>
+      <HintPath>..\..\packages\Thought.vCards.dll</HintPath>
     </Reference>
     <Reference Include="Toxy">
-      <HintPath>..\..\Build\Net40\Release\Toxy.dll</HintPath>
+      <HintPath>..\..\Build\Net40\Debug\Toxy.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

Toxy.Tools/ExtractionViewer/ExtractionViewer.csproj

@@ -33,31 +33,37 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DCSoft.RTF">
-      <HintPath>..\..\Build\Net40\Release\DCSoft.RTF.dll</HintPath>
+      <HintPath>..\..\packages\DCSoft.RTF.dll</HintPath>
+    </Reference>
+    <Reference Include="dmach.Mail">
+      <HintPath>..\..\packages\dmach.Mail.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack">
-      <HintPath>..\..\Build\Net40\Release\HtmlAgilityPack.dll</HintPath>
+      <HintPath>..\..\packages\HtmlAgilityPack.1.4.9\lib\Net40\HtmlAgilityPack.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>..\..\Build\Net40\Release\ICSharpCode.SharpZipLib.dll</HintPath>
+      <HintPath>..\..\packages\NPOI.2.1.3.1\lib\net40\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
     <Reference Include="itextsharp">
-      <HintPath>..\..\Build\Net40\Release\itextsharp.dll</HintPath>
-    </Reference>
-    <Reference Include="LumenWorks.Framework.IO">
-      <HintPath>..\..\Build\Net40\Release\LumenWorks.Framework.IO.dll</HintPath>
+      <HintPath>..\..\packages\iTextSharp.5.5.5\lib\itextsharp.dll</HintPath>
     </Reference>
     <Reference Include="NPOI">
-      <HintPath>..\..\Build\Net40\Release\NPOI.dll</HintPath>
+      <HintPath>..\..\packages\NPOI.2.1.3.1\lib\net40\NPOI.dll</HintPath>
     </Reference>
     <Reference Include="NPOI.OOXML">
-      <HintPath>..\..\Build\Net40\Release\NPOI.OOXML.dll</HintPath>
+      <HintPath>..\..\packages\NPOI.2.1.3.1\lib\net40\NPOI.OOXML.dll</HintPath>
     </Reference>
     <Reference Include="NPOI.OpenXml4Net">
-      <HintPath>..\..\Build\Net40\Release\NPOI.OpenXml4Net.dll</HintPath>
+      <HintPath>..\..\packages\NPOI.2.1.3.1\lib\net40\NPOI.OpenXml4Net.dll</HintPath>
     </Reference>
     <Reference Include="NPOI.OpenXmlFormats">
-      <HintPath>..\..\Build\Net40\Release\NPOI.OpenXmlFormats.dll</HintPath>
+      <HintPath>..\..\packages\NPOI.2.1.3.1\lib\net40\NPOI.OpenXmlFormats.dll</HintPath>
+    </Reference>
+    <Reference Include="NPOI.ScratchPad.HWPF">
+      <HintPath>..\..\packages\NPOI.2.1.3.1\lib\net40\NPOI.ScratchPad.HWPF.dll</HintPath>
+    </Reference>
+    <Reference Include="policy.2.0.taglib-sharp">
+      <HintPath>..\..\packages\taglib.2.1.0.0\lib\policy.2.0.taglib-sharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -70,14 +76,18 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="taglib-sharp">
+      <HintPath>..\..\packages\taglib.2.1.0.0\lib\taglib-sharp.dll</HintPath>
+    </Reference>
     <Reference Include="Thought.vCards">
-      <HintPath>..\..\Build\Net40\Release\Thought.vCards.dll</HintPath>
+      <HintPath>..\..\packages\Thought.vCards.dll</HintPath>
     </Reference>
     <Reference Include="Toxy">
-      <HintPath>..\..\Build\Net40\Release\Toxy.dll</HintPath>
+      <HintPath>..\..\Build\Net40\Debug\Toxy.dll</HintPath>
     </Reference>
-    <Reference Include="unvell.ReoGrid">
-      <HintPath>..\..\3rdParty\ReoGrid-0.8.5-Editor\unvell.ReoGrid.dll</HintPath>
+    <Reference Include="unvell.ReoGrid, Version=0.8.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\ReoGrid-0.8.5-Editor\unvell.ReoGrid.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

Toxy.Tools/ExtractionViewer/RichTextBoxPanel.cs

@@ -21,7 +21,7 @@ public void Clear()
             richTextBox1.Clear();
         }
 
-        public string Text
+        public override string Text
         {
             get { return this.richTextBox1.Text; }
             set { this.richTextBox1.Text = value; }

ToxyFramework/3rdParty/CnmFile.cs

@@ -7,7 +7,7 @@
 using InSolve.dmach.Mail;
 using InSolve.dmach.Mail.Decoders;
 
-namespace CnmViewer
+namespace Toxy
 {
     public class CnmFile : IMessageConstructor
     {