Merge pull request #14 from DIPSAS/bug/netstandard

Fixing netstandard-issue
DIPSAS · Jun 13, 2018 · 4f2238e · 4f2238e
2 parents ec0c5b0 + d60c257
commit 4f2238e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/Dapper.Oracle/Dapper.Oracle.csproj b/src/Dapper.Oracle/Dapper.Oracle.csproj
@@ -2,18 +2,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\common.targets" />
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>	
+    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup Condition=" $(IsNetFramework) ">
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Runtime.Serialization" />    
+    <Reference Include="System.Runtime.Serialization" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Dapper" Version="1.50.2" />
   </ItemGroup>
+  <PropertyGroup Condition=" $(IsNetFramework) ">
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+  </PropertyGroup>
 </Project>
diff --git a/src/Tests.Dapper.Oracle/OracleParameterRetretreivers.cs b/src/Tests.Dapper.Oracle/OracleParameterRetretreivers.cs
@@ -40,7 +40,8 @@ public class OracleParameterData
 
         public DataRowVersion SourceVersion { get; set; }
     }
-#if NET452
+#if NETCOREAPP2_0
+#else
     public class OracleUnmanagedParameterRetretreiver : IOracleParameterRetretreiver
     {
         public OracleParameterData GetParameter(object parameter)

diff --git a/src/Tests.Dapper.Oracle/Tests.Dapper.Oracle.csproj b/src/Tests.Dapper.Oracle/Tests.Dapper.Oracle.csproj
@@ -14,15 +14,17 @@
     <PackageReference Include="xunit.runner.console" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>
- 
+
 
   <!--Oracle.ManagedDataAccess.Core-->
 
 
   <PropertyGroup Condition=" $(IsNetFramework) ">
-    <DefineConstants>$(DefineConstants);NETFRAMEWORK</DefineConstants>    
+    <DefineConstants>$(DefineConstants);NETFRAMEWORK</DefineConstants>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
   </PropertyGroup>
 
+
   <ItemGroup>
     <ProjectReference Include="..\Dapper.Oracle\Dapper.Oracle.csproj" />
   </ItemGroup>