Merge branch 'master' into GetQueryCacheConcurrency

Author: hazzik

Tools/packages.config

@@ -7,6 +7,6 @@
   <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.7.0" targetFramework="net461" />
+  <package id="CSharpAsyncGenerator.CommandLine" version="0.8.1" targetFramework="net461" />
   <package id="vswhere" version="2.1.4" targetFramework="net461" />
 </packages>

build-common/NHibernate.props

@@ -21,5 +21,8 @@
     <PackageLicenseUrl>https://raw.githubusercontent.com/nhibernate/nhibernate-core/master/LICENSE.txt</PackageLicenseUrl>
     <RepositoryUrl>https://github.com/nhibernate/nhibernate-core.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
+
+    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <TreatSpecificWarningsAsErrors />
   </PropertyGroup>
 </Project>

lib/teamcity/oracle/oracle_installation.txt

@@ -1,18 +1,50 @@
 
-Installation steps for Oracle (Express Edition) for NH TeamCity:
-
-1.  Download Oracle Database 10g Express Edition (OracleXE.exe):  http://www.oracle.com/technetwork/database/express-edition/downloads/102xewinsoft-090667.html;
+Installation steps for Oracle for NH TeamCity:
+1.  Download Oracle Database 12c from https://oracle.com/. Please make sure you comply with it's license.
+    12.2 will fail some tests (mainly NH-1171) due to a bug with comments in queries, see
+    https://stackoverflow.com/q/7493028/1178314. So take care of installing 12.1 instead.
         (Note: you'll need to sign-up for a (free) Oracle account to download)
 
-2.  Run the installer ... choose any HTTP port for the listener if asked (it may automatically choose the default 8080 if available);
-3.  Enter 'password' as the password for the SYS and SYSTEM accounts;
-4.  The setup should install Oracle (XE) on the machine;
-5.  Once the installation is complete, leave the option ticked to open the homepage for configuration.
+2.  Run the installer ...
+3.  Choose any HTTP port for the listener if asked (it may automatically choose the default 8080 if available);
+4.  Choose the ASCII character set. You will have to ensure nhibernate.oracle.use_n_prefixed_types_for_unicode
+    parameter is set to true; Choosing instead the Unicode character set will cause some NHibernate tests to fail.
+5.  Enter 'password' as the password for the SYS and SYSTEM accounts;
+6.  The setup should install Oracle on the machine.
 
 Creating the NH Schema:
 
-a.  Login to the homepage using login/password SYSTEM/password;
-b.  Select Administration->Database Users->Create User;
-c.  Enter Username=nhibernate, Password=nhibernate, and select the DBA role;
-d.  Click 'Create' to create the user/schema.
+a.  Run SQL Plus:
+        SQL*Plus: Release XXX Production on YYY
+        Copyright (c) 1982, 2014, Oracle.  All rights reserved.
+        Enter user-name:
+b.  Enter:
+        / as SYSDBA
+    Expected result:
+        Connected to:
+        Oracle Database XXX
+        SQL>
+c.  Enter
+        create user nhibernate identified by nhibernate;
+d.  If it fails with ORA-65096, enter following command then go back to c.
+        alter session set "_ORACLE_SCRIPT"=true;
+e.  Once the user is created, enter:
+        grant dba to nhibernate;
+
+Resolve conflict between Oracle client and with the managed driver NuGet package (12.1 and below):
+
+1.  Within an elevated command line, navigate to {Oracle home}\product\{version}\{dbhome}\ODP.NET\managed\x64
+2.  Run
+    OraProvCfg /action:ungac /providerPath:Oracle.ManagedDataAccess
+This is needed because NHibernate test uses the managed driver NuGet package, but Oracle client installation
+(excepted 12.2 and higher) put in the GAC a conflicting version of the assembly. This conflicting
+version needs to be removed from the GAC. Read more on https://stackoverflow.com/a/35176586/1178314.
+Not doing this may notably cause failures in distributed transaction tests.
+
+Adjust the connection string for the tests:
+The tests involve creating and dropping many tables, sometimes with the same names but different data
+types. This does not play well with Oracle meta data pooling, which needs to be disabled.
+Add into your ODP.NET connection string:
+Metadata Pooling=false;Self Tuning=false;
 
+Please note that some tests are dependent on the machine locales, and may fail if they are not English.

src/.gitignore

@@ -22,9 +22,9 @@
 *.scc
 *.tokens
 [Bb]in
-[Db]ebug*/
+[Db]ebug/
 obj/
-[Rr]elease*/
+[Rr]elease/
 *resharper*
 _ReSharper*/
 [Tt]est[Rr]esult*

src/AsyncGenerator.yml

@@ -1,5 +1,6 @@
 projects:
 - filePath: NHibernate/NHibernate.csproj
+  targetFramework: net461
   concurrentRun: true
   applyChanges: true
   analyzation:
@@ -156,13 +157,15 @@
   - type: AsyncGenerator.Core.Plugins.EmptyRegionRemover
     assemblyName: AsyncGenerator.Core
 - filePath: NHibernate.DomainModel/NHibernate.DomainModel.csproj
+  targetFramework: net461
   concurrentRun: true
   applyChanges: true
   analyzation:
     scanMethodBody: true
     scanForMissingAsyncMembers:
     - all: true
 - filePath: NHibernate.Test/NHibernate.Test.csproj
+  targetFramework: net461
   concurrentRun: true
   applyChanges: true
   analyzation:

src/NHibernate.Config.Templates/Oracle-Managed.cfg.xml

@@ -9,10 +9,10 @@ for your own use before compile tests in VisualStudio.
 	<session-factory name="NHibernate.Test">
 		<property name="connection.driver_class">NHibernate.Driver.OracleManagedDataClientDriver</property>
 		<property name="connection.connection_string">
-			User ID=nhibernate;Password=nhibernate;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XE)))
+			User ID=nhibernate;Password=nhibernate;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = ORCL)))
 		</property>
 		<property name="show_sql">false</property>
 		<property name="dialect">NHibernate.Dialect.Oracle10gDialect</property>
 		<property name="query.substitutions">true 1, false 0, yes 'Y', no 'N'</property>
 	</session-factory>
