crpietschmann · paonath · May 18, 2019
diff --git a/DapperExtensions/SQLinq.Dapper.Test/IDbConnectionExtensionsTest.cs b/DapperExtensions/SQLinq.Dapper.Test/IDbConnectionExtensionsTest.cs
@@ -22,7 +22,7 @@ private IDbConnection GetDBConnection()
             //return new SqlConnection("Data Source=.\\SQLExpress;AttachDbFilename=" + folder + "Database1.mdf;Integrated Security=True");
             //return new SqlConnection("Data Source=.\\SQLEXPRESS;AttachDbFilename=" + folder + "Database1.mdf;Integrated Security=True;User Instance=True");
             //return new SqlConnection("Data Source=(LocalDB)\v11.0;AttachDbFilename=" + folder + "Database1.mdf;Integrated Security=True;Connect Timeout=15");
-            return new SqlConnection("Data Source=.;Database=DATABASE1;Integrated Security=True;");
+            return new SqlConnection("Data Source=.\\SQLEXPRESS01;Database=DATABASE1;Integrated Security=True;");
         }
 
         #region Query

diff --git a/DapperExtensions/SQLinq.Dapper.Test/SQLinq.Dapper.Test.csproj b/DapperExtensions/SQLinq.Dapper.Test/SQLinq.Dapper.Test.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,13 +11,17 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SQLinq.Dapper.Test</RootNamespace>
     <AssemblyName>SQLinq.Dapper.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
