Merging with master FileHelpers branch

.gitattributes

@@ -0,0 +1,15 @@
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain

.gitignore

@@ -13,16 +13,23 @@ _ReSharper.FileHelpers
 /*.ncrunchsolution
 /_ReSharper.FileHelpers.OnlyLib
 /FileHelpers.Tests/Data/*/~$*
-
 /FileHelpers.Benchmarks/Release
 /FileHelpers.Tests/Release
-
 /Release
 /FileHelpers.Tests/Data/temp.txt
-
 /packages
 /FileHelpers/FileHelpers.xml
 FileHelpers.sln.sdsettings
 FileHelpers.ExcelStorage/FileHelpers.ExcelStorage.xml
 FileHelpers.userprefs
 /.vs
+/FileHelpers.Analyzer/.vs
+/FileHelpers.Analyzer/packages
+/FileHelpers.Analyzer/FileHelpers.Analyzer/FileHelpers.Analyzer/bin
+/FileHelpers.Analyzer/FileHelpers.Analyzer/FileHelpers.Analyzer/obj
+/FileHelpers.Analyzer/FileHelpers.Analyzer/FileHelpers.Analyzer.Test/bin
+/FileHelpers.Analyzer/FileHelpers.Analyzer/FileHelpers.Analyzer.Test/obj
+/FileHelpers.Analyzer/FileHelpers.Analyzer/FileHelpers.Analyzer.Vsix/bin
+/FileHelpers.Analyzer/FileHelpers.Analyzer/FileHelpers.Analyzer.Vsix/obj
+/FileHelpers.Examples/obj
+/FileHelpers.Examples/Release

.nuget/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="coveralls.net" version="0.5.0" />
-  <package id="EWSoftware.SHFB" version="2014.11.22.0" />
+  <package id="EWSoftware.SHFB" version="2015.7.25" />
   <package id="ilmerge" version="2.14.1208" />
   <package id="OpenCover" version="4.6.166" />
   <package id="psake" version="4.4.1" />

.travis.yml

@@ -3,7 +3,10 @@ language: csharp
 solution: FileHelpers.sln
 install:
   - nuget restore FileHelpers.sln
+#  - nuget restore FileHelpers.Analyzer/FileHelpers.Analyzer.sln
   - nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner
 script:
   - xbuild /p:Configuration=Debug FileHelpers.sln
-  - mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe ./FileHelpers.Tests/Release/FileHelpers.Tests.dll -exclude=NotOnMono
+  - mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe ./FileHelpers.Tests/Release/FileHelpers.Tests.dll -exclude=NotOnMono
+#  - xbuild /p:Configuration=Debug FileHelpers.Analyzer/FileHelpers.Analyzer.sln
+#  - mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe ./FileHelpers.Analyzer/FileHelpers.Analyzer/FileHelpers.Analyzer.Test/Debug/FileHelpers.Analyzer.Test.dll

Build/CurrentVersion.ps1

@@ -1,5 +1,6 @@
 properties {
-    $CurrentVersion = "3.1.0" 
+    $AssemblyVersion = "3.2" 
+    $CurrentVersion = $AssemblyVersion + ".0" 
     $FullCurrentVersion = $CurrentVersion + ".0"
-    $VisibleVersion = $CurrentVersion + "-rc2"
+    $VisibleVersion = $CurrentVersion + ""
 }

Build/FileHelpers.shfbproj

@@ -2,8 +2,11 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <!-- NOTE: Update the version number in the path to match the package version -->
-    <SHFBROOT Condition=" '$(SHFBROOT)' == '' ">$(MSBuildThisFileDirectory)..\packages\EWSoftware.SHFB.2014.11.22.0\Tools\</SHFBROOT>
+    <SHFBROOT Condition=" '$(SHFBROOT)' == '' ">$(MSBuildThisFileDirectory)..\packages\EWSoftware.SHFB.2015.7.25.0\Tools\</SHFBROOT>
     <CopyrightHref>http://www.filehelpers.net</CopyrightHref>
