Fix Build

MarcosMeli · May 4, 2014 · 0908d04 · 0908d04
1 parent 4da908c
commit 0908d04
Show file tree

Hide file tree

Showing 9 changed files with 86 additions and 43 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,4 @@ _ReSharper.FileHelpers
 /FileHelpers.Tests/Data/temp.txt
 
 /packages
+/FileHelpers/FileHelpers.xml
diff --git a/Build/CurrentVersion.ps1 b/Build/CurrentVersion.ps1
@@ -1,4 +1,4 @@
 properties {
-    $CurrentVersion = "3.0.34" 
+    $CurrentVersion = "3.0.35" 
     $FullCurrentVersion = $CurrentVersion + ".0"
 }
diff --git a/Build/NuGet/FileHelpers.ExcelNPOIStorage.nuspec b/Build/NuGet/FileHelpers.ExcelNPOIStorage.nuspec
@@ -21,6 +21,7 @@
         </dependencies>
     </metadata>
     <files>
-        <file src="..\..\Release\Binaries\DotNet 4.0\FileHelpers.ExcelNPOIStorage.dll" target="lib\FileHelpers.ExcelNPOIStorage.dll" />
+        <file src="..\..\Release\Lib\net40\FileHelpers.ExcelNPOIStorage.dll" target="lib\net40\FileHelpers.ExcelNPOIStorage.dll" />
+        <file src="..\..\Release\Lib\net45\FileHelpers.ExcelNPOIStorage.dll" target="lib\net45\FileHelpers.ExcelNPOIStorage.dll" />
     </files>
 </package>
diff --git a/Build/NuGet/FileHelpers.ExcelStorage.nuspec b/Build/NuGet/FileHelpers.ExcelStorage.nuspec
@@ -21,7 +21,9 @@
         </dependencies>
     </metadata>
     <files>
