From ef1aa089ad00f3618985b1890d0d9eac0c105a06 Mon Sep 17 00:00:00 2001
From: pushrbx <thomace44@gmail.com>
Date: Wed, 2 Sep 2015 13:55:09 +0100
Subject: [PATCH 1/4] fix #8

New class 'RuntimeInfo' has been added to get the Entry assembly's
runtime version. SqlBatchOperion.Execute has been changed to check the
runtime, and if it's 2.0 or below then apply the workaround for
framework bug.
---
 .../Infrastructure/SqlCommandSet.cs           |  6 ++++--
 .../Operations/SqlBatchOperation.cs           |  7 ++++---
 Rhino.Etl.Core/Rhino.Etl.Core.csproj          |  4 +++-
 Rhino.Etl.Core/RuntimeInfo.cs                 | 20 +++++++++++++++++++
 4 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 Rhino.Etl.Core/RuntimeInfo.cs

diff --git a/Rhino.Etl.Core/Infrastructure/SqlCommandSet.cs b/Rhino.Etl.Core/Infrastructure/SqlCommandSet.cs
index 66d4c01..f75c196 100644
--- a/Rhino.Etl.Core/Infrastructure/SqlCommandSet.cs
+++ b/Rhino.Etl.Core/Infrastructure/SqlCommandSet.cs
@@ -113,9 +113,11 @@ public void Append(SqlCommand command)
         /// <param name="command"></param>
         private static void AssertHasParameters(SqlCommand command)
         {
-            if(command.Parameters.Count==0)
+            if (command.Parameters.Count == 0 &&
+                (RuntimeInfo.Version.Contains("2.0") || RuntimeInfo.Version.Contains("1.1")))
             {
-                throw new ArgumentException("A command in SqlCommandSet must have parameters. You can't pass hardcoded sql strings.");
+                throw new ArgumentException(
+                    "A command in SqlCommandSet must have parameters. You can't pass hardcoded sql strings.");
             }
         }
         
diff --git a/Rhino.Etl.Core/Operations/SqlBatchOperation.cs b/Rhino.Etl.Core/Operations/SqlBatchOperation.cs
index d0a6988..f175091 100644
--- a/Rhino.Etl.Core/Operations/SqlBatchOperation.cs
+++ b/Rhino.Etl.Core/Operations/SqlBatchOperation.cs
@@ -38,7 +38,7 @@ public int Timeout
         /// Initializes a new instance of the <see cref="SqlBatchOperation"/> class.
         /// </summary>
         /// <param name="connectionStringName">Name of the connection string.</param>
-        public SqlBatchOperation(string connectionStringName)
+        protected SqlBatchOperation(string connectionStringName)
             : this(ConfigurationManager.ConnectionStrings[connectionStringName])
         {            
         }
@@ -47,7 +47,7 @@ public SqlBatchOperation(string connectionStringName)
         /// Initializes a new instance of the <see cref="SqlBatchOperation"/> class.
         /// </summary>
         /// <param name="connectionStringSettings">The connection string settings to use.</param>