+    <HelpFileVersion>1.0.0.0</HelpFileVersion>
+    <FooterText>
+    </FooterText>
   </PropertyGroup>
   <PropertyGroup>
     <!-- The configuration and platform will be used to determine which
@@ -13,7 +16,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{cf4a2d77-89f2-4e65-a2bf-4b2318265600}</ProjectGuid>
-    <SHFBSchemaVersion>1.9.9.0</SHFBSchemaVersion>
+    <SHFBSchemaVersion>2015.6.5.0</SHFBSchemaVersion>
     <!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
          Studio adds them anyway -->
     <AssemblyName>Documentation</AssemblyName>
@@ -94,10 +97,41 @@ The Library also has support for import/export data from differents storages lik
         <component id="API Token Resolution">{@TokenFiles}
 <replace elements="/*//token" item="string(.)" /></component>
       </ComponentConfig>
-<ComponentConfig id="Code Block Component" enabled="True"><component id="Code Block Component"><basePath value="{@HtmlEncProjectFolder}" /><outputPaths>{@HelpFormatOutputPaths}</outputPaths><allowMissingSource value="false" /><removeRegionMarkers value="false" /><colorizer syntaxFile="{@SHFBFolder}PresentationStyles\Colorizer\highlight.xml" styleFile="{@SHFBFolder}PresentationStyles\Colorizer\highlight.xsl" stylesheet="{@SHFBFolder}PresentationStyles\Colorizer\highlight.css" scriptFile="{@SHFBFolder}PresentationStyles\Colorizer\highlight.js" disabled="{@DisableCodeBlockComponent}" language="cs" tabSize="0" numberLines="false" outlining="false" keepSeeTags="false" defaultTitle="true" /></component></ComponentConfig>
-<ComponentConfig id="Syntax Component" enabled="True"><component id="Syntax Component"><syntax input="/document/reference" output="/document/syntax" renderReferenceLinks="false" /><generators>
+      <ComponentConfig id="Code Block Component" enabled="True">
+        <component id="Code Block Component">
+          <basePath value="{@HtmlEncProjectFolder}" />
+          <outputPaths>{@HelpFormatOutputPaths}</outputPaths>
+          <allowMissingSource value="false" />
+          <removeRegionMarkers value="false" />
+          <colorizer syntaxFile="{@SHFBFolder}PresentationStyles\Colorizer\highlight.xml" styleFile="{@SHFBFolder}PresentationStyles\Colorizer\highlight.xsl" stylesheet="{@SHFBFolder}PresentationStyles\Colorizer\highlight.css" scriptFile="{@SHFBFolder}PresentationStyles\Colorizer\highlight.js" disabled="{@DisableCodeBlockComponent}" language="cs" tabSize="0" numberLines="false" outlining="false" keepSeeTags="false" defaultTitle="true" />
+        </component>
+      </ComponentConfig>
+      <ComponentConfig id="Syntax Component" enabled="True">
+        <component id="Syntax Component">
+          <syntax input="/document/reference" output="/document/syntax" renderReferenceLinks="false" />
+          <generators>
     {@SyntaxFilters}
