netcore20 support #2

version 2.0
ayberkcanturk · Oct 18, 2017 · b1cc1b5 · b1cc1b5
1 parent 77b047c
commit b1cc1b5
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 32 deletions.
diff --git a/common.props b/common.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.2.1</VersionPrefix>
+    <VersionPrefix>2.0.0</VersionPrefix>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <PackageIconUrl></PackageIconUrl>
     <PackageProjectUrl>https://github.com/ayberkcanturk/Dapper.TableValuedParameter</PackageProjectUrl>

diff --git a/src/Dapper.TableValueParameter/Dapper.TableValuedParameter.csproj b/src/Dapper.TableValueParameter/Dapper.TableValuedParameter.csproj
@@ -4,17 +4,14 @@
 
   <PropertyGroup>
     <AssemblyName>Dapper.TableValuedParameter</AssemblyName>
-    <TargetFrameworks>net461;netstandard1.6</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <PackageId>Dapper.TableValuedParameter</PackageId>
     <PackageTags>Dapper,tvp,TableValuedParameter, TableValueParameter</PackageTags>
     <Description>Dapper extension to use user defined parameter (Table Valued Parameter) in Dapper.</Description>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)'=='net461'">
-  <DefineConstants>DEBUG;NET461;NETSTANDARD1_6</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.6'">
-    <DefineConstants>NETSTANDARD1_6</DefineConstants>
+  <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
+    <DefineConstants>NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -24,26 +21,23 @@
   </PropertyGroup>
 
   <ItemGroup>
-	    <None Include="bin\$(Configuration)\net461\Dapper.TableValuedParameter.pdb">
-      <PackagePath>lib/net461/</PackagePath>
-      <Pack>true</Pack>
-    </None>
-	    <None Include="bin\$(Configuration)\netstandard1.6\Dapper.TableValuedParameter.pdb">
-      <PackagePath>lib/netstandard1.6/</PackagePath>
+	    <None Include="bin\$(Configuration)\netstandard2.0\Dapper.TableValuedParameter.pdb">
+      <PackagePath>lib/netstandard2.0/</PackagePath>
       <Pack>true</Pack>
     </None>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="Dapper" Version="1.50.2" />
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="Microsoft.CSharp" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.4.0" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <PackageReference Include="NETStandard.Library" Version="1.6.1" />
-    <PackageReference Include="Dapper" Version="1.50.2" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.3.0" />
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" Version="4.4.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="SourceLink.Create.CommandLine" Version="2.2.1" />
   </ItemGroup>
 </Project>
 

diff --git a/test/Dapper.TableValuedParameter.Console/Dapper.TableValuedParameter.Console.csproj b/test/Dapper.TableValuedParameter.Console/Dapper.TableValuedParameter.Console.csproj
@@ -33,9 +33,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Dapper, Version=1.50.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Dapper.1.50.2\lib\net451\Dapper.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
@@ -51,14 +48,19 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TvpExample.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Dapper">
+      <Version>1.50.2</Version>
+    </PackageReference>
+    <PackageReference Include="System.Data.SqlClient">
+      <Version>4.4.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Dapper.TableValueParameter\Dapper.TableValuedParameter.csproj">
       <Project>{f5818975-bebe-4952-b587-eb828505e4c1}</Project>
       <Name>Dapper.TableValuedParameter</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/test/Dapper.TableValuedParameter.ConsoleCore/Dapper.TableValuedParameter.ConsoleCore.csproj b/test/Dapper.TableValuedParameter.ConsoleCore/Dapper.TableValuedParameter.ConsoleCore.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Dapper" Version="1.50.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/Dapper.TableValuedParameter.Tests/Dapper.TableValuedParameter.Tests.csproj b/test/Dapper.TableValuedParameter.Tests/Dapper.TableValuedParameter.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>0.0.1</VersionPrefix>
-    <TargetFrameworks>net461;netcoreapp1.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>Dapper.TableValuedParameter.Tests</AssemblyName>
     <PackageId>Dapper.TableValuedParameter.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -27,7 +27,7 @@
     <Reference Include="System.Transactions" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
     <PackageReference Include="System.Runtime" Version="4.3.0" />
   </ItemGroup>