Merge branch 'master' into CacheBuild

Author: fredericDelaporte

.gitignore

@@ -13,3 +13,4 @@ current-test-configuration
 NHibernate.dll
 TestResult.xml
 .vscode
+.DS_Store

.travis.yml

@@ -1,13 +1,13 @@
 language: csharp
-mono: none
-dotnet: 2.1.2
+mono: latest
+dotnet: 2.1.300
 sudo: required
 services:
   - mysql
   - postgresql
   - docker
 env:
-  - DB=SqlServer2008 CONNECTION_STRING="Server=localhost;initial catalog=nhibernate;User Id=sa;Password=P@ssw0rd;"
+  - DB=SqlServer2008 CONNECTION_STRING="Server=localhost;initial catalog=nhibernate;User Id=sa;Password=P@ssw0rd;packet size=4096;"
   - DB=PostgreSQL CONNECTION_STRING="Host=localhost;Port=5432;Username=postgres;Database=nhibernate;Enlist=true;"
   - DB=Firebird 
   - DB=MySQL CONNECTION_STRING="Server=127.0.0.1;Uid=root;Database=nhibernate;Old Guids=True;"   

CONTRIBUTING.md

@@ -12,6 +12,8 @@ Visit [https://github.com/nhibernate/nhibernate-core/issues][1] and search for y
 
 Before creating an issue, please do your best to verify the existence of the problem. This reduces noise in the issue tracker and helps conserve the resources of the team for more useful tasks. Note the issue number for future steps.
 
+If you are familiar with NHibernate inner working and want to directly fix the issue, you may also contribute a PR without writing a separated issue, provided you describe the fixed issue in the PR.
+
 ## Fork and Clone from GitHub
 
 The main GitHub repository is at [https://github.com/nhibernate/nhibernate-core][2]. If you plan to contribute your test case or improvement back to NHibernate, you should visit that page and fork the repository so you can commit your own changes and then submit a pull request. 
@@ -44,10 +46,11 @@ The main GitHub repository is at [https://github.com/nhibernate/nhibernate-core]
 In most cases, you will be adding your test to the NHibernate.Test project. If there is a test that only works with VisualBasic, then add it to the NHibernate.Test.VisualBasic project instead. 
 
 1.  Open **NHibernate.sln** from the src folder.
-2.  If adding a C# test, go to the NHSpecificTest folder in the NHibernate.Test project. If adding a VisualBasic test, go to the Issues folder in the NHibernate.Test.VisualBasic project.
-3.  Copy and paste the GH0000 folder to create a duplicate test ("Copy of GH0000").
-4.  Replace the four instances of GH0000 with your issue number.
-5.  Edit the test as you see fit. Don't commit yet; there are details in a later step.
+2.  If adding a VisualBasic test, go to the Issues folder in the NHibernate.Test.VisualBasic project. If adding a C# test, go to the NHibernate.Test project.
+3.  C# only: either find the suitable feature folder and add your test there without following the two next points, or go to the NHSpecificTest folder.
+4.  Copy and paste the GH0000 folder to create a duplicate test ("Copy of GH0000").
+5.  Replace the four instances of GH0000 with your issue number.
+6.  Edit the test as you see fit. Don't commit yet; there are details in a later step.
 
 Do not use anymore the NHxxxx naming, they match issue numbers from https://nhibernate.jira.com/
 
@@ -63,7 +66,9 @@ NHibernate has migrated its issue tracking from Jira to GitHub, and using the Ji
 4.  Select and run the test.
 5.  You can also make the test project your startup project and it will run NUnit when you press F5.
 
-### Third Party NUnit Test Runner This would be something like ReSharper. 
+### Third Party NUnit Test Runner
+
+This could be something like ReSharper.
 
 1.  Sometimes tests fail when run under x64. If required (ex. SQLite and Firebird), go to the project properties Build tab and set the target to x86.
 2.  Next, just run the tests as usual.
@@ -91,11 +96,11 @@ Please note that some tests assume a case insensitive accent sensitive database
 
 ## Submit a Pull Request
 
-If you are fixing an existing issue, please make sure to include this issue number in your GitHub pull request. 
+If you are fixing an existing issue, please make sure to include this issue number in your GitHub pull request. (Use the # prefix instead of GH for automatically having a link to it.)
 
-We use tabs for code indentation, not spaces. As this is not the default in Visual Studio, you will need to reconfigure Visual Studio to indent with tabs whenever you work on the NHibernate codebase. To make this easier, NHibernate has an [editorconfig][3] configuration file to switch Visual Studio automatically between tabs and spaces mode. It is recommended you install editorconfig from the Visual Studio Extension Manager.
+We use tabs for code indentation, not spaces. To make this easier, NHibernate has an [editorconfig][3] configuration file to switch Visual Studio automatically between tabs and spaces mode.
 
-After submitting your pull request, come back later to check the outcome of automated builds. If some have failed, they will be listed in your pull request with a link to the corresponding TeamCity build. Find out in the build which tests are newly failing, and take appropriate action. Some of those builds have many known failing tests, which does not trigger a build failure. A *Comparison.txt* file in build Artifacts may help finding which failing tests are not known failing tests and must be addressed.
+After submitting your pull request, come back later to check the outcome of automated builds. If some have failed, they will be listed in your pull request with a link to the corresponding TeamCity build. Find out in the build which tests are newly failing, and take appropriate action. Some of those builds may have known failing tests, which does not trigger a build failure. In this case a *Comparison.txt* file in build Artifacts may help finding which failing tests are not known failing tests and must be addressed.
 
 ## Further Discussion
 

GitReleaseManager.yaml

@@ -5,6 +5,7 @@ issue-labels-include:
  - "t: New Feature"
  - "t: Improvement"
  - "t: Task"
+ - "t: Tests"
 issue-labels-exclude:
  - "r: Duplicate"
  - "r: External Issue"
@@ -26,3 +27,6 @@ issue-labels-alias:
  - name:   "t: Task"
    header: Task
    plural: Task
+ - name:   "t: Tests"
+   header: Tests
+   plural: Tests

ReleaseProcedure.txt

@@ -1,44 +1,57 @@
 These are the tasks typically needed to create an official NHibernate release.
 
-
   * In GitHub, make sure no open issues have milestone set to the release
-    that is about to happen (as these will show in the release notes).
-  
-  * Update releasenotes.txt with list of issues. See if any additions to the 
-    list of "known breaking changes" are necessary.
-	
-  * Check/update version number in build-common/common.xml.
-  
+    that is about to happen (as these will show in the milestone).
+
+  * Create a draft release in Github with GitReleaseManager. If you have used
+    the NHibernate build menu, it should be available in Tools\gitreleasemanage.x.x.x\
+    (change x.x.x by its current version in tools).
+    By example:
+
+Tools\gitreleasemanager.0.7.0\tools\GitReleaseManager.exe create -o nhibernate -r nhibernate-core -m 5.1 -u username -p password
+
+    (Adjust the -m milestone parameter above, and add "-c branchname" if
+    releasing another branch than master)
+
+  * Update releasenotes.txt with the list of issues generated in the GitHub
+    draft release. Add to the list the release task.
+    See if any additions to the list of "known breaking changes" are necessary.
+
+  * Update the GitHub draft release for matching other release formalism: ensure
+    its tag matches the released version (three parts: major.minor.release), update
+    its title, change its description for listing only highlights and breaking
+    changes, include links to the milestone and the releasenotes of the release
+    tag, include links to binaries on SourceForge and NuGet.
+    If the release tag does not match the released version with major.minor.release
+    formalism, the NuGet package will have an invalid link to release notes.
+
+  * Check/update version number in common.xml and NHibernate.props under
+    build-common folder, in master.xml under doc\reference folder, and in
+    appveyor.yml in the NHibernate root.
+
   * Don't forget to commit the above.
-  
-  * Perform the release build including running all tests (GaRelease.bat or
-    ShowBuildMenu.bat).
-	
-	NOTE: If you prefer to keep your source code in a path like e.g.:
-	  C:\Users\Something\Long\Projects\nhibernate-core
-	you may want to issue a command like:
-	  subst P: C:\Users\Something\Long\Projects
-	And then change to P:\nhibernate-core before building. This will avoid
-	displaying a long user-specific path in public symbol files.
-	
-  * If no error or other issue requiring further changes occurred, tag the
-    current git HEAD with a tag according to version number. Don't forget to
-	  push the tag to github.
-	
+
+  * Check the CI release build.
+    If no error or other issue requiring further changes occurred, merge
+    the release PR and wait for the resulting commit CI release build.
+
+  * Retrieve the artifacts of the CI release build.
+
   * Upload binary and source zip files to SourceForge. Update the "latest
     release".
 
-  * Update download link on nhibernate.info.
-  
-  * Push nuget packages including the symbol packages. The nuget packages
-    should already be available in the build directory, together with a batch
-    file to push them.
-  
-  * In GitHub, mark the milestone as released.
-  
+  * Update download link on nhibernate.info. Update the reference documentation
+    if needed.
+
+  * Push nuget packages including the symbol packages.
+
+  * In GitHub, mark the milestone as released and publish the release draft,
+    creating the release tag by the way. (It should match the tag in the
+    releasenotes link of the release description.)
+
   * Post release announcement to nhusers, nhibernate-development and as
     project news on SourceForge.
-		
+
   * If this was a stable branch, merge it forward to master. Perhaps some
     changes need to be edited out in the merge, but this will reduce the
-	  risk of some issue being left unfixed on master.
+    risk of some issue being left unfixed on master.

ShowBuildMenu.bat

@@ -51,12 +51,14 @@ echo E. Add a test configuration for Oracle.
 echo F. Add a test configuration for Oracle with managed driver.
 echo G. Add a test configuration for SQL Server Compact.
 echo H. Add a test configuration for MySql.
+echo I. Add a test configuration for SAP HANA.
 echo.
 echo X.  Exit to main menu.
 echo.
 
-%BUILDTOOL% prompt ABCDEFGHX
-if errorlevel 8 goto main-menu
+%BUILDTOOL% prompt ABCDEFGHIX
+if errorlevel 9 goto main-menu
+if errorlevel 8 goto test-setup-hana
 if errorlevel 7 goto test-setup-mysql
 if errorlevel 6 goto test-setup-sqlserverce
 if errorlevel 5 goto test-setup-oracle-managed
@@ -122,6 +124,13 @@ set LIB_FILES=
 set LIB_FILES2=
 goto test-setup-generic
 
+:test-setup-hana
+set CONFIG_NAME=HANA
+set TEST_PLATFORM=AnyCPU
+set LIB_FILES=
+set LIB_FILES2=
+goto test-setup-generic
+
 :test-setup-generic
 set CFGNAME=
 set /p CFGNAME=Enter a name for your test configuration or press enter to use default name: 

Tools/.gitignore

@@ -2,3 +2,4 @@ nuget.exe
 NUnit.*
 vswhere.*
 CSharpAsyncGenerator.CommandLine.*
+gitreleasemanager.*

Tools/packages.config

@@ -7,6 +7,7 @@
   <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />
   <package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net461" />
   <package id="NUnit.Extension.VSProjectLoader" version="3.6.0" targetFramework="net461" />
-  <package id="CSharpAsyncGenerator.CommandLine" version="0.8.2" targetFramework="net461" />
+  <package id="CSharpAsyncGenerator.CommandLine" version="0.8.2.6" targetFramework="net461" />
   <package id="vswhere" version="2.1.4" targetFramework="net461" />
+  <package id="gitreleasemanager" version="0.7.0" targetFramework="net461" />
 </packages>

appveyor.yml

@@ -1,4 +1,4 @@
-version: 5.1.0.{build}
+version: 5.1.2.{build}
 image: Visual Studio 2017
 environment:
   matrix:
@@ -63,4 +63,4 @@ on_finish:
     $wc = New-Object 'System.Net.WebClient'
     Get-Item '*-TestResult.xml' | ForEach-Object { 
         $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit3/$($env:APPVEYOR_JOB_ID)", $_)
-    }
+    }

build-common/DotNetSdkMono.props

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+The MIT License (MIT)
+
+Copyright (c) Microsoft Corporation.
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+-->
+<!-- Copied from here: https://github.com/Microsoft/visualfsharp/blob/cb9e692331c2f0d66b0f72d49a07533204011517/fcs/netfx.props -->
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <!-- When compiling .NET SDK 2.0 projects targeting .NET 4.x on Mono using 'dotnet build' you -->
+    <!-- have to teach MSBuild where the Mono copy of the reference assemblies is -->
+    <TargetIsMono Condition="$(TargetFramework.StartsWith('net4')) and '$(OS)' == 'Unix'">true</TargetIsMono>
+
+    <!-- Look in the standard install locations -->
+    <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>
+    <BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'true' AND EXISTS('/usr/lib/mono')">/usr/lib/mono</BaseFrameworkPathOverrideForMono>
+    <BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'true' AND EXISTS('/usr/local/lib/mono')">/usr/local/lib/mono</BaseFrameworkPathOverrideForMono>
+
+    <!-- If we found Mono reference assemblies, then use them -->
+    <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net45'">$(BaseFrameworkPathOverrideForMono)/4.5-api</FrameworkPathOverride>
+    <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net451'">$(BaseFrameworkPathOverrideForMono)/4.5.1-api</FrameworkPathOverride>
+    <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net452'">$(BaseFrameworkPathOverrideForMono)/4.5.2-api</FrameworkPathOverride>
+    <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net46'">$(BaseFrameworkPathOverrideForMono)/4.6-api</FrameworkPathOverride>
+    <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net461'">$(BaseFrameworkPathOverrideForMono)/4.6.1-api</FrameworkPathOverride>
+    <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net462'">$(BaseFrameworkPathOverrideForMono)/4.6.2-api</FrameworkPathOverride>
+    <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net47'">$(BaseFrameworkPathOverrideForMono)/4.7-api</FrameworkPathOverride>
+    <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net471'">$(BaseFrameworkPathOverrideForMono)/4.7.1-api</FrameworkPathOverride>
+    <EnableFrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != ''">true</EnableFrameworkPathOverride>
+
+    <!-- Add the Facades directory.  Not sure how else to do this. Necessary at least for .NET 4.5 -->
+    <AssemblySearchPaths Condition="'$(BaseFrameworkPathOverrideForMono)' != ''">$(FrameworkPathOverride)/Facades;$(AssemblySearchPaths)</AssemblySearchPaths>
+  </PropertyGroup>
+</Project>

build-common/NHibernate.props

@@ -1,14 +1,18 @@
 <Project>
+  <Import Project="DotNetSdkMono.props" />
   <PropertyGroup>
     <VersionMajor Condition="'$(VersionMajor)' == ''">5</VersionMajor>
-    <VersionMinor Condition="'$(VersionMinor)' == ''">0</VersionMinor>
-    <VersionPatch Condition="'$(VersionPatch)' == ''">3</VersionPatch>
+    <VersionMinor Condition="'$(VersionMinor)' == ''">1</VersionMinor>
+    <VersionPatch Condition="'$(VersionPatch)' == ''">2</VersionPatch>
     <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
 
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
     <AssemblyVersion>$(VersionMajor).$(VersionMinor).0.0</AssemblyVersion>
     <FileVersion>$(VersionPrefix).0</FileVersion>
 
+    <NhAppTargetFrameworks>net461;netcoreapp2.0</NhAppTargetFrameworks>
+    <NhLibTargetFrameworks>net461;netcoreapp2.0;netstandard2.0</NhLibTargetFrameworks>
+
     <Product>NHibernate</Product>
     <Company>NHibernate.info</Company>
     <Copyright>Licensed under LGPL.</Copyright>
@@ -19,6 +23,7 @@
     <PackageIconUrl>https://raw.githubusercontent.com/nhibernate/nhibernate-core/master/logo/NHibernate-NuGet.png</PackageIconUrl>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageLicenseUrl>https://raw.githubusercontent.com/nhibernate/nhibernate-core/master/LICENSE.txt</PackageLicenseUrl>
+    <PackageReleaseNotes>https://github.com/nhibernate/nhibernate-core/blob/$(VersionPrefix)/releasenotes.txt</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/nhibernate/nhibernate-core.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
 

build-common/common.xml

@@ -13,8 +13,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.1.2" overwrite="false" />
+	<property name="project.version.numeric" value="5.1.2" overwrite="false" />
 
 	<!-- properties used to connect to database for testing -->
 	<include buildfile="nhibernate-properties.xml" />

default.build

@@ -319,10 +319,21 @@
 			<in>
 				<items>
 					<include name="${nuget.nupackages.dir}/*.nupkg"/>
+					<exclude name="${nuget.nupackages.dir}/*.symbols.nupkg"/>
 				</items>
 			</in>
 			<do>
-				<echo message="nuget push ${filename} ${environment::newline()}" file="${nuget.nupackages.pushbatfile}" append="true"/>
+				<echo message="nuget push -source https://nuget.org/ ${path::get-file-name(filename)} ${environment::newline()}" file="${nuget.nupackages.pushbatfile}" append="true"/>
+			</do>
+		</foreach>
+		<foreach item="File" property="filename">
+			<in>
+				<items>
+					<include name="${nuget.nupackages.dir}/*.symbols.nupkg"/>
+				</items>
+			</in>
+			<do>
+				<echo message="nuget push -source https://nuget.smbsrc.net/ ${path::get-file-name(filename)} ${environment::newline()}" file="${nuget.nupackages.pushbatfile}" append="true"/>
 			</do>
 		</foreach>
 	</target>