Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Target netstandard2.0 and NH 5.1.0 #391

Merged
merged 10 commits into from
Mar 28, 2018
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"projects": [ "src" ],
"sdk": {
"version": "2.0.0"
"version": "2.1.4"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="NHibernate" Version="5.0.3" />
<PackageReference Include="NHibernate" Version="5.1.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
Expand Down
2 changes: 1 addition & 1 deletion src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PackageReference Include="Machine.Specifications.Runner.Console" Version="0.9.3" />
<PackageReference Include="Machine.Specifications.Runner.VisualStudio" Version="2.5.2" />
<PackageReference Include="Mono.Cecil" Version="0.9.6.1" />
<PackageReference Include="NHibernate" Version="5.0.3" />
<PackageReference Include="NHibernate" Version="5.1.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<ItemGroup>
<PackageReference Include="FakeItEasy" Version="4.3.0" />
<PackageReference Include="Machine.Specifications" Version="0.12.0" />
<PackageReference Include="NHibernate" Version="5.0.3" />
<PackageReference Include="NHibernate" Version="5.1.0" />
<PackageReference Include="NUnit" Version="3.9.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
<PackageReference Include="System.Data.SQLite" Version="1.0.106" />
Expand Down
23 changes: 14 additions & 9 deletions src/FluentNHibernate/FluentNHibernate.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<NoWarn>1591</NoWarn>
<PlatformTarget>AnyCpu</PlatformTarget>
<OutputType>Library</OutputType>
Expand All @@ -13,22 +13,26 @@
<Description>FluentNHibernate</Description>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)..\Shared.msbuild" />

<PropertyGroup>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NHibernate" Version="5.0.3" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

<Import Project="$(MSBuildThisFileDirectory)..\Shared.msbuild" />

<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
<PackageReference Include="NHibernate" Version="5.0.3" />

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be 5.1.0 as well now? Because all the tests are based on 5.1.0 so we should target this entire release to that? 5.1.0 does support net461 as well

<Reference Include="System.configuration" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Transactions" />
</ItemGroup>


<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="NHibernate" Version="5.1.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.4.3" />
Copy link
Member

@jrgcubano jrgcubano Mar 20, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need System.Data.SqlClient?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it seems it is needed for the MsSqlConnectionStringBuilder

Copy link
Contributor

@danilobreda danilobreda Mar 20, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could create our own implementation of the builder like the MySqlConnectionStringBuilder. Because we use the connectionString only, and have no interaction with the sqlconnectionstringbuilder for the user.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The use of a package that the developer does not have a interaction with it is not a good implementation. (the user only pass the connectionString as string)

Copy link
Member

@jrgcubano jrgcubano Mar 21, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@danilobreda @mgoodfellow Seem right. You can take care of this in another PR when we finish this one?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jrgcubano yes i can, i will wait for this release.

</ItemGroup>


<ItemGroup>
<Compile Include="..\CommonAssemblyInfo.cs">
<Link>Properties\CommonAssemblyInfo.cs</Link>
Expand All @@ -37,4 +41,5 @@
<Link>FluentKey.snk</Link>
</None>
</ItemGroup>

</Project>