Merge branch 'master' into persister

Author: hazzik

.editorconfig

@@ -6,6 +6,28 @@ insert_final_newline = true
 
 [*.cs]
 indent_style = tab
+dotnet_sort_system_directives_first = true
+csharp_space_after_cast = true
 
 [*.xsd]
 indent_style = tab
+
+[*.json]
+indent_style = space
+indent_size = 2
+
+[*.xml]
+indent_style = space
+indent_size = 2
+
+[*.csproj]
+indent_style = space
+indent_size = 2
+
+[*.vbproj]
+indent_style = space
+indent_size = 2
+
+[*.cshtml]
+indent_style = space
+indent_size = 4

.gitattributes

@@ -12,11 +12,11 @@
 *.msbuild text
 *.md      text
 
-*.sln text eol=crlf merge=union
-*.csproj text merge=union
-*.vbproj text merge=union
-*.fsproj text merge=union
-*.dbproj text merge=union
+*.sln text eol=crlf
+*.csproj text eol=crlf
+*.vbproj text eol=crlf
+*.fsproj text eol=crlf
+*.dbproj text eol=crlf
 
 # Resharper DotSettings files are in Unix format
 *.DotSettings text eol=lf 

.travis.yml

@@ -0,0 +1,49 @@
+language: csharp
+mono: latest
+dotnet: 2.1.2
+sudo: required
+services:
+  - mysql
+  - postgresql
+  - docker
+env:
+  - 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;"   
+matrix:
+  allow_failures:
+    - env: DB=MySQL CONNECTION_STRING="Server=127.0.0.1;Uid=root;Database=nhibernate;Old Guids=True;"
+before_install:
+  - curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
+  - curl https://packages.microsoft.com/config/ubuntu/14.04/prod.list | sudo tee /etc/apt/sources.list.d/microsoft.list
+  - sudo apt-get update -qq
+  - sudo apt-get install -y powershell 
+  - |-
+    if [[ "$DB" == "MySQL" ]]
+    then
+      echo -e '[server]\nlower_case_table_names=1' | sudo tee -a /etc/mysql/my.cnf
+      sudo service mysql restart
+    fi
+  - |-
+    if [[ "$DB" == "Firebird" ]]
+    then
+      sudo apt-get install -y libicu-dev libtommath-dev curl
+      curl -L -O https://github.com/FirebirdSQL/firebird/releases/download/R3_0_3/Firebird-3.0.3.32900-0.amd64.tar.gz
+      tar xzvf Firebird-3.0.3.32900-0.amd64.tar.gz
+      pushd Firebird-3.0.3.32900-0.amd64
+        sudo ./install.sh -silent   
+      popd
+      export $(sudo cat /opt/firebird/SYSDBA.password | grep -v ^# | xargs)
+      sudo chmod 775 /tmp/firebird
+      echo -e "nhibernate = /tmp/firebird/nhibernate.fdb" | sudo tee -a /opt/firebird/databases.conf
+      echo -e "AuthServer = Srp\nAuthClient = Srp\nUserManager = Srp\nWireCrypt = Enabled" | sudo tee -a /opt/firebird/firebird.conf
+      sudo /opt/firebird/bin/gsec -modify SYSDBA -pw masterkey -admin yes
+      sudo service firebird restart
+    fi
+before_script:
+  - if [[ "$DB" == "SqlServer2008" ]]; then docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=P@ssw0rd" -e "MSSQL_PID=Express" -p 1433:1433 -d --name sqlexpress microsoft/mssql-server-linux:latest; fi
+  - if [[ "$DB" == "PostgreSQL" ]]; then psql -c "CREATE DATABASE nhibernate;" -U postgres; fi
+  - if [[ "$DB" == "MySQL" ]]; then mysql -e "CREATE DATABASE IF NOT EXISTS nhibernate;"; fi
+script:
+  - pwsh -noprofile -command "& ./build.ps1 -TaskList Set-Configuration,Test -properties @{\"Database\" = \"$DB\";\"ConnectionString\"=\"$CONNECTION_STRING\"}"

CONTRIBUTING.md

@@ -4,18 +4,17 @@ This document describes the policies and procedures for working with NHibernate.
 
 For the least friction, please follow the steps in the order presented, being careful not to miss any. There are many details in this document that will help your contribution go as smoothly as possible. Please read it thoroughly. 
 
-## Check for Existing Issues Visit 
+## Create or find a GitHub Issue
 
-[https://nhibernate.jira.com][1] and search for your issue. If you see it, voting for it is a good way to increase the visibility of the issue. 
-## Create a JIRA Issue
+GitHub is used to generate the release notes and serves as a central point of reference for all changes that have occurred to NHibernate. 
 
-JIRA is used to generate the release notes and serves as a central point of reference for all changes that have occurred to NHibernate. 
+Visit [https://github.com/nhibernate/nhibernate-core/issues][1] and search for your issue. If you see it, giving it a like is a good way to increase the visibility of the issue. 
 
-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. Ex. NH-2318 
+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.
 
 ## Fork and Clone from GitHub
 
-The main GitHub repository is at <https://github.com/nhibernate/nhibernate-core>. 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. 
+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. 
 
 ## The Build Menu
 
@@ -35,29 +34,32 @@ The main GitHub repository is at <https://github.com/nhibernate/nhibernate-core>
 ## Setting up For Development
 
 1.  Install your favorite database and optionally set up a user capable of creating and dropping a database called **nhibernate**. There are some per-database instructions in the lib/teamcity/* folders, which you may find helpful. For SQL Server, you might be able to use the **localhost\sqlexpress** instance installed with Visual Studio. Often people already have databases set up, so you might not even need to do anything in this step.
-2.  Run the build menu and select the option A to create the AssemblyInfo.cs files.
-3.  Run the build menu and select option B to create a new test configuration. Notepad will pop up and you should edit the connection string information, saving it when you're done. These configurations will appear in the "available-test-configurations" folder.
-4.  Run the build menu and select option C to activate the test configuration you created. The appropriate configuration will be copied to the "current-test-configuration" folder.
-5.  (Optional) Run all the tests with option D and hopefully you will see no failing tests. The build may fail on certain databases; please ask on the mailing list if you are having trouble.
-6.  Before using the database for unit tests from Visual Studio, you'll need to create an empty database that matches your connection string. [NH-2866][2] will make this easier, but for now you just have to drop/create the database specified in your connection string yourself.
+2.  Run the build menu and select option B to create a new test configuration. Notepad will pop up and you should edit the connection string information, saving it when you're done. These configurations will appear in the "available-test-configurations" folder.
+3.  Run the build menu and select option C to activate the test configuration you created. The appropriate configuration will be copied to the "current-test-configuration" folder.
+4.  (Optional) Run all the tests with option D and hopefully you will see no failing tests. The build may fail on certain databases; please ask on the mailing list if you are having trouble.
+5.  Before using the database for unit tests from Visual Studio, you'll need to create an empty database that matches your connection string.
 
 ## Creating a Test Case to Verify the Issue
 
 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 NH0000 folder to create a duplicate test ("Copy of NH0000").
-4.  Replace the four (five for vb) instances of NH0000 with your issue number.
+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.
 
+Do not use anymore the NHxxxx naming, they match issue numbers from https://nhibernate.jira.com/
+
+NHibernate has migrated its issue tracking from Jira to GitHub, and using the Jira naming may lead to conflicts with previous Jira issues.
+
 ## Running Your Unit Test
 
 ### Debugging Through Included NUnit GUI
 
 1.  Right click on the project (ex. NHibernate.Test) in Visual Studio.
 2.  Select: Debug -> Start New Instance
-3.  Type the name of your unit test to quickly go to it. For example: NH2318
+3.  Type the name of your unit test to quickly go to it. For example: GH2318
 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.
 
@@ -66,13 +68,16 @@ In most cases, you will be adding your test to the NHibernate.Test project. If t
 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.
 
+## Regenerate async code
+
+NHibernate uses a code generator for its async implementation and tests. If your changes, including tests, involve any synchronous method having an async
+counter-part, you should regenerate the async code. Use build-menu option H for this. Then test any async counter-part it may have generated from your tests.
+
 ## Commit your Test Case
 
 Ensure that your e-mail address and name are configured appropriately in Git. 
 
-Create a feature branch so it's easy to keep it separate from other improvements. Having a pull request accepted might involve further commits based on community feedback, so having the feature branch provides a tidy place to work from. Using the issue number as the branch name is good practice. 
-
-When you commit, please include the issue number in your commit message. This will allow the JIRA issue tracker to automatically link your commits to the issue. By example: *NH-1234 - test case for blah trouble*.  Make sure you do not put any non whitespace character adjacent to the issue number, as this would prevent JIRA to match it. (Avoid *NH-1234: test case for blah trouble*.)
+Create a feature branch so it's easy to keep it separate from other improvements. Having a pull request accepted might involve further commits based on community feedback, so having the feature branch provides a tidy place to work from. Using the issue number as the branch name is good practice.
 
 ## Implementing the Bug Fix or Improvement
 
@@ -86,19 +91,21 @@ Please note that some tests assume a case insensitive accent sensitive database
 
 ## Submit a Pull Request
 
-Be sure to link to the JIRA issue in your GitHub pull request. Also, go back to your JIRA issue and link to the pull request. 
+If you are fixing an existing issue, please make sure to include this issue number in your GitHub pull request. 
 
 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.
 
+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.
+
 ## Further Discussion
 
-The NHibernate team monitors JIRA and GitHub regularly, so your request will be noticed. If you want to discuss it further, you are welcome to post to the [nhibernate-development mailing list][4]. 
+The NHibernate team monitors GitHub regularly, so your request will be noticed. If you want to discuss it further, you are welcome to post to the [nhibernate-development mailing list][4]. 
 
 ## Happy Contributing!
 
 The NHibernate community values your contributions. Thank you for the time you have invested.
 
- [1]: https://nhibernate.jira.com/
- [2]: https://nhibernate.jira.com/browse/NH-2866
+ [1]: https://github.com/nhibernate/nhibernate-core/issues/
+ [2]: https://github.com/nhibernate/nhibernate-core/
  [3]: http://www.editorconfig.org/
  [4]: http://groups.google.com/group/nhibernate-development