Skip to content

Commit 4df8e72

Browse files
ngbrownngbrown
committed
NH-3807 - .netstandard 2.0 project
1 parent decb0ab commit 4df8e72

29 files changed

+354
-2446
lines changed

‎src/NHibernate.Driver.AdoNet/NHibernate.Driver.AdoNet.csproj

Lines changed: 17 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,23 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{AED62C8C-4391-479E-AFD5-E41DD860D23E}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>NHibernate</RootNamespace>
11-
<AssemblyName>NHibernate.Driver.AdoNet</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
4+
<TargetFrameworks>net461</TargetFrameworks>
5+
<NoWarn>$(NoWarn);1591</NoWarn>
6+
<GenerateDocumentationFile>True</GenerateDocumentationFile>
7+
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
8+
<!--<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>-->
149
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug\</OutputPath>
20-
<DefineConstants>DEBUG;TRACE</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
<NoWarn>1591</NoWarn>
24-
<DocumentationFile>bin\Debug\NHibernate.Driver.AdoNet.xml</DocumentationFile>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<DebugType>pdbonly</DebugType>
28-
<Optimize>true</Optimize>
29-
<OutputPath>bin\Release\</OutputPath>
30-
<DefineConstants>TRACE</DefineConstants>
31-
<ErrorReport>prompt</ErrorReport>
32-
<WarningLevel>4</WarningLevel>
33-
<NoWarn>1591</NoWarn>
34-
<DocumentationFile>bin\Release\NHibernate.Driver.AdoNet.xml</DocumentationFile>
35-
</PropertyGroup>
36-
<ItemGroup>
37-
<Reference Include="System" />
38-
<Reference Include="System.Core" />
39-
<Reference Include="System.Data.DataSetExtensions" />
40-
<Reference Include="System.Data" />
41-
<Reference Include="System.Xml" />
10+
11+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
4212
</ItemGroup>
43-
<ItemGroup>
44-
<Compile Include="..\SharedAssemblyInfo.cs">
45-
<Link>Properties\SharedAssemblyInfo.cs</Link>
46-
</Compile>
47-
<Compile Include="Cfg\Loquacious\ConnectionConfigurationExtensionReflectionBased.cs" />
48-
<Compile Include="Driver\CsharpSqliteDriver.cs" />
49-
<Compile Include="Driver\DB2400Driver.cs" />
50-
<Compile Include="Driver\DB2Driver.cs" />
51-
<Compile Include="Driver\DotConnectMySqlDriver.cs" />
52-
<Compile Include="Driver\IfxDriver.cs" />
53-
<Compile Include="Driver\IngresDriver.cs" />
54-
<Compile Include="Driver\OracleClientDriver.cs" />
55-
<Compile Include="Driver\OracleDataClientDriver.cs" />
56-
<Compile Include="Driver\OracleLiteDataClientDriver.cs" />
57-
<Compile Include="Driver\ReflectionBasedDriver.cs" />
58-
<Compile Include="Driver\SybaseAsaClientDriver.cs" />
59-
<Compile Include="Driver\SybaseAseClientDriver.cs" />
60-
<Compile Include="Driver\SybaseSQLAnywhereDotNet4Driver.cs" />
61-
<Compile Include="Driver\SybaseSQLAnywhereDriver.cs" />
62-
<Compile Include="Properties\AssemblyInfo.cs" />
13+
14+
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
6315
</ItemGroup>
16+
6417
<ItemGroup>
65-
<ProjectReference Include="..\NHibernate\NHibernate.csproj">
66-
<Project>{5909bfe7-93cf-4e5f-be22-6293368af01d}</Project>
67-
<Name>NHibernate</Name>
68-
</ProjectReference>
18+
<ProjectReference Include="..\NHibernate\NHibernate.csproj" />
6919
</ItemGroup>
70-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
71-
</Project>
20+
21+
<Import Project="../SharedAssemblyInfo.targets" />
22+
23+
</Project>

‎src/NHibernate.Driver.FirebirdClient/NHibernate.Driver.FirebirdClient.csproj

