Skip to content

Commit fbeae31

Browse files
valfrid-lyvalfrid-ly
authored
Update project variables and support for multiplattform (#253)
1 parent 15e93c1 commit fbeae31

16 files changed

+430
-380
lines changed

‎DapperExtensions.StrongName/DapperExtensions.StrongName.csproj

+134-129
Large diffs are not rendered by default.

‎DapperExtensions.Test.Entities/DapperExtensions.Test.Entities.csproj

+31-42
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,35 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net461;net5.0;netstandard2.0;netstandard2.1;</TargetFrameworks>
5-
</PropertyGroup>
6-
7-
<PropertyGroup>
8-
<LangVersion>8.0</LangVersion>
9-
</PropertyGroup>
10-
11-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461'">
12-
<DefineConstants>NETFRAMEWORK</DefineConstants>
13-
</PropertyGroup>
14-
15-
<PropertyGroup Condition="'$(TargetFramework)' != 'net461' AND '$(TargetFramework)' != 'netstandard2.0'">
16-
<DefineConstants>NETCORE</DefineConstants>
17-
</PropertyGroup>
18-
19-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
20-
<DefineConstants>NETSTANDARD20</DefineConstants>
21-
</PropertyGroup>
22-
23-
<ItemGroup>
24-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
25-
<PackageReference Include="MySql.Data" Version="8.0.24" />
26-
<PackageReference Include="NUnit" Version="3.13.2" />
27-
<PackageReference Include="NUnit.ConsoleRunner" Version="3.12.0" />
28-
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
29-
<PackageReference Include="ReportGenerator" Version="4.8.8" />
30-
</ItemGroup>
31-
32-
<ItemGroup>
33-
<ProjectReference Include="..\DapperExtensions\DapperExtensions.csproj" />
34-
</ItemGroup>
35-
36-
<ItemGroup>
37-
<Folder Include="Properties\" />
38-
</ItemGroup>
39-
40-
<ItemGroup>
41-
<Reference Include="System">
42-
<HintPath>..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.dll</HintPath>
43-
</Reference>
44-
</ItemGroup>
3+
<PropertyGroup>
4+
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net461;net5.0</TargetFrameworks>
5+
<IsPackable>false</IsPackable>
6+
</PropertyGroup>
7+
8+
<PropertyGroup>
9+
<LangVersion>8.0</LangVersion>
10+
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
14+
<PackageReference Include="MySql.Data" Version="8.0.24" />
15+
<PackageReference Include="NUnit" Version="3.13.2" />
16+
<PackageReference Include="NUnit.ConsoleRunner" Version="3.12.0" />
17+
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
18+
<PackageReference Include="ReportGenerator" Version="4.8.8" />
19+
</ItemGroup>
20+
21+
<ItemGroup>
22+
<ProjectReference Include="..\DapperExtensions\DapperExtensions.csproj" />
23+
</ItemGroup>
24+
25+
<ItemGroup>
26+
<Folder Include="Properties\" />
27+
</ItemGroup>
28+
29+
<ItemGroup Condition="'$(TargetFramework)' == 'net461' and '$(OSTYPE)' != 'linux-gnu' and '$(OSTYPE)' != 'darwin18'">
30+
<Reference Include="System">
31+
<HintPath>..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.dll</HintPath>
32+
</Reference>
33+
</ItemGroup>
4534

4635
</Project>

‎DapperExtensions.Test.Maps/DapperExtensions.Test.Maps.csproj

+23-34
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,31 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net461;net5.0;netstandard2.0;netstandard2.1;</TargetFrameworks>
5-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net461;net5.0</TargetFrameworks>
5+
<IsPackable>false</IsPackable>
6+
</PropertyGroup>
67

7-
<PropertyGroup>
8-
<LangVersion>8.0</LangVersion>
9-
</PropertyGroup>
8+
<PropertyGroup>
9+
<LangVersion>8.0</LangVersion>
10+
</PropertyGroup>
1011

11-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461'">
12-
<DefineConstants>NETFRAMEWORK</DefineConstants>
13-
</PropertyGroup>
12+
<ItemGroup>
13+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
15+
<PackageReference Include="MySql.Data" Version="8.0.24" />
16+
<PackageReference Include="NUnit" Version="3.13.2" />
17+
<PackageReference Include="NUnit.ConsoleRunner" Version="3.12.0" />
18+
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
19+
<PackageReference Include="ReportGenerator" Version="4.8.8" />
20+
</ItemGroup>
1421

15-
<PropertyGroup Condition="'$(TargetFramework)' != 'net461' AND '$(TargetFramework)' != 'netstandard2.0'">
16-
<DefineConstants>NETCORE</DefineConstants>
17-
</PropertyGroup>
22+
<ItemGroup>
23+
<ProjectReference Include="..\DapperExtensions\DapperExtensions.csproj" />
24+
<ProjectReference Include="..\DapperExtensions.Test.Entities\DapperExtensions.Test.Entities.csproj" />
25+
</ItemGroup>
1826

19-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
20-
<DefineConstants>NETSTANDARD20</DefineConstants>
21-
</PropertyGroup>
22-
23-
<ItemGroup>
24-
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
25-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
26-
<PackageReference Include="MySql.Data" Version="8.0.24" />
27-
<PackageReference Include="NUnit" Version="3.13.2" />
28-
<PackageReference Include="NUnit.ConsoleRunner" Version="3.12.0" />
29-
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
30-
<PackageReference Include="ReportGenerator" Version="4.8.8" />
31-
</ItemGroup>
32-
33-
<ItemGroup>
34-
<ProjectReference Include="..\DapperExtensions\DapperExtensions.csproj" />
35-
<ProjectReference Include="..\DapperExtensions.Test.Entities\DapperExtensions.Test.Entities.csproj" />
36-
</ItemGroup>
37-
38-
<ItemGroup>
39-
<Folder Include="Properties\" />
40-
</ItemGroup>
27+
<ItemGroup>
28+
<Folder Include="Properties\" />
29+
</ItemGroup>
4130

4231
</Project>

‎DapperExtensions.Test/DapperExtensions.Test.csproj

+117-71
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,137 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net461;net5.0</TargetFrameworks>
5-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFrameworks Condition="'$(OSTYPE)' == 'linux-gnu' or '$(OSTYPE)' == 'darwin18' ">netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(OSTYPE)' != 'linux-gnu' and '$(OSTYPE)' != 'darwin18' ">netcoreapp2.1;netcoreapp3.1;net461;net5.0</TargetFrameworks>
6+
<IsPackable>false</IsPackable>
7+
</PropertyGroup>
8+
9+
<PropertyGroup>
10+
<RuntimeIdentifiers>win;osx;linux</RuntimeIdentifiers>
11+
</PropertyGroup>
12+
13+
<PropertyGroup>
14+
<LangVersion>8.0</LangVersion>
15+
</PropertyGroup>
616

7-
<PropertyGroup>
8-
<LangVersion>8.0</LangVersion>
9-
</PropertyGroup>
17+
<!--<PropertyGroup>
18+
<IsWindows Condition="'$(OS)' == 'Windows_NT'">true</IsWindows>
19+
</PropertyGroup>
1020
11-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461'">
12-
<DefineConstants>NETFRAMEWORK</DefineConstants>
13-
</PropertyGroup>
21+
<PropertyGroup Condition="'$(MSBuildRuntimeType)' == 'Core'">
22+
<IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
23+
<IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
24+
</PropertyGroup> -->
1425

15-
<PropertyGroup Condition="'$(TargetFramework)' != 'net461' AND '$(TargetFramework)' != 'netstandard2.0'">
16-
<DefineConstants>NETCORE</DefineConstants>
17-
</PropertyGroup>
26+
<ItemGroup>
27+
<PackageReference Include="coverlet.collector" Version="3.0.3">
28+
<PrivateAssets>all</PrivateAssets>
29+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
30+
</PackageReference>
31+
<PackageReference Include="FluentAssertions" Version="5.10.3" />
32+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
33+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
34+
<PackageReference Include="Microsoft.TestPlatform.TestHost" Version="16.10.0" />
35+
<PackageReference Include="Newtonsoft.Json" version="13.0.1" />
36+
<PackageReference Include="Moq" version="4.16.1" />
37+
<PackageReference Include="MySql.Data" version="8.0.24" />
38+
<PackageReference Include="NUnit" Version="3.13.2" />
39+
<PackageReference Include="NUnit.ConsoleRunner" Version="3.12.0" />
40+
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
41+
<PackageReference Include="ReportGenerator" Version="4.8.8" />
42+
<PackageReference Include="Slapper.AutoMapper" Version="2.0.1" />
43+
<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
44+
<PackageReference Include="Dapper" Version="2.0.90" />
45+
</ItemGroup>
1846

19-
<ItemGroup>
20-
<PackageReference Include="coverlet.collector" Version="3.0.3">
21-
<PrivateAssets>all</PrivateAssets>
22-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
23-
</PackageReference>
24-
<PackageReference Include="FluentAssertions" Version="5.10.3" />
25-
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
26-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
27-
<PackageReference Include="Microsoft.TestPlatform.TestHost" Version="16.10.0" />
28-
<PackageReference Include="Newtonsoft.Json" version="13.0.1" />
29-
<PackageReference Include="Moq" version="4.16.1" />
30-
<PackageReference Include="MySql.Data" version="8.0.24" />
31-
<PackageReference Include="NUnit" Version="3.13.2" />
32-
<PackageReference Include="NUnit.ConsoleRunner" Version="3.12.0" />
33-
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
34-
<PackageReference Include="ReportGenerator" Version="4.8.8" />
35-
<PackageReference Include="Slapper.AutoMapper" Version="2.0.1" />
36-
<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
37-
<PackageReference Include="Dapper" Version="2.0.90" />
38-
</ItemGroup>
47+
<ItemGroup Condition="'$(TargetFramework)' != 'net461'">
48+
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.110" />
49+
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
50+
<PackageReference Include="System.Data.SQLite.Core" version="1.0.113.7" />
3951

40-
<ItemGroup Condition="'$(TargetFramework)' != 'net461'">
41-
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.110" />
42-
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
43-
<PackageReference Include="IBM.Data.DB2.Core" version="2.2.0.100" />
44-
<PackageReference Include="System.Data.SQLite.Core" version="1.0.113.7" />
45-
</ItemGroup>
52+
<!--<PackageReference Include="IBM.Data.DB2.Core-lnx" Version="2.2.0.100" Condition="'$(OSTYPE)' == 'linux-gnu'" />
53+
<PackageReference Include="IBM.Data.DB2.Core-osx" Version="2.2.0.100" Condition="'$(OSTYPE)' == 'darwin18'"/>
54+
<PackageReference Include="IBM.Data.DB2.Core" Version="2.2.0.100" Condition="'$(OSTYPE)' != 'linux-gnu' AND '$(OSTYPE)' != 'darwin18'" />-->
55+
</ItemGroup>
4656

47-
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
48-
<PackageReference Include="Oracle.ManagedDataAccess" version="19.11.0" targetFramework="net461" />
49-
<PackageReference Include="System.Data.SQLite" version="1.0.113.7" targetFramework="net461" />
50-
<PackageReference Include="Microsoft.SqlServer.Compact" version="4.0.8876.1" />
51-
</ItemGroup>
57+
<!--<ItemGroup Condition="'$(TargetFramework)' != 'net461' and $(IsWindows) == true ">
58+
<PackageReference Include="IBM.Data.DB2.Core" version="2.2.0.100" />
59+
</ItemGroup>
5260
53-
<ItemGroup>
54-
<ProjectReference Include="..\DapperExtensions.Test.Entities\DapperExtensions.Test.Entities.csproj" />
55-
<ProjectReference Include="..\DapperExtensions.Test.Maps\DapperExtensions.Test.Maps.csproj" />
56-
<ProjectReference Include="..\DapperExtensions\DapperExtensions.csproj" />
57-
</ItemGroup>
61+
<ItemGroup Condition="'$(TargetFramework)' != 'net461' and $(IsLinux) == true ">
62+
<PackageReference Include="IBM.Data.DB2.Core-lnx" version="2.2.0.100" />
63+
</ItemGroup>
5864
59-
<!--<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
60-
<Reference Include="IBM.Data.DB2">
61-
<HintPath>..\..\..\..\..\Program Files\IBM\IBM DATA SERVER DRIVER\bin\netf40\IBM.Data.DB2.dll</HintPath>
62-
</Reference>
63-
</ItemGroup> -->
65+
<ItemGroup Condition="'$(TargetFramework)' != 'net461' and $(IsOSX) == true ">
66+
<PackageReference Include="IBM.Data.DB2.Core-osx" version="2.2.0.100" />
67+
</ItemGroup>-->
68+
69+
<Choose>
70+
<When Condition="'$(TargetFramework)' != 'net461' and $(RuntimeIdentifier) != ''">
71+
<ItemGroup>
72+
<PackageReference Condition="$(RuntimeIdentifier.StartsWith('win'))" Include="IBM.Data.DB2.Core" Version="2.2.0.100" />
73+
<PackageReference Condition="$(RuntimeIdentifier.StartsWith('osx'))" Include="IBM.Data.DB2.Core-osx" Version="2.2.0.100" />
74+
<PackageReference Condition="$(RuntimeIdentifier.StartsWith('linux'))" Include="IBM.Data.DB2.Core-lnx" Version="2.2.0.100" />
75+
</ItemGroup>
76+
</When>
77+
<When Condition="'$(TargetFramework)' != 'net461'">
78+
<ItemGroup>
79+
<PackageReference Condition="$([MSBuild]::IsOSPlatform('Windows'))" Include="IBM.Data.DB2.Core" Version="2.2.0.100" />
80+
<PackageReference Condition="$([MSBuild]::IsOSPlatform('OSX'))" Include="IBM.Data.DB2.Core-osx" Version="2.2.0.100" />
81+
<PackageReference Condition="$([MSBuild]::IsOSPlatform('Linux'))" Include="IBM.Data.DB2.Core-lnx" Version="2.2.0.100" />
82+
</ItemGroup>
83+
</When>
84+
<!--<Otherwise>
85+
<ItemGroup>
86+
<PackageReference Condition="$([MSBuild]::IsOSPlatform('Windows'))" Include="IBM.Data.DB2.Core" Version="2.2.0.100" />
87+
<PackageReference Condition="$([MSBuild]::IsOSPlatform('OSX'))" Include="IBM.Data.DB2.Core-osx" Version="2.2.0.100" />
88+
<PackageReference Condition="$([MSBuild]::IsOSPlatform('Linux'))" Include="IBM.Data.DB2.Core-lnx" Version="2.2.0.100" />
89+
</ItemGroup>
90+
</Otherwise>-->
91+
</Choose>
6492

65-
<!--<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
66-
<Exec Command="del $(SolutionDir)dapperTest_*.s* /s /q" />
67-
</Target>-->
68-
69-
<!--<PropertyGroup Label="FineCodeCoverage">
70-
<Enabled>
71-
True
72-
</Enabled>-->
73-
<!--<Exclude>
93+
<ItemGroup Condition="'$(TargetFramework)' == 'net461' and '$(OSTYPE)' != 'linux-gnu' and '$(OSTYPE)' != 'darwin18'">
94+
<PackageReference Include="Oracle.ManagedDataAccess" version="19.11.0" targetFramework="net461" />
95+
<PackageReference Include="System.Data.SQLite" version="1.0.113.7" targetFramework="net461" />
96+
<PackageReference Include="Microsoft.SqlServer.Compact" version="4.0.8876.1" />
97+
</ItemGroup>
98+
99+
<ItemGroup>
100+
<ProjectReference Include="..\DapperExtensions.Test.Entities\DapperExtensions.Test.Entities.csproj" />
101+
<ProjectReference Include="..\DapperExtensions.Test.Maps\DapperExtensions.Test.Maps.csproj" />
102+
<ProjectReference Include="..\DapperExtensions\DapperExtensions.csproj" />
103+
</ItemGroup>
104+
105+
<!--<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
106+
<Reference Include="IBM.Data.DB2">
107+
<HintPath>..\..\..\..\..\Program Files\IBM\IBM DATA SERVER DRIVER\bin\netf40\IBM.Data.DB2.dll</HintPath>
108+
</Reference>
109+
</ItemGroup>-->
110+
111+
<!--<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
112+
<Exec Command="del $(SolutionDir)dapperTest_*.s* /s /q" />
113+
</Target>-->
114+
115+
<!--<PropertyGroup Label="FineCodeCoverage">
116+
<Enabled>
117+
True
118+
</Enabled>-->
119+
<!--<Exclude>
74120
[ThirdParty.*]*
75121
[FourthParty]*
76122
</Exclude>
77123
<Include>
78124
[*]*
79125
</Include>-->
80-
<!--<ExcludeByFile>
81-
**/Migrations/*
82-
**/Hacks/*.cs
83-
</ExcludeByFile>-->
84-
<!--<ExcludeByAttribute>
126+
<!--<ExcludeByFile>
127+
**/Migrations/*
128+
**/Hacks/*.cs
129+
</ExcludeByFile>-->
130+
<!--<ExcludeByAttribute>
85131
MyCustomExcludeFromCodeCoverage
86132
</ExcludeByAttribute>-->
87-
<!--<IncludeTestAssembly>
88-
True
89-
</IncludeTestAssembly>
90-
</PropertyGroup>-->
133+
<!--<IncludeTestAssembly>
134+
True
135+
</IncludeTestAssembly>
136+
</PropertyGroup>-->
91137
</Project>

‎DapperExtensions.Test/IntegrationTests/Async/DB2/CrudFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if NETCORE
1+
#if NETCOREAPP
22
using DapperExtensions.Predicate;
33
using DapperExtensions.Test.Data.DB2;
44
using FluentAssertions;

‎DapperExtensions.Test/IntegrationTests/Async/DB2/DB2BaseAsyncFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if NETCORE
1+
#if NETCOREAPP
22
using Dapper;
33
using DapperExtensions.Sql;
44
using IBM.Data.DB2.Core;

‎DapperExtensions.Test/IntegrationTests/Async/DB2/TimerFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if NETCORE
1+
#if NETCOREAPP
22
using DapperExtensions.Test.Data.DB2;
33
using NUnit.Framework;
44
using System;

‎DapperExtensions.Test/IntegrationTests/DB2/CrudFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if NETCORE
1+
#if NETCOREAPP
22
using DapperExtensions.Predicate;
33
using DapperExtensions.Test.Data.DB2;
44
using FluentAssertions;

‎DapperExtensions.Test/IntegrationTests/DB2/DB2BaseFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if NETCORE
1+
#if NETCOREAPP
22
using Dapper;
33
using DapperExtensions.Sql;
44
using IBM.Data.DB2.Core;

‎DapperExtensions.Test/IntegrationTests/DB2/TimerFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if NETCORE
1+
#if NETCOREAPP
22
using DapperExtensions.Test.Data.DB2;
33
using NUnit.Framework;
44
using System;

0 commit comments

Comments
 (0)