-</generators><containerElement name="codeSnippetGroup" addNoExampleTabs="true" includeOnSingleSnippets="false" groupingEnabled="{@CodeSnippetGrouping}" /><configurations><generator id="C#" /><generator id="Visual Basic"><includeLineContinuation value="false" /></generator><generator id="Visual Basic Usage"><includeLineContinuation value="false" /></generator><generator id="Managed C++" /><generator id="F#" /><generator id="J#" /><generator id="JScript" /><generator id="JavaScript" /><generator id="XAML Usage" /><generator id="ASP.NET" /></configurations></component></ComponentConfig></ComponentConfigurations>
+</generators>
+          <containerElement name="codeSnippetGroup" addNoExampleTabs="true" includeOnSingleSnippets="false" groupingEnabled="{@CodeSnippetGrouping}" />
+          <configurations>
+            <generator id="C#" />
+            <generator id="Visual Basic">
+              <includeLineContinuation value="false" />
+            </generator>
+            <generator id="Visual Basic Usage">
+              <includeLineContinuation value="false" />
+            </generator>
+            <generator id="Managed C++" />
+            <generator id="F#" />
+            <generator id="J#" />
+            <generator id="JScript" />
+            <generator id="JavaScript" />
+            <generator id="XAML Usage" />
+            <generator id="ASP.NET" />
+          </configurations>
+        </component>
+      </ComponentConfig>
+    </ComponentConfigurations>
   </PropertyGroup>
   <!-- There are no properties for these two groups but they need to appear in
        order for Visual Studio to perform the build. -->

Build/NuGet/FileHelpers.ExcelNPOIStorage.nuspec

@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>FileHelpers.ExcelNPOIStorage</id>
-        <version>3.0.5</version>
+        <version>3.2.0</version>
         <title>FileHelpers.ExcelNPOIStorage</title>
-        <authors>Marcos Meli</authors>
+        <authors>Marcos Meli and Contributors</authors>
         <owners>Marcos Meli</owners>
         <licenseUrl>http://www.filehelpers.net/#license</licenseUrl>
         <projectUrl>http://www.filehelpers.net</projectUrl>
         <iconUrl>http://www.filehelpers.net/images/filehelpers_box_small.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Extension for FileHelpers to support Excel read/write operations using NPOI Library</description>
+        <description>Extension for FileHelpers to support Excel read/write operations using NPOI Library www.filehelpers.net</description>
         <summary>Extension for FileHelpers to support Excel read/write operations using NPOI Library</summary>
+        <releaseNotes>www.filehelpers.net/changelog</releaseNotes>
         <copyright>Marcos Meli - Devoo</copyright>
-        <tags>Excel Import Export</tags>
+        <tags>Excel, Import, Export, FileHelpers, FileHelper</tags>
         <frameworkAssemblies>
             <frameworkAssembly assemblyName="System.Data" targetFramework="" />
             <frameworkAssembly assemblyName="System.Xml" targetFramework="" />
         </frameworkAssemblies>        
         <dependencies>
-            <dependency id="FileHelpers" version="-VisibleVersion-" />
+            <dependency id="FileHelpers" version="3.2.0" />
         </dependencies>
     </metadata>
     <files>
@@ -28,4 +29,4 @@
         <file src="..\..\Release\Lib\net45\FileHelpers.ExcelNPOIStorage.dll" target="lib\net45\FileHelpers.ExcelNPOIStorage.dll" />
         <file src="..\..\Release\Lib\net45\FileHelpers.ExcelNPOIStorage.xml" target="lib\net45\FileHelpers.ExcelNPOIStorage.xml" />
     </files>
-</package>
+</package>

Build/NuGet/FileHelpers.ExcelStorage.nuspec

@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>FileHelpers.ExcelStorage</id>
-        <version>3.0.5</version>
+        <version>3.2.0</version>
         <title>FileHelpers.ExcelStorage</title>
-        <authors>Marcos Meli</authors>
+        <authors>Marcos Meli and Contributors</authors>
         <owners>Marcos Meli</owners>
         <licenseUrl>http://www.filehelpers.net/#license</licenseUrl>
         <projectUrl>http://www.filehelpers.net</projectUrl>
         <iconUrl>http://www.filehelpers.net/images/filehelpers_box_small.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Extension for FileHelpers to support Excel read/write operations, using Interop Assemblies (deprecated)</description>
+        <description>Extension for FileHelpers to support Excel read/write operations, using Interop Assemblies (deprecated) www.filehelpers.net</description>
         <summary>Extension for FileHelpers to support Excel read/write operations, using Interop Assemblies (deprecated)</summary>
