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>

build-common/NHibernate.props

@@ -24,5 +24,7 @@
 
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <TreatSpecificWarningsAsErrors />
+    
+    <DisableImplicitPackageTargetFallback>True</DisableImplicitPackageTargetFallback>
   </PropertyGroup>
 </Project>

default.build

@@ -33,6 +33,7 @@
 		<exec program="dotnet" verbose="true">
 			<arg value="msbuild" />
 			<arg value="${root.dir}/src/NHibernate.sln" />
+			<arg value="/p:TargetFramework=&quot;net461&quot;" />
 			<arg value="/p:OutputPath=&quot;${path::get-full-path(bin.dir)}&quot;" />
 			<arg value="/p:Platform=&quot;Any CPU&quot;" />
 			<arg value="/p:Configuration=&quot;Debug&quot;" if="${project.config == 'debug'}" />

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()
 			}
 		}
 	}
-}
+}

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

@@ -50,6 +50,8 @@ public Task DetachedCriteriaItSelfAsync()
 		{
 			try
 			{
+				Assume.That(typeof(System.Type).IsSerializable);
+
 				DetachedCriteria dc = DetachedCriteria.For(typeof(Student))
 				.Add(Expression.Eq("Name", "Gavin King"));
 				return SerializeAndListAsync(dc);
@@ -63,6 +65,8 @@ public Task DetachedCriteriaItSelfAsync()
 		[Test]
 		public async Task ExecutableCriteriaAsync()
 		{
+			Assume.That(typeof(System.Type).IsSerializable);
+
 			// All query below don't have sense, are only to test if all needed classes are serializable
 
 			// Basic criterion

src/NHibernate.Test/Async/DynamicProxyTests/InterfaceProxySerializationTests/ProxyFixture.cs

@@ -106,6 +106,8 @@ public async Task ProxyAsync()
 		[Test]
 		public async Task ProxySerializeAsync()
 		{
+			Assume.That(typeof(System.Type).IsSerializable);
+
 			ISession s = OpenSession();
 			IMyProxy ap = new MyProxyImpl {Id = 1, Name = "first proxy"};
 			await (s.SaveAsync(ap));
@@ -137,6 +139,8 @@ public async Task ProxySerializeAsync()
 		[Test]
 		public async Task SerializeNotFoundProxyAsync()
 		{
+			Assume.That(typeof(System.Type).IsSerializable);
+
 			ISession s = OpenSession();
 			// this does not actually exists in db
 			var notThere = (IMyProxy) await (s.LoadAsync(typeof (MyProxyImpl), 5));
@@ -150,4 +154,4 @@ public async Task SerializeNotFoundProxyAsync()
 			s.Close();
 		}
 	}
-}
+}

src/NHibernate.Test/Async/Legacy/FooBarTest.cs

@@ -2644,6 +2644,8 @@ public async Task NewFlushingAsync()
 		[Test]
 		public async Task PersistCollectionsAsync()
 		{
+			Assume.That(typeof(System.Type).IsSerializable);
+
 			ISession s = OpenSession();
 			ITransaction txn = s.BeginTransaction();
 			IEnumerator enumer = (await (s.CreateQuery("select count(*) from b in class Bar").EnumerableAsync())).GetEnumerator();
@@ -4654,6 +4656,8 @@ public async Task SaveDeleteAsync()
 		[Test]
 		public async Task ProxyArrayAsync()
 		{
+			Assume.That(typeof(System.Type).IsSerializable);
+
 			ISession s = OpenSession();
 			GlarchProxy g = new Glarch();
 			Glarch g1 = new Glarch();

src/NHibernate.Test/Async/Legacy/MasterDetailTest.cs

@@ -640,6 +640,8 @@ public async Task NamedQueryAsync()
 		[Test]
 		public async Task SerializationAsync()
 		{
+			Assume.That(typeof(System.Type).IsSerializable);
+
 			ISession s = OpenSession();
 			Master m = new Master();
 			Detail d1 = new Detail();

src/NHibernate.Test/Async/NHSpecificTest/NH2773/Fixture.cs

@@ -50,6 +50,8 @@ protected override void OnTearDown() {
       [Test]
       public async Task DeserializedSession_ProxyType_ShouldBeEqualToOriginalProxyTypeAsync()
       {
+         Assume.That(typeof(System.Type).IsSerializable);
+
          System.Type originalProxyType = null;
          System.Type deserializedProxyType = null;
          ISession deserializedSession = null;

src/NHibernate.Test/Async/NHSpecificTest/NH2880/Fixture.cs

@@ -45,6 +45,8 @@ protected override void OnSetUp()
 		[Test]
 		public async Task ProxiesFromDeserializedSessionsCanBeLoadedAsync()
 		{
+			Assume.That(typeof(System.Type).IsSerializable);
+
 			MemoryStream sessionMemoryStream;
 
 			using (ISession s = Sfi.OpenSession())
@@ -85,4 +87,4 @@ protected override void OnTearDown()
 			}
 		}
 	}
-}
+}

src/NHibernate.Test/Async/NHSpecificTest/NH3119/FixtureByCode.cs

@@ -98,6 +98,8 @@ public async Task PocoComponentTuplizer_Instantiate_UsesReflectonOptimizerAsync(
 		[Test]
 		public async Task PocoComponentTuplizerOfDeserializedConfiguration_Instantiate_UsesReflectonOptimizerAsync()
 		{
+			Assume.That(typeof(System.Type).IsSerializable);
+
 			MemoryStream configMemoryStream = new MemoryStream();
 			BinaryFormatter writer = new BinaryFormatter();
 			writer.Serialize(configMemoryStream, cfg);

src/NHibernate.Test/Async/NHSpecificTest/NH317/Fixture.cs

@@ -38,6 +38,8 @@ protected override IList Mappings
 		[Test]
 		public async Task ProxySerializationAsync()
 		{
+			Assume.That(typeof(System.Type).IsSerializable);
+
 			Node node = new Node();
 			node.Id = 1;
 			node.Name = "Node 1";
@@ -72,4 +74,4 @@ public async Task ProxySerializationAsync()
 			s.Close();
 		}
 	}
-}
+}

src/NHibernate.Test/Async/NHSpecificTest/NH3487/Fixture.cs

@@ -64,6 +64,8 @@ protected override void OnTearDown()
 		[Test]
 		public async Task CanDeserializeSessionWithEntityHashCollisionAsync()
 		{
+			Assume.That(typeof(System.Type).IsSerializable);
+
 			IFormatter formatter = new BinaryFormatter();
 			byte[] serializedSessionArray;
 
@@ -91,4 +93,4 @@ public async Task CanDeserializeSessionWithEntityHashCollisionAsync()
 
 		}
 	}