-</hibernate-configuration>
+</hibernate-configuration>

src/NHibernate.DomainModel/Async/CustomPersister.cs

@@ -21,6 +21,7 @@
 using NHibernate.Tuple.Entity;
 using NHibernate.Type;
 using NHibernate.Util;
+using Array = System.Array;
 
 namespace NHibernate.DomainModel
 {

src/NHibernate.DomainModel/Baz.cs

@@ -396,7 +396,7 @@ public void SetDefaults()
 			StringArray = StringSet.ToArray();
 			StringList = new List<string>(StringArray);
 			IntArray = new int[] {1, 3, 3, 7};
-			FooArray = new Foo[0];
+			FooArray = Array.Empty<Foo>();
 
 			Customs = new List<string[]>();
 			Customs.Add(new String[] {"foo", "bar"});

src/NHibernate.DomainModel/CustomPersister.cs

@@ -11,6 +11,7 @@
 using NHibernate.Tuple.Entity;
 using NHibernate.Type;
 using NHibernate.Util;
+using Array = System.Array;
 
 namespace NHibernate.DomainModel
 {
@@ -130,12 +131,12 @@ public bool[] PropertyInsertability
 
 		public ValueInclusion[] PropertyInsertGenerationInclusions
 		{
-			get { return new ValueInclusion[0]; }
+			get { return Array.Empty<ValueInclusion>(); }
 		}
 
 		public ValueInclusion[] PropertyUpdateGenerationInclusions
 		{
-			get { return new ValueInclusion[0]; }
+			get { return Array.Empty<ValueInclusion>(); }
 		}
 
 		public bool[] PropertyCheckability

src/NHibernate.DomainModel/Foo.cs

@@ -322,7 +322,7 @@ public FooComponent Component
 		public FooComponent NullComponent
 		{
 			get { return null; }
-			set { if (value != null) throw new Exception("Null component"); }
+			set { if (value != null) throw new ArgumentException("Null component"); }
 		}
 
 		#endregion
@@ -432,4 +432,4 @@ public bool EqualsFoo(Foo other)
 
 		private static int count = 0;
 	}
-}
+}

src/NHibernate.DomainModel/FooComponent.cs

@@ -110,7 +110,7 @@ private String NullString
 			set
 			{
 				if (value != null)
-					throw new Exception("null component property");
+					throw new ArgumentException("null component property");
 			}
 		}
 
@@ -179,4 +179,4 @@ public override string ToString()
 
 		#endregion
 	}
-}
+}

src/NHibernate.DomainModel/NHibernate.DomainModel.csproj

@@ -6,10 +6,6 @@
     <IsTestProject>true</IsTestProject>
     <NoWarn>$(NoWarn);3001;3002;3003;3005</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-    <TreatSpecificWarningsAsErrors />
-  </PropertyGroup>
   <ItemGroup>
     <None Remove="**\*.hbm.xml" />
   </ItemGroup>

src/NHibernate.Example.Web/Infrastructure/NHibernateToMicrosoftLogger.cs

@@ -18,6 +18,7 @@ public NHibernateToMicrosoftLogger(ILogger msLogger)
 		{
 			{ NHibernateLogLevel.Trace, LogLevel.Trace },
 			{ NHibernateLogLevel.Debug, LogLevel.Debug },
+			{ NHibernateLogLevel.Info, LogLevel.Information },
 			{ NHibernateLogLevel.Warn, LogLevel.Warning },
 			{ NHibernateLogLevel.Error, LogLevel.Error },
 			{ NHibernateLogLevel.Fatal, LogLevel.Critical },

src/NHibernate.Test/Async/Component/Basic/ComponentTest.cs

@@ -32,7 +32,7 @@ protected override string MappingsAssembly
 
 		protected override System.Collections.IList Mappings
 		{
-			get { return new string[] { }; }
+			get { return Array.Empty<string>(); }
 		}
 
 		protected override void Configure(Configuration configuration)

src/NHibernate.Test/Async/Criteria/DetachedCriteriaSerializable.cs

@@ -185,4 +185,4 @@ public async Task ExecutableCriteriaAsync()
 			await (SerializeAndListAsync(dc));
 		}
 	}
-}
+}