-        <file src="..\..\Release\Binaries\DotNet 4.0\FileHelpers.ExcelStorage.dll" target="lib\FileHelpers.ExcelStorage.dll" />
-        <file src="..\..\Release\Binaries\DotNet 4.0\FileHelpers.ExcelStorage.xml" target="lib\FileHelpers.ExcelStorage.xml" />        
+        <file src="..\..\Release\Lib\net40\FileHelpers.ExcelStorage.dll" target="lib\net40\FileHelpers.ExcelStorage.dll" />
+        <file src="..\..\Release\Lib\net40\FileHelpers.ExcelStorage.xml" target="lib\net40\FileHelpers.ExcelStorage.xml" />
+        <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>
diff --git a/Build/default.ps1 b/Build/default.ps1
@@ -27,10 +27,10 @@ task common -depends version {
 task compile -depends common {
     "Compiling " + $config
 
-    Compile-Sln-With-Deploy "..\FileHelpers.OnlyLib.sln" "2.0" "Lib\net20"
-    Compile-Sln-With-Deploy "..\FileHelpers.OnlyLib.sln" "4.5" "Lib\net45"
+    Compile-Sln-With-Deploy "..\FileHelpers.OnlyMainLib.sln" "2.0" "Lib\net20"
+    Compile-Sln-With-Deploy "..\FileHelpers.OnlyLibs.sln" "4.5" "Lib\net45"
 
-    Compile-Sln-With-Deploy "..\FileHelpers.OnlyLib.sln" "4.0" "Lib\net40"
+    Compile-Sln-With-Deploy "..\FileHelpers.OnlyLibs.sln" "4.0" "Lib\net40"
 }
 
 task docs -depends compile {
@@ -44,7 +44,7 @@ task docs -depends compile {
 task pack -depends compile, docs {
     "Packing"
 
-    $zipName = "Output\FileHelpers_" + $CurrentVersion + ".zip"
+    $zipName = "Output\FileHelpers_" + $CurrentVersion + "_Build.zip"
     Create-Zip $config $zipName
 }
 
@@ -58,7 +58,7 @@ task test -depends compile{
     exec { & .\xunit.console.clr4 $base_dir\tests.xunit }
 }
 
-#functions ---------------------------------------------------------------------------------------------------------
+#functions ----------------------------------------------------
 
 function Delete-Make-Directory($path)
 {

diff --git a/FileHelpers.OnlyLibs.sln b/FileHelpers.OnlyLibs.sln
@@ -0,0 +1,37 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileHelpers", "FileHelpers\FileHelpers.csproj", "{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileHelpers.ExcelStorage", "FileHelpers.ExcelStorage\FileHelpers.ExcelStorage.csproj", "{B3F2B976-73D5-49C7-BEAA-BF62E233132A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileHelpers.ExcelNPOIStorage", "FileHelpers.ExcelNPOIStorage\FileHelpers.ExcelNPOIStorage.csproj", "{BEB0D823-6A7E-47FD-A275-1B3314F8412D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B3F2B976-73D5-49C7-BEAA-BF62E233132A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B3F2B976-73D5-49C7-BEAA-BF62E233132A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B3F2B976-73D5-49C7-BEAA-BF62E233132A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B3F2B976-73D5-49C7-BEAA-BF62E233132A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BEB0D823-6A7E-47FD-A275-1B3314F8412D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BEB0D823-6A7E-47FD-A275-1B3314F8412D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BEB0D823-6A7E-47FD-A275-1B3314F8412D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BEB0D823-6A7E-47FD-A275-1B3314F8412D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
+		DPCodeReviewSolutionGUID = {7ED1BD6E-F965-49DE-AC44-0FC8F9EA1E54}
+	EndGlobalSection
+	GlobalSection(NDepend) = preSolution
+		Project = ".\FileHelpers.ndproj"
+	EndGlobalSection
+EndGlobal
diff --git a/FileHelpers.OnlyLib.sln → FileHelpers.OnlyMainLib.sln b/FileHelpers.OnlyLib.sln → FileHelpers.OnlyMainLib.sln
@@ -1,28 +1,28 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30324.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileHelpers", "FileHelpers\FileHelpers.csproj", "{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
-		DPCodeReviewSolutionGUID = {7ED1BD6E-F965-49DE-AC44-0FC8F9EA1E54}
-	EndGlobalSection
-	GlobalSection(NDepend) = preSolution
-		Project = ".\FileHelpers.ndproj"
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30324.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileHelpers", "FileHelpers\FileHelpers.csproj", "{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
+		DPCodeReviewSolutionGUID = {7ED1BD6E-F965-49DE-AC44-0FC8F9EA1E54}
+	EndGlobalSection
+	GlobalSection(NDepend) = preSolution
+		Project = ".\FileHelpers.ndproj"
+	EndGlobalSection
+EndGlobal
diff --git a/FileHelpers/VersionInfo.cs b/FileHelpers/VersionInfo.cs
@@ -2,8 +2,8 @@
 using System.Runtime.InteropServices;
 
 // The version of the Library
-[assembly : AssemblyVersion("3.0.34.0")]
-[assembly : AssemblyFileVersion("3.0.34.0")]
+[assembly : AssemblyVersion("3.0.35.0")]
+[assembly : AssemblyFileVersion("3.0.35.0")]
 
 [assembly : AssemblyDescription("A free and easy to use .NET library to read/write data from fixed length or delimited records in files, strings or streams")]
 [assembly : AssemblyProduct("FileHelpers  http://www.filehelpers.com")]

diff --git a/Readme.md b/Readme.md
@@ -43,9 +43,11 @@ Contact and Ideas
  (for the API, Source Code or Examples), please let me know, by sending an e-mail 
  to marcos (at) filehelpers.com
 
-## Sponsors ##
-Our build server is kindly provided by [CodeBetter](http://codebetter.com/) at [FileHelpers Builds](http://teamcity.codebetter.com/project.html?projectId=project41&tab=projectOverview)
+Sponsors
+-----------------
+
+ Our build server is kindly provided by [CodeBetter](http://codebetter.com/) at [FileHelpers Builds](http://teamcity.codebetter.com/project.html?projectId=project41&tab=projectOverview)
 
-We have also the awesome .Net tools from [JetBrains](http://www.jetbrains.com/).
+ We have also the awesome .Net tools from [JetBrains](http://www.jetbrains.com/).
 
-![YouTrack and TeamCity](http://www.jetbrains.com/img/banners/Codebetter300x250.png)
+ ![YouTrack and TeamCity](http://www.jetbrains.com/img/banners/Codebetter300x250.png)