-}
+}

src/NHibernate.Test/Async/NHSpecificTest/NH3583/AutoFlushFixture.cs

@@ -61,6 +61,8 @@ public async Task ShouldAutoFlushWhenInExplicitTransactionAsync()
 				Assert.That(result.Count, Is.EqualTo(1));
 			}
 		}
+
+#if NET461
 		[Test]
 		public async Task ShouldAutoFlushWhenInDistributedTransactionAsync()
 		{
@@ -77,5 +79,6 @@ public async Task ShouldAutoFlushWhenInDistributedTransactionAsync()
 				Assert.That(result.Count, Is.EqualTo(1));
 			}
 		}
+#endif
 	}
 }

src/NHibernate.Test/Async/ReadOnly/ReadOnlyCriteriaQueryTest.cs

@@ -1068,6 +1068,8 @@ public async Task SubselectAsync()
 		[Test]
 		public async Task DetachedCriteriaAsync()
 		{
+			Assume.That(typeof(System.Type).IsSerializable);
+
 			DetachedCriteria dc = NHibernate.Criterion.DetachedCriteria.For<Student>()
 				.Add(Property.ForName("Name").Eq("Gavin King"))
 				.AddOrder(Order.Asc("StudentNumber"));

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

@@ -254,7 +254,6 @@ public async Task WhenConfiguredOnlyExplicitAutoQuoteAsync()
 			// Test uses the default dialect driver, which will not accept Odbc or OleDb connection strings.
 			if (typeof(OdbcDriver).IsAssignableFrom(driverClass) || typeof(OleDbDriver).IsAssignableFrom(driverClass))
 				Assert.Ignore("Test is not compatible with OleDb or ODBC driver connection strings");
-
 			var configuredDialect = Dialect.Dialect.GetDialect();
 			if(!configuredDialect.DefaultProperties.ContainsKey(Environment.ConnectionDriver))
 			{

src/NHibernate.Test/Async/Tools/hbm2ddl/SchemaValidator/SchemaValidateFixture.cs

@@ -59,6 +59,7 @@ public Task ShouldVerifySameTableAsync()
 			}
 		}
 
+#if NET461
 		[Test, SetCulture("tr-TR"), SetUICulture("tr-TR")]
 		public async Task ShouldVerifySameTableTurkishAsync()
 		{
@@ -87,6 +88,7 @@ public async Task ShouldVerifySameTableTurkishAsync()
 				await (export.DropAsync(true, true));
 			}
 		}
+#endif
 
 		[Test]
 		public void ShouldNotVerifyModifiedTableAsync()

src/NHibernate.Test/Async/TransformTests/AliasToBeanResultTransformerFixture.cs

@@ -257,6 +257,8 @@ public void ToPropertiesInsensitivelyDuplicated_WithoutAnyProjectionsAsync()
 		[Test]
 		public async Task SerializationAsync()
 		{
+			Assume.That(typeof(System.Type).IsSerializable);
+
 			await (AssertSerializationAsync<PublicPropertiesSimpleDTO>());
 			await (AssertSerializationAsync<PrivateFieldsSimpleDTO>());
 			await (AssertSerializationAsync<PublicInheritedPropertiesSimpleDTO>());
@@ -312,4 +314,4 @@ public async Task SerializationAsync()
 			}
 		}
 	}
-}
+}