Lines changed: 19 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,25 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{DADD54C1-3679-4672-9774-9362428EB9E0}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>NHibernate</RootNamespace>
11-
<AssemblyName>NHibernate.Driver.FirebirdClient</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
4+
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
5+
<NoWarn>$(NoWarn);1591</NoWarn>
6+
<GenerateDocumentationFile>True</GenerateDocumentationFile>
7+
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
8+
<!--<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>-->
149
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug\</OutputPath>
20-
<DefineConstants>DEBUG;TRACE</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
<DocumentationFile>bin\Debug\NHibernate.Driver.FirebirdClient.xml</DocumentationFile>
24-
<NoWarn>1591</NoWarn>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<DebugType>pdbonly</DebugType>
28-
<Optimize>true</Optimize>
29-
<OutputPath>bin\Release\</OutputPath>
30-
<DefineConstants>TRACE</DefineConstants>
31-
<ErrorReport>prompt</ErrorReport>
32-
<WarningLevel>4</WarningLevel>
33-
<DocumentationFile>bin\Release\NHibernate.Driver.FirebirdClient.xml</DocumentationFile>
34-
<NoWarn>1591</NoWarn>
35-
</PropertyGroup>
36-
<ItemGroup>
37-
<Reference Include="FirebirdSql.Data.FirebirdClient, Version=5.9.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
38-
<HintPath>..\packages\FirebirdSql.Data.FirebirdClient.5.9.0.1\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
39-
</Reference>
40-
<Reference Include="System" />
41-
<Reference Include="System.Core" />
42-
<Reference Include="System.Data.DataSetExtensions" />
43-
<Reference Include="System.Data" />
44-
<Reference Include="System.Xml" />
10+
11+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
12+
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="5.6.0" />
4513
</ItemGroup>
46-
<ItemGroup>
47-
<Compile Include="..\SharedAssemblyInfo.cs">
48-
<Link>Properties\SharedAssemblyInfo.cs</Link>
49-
</Compile>
50-
<Compile Include="Cfg\Loquacious\ConnectionConfigurationExtensionFirebirdClient.cs" />
51-
<Compile Include="Driver\FirebirdClientDriver.cs" />
52-
<Compile Include="Properties\AssemblyInfo.cs" />
53-
</ItemGroup>
54-
<ItemGroup>
55-
<ProjectReference Include="..\NHibernate\NHibernate.csproj">
56-
<Project>{5909bfe7-93cf-4e5f-be22-6293368af01d}</Project>
57-
<Name>NHibernate</Name>
58-
</ProjectReference>
14+
15+
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
16+
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="2.6.5" />
5917
</ItemGroup>
18+
6019
<ItemGroup>
61-
<None Include="app.config" />
62-
<None Include="packages.config" />
20+
<ProjectReference Include="..\NHibernate\NHibernate.csproj" />
6321
</ItemGroup>
64-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
65-
</Project>
22+
23+
<Import Project="../SharedAssemblyInfo.targets" />
24+
25+
</Project>

‎src/NHibernate.Driver.FirebirdClient/packages.config

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/NHibernate.Driver.MySql/AdoNet/MySqlClientBatchingBatcher.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#if !NETSTANDARD2_0
12
using System;
23
using System.Data.Common;
34
using System.Text;
@@ -144,4 +145,5 @@ protected override void Dispose(bool isDisposing)
144145
}
145146
}
146147
}
147-
}
148+
}
149+
#endif

‎src/NHibernate.Driver.MySql/AdoNet/MySqlClientBatchingBatcherFactory.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ public class MySqlClientBatchingBatcherFactory : IBatcherFactory
66
{
77
public virtual IBatcher CreateBatcher(ConnectionManager connectionManager, IInterceptor interceptor)
88
{
9+
#if !NETSTANDARD2_0
910
return new MySqlClientBatchingBatcher(connectionManager, interceptor);
11+
#else
12+
return new NonBatchingBatcher(connectionManager, interceptor);
13+
#endif
1014
}
1115
}
12-
}
16+
}

