Skip to content

Commit f141ce0

Browse files
fredericDelaportefredericDelaporte
authored
Merge branch 'master' into BatchableCache
2 parents efdeac8 + 469d79f commit f141ce0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1074
-188
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
language: csharp
2-
mono: none
2+
mono: latest
33
dotnet: 2.1.2
44
sudo: required
55
services:
66
- mysql
77
- postgresql
88
- docker
99
env:
10-
- DB=SqlServer2008 CONNECTION_STRING="Server=localhost;initial catalog=nhibernate;User Id=sa;Password=P@ssw0rd;"
10+
- DB=SqlServer2008 CONNECTION_STRING="Server=localhost;initial catalog=nhibernate;User Id=sa;Password=P@ssw0rd;packet size=4096;"
1111
- DB=PostgreSQL CONNECTION_STRING="Host=localhost;Port=5432;Username=postgres;Database=nhibernate;Enlist=true;"
1212
- DB=Firebird
1313
- DB=MySQL CONNECTION_STRING="Server=127.0.0.1;Uid=root;Database=nhibernate;Old Guids=True;"

‎ReleaseProcedure.txt‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,20 @@ Tools\gitreleasemanager.0.7.0\tools\GitReleaseManager.exe create -o nhibernate -
1414
releasing another branch than master)
1515

1616
* Update releasenotes.txt with the list of issues generated in the GitHub
17-
draft release.
17+
draft release. Add to the list the release task.
1818
See if any additions to the list of "known breaking changes" are necessary.
1919

20-
* Update the GitHub draft release for matching other release formalism: update
20+
* Update the GitHub draft release for matching other release formalism: ensure
21+
its tag matches the released version (three parts: major.minor.release), update
2122
its title, change its description for listing only highlights and breaking
2223
changes, include links to the milestone and the releasenotes of the release
2324
tag, include links to binaries on SourceForge and NuGet.
25+
If the release tag does not match the released version with major.minor.release
26+
formalism, the NuGet package will have an invalid link to release notes.
2427

2528
* Check/update version number in common.xml and NHibernate.props under
26-
build-common folder, and in master.xml under doc\reference folder.
29+
build-common folder, in master.xml under doc\reference folder, and in
30+
appveyor.yml in the NHibernate root.
2731

2832
* Don't forget to commit the above.
2933

@@ -36,13 +40,14 @@ Tools\gitreleasemanager.0.7.0\tools\GitReleaseManager.exe create -o nhibernate -
3640
* Upload binary and source zip files to SourceForge. Update the "latest
3741
release".
3842

39-
* Update download link on nhibernate.info.
43+
* Update download link on nhibernate.info. Update the reference documentation
44+
if needed.
4045

4146
* Push nuget packages including the symbol packages.
4247

4348
* In GitHub, mark the milestone as released and publish the release draft,
4449
creating the release tag by the way. (It should match the tag in the
45-
releasenots link of the release description.)
50+
releasenotes link of the release description.)
4651

4752
* Post release announcement to nhusers, nhibernate-development and as
4853
project news on SourceForge.

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 5.1.0.{build}
1+
version: 5.1.1.{build}
22
image: Visual Studio 2017
33
environment:
44
matrix:

‎build-common/DotNetSdkMono.props‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
The MIT License (MIT)
4+
5+
Copyright (c) Microsoft Corporation.
6+
All rights reserved.
7+
8+
Permission is hereby granted, free of charge, to any person obtaining a copy
9+
of this software and associated documentation files (the "Software"), to deal
10+
in the Software without restriction, including without limitation the rights
11+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
copies of the Software, and to permit persons to whom the Software is
13+
furnished to do so, subject to the following conditions:
14+
15+
The above copyright notice and this permission notice shall be included in all
16+
copies or substantial portions of the Software.
17+
18+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
24+
SOFTWARE.
25+
-->
26+
<!-- Copied from here: https://github.com/Microsoft/visualfsharp/blob/cb9e692331c2f0d66b0f72d49a07533204011517/fcs/netfx.props -->
27+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
28+
<PropertyGroup>
29+
<!-- When compiling .NET SDK 2.0 projects targeting .NET 4.x on Mono using 'dotnet build' you -->
30+
<!-- have to teach MSBuild where the Mono copy of the reference assemblies is -->
31+
<TargetIsMono Condition="$(TargetFramework.StartsWith('net4')) and '$(OS)' == 'Unix'">true</TargetIsMono>
32+
33+
<!-- Look in the standard install locations -->
34+
<BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'true' AND EXISTS('/Library/Frameworks/Mono.framework/Versions/Current/lib/mono')">/Library/Frameworks/Mono.framework/Versions/Current/lib/mono</BaseFrameworkPathOverrideForMono>
35+
<BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'true' AND EXISTS('/usr/lib/mono')">/usr/lib/mono</BaseFrameworkPathOverrideForMono>
36+
<BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'true' AND EXISTS('/usr/local/lib/mono')">/usr/local/lib/mono</BaseFrameworkPathOverrideForMono>
37+
38+
<!-- If we found Mono reference assemblies, then use them -->
39+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net45'">$(BaseFrameworkPathOverrideForMono)/4.5-api</FrameworkPathOverride>
40+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net451'">$(BaseFrameworkPathOverrideForMono)/4.5.1-api</FrameworkPathOverride>
41+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net452'">$(BaseFrameworkPathOverrideForMono)/4.5.2-api</FrameworkPathOverride>
42+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net46'">$(BaseFrameworkPathOverrideForMono)/4.6-api</FrameworkPathOverride>
43+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net461'">$(BaseFrameworkPathOverrideForMono)/4.6.1-api</FrameworkPathOverride>
44+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net462'">$(BaseFrameworkPathOverrideForMono)/4.6.2-api</FrameworkPathOverride>
45+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net47'">$(BaseFrameworkPathOverrideForMono)/4.7-api</FrameworkPathOverride>
46+
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net471'">$(BaseFrameworkPathOverrideForMono)/4.7.1-api</FrameworkPathOverride>
47+
<EnableFrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != ''">true</EnableFrameworkPathOverride>
48+
49+
<!-- Add the Facades directory. Not sure how else to do this. Necessary at least for .NET 4.5 -->
50+
<AssemblySearchPaths Condition="'$(BaseFrameworkPathOverrideForMono)' != ''">$(FrameworkPathOverride)/Facades;$(AssemblySearchPaths)</AssemblySearchPaths>
51+
</PropertyGroup>
52+
</Project>