+    <SccProjectName>
+    </SccProjectName>
+    <SccLocalPath>
+    </SccLocalPath>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccProvider>
+    </SccProvider>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <TargetFrameworkProfile />
@@ -42,12 +46,18 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Dapper, Version=1.60.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Dapper.1.60.6\lib\net451\Dapper.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -79,6 +89,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/DapperExtensions/SQLinq.Dapper.Test/packages.config b/DapperExtensions/SQLinq.Dapper.Test/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Dapper" version="1.60.6" targetFramework="net47" />
+</packages>
diff --git a/DapperExtensions/SQLinq.Dapper/Properties/AssemblyInfo.cs b/DapperExtensions/SQLinq.Dapper/Properties/AssemblyInfo.cs
@@ -1,36 +1,36 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
+//using System.Reflection;
+//using System.Runtime.CompilerServices;
+//using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("SQLinq.Dapper")]
-[assembly: AssemblyDescription("https://github.com/crpietschmann/SQLinq")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Chris Pietschmann (http://pietschsoft.com)")]
-[assembly: AssemblyProduct("SQLinq.Dapper")]
-[assembly: AssemblyCopyright("Copyright © Chris Pietschmann 2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+//// General Information about an assembly is controlled through the following 
+//// set of attributes. Change these attribute values to modify the information
+//// associated with an assembly.
+//[assembly: AssemblyTitle("SQLinq.Dapper")]
+//[assembly: AssemblyDescription("https://github.com/crpietschmann/SQLinq")]
+//[assembly: AssemblyConfiguration("")]
+//[assembly: AssemblyCompany("Chris Pietschmann (http://pietschsoft.com)")]
+//[assembly: AssemblyProduct("SQLinq.Dapper")]
+//[assembly: AssemblyCopyright("Copyright © Chris Pietschmann 2015")]
+//[assembly: AssemblyTrademark("")]
+//[assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+//// Setting ComVisible to false makes the types in this assembly not visible 
+//// to COM components.  If you need to access a type in this assembly from 
+//// COM, set the ComVisible attribute to true on that type.
+//[assembly: ComVisible(false)]
 
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("0bade197-d40d-42c2-b718-d946ad6c887a")]
+//// The following GUID is for the ID of the typelib if this project is exposed to COM
+//[assembly: Guid("0bade197-d40d-42c2-b718-d946ad6c887a")]
 
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.1.0")]
-[assembly: AssemblyFileVersion("1.5.1.0")]
+//// Version information for an assembly consists of the following four values:
+////
+////      Major Version
+////      Minor Version 
+////      Build Number
+////      Revision
+////
+//// You can specify all the values or you can default the Build and Revision Numbers 
+//// by using the '*' as shown below:
+//// [assembly: AssemblyVersion("1.0.*")]
+//[assembly: AssemblyVersion("1.5.1.0")]
+//[assembly: AssemblyFileVersion("1.5.1.0")]
diff --git a/DapperExtensions/SQLinq.Dapper/SQLinq.Dapper.csproj b/DapperExtensions/SQLinq.Dapper/SQLinq.Dapper.csproj
@@ -1,82 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1F1E8FE0-C6EB-40D5-B79F-2E1FF8C093D8}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SQLinq.Dapper</RootNamespace>
-    <AssemblyName>SQLinq.Dapper</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <TargetFrameworkProfile />
+    <TargetFramework>netstandard2.0</TargetFramework>
+
+    <!--NUGET -->
+    <Copyright>Copyright © Chris Pietschmann 2019</Copyright>
+    <Authors>Chris Pietschmann</Authors>
+    <Company>Chris Pietschmann (http://pietschsoft.com)</Company>
+    <Version>1.5.1.1</Version>
+    <PackageVersion>1.5.2-beta</PackageVersion>
+    <IconUrl></IconUrl>
+    <RepositoryUrl></RepositoryUrl>
+    <PackageProjectUrl>https://github.com/crpietschmann/SQLinq</PackageProjectUrl>
+
+
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <PackageId>SQLinq.Dapper</PackageId>
+
+    <Description>
+      SQLinq.Dapper is a small helper library that bridges the gap between SQLinq and Dapper dot net to allow for queries to be performed more easily.
+
+      https://github.com/crpietschmann/SQLinq
+    </Description>
+
+    <PackageReleaseNotes>
+      First release.
+    </PackageReleaseNotes>
+
+    <PackageTags>
+      asp.net core, netcore, csharp
+    </PackageTags>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Dapper, Version=1.40.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Dapper.1.42\lib\net45\Dapper.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DictionaryParameterObject.cs" />
-    <Compile Include="IDbConnectionExtensions.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\..\SQLinq\SQLinq.csproj">
-      <Project>{95af6dbe-d796-469b-97d1-0c23d664d384}</Project>
-      <Name>SQLinq</Name>
-    </ProjectReference>
+    <PackageReference Include="Dapper" Version="1.60.6" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\..\SQLinq\SQLinq.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
+
+
+
+
+</Project>
diff --git a/DapperExtensions/SQLinq.Dapper/SQLinq.Dapper.csproj.vspscc b/DapperExtensions/SQLinq.Dapper/SQLinq.Dapper.csproj.vspscc
diff --git a/DapperExtensions/SQLinq.Dapper/packages.config b/DapperExtensions/SQLinq.Dapper/packages.config
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,11 @@
+<Project>
+  <PropertyGroup>
+    <Copyright>Copyright PH 2019 (c) [email protected]. All rights reserved.</Copyright>
+    <Authors>Paolo Innocenti</Authors>
+    <Company>[email protected]</Company>
+    <Version>1.0.37</Version>
+
+
+
+  </PropertyGroup>
+</Project>
diff --git a/README.md b/README.md
@@ -66,7 +66,7 @@ foreach(var p in sqlParameters)
 
 ## SQLinq.Dapper
 
-SQLinq.Dapper is a small helper library that bridges the gap between SQLinq and [Dapper dot net](http://code.google.com/p/dapper-dot-net/) to allow for queries to be performed more easily.  
+SQLinq.Dapper is a small helper library that bridges the gap between SQLinq and [Dapper dot net](https://github.com/StackExchange/Dapper/) to allow for queries to be performed more easily.  
 
 **SQLinq.Dapper Usage:**  
 Here's a simple example of using SQLinq.Dapper:  

diff --git a/SQLinq.sln b/SQLinq.sln
@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28803.452
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLinq", "SQLinq\SQLinq.csproj", "{95AF6DBE-D796-469B-97D1-0C23D664D384}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SQLinq", "SQLinq\SQLinq.csproj", "{95AF6DBE-D796-469B-97D1-0C23D664D384}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLinqTest", "SQLinqTest\SQLinqTest.csproj", "{953B054F-B55C-4EA1-8A4D-6E9DDB38CC4F}"
 EndProject
@@ -28,7 +28,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "net", "net", "{1E17E797-A51
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DapperExtensions", "DapperExtensions", "{1DBE9D80-2BCB-4460-953C-C6C0631161A9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLinq.Dapper", "DapperExtensions\SQLinq.Dapper\SQLinq.Dapper.csproj", "{1F1E8FE0-C6EB-40D5-B79F-2E1FF8C093D8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SQLinq.Dapper", "DapperExtensions\SQLinq.Dapper\SQLinq.Dapper.csproj", "{1F1E8FE0-C6EB-40D5-B79F-2E1FF8C093D8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLinq.Dapper.Test", "DapperExtensions\SQLinq.Dapper.Test\SQLinq.Dapper.Test.csproj", "{3F9DE692-FBE8-4D31-A41F-FE2FEB175A53}"
 EndProject
@@ -98,6 +98,9 @@ Global
 		{53366D81-F50A-4A65-9C4E-724E75B0DE73} = {A18F3145-788E-46B8-8938-D02B89966652}
 		{AFD80FD5-AE34-4667-9B82-D64BB3F0AA0E} = {C6611665-1E45-427E-B333-F5866DC4DB55}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {0A44520F-85FC-4F0D-A5CD-8874A20B14A5}
+	EndGlobalSection
 	GlobalSection(TestCaseManagementSettings) = postSolution
 		CategoryFile = SQLinq.vsmdi
 	EndGlobalSection