Merge branch 'release/3.0.0' into production

Author: craigfowler

.gitignore

@@ -13,3 +13,4 @@ packages/*/*
 *.csproj.user
 Tests/*/TestResults/
 *.DotSettings.user
+Tests/**/*.db

CSF.Entities/CSF.Entities.csproj

@@ -11,7 +11,7 @@
     <Authors>craigfowler</Authors>
     <Title>Entity &amp; identity types</Title>
     <Description>Interfaces &amp; base types to describe ORM-mapped entities and their identities.</Description>
-    <ReleaseVersion>2.0.3</ReleaseVersion>
+    <ReleaseVersion>3.0.0</ReleaseVersion>
     <Version>$(ReleaseVersion)</Version>
     <PackageVersion>$(ReleaseVersion)</PackageVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

CSF.Entities/Entity`1.cs

@@ -66,7 +66,19 @@ public override string ToString()
         object IEntity.IdentityValue
         {
             get { return IdentityValue; }
-            set { IdentityValue = (TIdentity) value; }
+            set { IdentityValue = ToIdentityType(value); }
+        }
+
+        /// <summary>
+        /// Converts a specified <paramref name="value"/> to the <typeparamref name="TIdentity"/> type.
+        /// </summary>
+        /// <returns>The converted value.</returns>
+        /// <param name="value">The value to convert.</param>
+        TIdentity ToIdentityType(object value)
+        {
+            var formatter = System.Globalization.CultureInfo.InvariantCulture;
+            var converted = Convert.ChangeType(value, typeof(TIdentity), formatter);
+            return (TIdentity)converted;
         }
 
         Type IEntity.IdentityType => typeof(TIdentity);

CSF.ORM.Entities/CSF.ORM.Entities.csproj

@@ -13,7 +13,7 @@
     <Authors>craigfowler</Authors>
     <Title>ORM abstractions: Entity integration</Title>
     <Description>An integration between CSF.ORM and CSF.Entities, providing convenience functionality for projects which use both.</Description>
-    <ReleaseVersion>2.0.3</ReleaseVersion>
+    <ReleaseVersion>3.0.0</ReleaseVersion>
     <Version>$(ReleaseVersion)</Version>
     <PackageVersion>$(ReleaseVersion)</PackageVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

CSF.ORM.NHibernate.Common/CSF.ORM.NHibernate.Common.csproj

@@ -9,7 +9,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <ReleaseVersion>2.0.3</ReleaseVersion>
+    <ReleaseVersion>3.0.0</ReleaseVersion>
     <Version>$(ReleaseVersion)</Version>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\CSF-Software-OSS.snk</AssemblyOriginatorKeyFile>

CSF.ORM.NHibernate.Common/SessionAdapter.cs

@@ -44,7 +44,13 @@ public class SessionAdapter : IDataConnection, IGetsTransaction, IHasNativeImple
         /// Gets the native implementation which provides the service's functionality.
         /// </summary>
         /// <value>The native implementation.</value>
-        public object NativeImplementation => session;
+        public object NativeImplementation => session;
+
+        /// <summary>
+        /// Gets a value indicating whether a transaction is currently active, created by this provider.
+        /// </summary>
+        /// <value><c>true</c> if is transaction is active; otherwise, <c>false</c>.</value>
+        public bool IsTransactionActive => HasExistingTransaction;
 
         /// <summary>
         /// Gets a persister object from the current connection.
@@ -91,8 +97,8 @@ public ITransaction GetTransaction()
             return provider.GetTransaction(session);
         }
 
-        bool HasExistingTransaction => session.Transaction?.IsActive == true;
-
+        bool HasExistingTransaction => session.Transaction?.IsActive == true;
+
         #region IDisposable Support
         bool disposedValue;
 

CSF.ORM.NHibernate4/CSF.ORM.NHibernate4.csproj

@@ -12,7 +12,7 @@
     <Authors>craigfowler</Authors>
     <Title>ORM abstractions: Implementation for NHibernate 4</Title>
     <Description>Implementation of the ORM abstractions for users of NHibernate version 4.x.</Description>
-    <ReleaseVersion>2.0.3</ReleaseVersion>
+    <ReleaseVersion>3.0.0</ReleaseVersion>
     <Version>$(ReleaseVersion)</Version>
     <PackageVersion>$(ReleaseVersion)</PackageVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

CSF.ORM.NHibernate4/TransactionAdapter.cs

@@ -59,7 +59,7 @@ public void Commit()
         /// <summary>
         /// Commit this transaction to the back-end using an asynchronous API, where available.
         /// </summary>
-        public void CommitAsync() => Task.Run(() => Commit());
+        public Task CommitAsync() => Task.Run(() => Commit());
 
         /// <summary>
         /// Rollback this instance.
@@ -78,7 +78,7 @@ public void Rollback()
         /// <summary>
         /// Roll the transaction back and abort changes using an asynchronous API, where available.
         /// </summary>
-        public void RollbackAsync() => Task.Run(() => Rollback());
+        public Task RollbackAsync() => Task.Run(() => Rollback());
 
         #region IDisposable Support
         /// <summary>

CSF.ORM.NHibernate5/CSF.ORM.NHibernate5.csproj

@@ -12,7 +12,7 @@
     <Authors>craigfowler</Authors>
     <Title>ORM abstractions: Implementation for NHibernate 5</Title>
     <Description>Implementation of the ORM abstractions for users of NHibernate version 5.x.</Description>
-    <ReleaseVersion>2.0.3</ReleaseVersion>
+    <ReleaseVersion>3.0.0</ReleaseVersion>
     <Version>$(ReleaseVersion)</Version>
     <PackageVersion>$(ReleaseVersion)</PackageVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

CSF.ORM.NHibernate5/TransactionAdapter.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using nh = NHibernate;
 
 namespace CSF.ORM.NHibernate
@@ -57,14 +58,15 @@ public void Commit()
         /// <summary>
         /// Commit this transaction to the back-end using an asynchronous API, where available.
         /// </summary>
-        public void CommitAsync()
+        public Task CommitAsync()
         {
             AssertNotFinalised();
 
             if (mayCommitAndDispose)
-                transaction.CommitAsync();
+                return transaction.CommitAsync();
 
             IsFinal = true;
+            return Task.CompletedTask;
         }
 
         /// <summary>
@@ -84,17 +86,16 @@ public void Rollback()
         /// <summary>
         /// Roll the transaction back and abort changes using an asynchronous API, where available.
         /// </summary>
-        public void RollbackAsync()
+        public Task RollbackAsync()
         {
             if (transaction.WasRolledBack || IsFinal || disposedValue)
             {
                 IsFinal = true;
-                return;
+                return Task.CompletedTask;
             }
 
-            transaction.RollbackAsync();
-
             IsFinal = true;
+            return transaction.RollbackAsync();
         }
 
         void AssertNotFinalised()