Skip to content

Commit 9f51dba

Browse files
committed
NH-3807 - Use the very most recent versions of dependencies for netstandard2.0 compatibility.
Set DisableImplicitPackageTargetFallback on projects.
1 parent 0e5de11 commit 9f51dba

File tree

7 files changed

+15
-7
lines changed

7 files changed

+15
-7
lines changed

src/NHibernate.DomainModel/NHibernate.DomainModel.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
5+
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
56
</PropertyGroup>
67

78
<ItemGroup>
@@ -10,7 +11,7 @@
1011
</ItemGroup>
1112

1213
<ItemGroup>
13-
<PackageReference Include="Iesi.Collections" Version="4.0.1.4000" />
14+
<PackageReference Include="Iesi.Collections" Version="4.0.2" />
1415
</ItemGroup>
1516

1617
<ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<NoWarn>$(NoWarn);1591</NoWarn>
66
<GenerateDocumentationFile>True</GenerateDocumentationFile>
77
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
8-
<!--<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>-->
8+
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
99
</PropertyGroup>
1010

1111
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<NoWarn>$(NoWarn);1591</NoWarn>
66
<GenerateDocumentationFile>True</GenerateDocumentationFile>
77
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
8-
<!--<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>-->
8+
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
99
</PropertyGroup>
1010

1111
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">

src/NHibernate.Driver.Npgsql/NHibernate.Driver.Npgsql.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<NoWarn>$(NoWarn);1591</NoWarn>
66
<GenerateDocumentationFile>True</GenerateDocumentationFile>
77
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
8-
<!--<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>-->
8+
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
99
</PropertyGroup>
1010

1111
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">

src/NHibernate.Driver.SqlClient/NHibernate.Driver.SqlClient.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<NoWarn>$(NoWarn);1591</NoWarn>
66
<GenerateDocumentationFile>True</GenerateDocumentationFile>
77
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
8-
<!--<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>-->
8+
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
99
</PropertyGroup>
1010

1111
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">

src/NHibernate/NHibernate.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<NoWarn>$(NoWarn);1591;3001;3002;3003;3005</NoWarn>
66
<GenerateDocumentationFile>True</GenerateDocumentationFile>
77
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
8-
<!--<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>-->
8+
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
99
</PropertyGroup>
1010

1111
<ItemGroup>
@@ -17,7 +17,7 @@
1717

1818
<ItemGroup>
1919
<PackageReference Include="Antlr3.Runtime" Version="3.5.1" />
20-
<PackageReference Include="Iesi.Collections" Version="4.0.1.4000" />
20+
<PackageReference Include="Iesi.Collections" Version="4.0.2" />
2121
<PackageReference Include="Remotion.Linq" Version="2.1.2" />
2222
<PackageReference Include="Remotion.Linq.EagerFetching" Version="2.1.0" />
2323
</ItemGroup>

src/NuGet.config

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
5+
<add key="TeamCity" value="https://teamcity.jetbrains.com/guestAuth/app/nuget/v1/FeedService.svc" />
6+
</packageSources>
7+
</configuration>

0 commit comments

Comments
 (0)