-        public SqlBatchOperation(ConnectionStringSettings connectionStringSettings)
+        protected SqlBatchOperation(ConnectionStringSettings connectionStringSettings)
             : base(connectionStringSettings)
         {
             base.paramPrefix = "@";
@@ -66,11 +66,12 @@ public override IEnumerable<Row> Execute(IEnumerable<Row> rows)
             {
                 SqlCommandSet commandSet = null;
                 CreateCommandSet(connection, transaction, ref commandSet, timeout);
+
                 foreach (Row row in rows)
                 {
                     SqlCommand command = new SqlCommand();
                     PrepareCommand(row, command);
-                    if (command.Parameters.Count == 0) //workaround around a framework bug
+                    if (command.Parameters.Count == 0 && (RuntimeInfo.Version.Contains("2.0") || RuntimeInfo.Version.Contains("1.1"))) //workaround around a framework bug
                     {
                         Guid guid = Guid.NewGuid();
                         command.Parameters.AddWithValue(guid.ToString(), guid);
diff --git a/Rhino.Etl.Core/Rhino.Etl.Core.csproj b/Rhino.Etl.Core/Rhino.Etl.Core.csproj
index 05b6edb..ea604d2 100644
--- a/Rhino.Etl.Core/Rhino.Etl.Core.csproj
+++ b/Rhino.Etl.Core/Rhino.Etl.Core.csproj
@@ -122,12 +122,13 @@
     <Compile Include="Pipelines\PipelineExecutionException.cs" />
     <Compile Include="Pipelines\SingleThreadedNonCachedPipelineExecuter.cs" />
     <Compile Include="Pipelines\ThreadPoolPipelineExecuter.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Operations\SqlBulkInsertOperation.cs" />
     <Compile Include="Pipelines\SingleThreadedPipelineExecuter.cs" />
     <Compile Include="Exceptions\RhinoEtlException.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="QuackingDictionary.cs" />
     <Compile Include="Row.cs" />
+    <Compile Include="RuntimeInfo.cs" />
     <Compile Include="WithLoggingMixin.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -150,6 +151,7 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Rhino.Etl.Core/RuntimeInfo.cs b/Rhino.Etl.Core/RuntimeInfo.cs
new file mode 100644
index 0000000..2238d9f
--- /dev/null
+++ b/Rhino.Etl.Core/RuntimeInfo.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+
+namespace Rhino.Etl.Core
+{
+    internal static class RuntimeInfo
+    {
+        public static string Version
+        {
+            get
+            {
+                var asm = Assembly.GetEntryAssembly();
+                return asm.ImageRuntimeVersion;
+            }
+        }
+    }
+}

From e450a63ede15e7698da54d23744126a6fd561c57 Mon Sep 17 00:00:00 2001
From: Michael L Perry <michael@qedcode.com>
Date: Thu, 12 May 2016 16:30:26 -0500
Subject: [PATCH 2/4] Display a meaningful error message instead of The given
 ColumnMapping does not match up with any column in the source or destination.

---
 .../Operations/SqlBulkInsertOperation.cs      | 68 ++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)

diff --git a/Rhino.Etl.Core/Operations/SqlBulkInsertOperation.cs b/Rhino.Etl.Core/Operations/SqlBulkInsertOperation.cs
index feff148..d3d87c5 100644
--- a/Rhino.Etl.Core/Operations/SqlBulkInsertOperation.cs
+++ b/Rhino.Etl.Core/Operations/SqlBulkInsertOperation.cs
@@ -4,7 +4,9 @@
 namespace Rhino.Etl.Core.Operations
 {
     using System;
+    using System.Linq;
     using System.Collections.Generic;
+    using System.Data;
     using System.Data.SqlClient;
     using DataReaders;
 
@@ -228,7 +230,15 @@ public override IEnumerable<Row> Execute(IEnumerable<Row> rows)
             {
                 sqlBulkCopy = CreateSqlBulkCopy(connection, transaction);
                 DictionaryEnumeratorDataReader adapter = new DictionaryEnumeratorDataReader(_inputSchema, rows);
-                sqlBulkCopy.WriteToServer(adapter);
+                try
+                {
+                    sqlBulkCopy.WriteToServer(adapter);
+                }
+                catch (InvalidOperationException)
+                {
+                    CompareSqlColumns(connection, transaction);
+                    throw;
+                }
 
                 if (PipelineExecuter.HasErrors)
                 {
@@ -276,5 +286,61 @@ private SqlBulkCopy CreateSqlBulkCopy(SqlConnection connection, SqlTransaction t
             copy.BulkCopyTimeout = Timeout;
             return copy;
         }
+
+        private void CompareSqlColumns(SqlConnection connection, SqlTransaction transaction)
+        {
+            var command = connection.CreateCommand();
+            command.CommandText = $"select * from {TargetTable} where 1=0";
+            command.CommandType = CommandType.Text;
+            command.Transaction = transaction;
+
+            using (var reader = command.ExecuteReader())
+            {
+                var databaseColumns = Enumerable
+                    .Range(0, reader.FieldCount)
+                    .Select(n => new { Name = reader.GetName(n), Type = reader.GetFieldType(n) })
+                    .ToArray();
+
+                var missingColumns = _schema.Keys.Except(
+                    databaseColumns.Select(c => c.Name));
+                if (missingColumns.Any())
+                    throw new InvalidOperationException(
+                        "The following columns are not in the target table: " +
+                        string.Join(", ", missingColumns.ToArray()));
+                var differentColumns = _schema
+                    .Select(s => new
+                    {
+                        Name = s.Key,
+                        SchemaType = s.Value,
+                        DatabaseType = databaseColumns.Single(c => c.Name == s.Key).Type
+                    })
+                    .Where(c => c.SchemaType != c.DatabaseType);
+                if (differentColumns.Any())
+                    throw new InvalidOperationException(
+                        "The following columns have different types in the target table: " +
+                        string.Join(", ", differentColumns
+                            .Select(c => $"{c.Name}: is {GetFriendlyName(c.SchemaType)}, but should be {GetFriendlyName(c.DatabaseType)}.")
+                            .ToArray()
+                        ));
+            }
+        }
+
+        private static string GetFriendlyName(Type type)
+        {
+            var friendlyName = type.Name;
+            if (!type.IsGenericType)
+                return friendlyName;
+
+            var iBacktick = friendlyName.IndexOf('`');
+            if (iBacktick > 0)
+                friendlyName = friendlyName.Remove(iBacktick);
+
+            var genericParameters = type.GetGenericArguments()
+                .Select(x => GetFriendlyName(x))
+                .ToArray();
+            friendlyName += "<" + string.Join(", ", genericParameters) + ">";
+
+            return friendlyName;
+        }
     }
 }
\ No newline at end of file

From 162d06033d0d7236797d95b3ad67b32f6e70fd91 Mon Sep 17 00:00:00 2001
From: Michael L Perry <michael@qedcode.com>
Date: Thu, 23 Jun 2016 16:03:41 -0500
Subject: [PATCH 3/4] Compare string lengths.

---
 .../Operations/SqlBulkInsertOperation.cs      | 51 +++++++++++++++----
 1 file changed, 42 insertions(+), 9 deletions(-)

diff --git a/Rhino.Etl.Core/Operations/SqlBulkInsertOperation.cs b/Rhino.Etl.Core/Operations/SqlBulkInsertOperation.cs
index d3d87c5..2d88f15 100644
--- a/Rhino.Etl.Core/Operations/SqlBulkInsertOperation.cs
+++ b/Rhino.Etl.Core/Operations/SqlBulkInsertOperation.cs
@@ -236,7 +236,7 @@ public override IEnumerable<Row> Execute(IEnumerable<Row> rows)
                 }
                 catch (InvalidOperationException)
                 {
-                    CompareSqlColumns(connection, transaction);
+                    CompareSqlColumns(connection, transaction, rows);
                     throw;
                 }
 
@@ -287,18 +287,25 @@ private SqlBulkCopy CreateSqlBulkCopy(SqlConnection connection, SqlTransaction t
             return copy;
         }
 
-        private void CompareSqlColumns(SqlConnection connection, SqlTransaction transaction)
+        private void CompareSqlColumns(SqlConnection connection, SqlTransaction transaction, IEnumerable<Row> rows)
         {
             var command = connection.CreateCommand();
             command.CommandText = $"select * from {TargetTable} where 1=0";
             command.CommandType = CommandType.Text;
             command.Transaction = transaction;
 
-            using (var reader = command.ExecuteReader())
+            using (var reader = command.ExecuteReader(CommandBehavior.KeyInfo))
             {
-                var databaseColumns = Enumerable
-                    .Range(0, reader.FieldCount)
-                    .Select(n => new { Name = reader.GetName(n), Type = reader.GetFieldType(n) })
+                var schemaTable = reader.GetSchemaTable();
+                var databaseColumns = schemaTable.Rows
+                    .OfType<DataRow>()
+                    .Select(r => new
+                    {
+                        Name = (string)r["ColumnName"],
+                        Type = (Type)r["DataType"],
+                        IsNullable = (bool)r["AllowDBNull"],
+                        MaxLength = (int)r["ColumnSize"]
+                    })
                     .ToArray();
 
                 var missingColumns = _schema.Keys.Except(
@@ -312,16 +319,33 @@ private void CompareSqlColumns(SqlConnection connection, SqlTransaction transact
                     {
                         Name = s.Key,
                         SchemaType = s.Value,
-                        DatabaseType = databaseColumns.Single(c => c.Name == s.Key).Type
+                        DatabaseType = databaseColumns.Single(c => c.Name == s.Key)
                     })
-                    .Where(c => c.SchemaType != c.DatabaseType);
+                    .Where(c => !TypesMatch(c.SchemaType, c.DatabaseType.Type, c.DatabaseType.IsNullable));
                 if (differentColumns.Any())
                     throw new InvalidOperationException(
                         "The following columns have different types in the target table: " +
                         string.Join(", ", differentColumns
-                            .Select(c => $"{c.Name}: is {GetFriendlyName(c.SchemaType)}, but should be {GetFriendlyName(c.DatabaseType)}.")
+                            .Select(c => $"{c.Name}: is {GetFriendlyName(c.SchemaType)}, but should be {GetFriendlyName(c.DatabaseType.Type)}{(c.DatabaseType.IsNullable ? "?" : "")}.")
                             .ToArray()
                         ));
+                var stringsTooLong =
+                    (from column in databaseColumns
+                     where column.Type == typeof(string)
+                     from mapping in Mappings
+                     where mapping.Value == column.Name
+                     let name = mapping.Key
+                     from row in rows
+                     let value = (string)row[name]
+                     where value != null && value.Length > column.MaxLength
+                     select new { column.Name, column.MaxLength, Value = value })
+                    .ToArray();
+                if (stringsTooLong.Any())
+                    throw new InvalidOperationException(
+                        "The folowing columns have values too long for the target table: " +
+                        string.Join(", ", stringsTooLong
+                            .Select(s => $"{s.Name}: max length is {s.MaxLength}, value is {s.Value}.")
+                            .ToArray()));
             }
         }
 
@@ -342,5 +366,14 @@ private static string GetFriendlyName(Type type)
 
             return friendlyName;
         }
+
+        private bool TypesMatch(Type schemaType, Type databaseType, bool isNullable)
+        {
+            if (schemaType == databaseType)
+                return true;
+            if (isNullable && schemaType == typeof(Nullable<>).MakeGenericType(databaseType))
+                return true;
+            return false;
+        }
     }
 }
\ No newline at end of file

From f8f73cdf1785c6e39c9d1d5cec642e7ec1c26bba Mon Sep 17 00:00:00 2001
From: "M. Zahir Solak" <zahirsolak@gmailc.om>
Date: Wed, 21 Dec 2016 13:11:40 +0300
Subject: [PATCH 4/4] Upgrade .net framework to v4.0.

---
 Rhino.Etl.Cmd/Rhino.Etl.Cmd.csproj               | 10 ++++++++--
 Rhino.Etl.Cmd/app.config                         |  3 +++
 .../Operations/SqlBulkInsertOperation.cs         | 16 ++++++++++++----
 Rhino.Etl.Core/Rhino.Etl.Core.csproj             | 10 +++++++---
 Rhino.Etl.Dsl/Rhino.Etl.Dsl.csproj               |  7 +++++--
 Rhino.Etl.Tests/App.config                       |  8 +++-----
 Rhino.Etl.Tests/Rhino.Etl.Tests.csproj           |  3 ++-
 7 files changed, 40 insertions(+), 17 deletions(-)
 create mode 100644 Rhino.Etl.Cmd/app.config

diff --git a/Rhino.Etl.Cmd/Rhino.Etl.Cmd.csproj b/Rhino.Etl.Cmd/Rhino.Etl.Cmd.csproj
index bc7a4bf..ab9ccd7 100644
--- a/Rhino.Etl.Cmd/Rhino.Etl.Cmd.csproj
+++ b/Rhino.Etl.Cmd/Rhino.Etl.Cmd.csproj
@@ -16,7 +16,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -31,6 +31,7 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -88,7 +89,6 @@
   <ItemGroup>
     <Compile Include="RhinoEtlRunner.cs" />
     <Compile Include="RhinoEtlSetup.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RhinoEtlCommandLineOptions.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -137,6 +137,12 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Rhino.Etl.Cmd/app.config b/Rhino.Etl.Cmd/app.config
new file mode 100644
index 0000000..e365603
--- /dev/null
+++ b/Rhino.Etl.Cmd/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/Rhino.Etl.Core/Operations/SqlBulkInsertOperation.cs b/Rhino.Etl.Core/Operations/SqlBulkInsertOperation.cs
index 2d88f15..5a77065 100644
--- a/Rhino.Etl.Core/Operations/SqlBulkInsertOperation.cs
+++ b/Rhino.Etl.Core/Operations/SqlBulkInsertOperation.cs
@@ -290,7 +290,7 @@ private SqlBulkCopy CreateSqlBulkCopy(SqlConnection connection, SqlTransaction t
         private void CompareSqlColumns(SqlConnection connection, SqlTransaction transaction, IEnumerable<Row> rows)
         {
             var command = connection.CreateCommand();
-            command.CommandText = $"select * from {TargetTable} where 1=0";
+            command.CommandText = "select * from {TargetTable} where 1=0".Replace("{TargetTable}", TargetTable);
             command.CommandType = CommandType.Text;
             command.Transaction = transaction;
 
@@ -326,9 +326,13 @@ private void CompareSqlColumns(SqlConnection connection, SqlTransaction transact
                     throw new InvalidOperationException(
                         "The following columns have different types in the target table: " +
                         string.Join(", ", differentColumns
-                            .Select(c => $"{c.Name}: is {GetFriendlyName(c.SchemaType)}, but should be {GetFriendlyName(c.DatabaseType.Type)}{(c.DatabaseType.IsNullable ? "?" : "")}.")
+                            //.Select(c => $"{c.Name}: is {GetFriendlyName(c.SchemaType)}, but should be {GetFriendlyName(c.DatabaseType.Type)}{(c.DatabaseType.IsNullable ? "?" : "")}.")
+                            // c.Name, GetFriendlyName(c.SchemaType), GetFriendlyName(c.DatabaseType.Type), (c.DatabaseType.IsNullable ? \"?\" : \"\")
+                            .Select(c => string.Format("{0}: is {1}, but should be {2}{3}.", c.Name,
+                                GetFriendlyName(c.SchemaType), GetFriendlyName(c.DatabaseType.Type),
+                                (c.DatabaseType.IsNullable ? "?" : "")))
                             .ToArray()
-                        ));
+                            ));
                 var stringsTooLong =
                     (from column in databaseColumns
                      where column.Type == typeof(string)
@@ -344,7 +348,11 @@ from row in rows
                     throw new InvalidOperationException(
                         "The folowing columns have values too long for the target table: " +
                         string.Join(", ", stringsTooLong
-                            .Select(s => $"{s.Name}: max length is {s.MaxLength}, value is {s.Value}.")
+                            .Select(s => "{s.Name}: max length is {s.MaxLength}, value is {s.Value}."
+                                .Replace("{s.Name}", s.Name)
+                                .Replace("{s.MaxLength}", s.MaxLength.ToString())
+                                .Replace("{s.Value}", s.Value)
+                            )
                             .ToArray()));
             }
         }
diff --git a/Rhino.Etl.Core/Rhino.Etl.Core.csproj b/Rhino.Etl.Core/Rhino.Etl.Core.csproj
index ea604d2..40a4185 100644
--- a/Rhino.Etl.Core/Rhino.Etl.Core.csproj
+++ b/Rhino.Etl.Core/Rhino.Etl.Core.csproj
@@ -30,7 +30,8 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -43,6 +44,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DocumentationFile>Rhino.Etl.Core.XML</DocumentationFile>
     <NoWarn>1607</NoWarn>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -52,6 +54,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>Rhino.Etl.Core.XML</DocumentationFile>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Boo.Lang">
@@ -125,7 +128,6 @@
     <Compile Include="Operations\SqlBulkInsertOperation.cs" />
     <Compile Include="Pipelines\SingleThreadedPipelineExecuter.cs" />
     <Compile Include="Exceptions\RhinoEtlException.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="QuackingDictionary.cs" />
     <Compile Include="Row.cs" />
     <Compile Include="RuntimeInfo.cs" />
@@ -151,7 +153,9 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Rhino.Etl.Dsl/Rhino.Etl.Dsl.csproj b/Rhino.Etl.Dsl/Rhino.Etl.Dsl.csproj
index dbb7be8..bd0f670 100644
--- a/Rhino.Etl.Dsl/Rhino.Etl.Dsl.csproj
+++ b/Rhino.Etl.Dsl/Rhino.Etl.Dsl.csproj
@@ -30,7 +30,8 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -101,7 +102,6 @@
     <Compile Include="Macros\RowProcessedMacro.cs" />
     <Compile Include="Macros\SqlBulkInsertMacro.cs" />
     <Compile Include="Macros\TerminateMacro.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Rhino.Etl.Core\Rhino.Etl.Core.csproj">
@@ -129,6 +129,9 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Rhino.Etl.Tests/App.config b/Rhino.Etl.Tests/App.config
index 4a4cded..0fe3f05 100644
--- a/Rhino.Etl.Tests/App.config
+++ b/Rhino.Etl.Tests/App.config
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0"?>
 <configuration>
   <connectionStrings>
-    <add name="test"
-       connectionString="Data Source=.\SQLExpress;Initial Catalog=test;Integrated Security=SSPI;Timeout=30;"
-       providerName="System.Data.SqlClient.SqlConnection, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+    <add name="test" connectionString="Data Source=.\SQLExpress;Initial Catalog=test;Integrated Security=SSPI;Timeout=30;" providerName="System.Data.SqlClient.SqlConnection, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
   </connectionStrings>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/Rhino.Etl.Tests/Rhino.Etl.Tests.csproj b/Rhino.Etl.Tests/Rhino.Etl.Tests.csproj
index aecca84..4f4cccf 100644
--- a/Rhino.Etl.Tests/Rhino.Etl.Tests.csproj
+++ b/Rhino.Etl.Tests/Rhino.Etl.Tests.csproj
@@ -32,7 +32,8 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>