‎src/NHibernate.Driver.MySql/AdoNet/MySqlClientSqlCommandSet.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#if !NETSTANDARD2_0
12
using System;
23
using System.Data.Common;
34
using System.Diagnostics;
@@ -67,4 +68,5 @@ public int CountOfCommands
6768
get { return countOfCommands; }
6869
}
6970
}
70-
}
71+
}
72+
#endif

‎src/NHibernate.Driver.MySql/NHibernate.Driver.MySql.csproj

Lines changed: 19 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,25 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{4F5F0C13-F302-4CEE-B60E-A55D7C30E3F8}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>NHibernate</RootNamespace>
11-
<AssemblyName>NHibernate.Driver.MySql</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
4+
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
5+
<NoWarn>$(NoWarn);1591</NoWarn>
6+
<GenerateDocumentationFile>True</GenerateDocumentationFile>
7+
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
8+
<!--<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>-->
149
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug\</OutputPath>
20-
<DefineConstants>DEBUG;TRACE</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
<DocumentationFile>bin\Debug\NHibernate.Driver.MySql.xml</DocumentationFile>
24-
<NoWarn>1591</NoWarn>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<DebugType>pdbonly</DebugType>
28-
<Optimize>true</Optimize>
29-
<OutputPath>bin\Release\</OutputPath>
30-
<DefineConstants>TRACE</DefineConstants>
31-
<ErrorReport>prompt</ErrorReport>
32-
<WarningLevel>4</WarningLevel>
33-
<DocumentationFile>bin\Release\NHibernate.Driver.MySql.xml</DocumentationFile>
34-
<NoWarn>1591</NoWarn>
35-
</PropertyGroup>
36-
<ItemGroup>
37-
<Reference Include="MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
38-
<HintPath>..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll</HintPath>
39-
</Reference>
40-
<Reference Include="System" />
41-
<Reference Include="System.Core" />
42-
<Reference Include="System.Xml.Linq" />
43-
<Reference Include="System.Data.DataSetExtensions" />
44-
<Reference Include="Microsoft.CSharp" />
45-
<Reference Include="System.Data" />
46-
<Reference Include="System.Net.Http" />
47-
<Reference Include="System.Xml" />
10+
11+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
12+
<PackageReference Include="MySql.Data" Version="6.10.1-beta" />
4813
</ItemGroup>
49-
<ItemGroup>
50-
<Compile Include="..\SharedAssemblyInfo.cs">
51-
<Link>Properties\SharedAssemblyInfo.cs</Link>
52-
</Compile>
53-
<Compile Include="AdoNet\MySqlClientBatchingBatcher.cs" />
54-
<Compile Include="AdoNet\MySqlClientBatchingBatcherFactory.cs" />
55-
<Compile Include="AdoNet\MySqlClientSqlCommandSet.cs" />
56-
<Compile Include="Cfg\Loquacious\ConnectionConfigurationExtensionMySql.cs" />
57-
<Compile Include="Driver\MySqlDataDriver.cs" />
58-
<Compile Include="Properties\AssemblyInfo.cs" />
59-
</ItemGroup>
60-
<ItemGroup>
61-
<ProjectReference Include="..\NHibernate\NHibernate.csproj">
62-
<Project>{5909bfe7-93cf-4e5f-be22-6293368af01d}</Project>
63-
<Name>NHibernate</Name>
64-
</ProjectReference>
14+
15+
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
16+
<PackageReference Include="MySql.Data" Version="6.7.9" />
6517
</ItemGroup>
18+
6619
<ItemGroup>
67-
<None Include="app.config" />
68-
<None Include="packages.config" />
20+
<ProjectReference Include="..\NHibernate\NHibernate.csproj" />
6921
</ItemGroup>
70-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
71-
</Project>
22+
23+
<Import Project="../SharedAssemblyInfo.targets" />
24+
25+
</Project>

‎src/NHibernate.Driver.MySql/packages.config

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)