‎build-common/NHibernate.props‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<Project>
2+
<Import Project="DotNetSdkMono.props" />
23
<PropertyGroup>
34
<VersionMajor Condition="'$(VersionMajor)' == ''">5</VersionMajor>
45
<VersionMinor Condition="'$(VersionMinor)' == ''">1</VersionMinor>
5-
<VersionPatch Condition="'$(VersionPatch)' == ''">0</VersionPatch>
6+
<VersionPatch Condition="'$(VersionPatch)' == ''">1</VersionPatch>
67
<VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
78

89
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
@@ -19,6 +20,7 @@
1920
<PackageIconUrl>https://raw.githubusercontent.com/nhibernate/nhibernate-core/master/logo/NHibernate-NuGet.png</PackageIconUrl>
2021
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
2122
<PackageLicenseUrl>https://raw.githubusercontent.com/nhibernate/nhibernate-core/master/LICENSE.txt</PackageLicenseUrl>
23+
<PackageReleaseNotes>https://github.com/nhibernate/nhibernate-core/blob/$(VersionPrefix)/releasenotes.txt</PackageReleaseNotes>
2224
<RepositoryUrl>https://github.com/nhibernate/nhibernate-core.git</RepositoryUrl>
2325
<RepositoryType>git</RepositoryType>
2426

‎build-common/common.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
<!-- This is used only for build folder -->
1515
<!-- TODO: Either remove or refactor to use NHibernate.props -->
16-
<property name="project.version" value="5.1.0" overwrite="false" />
17-
<property name="project.version.numeric" value="5.1.0" overwrite="false" />
16+
<property name="project.version" value="5.1.1" overwrite="false" />
17+
<property name="project.version.numeric" value="5.1.1" overwrite="false" />
1818

1919
<!-- properties used to connect to database for testing -->
2020
<include buildfile="nhibernate-properties.xml" />

‎default.build‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,10 +319,21 @@
319319
<in>
320320
<items>
321321
<include name="${nuget.nupackages.dir}/*.nupkg"/>
322+
<exclude name="${nuget.nupackages.dir}/*.symbols.nupkg"/>
322323
</items>
323324
</in>
324325
<do>
325-
<echo message="nuget push ${filename} ${environment::newline()}" file="${nuget.nupackages.pushbatfile}" append="true"/>
326+
<echo message="nuget push -source https://nuget.org/ ${path::get-file-name(filename)} ${environment::newline()}" file="${nuget.nupackages.pushbatfile}" append="true"/>
327+
</do>
328+
</foreach>
329+
<foreach item="File" property="filename">
330+
<in>
331+
<items>
332+
<include name="${nuget.nupackages.dir}/*.symbols.nupkg"/>
333+
</items>
334+
</in>
335+
<do>
336+
<echo message="nuget push -source https://nuget.smbsrc.net/ ${path::get-file-name(filename)} ${environment::newline()}" file="${nuget.nupackages.pushbatfile}" append="true"/>
326337
</do>
327338
</foreach>
328339
</target>

‎doc/NHibernate.shfbproj.template‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
<IndentHtml>False</IndentHtml>
2626
<HelpFileVersion>${project.version.numeric}</HelpFileVersion>
2727
<DocumentationSources>
28-
<DocumentationSource sourceFile="${root.dir}/src/NHibernate/bin/${build.config}/NHibernate.dll" />
29-
<DocumentationSource sourceFile="${root.dir}/src/NHibernate/bin/${build.config}/Nhibernate.xml" />
28+
<DocumentationSource sourceFile="${root.dir}/src/NHibernate/bin/${build.config}/net461/NHibernate.dll" />
29+
<DocumentationSource sourceFile="${root.dir}/src/NHibernate/bin/${build.config}/net461/Nhibernate.xml" />
3030
</DocumentationSources>
3131
</PropertyGroup>
3232
<!-- There are no properties for these two groups but they need to appear in

‎doc/reference/README.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ DocBook Quick Start
3030
================================================================================
3131
Read this article on Code Project (by Jim Crafton)
3232
"Documention with DocBook on Win32"
33-
http://www.codeproject.com/winhelp/docbook_howto.asp
33+
https://www.codeproject.com/Articles/4481/Documention-with-DocBook-on-Win
3434

3535

3636
================================================================================

0 commit comments

Comments
 (0)