-
Notifications
You must be signed in to change notification settings - Fork 687
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
Changes from 3 commits
2570ab3
0b1c28a
b6ee674
88e022d
4f06e12
715a57c
f63c389
15b9b6c
3ab1556
6fdbdaa
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
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 |
---|---|---|
@@ -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> | ||
|
@@ -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" /> | ||
<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" /> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We need System.Data.SqlClient? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, it seems it is needed for the MsSqlConnectionStringBuilder There was a problem hiding this comment. Choose a reason for hiding this commentThe 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. There was a problem hiding this comment. Choose a reason for hiding this commentThe 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) There was a problem hiding this comment. Choose a reason for hiding this commentThe 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? There was a problem hiding this comment. Choose a reason for hiding this commentThe 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> | ||
|
@@ -37,4 +41,5 @@ | |
<Link>FluentKey.snk</Link> | ||
</None> | ||
</ItemGroup> | ||
|
||
</Project> |
There was a problem hiding this comment.
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