Add .NET Core 2.0 and .NET Standard 2.0 builds

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.8.1" targetFramework="net461" />
+  <package id="CSharpAsyncGenerator.CommandLine" version="0.8.2" targetFramework="net461" />
   <package id="vswhere" version="2.1.4" targetFramework="net461" />
 </packages>

src/NHibernate.DomainModel/NHibernate.DomainModel.csproj

@@ -2,7 +2,7 @@
   <Import Project="../../build-common/NHibernate.props" />
   <PropertyGroup>
     <Description>The Domain Model used by the Unit Tests.</Description>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net461;netcoreapp2.0</TargetFrameworks>
     <IsTestProject>true</IsTestProject>
     <NoWarn>$(NoWarn);3001;3002;3003;3005</NoWarn>
   </PropertyGroup>

src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj

@@ -2,7 +2,7 @@
   <Import Project="../../build-common/NHibernate.props" />
   <PropertyGroup>
     <Description>The Visual Basic Unit Tests for NHibernate.</Description>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
     <IsTestProject>true</IsTestProject>
     <NoWarn>$(NoWarn);3001;3002;3003;3005</NoWarn>
     <OptionExplicit>On</OptionExplicit>
@@ -11,6 +11,9 @@
   <ItemGroup>
     <None Remove="**\*.hbm.xml" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.0'">
+    <Compile Remove="**\Issues\NH3302\**" />
+  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="**\*.hbm.xml" Exclude="bin\**\*.*" />
   </ItemGroup>

src/NHibernate.Test/Ado/BatcherFixture.cs

@@ -86,6 +86,7 @@ public void OneRoundTripUpdate()
 			Cleanup();
 		}
 
+#if NET461
 		[Test, Ignore("Not fixed yet.")]
 		[Description("SqlClient: The batcher should run all different INSERT queries in only one roundtrip.")]
 		public void SqlClientOneRoundTripForUpdateAndInsert()
@@ -95,7 +96,7 @@ public void SqlClientOneRoundTripForUpdateAndInsert()
 
 			FillDb();
 
-			using(var sqlLog = new SqlLogSpy())
+			using (var sqlLog = new SqlLogSpy())
 			using (ISession s = Sfi.OpenSession())
 			using (ITransaction tx = s.BeginTransaction())
 			{
@@ -140,7 +141,7 @@ public void BatchedoutputShouldBeFormatted()
 
 			Cleanup();
 		}
-
+#endif
 
 		[Test]
 		[Description("The batcher should run all DELETE queries in only one roundtrip.")]

src/NHibernate.Test/App.config

@@ -31,10 +31,9 @@
 			<property name="dialect">NHibernate.Dialect.MsSql2008Dialect</property>
 
 			<property name="connection.driver_class">NHibernate.Driver.Sql2008ClientDriver</property> <!-- Shouldn't be necessary, but is required by some tests -->
-			<property name="connection.connection_string_name">TestConnectionString</property>
+			<property name="connection.connection_string">Server=localhost\sqlexpress;Database=nhibernate;Integrated Security=SSPI</property>
 			<property name="connection.provider">NHibernate.Test.DebugConnectionProvider, NHibernate.Test</property>
 			<property name="connection.isolation">ReadCommitted</property> <!-- See System.Data.IsolationLevel for valid values -->
-			<!--property name="connection.connection_string" /-->
 
 			<property name="cache.provider_class">NHibernate.Cache.HashtableCacheProvider, NHibernate</property>
 			<property name="cache.use_query_cache">true</property>
@@ -53,7 +52,7 @@
 	</session-factory>
 	</hibernate-configuration>
 
-	<log4net debug="false">
+<log4net debug="false">
 
 		<!-- Appenders -->
 		<appender name="trace" type="log4net.Appender.TraceAppender, log4net">

src/NHibernate.Test/Async/Ado/BatcherFixture.cs

@@ -98,6 +98,7 @@ public async Task OneRoundTripUpdateAsync()
 			await (CleanupAsync());
 		}
 
+#if NET461
 		[Test, Ignore("Not fixed yet.")]
 		[Description("SqlClient: The batcher should run all different INSERT queries in only one roundtrip.")]
 		public async Task SqlClientOneRoundTripForUpdateAndInsertAsync()
@@ -107,7 +108,7 @@ public async Task SqlClientOneRoundTripForUpdateAndInsertAsync()
 
 			await (FillDbAsync());
 
-			using(var sqlLog = new SqlLogSpy())
+			using (var sqlLog = new SqlLogSpy())
 			using (ISession s = Sfi.OpenSession())
 			using (ITransaction tx = s.BeginTransaction())
 			{
@@ -152,7 +153,7 @@ public async Task BatchedoutputShouldBeFormattedAsync()
 
 			await (CleanupAsync());
 		}
-
+#endif
 
 		[Test]
 		[Description("The batcher should run all DELETE queries in only one roundtrip.")]

src/NHibernate.Test/Async/CfgTest/ConfigurationSerializationTests.cs

@@ -28,6 +28,8 @@ public class ConfigurationSerializationTestsAsync
 		[Test]
 		public async Task Basic_CRUD_should_workAsync()
 		{
+			Assume.That(typeof(System.Type).IsSerializable);
+
 			Assembly assembly = Assembly.Load("NHibernate.DomainModel");
 			var cfg = new Configuration();
 			if (TestConfigurationHelper.hibernateConfigFile != null)

src/NHibernate.Test/Async/ConnectionStringTest/NamedConnectionStringFixture.cs

@@ -11,6 +11,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data.Common;
+using System.Reflection;
 using NHibernate.Connection;
 using NUnit.Framework;
 using Environment=NHibernate.Cfg.Environment;

src/NHibernate.Test/Async/ConnectionTest/AggressiveReleaseTest.cs

@@ -58,6 +58,8 @@ protected override void Done()
 		[Test]
 		public async Task SerializationOnAfterStatementAggressiveReleaseAsync()
 		{
+			Assume.That(typeof(System.Type).IsSerializable);
+
 			Prepare();
 			ISession s = GetSessionUnderTest();
 			Silly silly = new Silly("silly");
@@ -79,6 +81,8 @@ public async Task SerializationOnAfterStatementAggressiveReleaseAsync()
 		[Test]
 		public async Task SerializationFailsOnAfterStatementAggressiveReleaseWithOpenResourcesAsync()
 		{
+			Assume.That(typeof(System.Type).IsSerializable);
+
 			Prepare();
 			ISession s = GetSessionUnderTest();
 
@@ -258,4 +262,4 @@ public async Task ConnectionMaintanenceDuringFlushAsync()
 			Done();
 		}
 	}
-}
+}

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

@@ -475,6 +475,8 @@ public async Task CloningCriteria_AddCount_RemoveOrderingAsync()
 		[Test]
 		public async Task DetachedCriteriaTestAsync()
 		{
+			Assume.That(typeof(System.Type).IsSerializable);
+
 			DetachedCriteria dc = DetachedCriteria.For(typeof(Student))
 				.Add(Property.ForName("Name").Eq("Gavin King"))
 				.AddOrder(Order.Asc("StudentNumber"))
@@ -3036,4 +3038,4 @@ public async Task CanSetLockModeOnDetachedCriteriaAsync()
 			}
 		}
 	}
-}
+}