test: Run tests using .NET 6

Author: hazzik

src/NHibernate.Mapping.Attributes.Test/Baz.CoreReference.hbm.xml

@@ -119,7 +119,7 @@
         <property name="Count" type="Int32" column="count_" />
       </composite-element>
     </list>
-    <list name="ManyToAny" lazy="true" collection-type="System.Collections.ArrayList, System.Runtime.Extensions">
+    <list name="ManyToAny" lazy="true" collection-type="Collections.ArrayList">
       <key column="baz" />
       <index column="ind" />
       <many-to-any id-type="String">

src/NHibernate.Mapping.Attributes.Test/DomainModel.CoreReference.hbm.xml

@@ -121,7 +121,7 @@
         <property name="Count" type="Int32" column="count_" />
       </composite-element>
     </list>
-    <list name="ManyToAny" lazy="true" collection-type="System.Collections.ArrayList, System.Runtime.Extensions">
+    <list name="ManyToAny" lazy="true" collection-type="Collections.ArrayList">
       <key column="baz" />
       <index column="ind" />
       <many-to-any id-type="String">

src/NHibernate.Mapping.Attributes.Test/NHibernate.Mapping.Attributes.Test.csproj

@@ -4,13 +4,13 @@
   <PropertyGroup>
     <Product>NHibernate.Mapping.Attributes.Generator</Product>
     <Description>Unit tests of NHibernate.Mapping.Attributes</Description>
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
+    <TargetFrameworks>net6.0;net461</TargetFrameworks>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
     <DefineConstants>NETFX;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <OutputType>Exe</OutputType>
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
@@ -36,14 +36,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.9.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
     <PackageReference Include="log4net" Version="2.0.15" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
-    <PackageReference Include="System.Data.Common" Version="4.3.0" />
-    <PackageReference Include="System.Collections" Version="4.3.0" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+    <PackageReference Include="NUnit" Version="3.9.0" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <PackageReference Include="NUnitLite" Version="3.9.0" />
   </ItemGroup>
 </Project>

src/NHibernate.Mapping.Attributes.Test/NHibernate.Mapping.Attributes.Test.nunit

@@ -1,4 +1,4 @@
-#if NETCOREAPP2_0
+#if !NETFX
 namespace NHibernate.Mapping.Attributes.Test
 {
 	public class Program

src/NHibernate.Mapping.Attributes.Test/Program.cs

@@ -42,13 +42,9 @@ public void TestSerialization()
 				HbmSerializer.Default.Error.Remove(0, HbmSerializer.Default.Error.Length);
 
 			// Generate (baz & assembly) + Validate
-			Stream bazStream = null;
-			Stream assemblyStream = null;
-			try
+			using (var bazStream = SerializeBaz())
+			using (var assemblyStream = SerializeAssembly())
 			{
-				bazStream = SerializeBaz();
-				assemblyStream = SerializeAssembly();
-
 				// Throw if errors
 				if (HbmSerializer.Default.Validate && HbmSerializer.Default.Error.Length > 0)
 					throw new Exception(HbmSerializer.Default.Error.ToString());
@@ -62,13 +58,6 @@ public void TestSerialization()
 				Compare(assemblyStream, "DomainModel.CoreReference.hbm.xml");
 #endif
 			}
-			finally
-			{
-				if (bazStream != null)
-					bazStream.Close();
-				if (assemblyStream != null)
-					assemblyStream.Close();
-			}
 		}