Skip to content

Commit 4f2238e

Browse files
authored
Merge pull request #14 from DIPSAS/bug/netstandard
Fixing netstandard-issue
2 parents ec0c5b0 + d60c257 commit 4f2238e

3 files changed

Lines changed: 11 additions & 5 deletions

File tree

src/Dapper.Oracle/Dapper.Oracle.csproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,21 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<Import Project="..\common.targets" />
44
<PropertyGroup>
5-
<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
5+
<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
66
</PropertyGroup>
77

88
<ItemGroup Condition=" $(IsNetFramework) ">
99
<Reference Include="Microsoft.CSharp" />
1010
<Reference Include="System" />
1111
<Reference Include="System.Configuration" />
1212
<Reference Include="System.Core" />
13-
<Reference Include="System.Runtime.Serialization" />
13+
<Reference Include="System.Runtime.Serialization" />
1414
</ItemGroup>
1515

1616
<ItemGroup>
1717
<PackageReference Include="Dapper" Version="1.50.2" />
1818
</ItemGroup>
19+
<PropertyGroup Condition=" $(IsNetFramework) ">
20+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
21+
</PropertyGroup>
1922
</Project>

src/Tests.Dapper.Oracle/OracleParameterRetretreivers.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ public class OracleParameterData
4040

4141
public DataRowVersion SourceVersion { get; set; }
4242
}
43-
#if NET452
43+
#if NETCOREAPP2_0
44+
#else
4445
public class OracleUnmanagedParameterRetretreiver : IOracleParameterRetretreiver
4546
{
4647
public OracleParameterData GetParameter(object parameter)

src/Tests.Dapper.Oracle/Tests.Dapper.Oracle.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,17 @@
1414
<PackageReference Include="xunit.runner.console" Version="2.3.1" />
1515
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
1616
</ItemGroup>
17-
17+
1818

1919
<!--Oracle.ManagedDataAccess.Core-->
2020

2121

2222
<PropertyGroup Condition=" $(IsNetFramework) ">
23-
<DefineConstants>$(DefineConstants);NETFRAMEWORK</DefineConstants>
23+
<DefineConstants>$(DefineConstants);NETFRAMEWORK</DefineConstants>
24+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
2425
</PropertyGroup>
2526

27+
2628
<ItemGroup>
2729
<ProjectReference Include="..\Dapper.Oracle\Dapper.Oracle.csproj" />
2830
</ItemGroup>

0 commit comments

Comments
 (0)