Merge branch 'master' into feature/no-reflection-serialization

Author: fredericDelaporte

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>

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.Test/Async/Events/Collections/Association/Bidirectional/ManyToMany/BidirectionalManyToManyBagToSetCollectionEventFixture.cs

@@ -39,13 +39,13 @@ public override Task UpdateParentOneToTwoSameChildrenAsync()
 			{
 				Assert.Ignore("Not supported");
 				return Task.CompletedTask;
+				// This test need some more deep study if it really work in H3.2
+				// because <bag> allow duplication.
 			}
 			catch (System.Exception ex)
 			{
 				return Task.FromException<object>(ex);
 			}
-			// This test need some more deep study if it really work in H3.2
-			// because <bag> allow duplication.
 		}
 	}
 }

src/NHibernate.Test/Async/Tools/hbm2ddl/SchemaMetadataUpdaterTest/SchemaMetadataUpdaterFixture.cs

@@ -39,8 +39,8 @@ public async Task CanRetrieveReservedWordsAsync()
 				var metaData = dialect.GetDataBaseSchema(connectionHelper.Connection);
 				var reserved = metaData.GetReservedWords();
 				Assert.That(reserved, Is.Not.Empty);
-				Assert.That(reserved, Has.Member("SELECT").IgnoreCase);
-				Assert.That(reserved, Has.Member("FROM").IgnoreCase);
+				Assert.That(reserved, Has.Some.EqualTo("SELECT").IgnoreCase);
+				Assert.That(reserved, Has.Some.EqualTo("FROM").IgnoreCase);
 			}
 			finally
 			{

src/NHibernate.Test/MappingExceptions/PropertyNotFoundExceptionFixture.cs

@@ -1,5 +1,6 @@
 using System;
 using NHibernate.Cfg;
+using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.MappingExceptions
@@ -44,5 +45,21 @@ public void ConstructWithNullType()
 			new PropertyNotFoundException(null, "someField");
 			new PropertyNotFoundException(null, "SomeProperty", "getter");
 		}
+
+		[Test]
+		public void IsSerializable()
+		{
+			NHAssert.IsSerializable(new PropertyNotFoundException(null, "someField"));
+			NHAssert.IsSerializable(new PropertyNotFoundException(null, "SomeProperty", "getter"));
+		}
+
+		[Test]
+		public void SerializeWithType()
+		{
+			var bytes = SerializationHelper.Serialize(new PropertyNotFoundException(typeof(PropertyNotFoundExceptionFixture), "SomeProperty", "getter"));
+			var pnfe = (PropertyNotFoundException) SerializationHelper.Deserialize(bytes);
+
+			Assert.That(pnfe.TargetType, Is.EqualTo(typeof(PropertyNotFoundExceptionFixture)));
+		}
 	}
-}
+}

src/NHibernate.Test/NHibernate.Test.csproj

@@ -41,12 +41,12 @@
     <PackageReference Include="Microsoft.SqlServer.Compact" Version="4.0.8876.1" />
     <PackageReference Include="MySql.Data" Version="6.9.10" />
     <PackageReference Include="Npgsql" Version="3.2.4.1" />
-    <PackageReference Include="nunit" Version="3.7.1" />
     <PackageReference Include="Oracle.ManagedDataAccess" Version="12.1.2400" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.105.2" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.7.6" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="NUnit" Version="3.9.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(NuGetPackageRoot)' != '' ">
     <NativeBinaries Include="$(NuGetPackageRoot)microsoft.sqlserver.compact\4.0.8876.1\NativeBinaries\**\*.*" />

src/NHibernate.Test/Tools/hbm2ddl/SchemaMetadataUpdaterTest/SchemaMetadataUpdaterFixture.cs

@@ -27,8 +27,8 @@ public void CanRetrieveReservedWords()
 				var metaData = dialect.GetDataBaseSchema(connectionHelper.Connection);
 				var reserved = metaData.GetReservedWords();
 				Assert.That(reserved, Is.Not.Empty);
-				Assert.That(reserved, Has.Member("SELECT").IgnoreCase);
-				Assert.That(reserved, Has.Member("FROM").IgnoreCase);
+				Assert.That(reserved, Has.Some.EqualTo("SELECT").IgnoreCase);
+				Assert.That(reserved, Has.Some.EqualTo("FROM").IgnoreCase);
 			}
 			finally
 			{

src/NHibernate/Async/Action/BulkOperationCleanupAction.cs

@@ -38,7 +38,6 @@ public Task BeforeExecutionsAsync(CancellationToken cancellationToken)
 			{
 				return Task.FromException<object>(ex);
 			}
-			// nothing to do
 		}
 
 		public Task ExecuteAsync(CancellationToken cancellationToken)
@@ -56,7 +55,6 @@ public Task ExecuteAsync(CancellationToken cancellationToken)
 			{
 				return Task.FromException<object>(ex);
 			}
-			// nothing to do
 		}
 
 		private async Task EvictCollectionRegionsAsync(CancellationToken cancellationToken)

src/NHibernate/Async/Cache/HashtableCache.cs

@@ -107,7 +107,6 @@ public Task LockAsync(object key, CancellationToken cancellationToken)
 			{
 				return Task.FromException<object>(ex);
 			}
-			// local cache, so we use synchronization
 		}
 
 		/// <summary></summary>
@@ -126,7 +125,6 @@ public Task UnlockAsync(object key, CancellationToken cancellationToken)
 			{
 				return Task.FromException<object>(ex);
 			}
-			// local cache, so we use synchronization
 		}
 
 		#endregion

src/NHibernate/Async/Cache/ReadOnlyCache.cs

@@ -169,7 +169,6 @@ public Task EvictAsync(CacheKey key, CancellationToken cancellationToken)
 			{
 				return Task.FromException<object>(ex);
 			}
-			// NOOP
 		}
 
 		/// <summary>