Skip to content

Commit

Permalink
Merge pull request #1658 from fredericDelaporte/cacheSetting
Browse files Browse the repository at this point in the history
Add missing cache setting
  • Loading branch information
fredericDelaporte authored Apr 12, 2018
2 parents 942b61b + 9527634 commit 61bd921
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build-common/NHibernate.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<VersionMajor Condition="'$(VersionMajor)' == ''">5</VersionMajor>
<VersionMinor Condition="'$(VersionMinor)' == ''">0</VersionMinor>
<VersionPatch Condition="'$(VersionPatch)' == ''">3</VersionPatch>
<VersionPatch Condition="'$(VersionPatch)' == ''">4</VersionPatch>
<VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>

<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
Expand Down
4 changes: 2 additions & 2 deletions build-common/common.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@

<!-- This is used only for build folder -->
<!-- TODO: Either remove or refactor to use NHibernate.props -->
<property name="project.version" value="5.0.3" overwrite="false" />
<property name="project.version.numeric" value="5.0.3" overwrite="false" />
<property name="project.version" value="5.0.4" overwrite="false" />
<property name="project.version.numeric" value="5.0.4" overwrite="false" />

<!-- properties used to connect to database for testing -->
<include buildfile="nhibernate-properties.xml" />
Expand Down
10 changes: 9 additions & 1 deletion releasenotes.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
Build 5.0.3
Build 5.0.4
=============================

Release notes - NHibernate - Version 5.0.4

** Bug
* #1658 Add missing cache setting

Build 5.0.3
=============================

Release notes - NHibernate - Version 5.0.3
Expand Down
9 changes: 9 additions & 0 deletions src/NHibernate/nhibernate-configuration.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,15 @@
<xs:enumeration value="cache.region_prefix" />
<xs:enumeration value="cache.use_minimal_puts" />
<xs:enumeration value="cache.default_expiration" />
<xs:enumeration value="cache.use_sliding_expiration">
<xs:annotation>
<xs:documentation>
The use_sliding_expiration value is whether you wish to use a sliding expiration or not. Defaults
to false. Not all providers support this setting, it may be ignored. Check their respective
documentation.
</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="query.substitutions" />
<xs:enumeration value="query.factory_class" />
<xs:enumeration value="query.linq_provider_class" />
Expand Down

0 comments on commit 61bd921

Please sign in to comment.