Merge branch 'update-framework' into 'master'.

paulyoder · Aug 19, 2018 · 9332672 · 9332672
2 parents 68b04e1 + f9c82ab
commit 9332672
Show file tree

Hide file tree

Showing 77 changed files with 115 additions and 36,780 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,5 @@ src/packages/
 *.DotSettings.user
 *.csproj.user
 .vs/
-
+*.csproj.user
+*.DotSettings.user
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# Changelog
+
+### 2.0.0
+
+* Remove support for Microsoft Jet
+  * MS Ace driver is now a hard requirement
+* Target AnyCPU
+* Switch .Net framework to 4.5.1
+
 ### 1.11.0
 
 * Refactorings

diff --git a/lib/Remotion/Remotion.Data.Linq.dll b/lib/Remotion/Remotion.Data.Linq.dll
diff --git a/lib/Remotion/Remotion.Interfaces.dll b/lib/Remotion/Remotion.Interfaces.dll
diff --git a/lib/Remotion/Remotion.dll b/lib/Remotion/Remotion.dll
diff --git a/package/LinqToExcel.nuspec b/package/LinqToExcel.nuspec
diff --git a/project.build b/project.build
diff --git a/src/LinqToExcel.Tests/Company.cs b/src/LinqToExcel.Tests/Company.cs
@@ -6,7 +6,7 @@ public class Company
     {
         public string Name { get; set; }
         public string CEO { get; set; }
-        public int EmployeeCount { get; set; }
+        public int? EmployeeCount { get; set; }
         public DateTime StartDate { get; set; }
         public bool IsActive { get; set; }
     }

diff --git a/src/LinqToExcel.Tests/IndexToColumnNamesTests.cs b/src/LinqToExcel.Tests/IndexToColumnNamesTests.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace LinqToExcel.Tests
 {