+        <releaseNotes>www.filehelpers.net/changelog</releaseNotes>
         <copyright>Marcos Meli - Devoo</copyright>
-                <tags>Excel Import Export</tags>
+        <tags>Excel, Import, Export, NPOI, FileHelpers, FileHelper</tags>
         <frameworkAssemblies>
             <frameworkAssembly assemblyName="System.Data" targetFramework="" />
             <frameworkAssembly assemblyName="System.Xml" targetFramework="" />
         </frameworkAssemblies>        
         <dependencies>
-            <dependency id="FileHelpers" version="-VisibleVersion-" />
+            <dependency id="FileHelpers" version="3.2.0" />
         </dependencies>
     </metadata>
     <files>
@@ -28,4 +29,4 @@
         <file src="..\..\Release\Lib\net45\FileHelpers.ExcelStorage.dll" target="lib\net45\FileHelpers.ExcelStorage.dll" />
         <file src="..\..\Release\Lib\net45\FileHelpers.ExcelStorage.xml" target="lib\net45\FileHelpers.ExcelStorage.xml" />
     </files>
-</package>
+</package>

Build/NuGet/FileHelpers.nuspec

@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>FileHelpers</id>
-        <version>3.0.5</version>
+        <version>3.2.0</version>
         <title>FileHelpers</title>
-        <authors>Marcos Meli</authors>
+        <authors>Marcos Meli and Contributors</authors>
         <owners>Marcos Meli</owners>
         <licenseUrl>http://www.filehelpers.net/#license</licenseUrl>
         <projectUrl>http://www.filehelpers.net</projectUrl>
         <iconUrl>http://www.filehelpers.net/images/filehelpers_box_small.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Open Source library for automatic formatted file read/write operations</description>
+        <description>Open Source library for automatic formatted file read/write operations www.filehelpers.net</description>
         <summary>Open Source library for automatic formatted file read/write operations</summary>
+        <releaseNotes>www.filehelpers.net/changelog</releaseNotes>
         <copyright>Marcos Meli - Devoo</copyright>
-        <tags>Flat File CSV FixedLength Delimited Import Export</tags>
+        <tags>FileHelpers, Flat File, CSV, FixedLength, Fixed, Delimited, Import, Export, ETL, FileHelper</tags>
         <frameworkAssemblies>
             <frameworkAssembly assemblyName="System.Data" targetFramework="" />
             <frameworkAssembly assemblyName="System.Xml" targetFramework="" />
-        </frameworkAssemblies>        
+        </frameworkAssemblies>
     </metadata>
     <files>
         <file src="..\..\Release\Lib\net20\FileHelpers.dll" target="lib\net20\FileHelpers.dll" />
@@ -28,6 +29,6 @@
         <file src="..\..\Release\Lib\net40\FileHelpers.xml" target="lib\net40\FileHelpers.xml" />
         <file src="..\..\Release\Lib\net45\FileHelpers.dll" target="lib\net45\FileHelpers.dll" />
         <file src="..\..\Release\Lib\net45\FileHelpers.xml" target="lib\net45\FileHelpers.xml" />
-        <file src="Readme.txt" target="" />
+        <file src="Readme.txt" target="Readme.txt" />
     </files>
-</package>
+</package>

Build/NuGet/Readme.txt

@@ -1,6 +1,7 @@
-FileHelpers library successful installed !!
+FileHelpers Library Installed
+-----------------------------
 
-You can check the version history at: http://www.filehelpers.net/changelog/
+Check the version history at: http://www.filehelpers.net/changelog/
 
 Visit the new home page http://www.filehelpers.net for more examples, tips and tutorials
 

Build/adddocs.bat

@@ -0,0 +1 @@
+..\Libs\FileReplaceUTF8.exe ..\Help\html\* "</div></div></div><div" -f adddocs.txt