Skip to content

Commit e34389d

Browse files
committed
NH-3807 - .netstandard 2.0 project
Compiling
1 parent aa5638b commit e34389d

File tree

99 files changed

+547
-87
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+547
-87
lines changed

src/NHibernate.DomainModel/NHibernate.DomainModel.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<Import Project="../../build-common/NHibernate.props" />
33
<PropertyGroup>
44
<Description>The Domain Model used by the Unit Tests.</Description>
5-
<TargetFramework>net461</TargetFramework>
5+
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
6+
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
67
<IsTestProject>true</IsTestProject>
78
<NoWarn>$(NoWarn);3001;3002;3003;3005</NoWarn>
89
</PropertyGroup>

src/NHibernate.Driver.Firebird/NHibernate.Driver.Firebird.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<Description>Driver for Firebird to be used with NHibernate 5.</Description>
66
<PackageTags>NHibernate; Driver; firebird; firebirsql; firebirdclient; ADO.Net; Core</PackageTags>
77

8-
<TargetFramework>net461</TargetFramework>
8+
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
9+
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
910
<NoWarn>$(NoWarn);3001;3002;3003;3005;1591</NoWarn>
1011
<SignAssembly>True</SignAssembly>
1112
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<Description>Driver for MySql and MariaDB to be used with NHibernate 5.</Description>
66
<PackageTags>NHibernate; Driver; MySql; MySql.Data; Connector/NET; C/Net; ADO.Net; Core</PackageTags>
77

8-
<TargetFramework>net461</TargetFramework>
8+
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
9+
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
910
<NoWarn>$(NoWarn);3001;3002;3003;3005;1591</NoWarn>
1011
<SignAssembly>True</SignAssembly>
1112
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>

src/NHibernate.Driver.PostgreSql/NHibernate.Driver.PostgreSql.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<Description>Driver for PostgreSQL to be used with NHibernate 5.</Description>
66
<PackageTags>NHibernate; Driver; Npgsql; PostgreSQL; Postgres; ADO.Net; Core</PackageTags>
77

8-
<TargetFramework>net461</TargetFramework>
8+
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
9+
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
910
<NoWarn>$(NoWarn);3001;3002;3003;3005;1591</NoWarn>
1011
<SignAssembly>True</SignAssembly>
1112
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>

src/NHibernate.Driver.SqlServer/NHibernate.Driver.SqlServer.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<Description>Driver for Microsoft SQL Server to be used with NHibernate 5.</Description>
66
<PackageTags>NHibernate; Driver; SqlClient; SqlServer; SQL Server; ADO.Net; Core</PackageTags>
77

8-
<TargetFramework>net461</TargetFramework>
8+
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
9+
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
910
<NoWarn>$(NoWarn);3001;3002;3003;3005;1591</NoWarn>
1011
<SignAssembly>True</SignAssembly>
1112
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>

src/NHibernate.Example.Web/NHibernate.Example.Web.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net461</TargetFramework>
4+
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
5+
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
56
</PropertyGroup>
67

78
<ItemGroup>

src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22
<Import Project="../../build-common/NHibernate.props" />
33
<PropertyGroup>
44
<Description>The Visual Basic Unit Tests for NHibernate.</Description>
5-
<TargetFramework>net461</TargetFramework>
5+
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
66
<IsTestProject>true</IsTestProject>
77
<NoWarn>$(NoWarn);3001;3002;3003;3005</NoWarn>
88
<OptionExplicit>On</OptionExplicit>
99
<OptionStrict>On</OptionStrict>
1010
</PropertyGroup>
11+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
12+
<Compile Remove="Issues\NH3302\**" /> <!--"Like" not supported in netcoreapp2.0.-->
13+
</ItemGroup>
1114
<ItemGroup>
1215
<None Remove="**\*.hbm.xml" />
1316
</ItemGroup>

src/NHibernate.Test/Ado/BatcherFixture.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,12 @@ public void OneRoundTripUpdate()
9090
[Description("SqlClient: The batcher should run all different INSERT queries in only one roundtrip.")]
9191
public void SqlClientOneRoundTripForUpdateAndInsert()
9292
{
93+
#if !NETCOREAPP2_0
9394
if (Sfi.Settings.BatcherFactory is SqlClientBatchingBatcherFactory == false)
95+
#endif
96+
{
9497
Assert.Ignore("This test is for SqlClientBatchingBatcher only");
98+
}
9599

96100
FillDb();
97101

@@ -128,8 +132,12 @@ public void SqlClientOneRoundTripForUpdateAndInsert()
128132
[Description("SqlClient: The batcher log output should be formatted")]
129133
public void BatchedoutputShouldBeFormatted()
130134
{
135+
#if !NETCOREAPP2_0
131136
if (Sfi.Settings.BatcherFactory is SqlClientBatchingBatcherFactory == false)
137+
#endif
138+
{
132139
Assert.Ignore("This test is for SqlClientBatchingBatcher only");
140+
}
133141

134142
using (var sqlLog = new SqlLogSpy())
135143
{

src/NHibernate.Test/Async/Ado/BatcherFixture.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,12 @@ public async Task OneRoundTripUpdateAsync()
102102
[Description("SqlClient: The batcher should run all different INSERT queries in only one roundtrip.")]
103103
public async Task SqlClientOneRoundTripForUpdateAndInsertAsync()
104104
{
105+
#if !NETCOREAPP2_0
105106
if (Sfi.Settings.BatcherFactory is SqlClientBatchingBatcherFactory == false)
107+
#endif
108+
{
106109
Assert.Ignore("This test is for SqlClientBatchingBatcher only");
110+
}
107111

108112
await (FillDbAsync());
109113

@@ -140,8 +144,12 @@ public async Task SqlClientOneRoundTripForUpdateAndInsertAsync()
140144
[Description("SqlClient: The batcher log output should be formatted")]
141145
public async Task BatchedoutputShouldBeFormattedAsync()
142146
{
147+
#if !NETCOREAPP2_0
143148
if (Sfi.Settings.BatcherFactory is SqlClientBatchingBatcherFactory == false)
149+
#endif
150+
{
144151
Assert.Ignore("This test is for SqlClientBatchingBatcher only");
152+
}
145153

146154
using (var sqlLog = new SqlLogSpy())
147155
{

src/NHibernate.Test/Async/Component/Basic/ComponentWithUniqueConstraintTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
using System;
1212
using System.Data.Common;
13-
using System.Data.Odbc;
1413
using System.Data.SqlClient;
1514
using System.Linq;
1615
using NHibernate.Cfg.MappingSchema;

0 commit comments

Comments
 (0)