Revert "remove 3rdParty folder and use nuget package folder instead"

This reverts commit 52aed03.
tianma8778 · Feb 23, 2015 · 35cf4b5 · 35cf4b5
1 parent 00ec36f
commit 35cf4b5
Show file tree

Hide file tree

Showing 102 changed files with 56,453 additions and 162,492 deletions.
diff --git a/packages/DCSoft.RTF.XML → 3rdParty/DCSoft.RTF.XML b/packages/DCSoft.RTF.XML → 3rdParty/DCSoft.RTF.XML
diff --git a/packages/DCSoft.RTF.dll → 3rdParty/DCSoft.RTF.dll b/packages/DCSoft.RTF.dll → 3rdParty/DCSoft.RTF.dll
diff --git a/3rdParty/HtmlAgilityPack.dll b/3rdParty/HtmlAgilityPack.dll
diff --git a/...8.0/lib/net20/LumenWorks.Framework.IO.xml → 3rdParty/LumenWorks.Framework.IO.XML b/...8.0/lib/net20/LumenWorks.Framework.IO.xml → 3rdParty/LumenWorks.Framework.IO.XML
diff --git a/...8.0/lib/net20/LumenWorks.Framework.IO.dll → 3rdParty/LumenWorks.Framework.IO.dll b/...8.0/lib/net20/LumenWorks.Framework.IO.dll → 3rdParty/LumenWorks.Framework.IO.dll
diff --git a/packages/NPOI.2.1.3.1/LICENSE → 3rdParty/NPOI/LICENSE b/packages/NPOI.2.1.3.1/LICENSE → 3rdParty/NPOI/LICENSE
diff --git a/...3.1/lib/net20/ICSharpCode.SharpZipLib.dll → .../NPOI/dotnet2/ICSharpCode.SharpZipLib.dll b/...3.1/lib/net20/ICSharpCode.SharpZipLib.dll → .../NPOI/dotnet2/ICSharpCode.SharpZipLib.dll
diff --git a/...ges/NPOI.2.1.3.1/lib/net20/NPOI.OOXML.dll → 3rdParty/NPOI/dotnet2/NPOI.OOXML.dll b/...ges/NPOI.2.1.3.1/lib/net20/NPOI.OOXML.dll → 3rdParty/NPOI/dotnet2/NPOI.OOXML.dll
diff --git a/...OI.2.1.3.1/lib/net20/NPOI.OpenXml4Net.dll → 3rdParty/NPOI/dotnet2/NPOI.OpenXml4Net.dll b/...OI.2.1.3.1/lib/net20/NPOI.OpenXml4Net.dll → 3rdParty/NPOI/dotnet2/NPOI.OpenXml4Net.dll
diff --git a/...2.1.3.1/lib/net20/NPOI.OpenXmlFormats.dll → ...arty/NPOI/dotnet2/NPOI.OpenXmlFormats.dll b/...2.1.3.1/lib/net20/NPOI.OpenXmlFormats.dll → ...arty/NPOI/dotnet2/NPOI.OpenXmlFormats.dll
diff --git a/....1.3.1/lib/net20/NPOI.ScratchPad.HWPF.dll → ...rty/NPOI/dotnet2/NPOI.ScratchPad.HWPF.dll b/....1.3.1/lib/net20/NPOI.ScratchPad.HWPF.dll → ...rty/NPOI/dotnet2/NPOI.ScratchPad.HWPF.dll
diff --git a/packages/NPOI.2.1.3.1/lib/net20/NPOI.dll → 3rdParty/NPOI/dotnet2/NPOI.dll b/packages/NPOI.2.1.3.1/lib/net20/NPOI.dll → 3rdParty/NPOI/dotnet2/NPOI.dll
diff --git a/...3.1/lib/net40/ICSharpCode.SharpZipLib.dll → .../NPOI/dotnet4/ICSharpCode.SharpZipLib.dll b/...3.1/lib/net40/ICSharpCode.SharpZipLib.dll → .../NPOI/dotnet4/ICSharpCode.SharpZipLib.dll
diff --git a/...ges/NPOI.2.1.3.1/lib/net40/NPOI.OOXML.dll → 3rdParty/NPOI/dotnet4/NPOI.OOXML.dll b/...ges/NPOI.2.1.3.1/lib/net40/NPOI.OOXML.dll → 3rdParty/NPOI/dotnet4/NPOI.OOXML.dll
diff --git a/...OI.2.1.3.1/lib/net40/NPOI.OpenXml4Net.dll → 3rdParty/NPOI/dotnet4/NPOI.OpenXml4Net.dll b/...OI.2.1.3.1/lib/net40/NPOI.OpenXml4Net.dll → 3rdParty/NPOI/dotnet4/NPOI.OpenXml4Net.dll
diff --git a/...2.1.3.1/lib/net40/NPOI.OpenXmlFormats.dll → ...arty/NPOI/dotnet4/NPOI.OpenXmlFormats.dll b/...2.1.3.1/lib/net40/NPOI.OpenXmlFormats.dll → ...arty/NPOI/dotnet4/NPOI.OpenXmlFormats.dll
diff --git a/....1.3.1/lib/net40/NPOI.ScratchPad.HWPF.dll → ...rty/NPOI/dotnet4/NPOI.ScratchPad.HWPF.dll b/....1.3.1/lib/net40/NPOI.ScratchPad.HWPF.dll → ...rty/NPOI/dotnet4/NPOI.ScratchPad.HWPF.dll
diff --git a/packages/NPOI.2.1.3.1/lib/net40/NPOI.dll → 3rdParty/NPOI/dotnet4/NPOI.dll b/packages/NPOI.2.1.3.1/lib/net40/NPOI.dll → 3rdParty/NPOI/dotnet4/NPOI.dll
diff --git a/3rdParty/PDFsharp/!ReadMe.txt b/3rdParty/PDFsharp/!ReadMe.txt
@@ -0,0 +1,66 @@
+Welcome to PDFsharp and MigraDoc Foundation
+===========================================
+
+PDFsharp & MigraDoc Foundation Support Forum
+--------------------------------------------
+The right place to search for answers and to ask new questions:
+http://forum.pdfsharp.net/
+
+
+The PDFsharp & MigraDoc Web Site
+--------------------------------
+Here's the homepage:
+http://www.pdfsharp.net/
+
+Here's the PDFsharp & MigraDoc Wiki:
+http://www.pdfsharp.net/wiki/
+
+Please note: the Wiki introduces many of the PDFsharp and MigraDoc samples with screen shots, code snippets, generated PDF files, etc.
+
+
+Current Downloads
+-----------------
+Visit the homepage and click on Downloads.
+
+You'll find the latest versions on CodePlex:
+http://pdfsharp.codeplex.com/Release/ProjectReleases.aspx
+
+And on SourceForge:
+http://sourceforge.net/projects/pdfsharp
+
+
+Available Packages
+------------------
+PDFSharp-MigraDocFoundation-1_32.zip: the complete source code (recommended if you're using Visual Studio 2010) 
+PDFsharp-MigraDocFoundation-Assemblies-1_32.zip: the compiled assemblies (for those who don't use Visual Studio 2010) 
+
+Visit CodePlex for further information:
+http://pdfsharp.codeplex.com/Release/ProjectReleases.aspx
+
+
+What's New in PDFsharp & MigraDoc Foundation 1.32
+-------------------------------------------------
+Version 1.32 contains some minor bug fixes.
+Version 1.32 includes solutions for Visual Studio 2010.
+If you need solutions for VS 2005 or VS 2008, download version 1.31.
+
+What's New in PDFsharp & MigraDoc Foundation 1.31
+-------------------------------------------------
+Version 1.31 contains some minor bug fixes.
+Image compression was improved:
+ * Bitonal images are now compressed using CCITT Fax encoding
+ * Bitonal images are still FlateEncoded if compression ratio is better
+ * JPEG images are now FlateEncoded if that reduces size
+ * Non-JPEG grayscale image are now stored without color palette
+ * Color paletters are now FlateEncoded
+
+Bitonal images: only images with a two-color palette are
+treated as bitonal images; save images that only contain black and
+white in a bitonal format (Paint calls it "Monochrome Bitmap")
+to be able to profit from the new CCITT Fax compression.
+
+Please note: if you favor small PDF files, go for version 1.31.
+If you favor fast PDF generation, stay with version 1.30.
+One of the forthcoming versions will allow you to configure the
+generation of PDF files (something like "Optimize for Size" and
+"Optimize for Speed").
diff --git a/3rdParty/PDFsharp/GDI+/MigraDoc.DocumentObjectModel.dll b/3rdParty/PDFsharp/GDI+/MigraDoc.DocumentObjectModel.dll
diff --git a/3rdParty/PDFsharp/GDI+/MigraDoc.Rendering.dll b/3rdParty/PDFsharp/GDI+/MigraDoc.Rendering.dll
diff --git a/3rdParty/PDFsharp/GDI+/MigraDoc.RtfRendering.dll b/3rdParty/PDFsharp/GDI+/MigraDoc.RtfRendering.dll
diff --git a/3rdParty/PDFsharp/GDI+/PdfSharp.Charting.dll b/3rdParty/PDFsharp/GDI+/PdfSharp.Charting.dll
diff --git a/3rdParty/PDFsharp/GDI+/PdfSharp.dll b/3rdParty/PDFsharp/GDI+/PdfSharp.dll
diff --git a/3rdParty/PDFsharp/WPF/MigraDoc.DocumentObjectModel-WPF.dll b/3rdParty/PDFsharp/WPF/MigraDoc.DocumentObjectModel-WPF.dll
diff --git a/3rdParty/PDFsharp/WPF/MigraDoc.Rendering-WPF.dll b/3rdParty/PDFsharp/WPF/MigraDoc.Rendering-WPF.dll
diff --git a/3rdParty/PDFsharp/WPF/MigraDoc.RtfRendering-WPF.dll b/3rdParty/PDFsharp/WPF/MigraDoc.RtfRendering-WPF.dll
diff --git a/3rdParty/PDFsharp/WPF/PdfSharp-WPF.dll b/3rdParty/PDFsharp/WPF/PdfSharp-WPF.dll
diff --git a/3rdParty/PDFsharp/WPF/PdfSharp.Charting-WPF.dll b/3rdParty/PDFsharp/WPF/PdfSharp.Charting-WPF.dll
diff --git a/packages/ReoGrid-0.8.5-Editor/README.txt → 3rdParty/ReoGrid-0.8.5-Editor/README.txt b/packages/ReoGrid-0.8.5-Editor/README.txt → 3rdParty/ReoGrid-0.8.5-Editor/README.txt
diff --git a/.../ReoGrid-0.8.5-Editor/ReoGrid License.txt → .../ReoGrid-0.8.5-Editor/ReoGrid License.txt b/.../ReoGrid-0.8.5-Editor/ReoGrid License.txt → .../ReoGrid-0.8.5-Editor/ReoGrid License.txt
diff --git a/...s/ReoGrid-0.8.5-Editor/unvell.ReoGrid.dll → ...y/ReoGrid-0.8.5-Editor/unvell.ReoGrid.dll b/...s/ReoGrid-0.8.5-Editor/unvell.ReoGrid.dll → ...y/ReoGrid-0.8.5-Editor/unvell.ReoGrid.dll
diff --git a/...rid-0.8.5-Editor/unvell.ReoGridEditor.dll → ...rid-0.8.5-Editor/unvell.ReoGridEditor.dll b/...rid-0.8.5-Editor/unvell.ReoGridEditor.dll → ...rid-0.8.5-Editor/unvell.ReoGridEditor.dll
diff --git a/packages/Thought.vCards.dll → 3rdParty/Thought.vCards/Thought.vCards.dll b/packages/Thought.vCards.dll → 3rdParty/Thought.vCards/Thought.vCards.dll
diff --git a/packages/dmach.Mail.dll → 3rdParty/dmach.Mail.dll b/packages/dmach.Mail.dll → 3rdParty/dmach.Mail.dll
diff --git a/3rdParty/itextsharp-dll-core/iTextSharp.xml b/3rdParty/itextsharp-dll-core/iTextSharp.xml
diff --git a/3rdParty/itextsharp-dll-core/itextsharp.dll b/3rdParty/itextsharp-dll-core/itextsharp.dll
diff --git a/3rdParty/nunit.framework.dll b/3rdParty/nunit.framework.dll
diff --git a/3rdParty/taglib-sharp.dll b/3rdParty/taglib-sharp.dll
diff --git a/Toxy-dotnet35.sln → Toxy-dotnet2.sln b/Toxy-dotnet35.sln → Toxy-dotnet2.sln
diff --git a/Toxy.Test/App.config b/Toxy.Test/App.config
@@ -1,15 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <configuration>
   <appSettings>
-    <add key="testdataPath" value="..\..\testdata" />
+    <add key="testdataPath" value="..\..\testdata"/>
   </appSettings>
-<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>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/Toxy.Test/Toxy.Test.csproj b/Toxy.Test/Toxy.Test.csproj
@@ -35,11 +35,8 @@
     <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>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+      <HintPath>..\3rdParty\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
@@ -84,15 +81,14 @@
   </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_dotnet4.csproj">
+    <ProjectReference Include="..\ToxyFramework\ToxyFramework.csproj">
       <Project>{ccb814a5-a750-4b96-afd3-f7e4d868f231}</Project>
-      <Name>ToxyFramework_dotnet4</Name>
+      <Name>ToxyFramework</Name>
     </ProjectReference>
   </ItemGroup>
   <Choose>

diff --git a/Toxy.Test/packages.config b/Toxy.Test/packages.config
diff --git a/Toxy.Tools/DuplicateContactMerger/DuplicateContactMerger.csproj b/Toxy.Tools/DuplicateContactMerger/DuplicateContactMerger.csproj
@@ -43,10 +43,10 @@
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Thought.vCards">
-      <HintPath>..\..\packages\Thought.vCards.dll</HintPath>
+      <HintPath>..\..\Build\Net40\Release\Thought.vCards.dll</HintPath>
     </Reference>
     <Reference Include="Toxy">
-      <HintPath>..\..\Build\Net40\Debug\Toxy.dll</HintPath>
+      <HintPath>..\..\Build\Net40\Release\Toxy.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Toxy.Tools/ExtractionViewer/ExtractionViewer.csproj b/Toxy.Tools/ExtractionViewer/ExtractionViewer.csproj
@@ -33,37 +33,31 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DCSoft.RTF">
-      <HintPath>..\..\packages\DCSoft.RTF.dll</HintPath>
-    </Reference>
-    <Reference Include="dmach.Mail">
-      <HintPath>..\..\packages\dmach.Mail.dll</HintPath>
+      <HintPath>..\..\Build\Net40\Release\DCSoft.RTF.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack">
-      <HintPath>..\..\packages\HtmlAgilityPack.1.4.9\lib\Net40\HtmlAgilityPack.dll</HintPath>
+      <HintPath>..\..\Build\Net40\Release\HtmlAgilityPack.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>..\..\packages\NPOI.2.1.3.1\lib\net40\ICSharpCode.SharpZipLib.dll</HintPath>
+      <HintPath>..\..\Build\Net40\Release\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
     <Reference Include="itextsharp">
-      <HintPath>..\..\packages\iTextSharp.5.5.5\lib\itextsharp.dll</HintPath>
+      <HintPath>..\..\Build\Net40\Release\itextsharp.dll</HintPath>
+    </Reference>
+    <Reference Include="LumenWorks.Framework.IO">
+      <HintPath>..\..\Build\Net40\Release\LumenWorks.Framework.IO.dll</HintPath>
     </Reference>
     <Reference Include="NPOI">
-      <HintPath>..\..\packages\NPOI.2.1.3.1\lib\net40\NPOI.dll</HintPath>
+      <HintPath>..\..\Build\Net40\Release\NPOI.dll</HintPath>
     </Reference>
     <Reference Include="NPOI.OOXML">
-      <HintPath>..\..\packages\NPOI.2.1.3.1\lib\net40\NPOI.OOXML.dll</HintPath>
+      <HintPath>..\..\Build\Net40\Release\NPOI.OOXML.dll</HintPath>
     </Reference>
     <Reference Include="NPOI.OpenXml4Net">
-      <HintPath>..\..\packages\NPOI.2.1.3.1\lib\net40\NPOI.OpenXml4Net.dll</HintPath>
+      <HintPath>..\..\Build\Net40\Release\NPOI.OpenXml4Net.dll</HintPath>
     </Reference>
     <Reference Include="NPOI.OpenXmlFormats">
-      <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>
+      <HintPath>..\..\Build\Net40\Release\NPOI.OpenXmlFormats.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -76,18 +70,14 @@
     <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>..\..\packages\Thought.vCards.dll</HintPath>
+      <HintPath>..\..\Build\Net40\Release\Thought.vCards.dll</HintPath>
     </Reference>
     <Reference Include="Toxy">
-      <HintPath>..\..\Build\Net40\Debug\Toxy.dll</HintPath>
+      <HintPath>..\..\Build\Net40\Release\Toxy.dll</HintPath>
     </Reference>
-    <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 Include="unvell.ReoGrid">
+      <HintPath>..\..\3rdParty\ReoGrid-0.8.5-Editor\unvell.ReoGrid.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Toxy.Tools/ExtractionViewer/RichTextBoxPanel.cs b/Toxy.Tools/ExtractionViewer/RichTextBoxPanel.cs
@@ -21,7 +21,7 @@ public void Clear()
             richTextBox1.Clear();
         }
 
-        public override string Text
+        public string Text
         {
             get { return this.richTextBox1.Text; }
             set { this.richTextBox1.Text = value; }

diff --git a/ToxyFramework/3rdParty/CnmFile.cs b/ToxyFramework/3rdParty/CnmFile.cs
@@ -7,7 +7,7 @@
 using InSolve.dmach.Mail;
 using InSolve.dmach.Mail.Decoders;
 
-namespace Toxy
+namespace CnmViewer
 {
     public class CnmFile : IMessageConstructor
     {