Skip to content

Commit ea58b47

Browse files
ngbrownngbrown
committed
NH-3807 - .netstandard 2.0 project
- .NET Core 2.0 RTM
1 parent 04af45a commit ea58b47

File tree

91 files changed

+700
-145
lines changed

Some content is hidden

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

91 files changed

+700
-145
lines changed

‎build-common/NHibernate.props

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,17 @@
1212
<Product>NHibernate</Product>
1313
<Company>NHibernate.info</Company>
1414
<Copyright>Licensed under LGPL.</Copyright>
15+
<Authors>NHibernate community, Hibernate community</Authors>
16+
<Company>NHibernate.info</Company>
17+
<NeutralLanguage>en-US</NeutralLanguage>
18+
<PackageProjectUrl>http://nhibernate.info</PackageProjectUrl>
19+
<PackageIconUrl>https://raw.githubusercontent.com/nhibernate/nhibernate-core/master/logo/NHibernate-NuGet.png</PackageIconUrl>
20+
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
21+
<PackageLicenseUrl>https://raw.githubusercontent.com/nhibernate/nhibernate-core/master/LICENSE.txt</PackageLicenseUrl>
22+
<RepositoryUrl>https://github.com/nhibernate/nhibernate-core.git</RepositoryUrl>
23+
<RepositoryType>git</RepositoryType>
24+
25+
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
26+
<TreatSpecificWarningsAsErrors>1717;1574</TreatSpecificWarningsAsErrors>
1527
</PropertyGroup>
1628
</Project>

‎src/NHibernate.DomainModel/NHibernate.DomainModel.csproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="../../build-common/NHibernate.props" />
33

44
<PropertyGroup>
55
<Description>The Domain Model used by the Unit Tests.</Description>
66

7-
<TargetFramework>net461</TargetFramework>
7+
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
88
<NoWarn>$(NoWarn);3001;3002;3003;3005</NoWarn>
9+
10+
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
11+
<IsPackable>false</IsPackable>
912
</PropertyGroup>
1013

1114
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="../../build-common/NHibernate.props" />
33

44
<PropertyGroup>
@@ -8,8 +8,12 @@
88
<TargetFramework>net461</TargetFramework>
99
<NoWarn>$(NoWarn);3001;3002;3003;3005;1591</NoWarn>
1010
<SignAssembly>True</SignAssembly>
11+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
1112
<AssemblyOriginatorKeyFile>..\NHibernate.snk</AssemblyOriginatorKeyFile>
1213
<GenerateDocumentationFile>true</GenerateDocumentationFile>
14+
15+
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
16+
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
1317
</PropertyGroup>
1418

1519
<ItemGroup>
@@ -20,4 +24,10 @@
2024
<ProjectReference Include="..\NHibernate\NHibernate.csproj" />
2125
</ItemGroup>
2226

27+
<ItemGroup>
28+
<Content Include="../../LICENSE.txt">
29+
<PackagePath>NHibernate.license.txt</PackagePath>
30+
</Content>
31+
</ItemGroup>
32+
2333
</Project>

‎src/NHibernate.Driver.AdoNet/Properties/AssemblyInfo.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
using System;
2+
using System.Reflection;
3+
using System.Security;
4+
5+
[assembly: CLSCompliantAttribute(true)]
6+
[assembly: AssemblyDelaySignAttribute(false)]
7+
[assembly: AllowPartiallyTrustedCallersAttribute()]
8+
[assembly: SecurityRulesAttribute(SecurityRuleSet.Level1)]

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="../../build-common/NHibernate.props" />
33

44
<PropertyGroup>
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>
99
<NoWarn>$(NoWarn);3001;3002;3003;3005;1591</NoWarn>
1010
<SignAssembly>True</SignAssembly>
11+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
1112
<AssemblyOriginatorKeyFile>..\NHibernate.snk</AssemblyOriginatorKeyFile>
1213
<GenerateDocumentationFile>true</GenerateDocumentationFile>
14+
15+
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
16+
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
1317
</PropertyGroup>
1418

1519
<ItemGroup>
@@ -24,4 +28,10 @@
2428
<ProjectReference Include="..\NHibernate\NHibernate.csproj" />
2529
</ItemGroup>
2630

31+
<ItemGroup>
32+
<Content Include="../../LICENSE.txt">
33+
<PackagePath>NHibernate.license.txt</PackagePath>
34+
</Content>
35+
</ItemGroup>
36+
2737
</Project>

‎src/NHibernate.Driver.FirebirdClient/Properties/AssemblyInfo.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
using System;
2+
using System.Reflection;
3+
using System.Security;
4+
5+
[assembly: CLSCompliantAttribute(true)]
6+
[assembly: AssemblyDelaySignAttribute(false)]
7+
[assembly: AllowPartiallyTrustedCallersAttribute()]
8+
[assembly: SecurityRulesAttribute(SecurityRuleSet.Level1)]

‎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: 4 additions & 0 deletions
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
}
1216
}

‎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: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,41 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="../../build-common/NHibernate.props" />
33

44
<PropertyGroup>
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>
99
<NoWarn>$(NoWarn);3001;3002;3003;3005;1591</NoWarn>
1010
<SignAssembly>True</SignAssembly>
11+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
1112
<AssemblyOriginatorKeyFile>..\NHibernate.snk</AssemblyOriginatorKeyFile>
1213
<GenerateDocumentationFile>true</GenerateDocumentationFile>
14+
15+
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
16+
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
1317
</PropertyGroup>
1418

1519
<ItemGroup>
1620
<None Include="..\NHibernate.snk" Link="NHibernate.snk" />
1721
</ItemGroup>
1822

19-
<ItemGroup>
23+
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
2024
<PackageReference Include="MySql.Data" Version="6.9.9" />
2125
</ItemGroup>
2226

27+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
28+
<PackageReference Include="MySql.Data" Version="6.10.1-beta" />
29+
</ItemGroup>
30+
2331
<ItemGroup>
2432
<ProjectReference Include="..\NHibernate\NHibernate.csproj" />
2533
</ItemGroup>
2634

35+
<ItemGroup>
36+
<Content Include="../../LICENSE.txt">
37+
<PackagePath>NHibernate.license.txt</PackagePath>
38+
</Content>
39+
</ItemGroup>
40+
2741
</Project>

0 commit comments

Comments
 (0)