Skip to content

Commit 4d887d8

Browse files
bahusoidfredericDelaporte
authored andcommitted
Allow to provide dev specific properties in NHibernate.dev.props
1 parent 9d4d2c9 commit 4d887d8

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ TestResult.xml
1616
.DS_Store
1717

1818
.idea/
19-
.vs/
19+
.vs/
20+
/build-common/NHibernate.dev.props

build-common/NHibernate.props

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<Project>
22
<Import Project="DotNetSdkMono.props" />
3+
<Import Condition="Exists('NHibernate.dev.props')" Project="NHibernate.dev.props"/>
4+
35
<PropertyGroup>
46
<VersionMajor Condition="'$(VersionMajor)' == ''">5</VersionMajor>
57
<VersionMinor Condition="'$(VersionMinor)' == ''">2</VersionMinor>
@@ -10,8 +12,8 @@
1012
<AssemblyVersion>$(VersionMajor).$(VersionMinor).0.0</AssemblyVersion>
1113
<FileVersion>$(VersionPrefix).0</FileVersion>
1214

13-
<NhAppTargetFrameworks>net461;netcoreapp2.0</NhAppTargetFrameworks>
14-
<NhLibTargetFrameworks>net461;netcoreapp2.0;netstandard2.0</NhLibTargetFrameworks>
15+
<NhAppTargetFrameworks Condition ="$(NhAppTargetFrameworks) == ''">net461;netcoreapp2.0</NhAppTargetFrameworks>
16+
<NhLibTargetFrameworks Condition ="$(NhLibTargetFrameworks) == ''">net461;netcoreapp2.0;netstandard2.0</NhLibTargetFrameworks>
1517

1618
<Product>NHibernate</Product>
1719
<Company>NHibernate.info</Company>

0 commit comments

Comments
 (0)