Run tests on .NET 6

.config/dotnet-tools.json

@@ -3,10 +3,10 @@
   "isRoot": true,
   "tools": {
     "csharpasyncgenerator.tool": {
-      "version": "0.19.1",
+      "version": "0.20.1",
       "commands": [
         "async-generator"
       ]
     }
   }
-}
+}

.github/workflows/NetCoreTests.yml

@@ -54,9 +54,9 @@ jobs:
 
     - uses: actions/checkout@v2
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1.8.0
+      uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 2.1.x
+        dotnet-version: 6.0.x
 
     - name: Build and Test
       run: |

ShowBuildMenu.sh

@@ -172,8 +172,8 @@ testSetupMenu() {
 }
 
 testRun(){
-	dotnet test ./src/NHibernate.Test/NHibernate.Test.csproj -f netcoreapp2.0
-	dotnet test ./src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj -f netcoreapp2.0
+	dotnet test ./src/NHibernate.Test/NHibernate.Test.csproj -f net6.0
+	dotnet test ./src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj -f net6.0
 	mainMenu
 }
 

Tools/.gitignore

@@ -4,3 +4,4 @@ csharpasyncgenerator.commandline/
 gitreleasemanager/
 obj/
 microsoft.*
+netstandard.*

Tools/BuildTool/BuildTool.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 </Project>

appveyor.yml

@@ -1,5 +1,5 @@
 version: '{build}'
-image: Visual Studio 2017
+image: Visual Studio 2022
 environment:
   matrix:
   - DB: SqlServer2008
@@ -8,7 +8,7 @@ environment:
     CONNECTION_STRING: Host=localhost;Port=5432;Username=postgres;Password=Password12!;Database=nhibernate;Enlist=true;
   - DB: Firebird
   - DB: MySQL
-    CONNECTION_STRING: Server=127.0.0.1;Uid=root;Pwd=Password12!;Database=nhibernate;Old Guids=True;SslMode=none;
+    CONNECTION_STRING: Server=127.0.0.1;Uid=root;Pwd=Password12!;Database=nhibernate;Old Guids=True;SslMode=none;CharSet=utf8;
   - DB: SQLite
 init:
     # Required for having windows endlines in sources zip
@@ -42,7 +42,7 @@ before_test:
         Start-Service 'MySQL57'
         # Create nhibernate database (not handled by NHibernate.TestDatabaseSetup.dll)
         $env:MYSQL_PWD = 'Password12!'
-        & 'C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql' -e 'CREATE DATABASE nhibernate;' --user=root
+        & 'C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql' -e 'CREATE DATABASE nhibernate CHARACTER SET utf8 COLLATE utf8_general_ci;' --user=root
       }
       'Odbc' { Start-Service 'MSSQL$SQL2017' }
       'PostgreSQL' {

build-common/NHibernate.props

@@ -13,18 +13,26 @@
     <FileVersion Condition="'$(VersionSuffix)' != '' AND '$(BuildNumber)' != ''">$(VersionPrefix).$(BuildNumber)</FileVersion>
     <FileVersion Condition="'$(FileVersion)' == ''">$(VersionPrefix).0</FileVersion>
 
-    <NhAppTargetFrameworks Condition ="$(NhAppTargetFrameworks) == ''">net461;netcoreapp2.0</NhAppTargetFrameworks>
+    <NhAppTargetFrameworks Condition ="$(NhAppTargetFrameworks) == ''">net461;net6.0</NhAppTargetFrameworks>
     <NhLibTargetFrameworks Condition ="$(NhLibTargetFrameworks) == ''">net461;netcoreapp2.0;netstandard2.0</NhLibTargetFrameworks>
     <NhNetFx>false</NhNetFx>
     <NhNetFx Condition="$(TargetFramework.StartsWith('net4'))">true</NhNetFx>
-    <DefineConstants Condition="$(NhNetFx) AND $(NhVbNet) == ''" >NETFX;$(DefineConstants)</DefineConstants>
+    <!-- Visual Basic requires to use coma (,) as a separator, other project types - semicolon (;) -->
+    <DefineConstants Condition="$(NhNetFx) AND '$(MSBuildProjectExtension)' != '.vbproj'">NETFX;$(DefineConstants)</DefineConstants>
+    <DefineConstants Condition="$(NhNetFx) AND '$(MSBuildProjectExtension)' == '.vbproj'">NETFX,$(DefineConstants)</DefineConstants>
 
     <Product>NHibernate</Product>
     <Company>NHibernate.info</Company>
     <Copyright>Licensed under LGPL.</Copyright>
     <Authors>NHibernate community, Hibernate community</Authors>
     <NeutralLanguage>en-US</NeutralLanguage>
 
+    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <TreatSpecificWarningsAsErrors />
+
+    <DisableImplicitPackageTargetFallback>True</DisableImplicitPackageTargetFallback>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(IsPackable)' == 'True'">
     <PackageProjectUrl>https://nhibernate.info</PackageProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/nhibernate/nhibernate-core/master/logo/NHibernate-NuGet.png</PackageIconUrl>
     <PackageIcon>NHibernate-NuGet.png</PackageIcon>
@@ -35,11 +43,6 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-
-    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-    <TreatSpecificWarningsAsErrors />
-
-    <DisableImplicitPackageTargetFallback>True</DisableImplicitPackageTargetFallback>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="all" />

global.json

@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "6.0.101",
+    "rollForward": "latestFeature"
+  }
+}

psake.ps1

@@ -113,7 +113,7 @@ Task Test -depends Build {
         'NHibernate.Test',
         'NHibernate.Test.VisualBasic'
     ) | ForEach-Object { 
-        $assembly = [IO.Path]::Combine("src", $_, "bin", "Release", "netcoreapp2.0", "$_.dll")
+        $assembly = [IO.Path]::Combine("src", $_, "bin", "Release", "net6.0", "$_.dll")
         Exec {
             dotnet $assembly --labels=before --nocolor "--result=$_-TestResult.xml"
         }

src/AsyncGenerator.yml

@@ -187,7 +187,7 @@
     scanForMissingAsyncMembers:
     - all: true
 - filePath: NHibernate.Test/NHibernate.Test.csproj
-  targetFramework: netcoreapp2.0
+  targetFramework: net6.0
   concurrentRun: true
   applyChanges: true
   suppressDiagnosticFailures:
@@ -230,6 +230,15 @@
     - filePathEndsWith: Linq/MathTests.cs
     - filePathEndsWith: Linq/ExpressionSessionLeakTest.cs
     - filePathEndsWith: Linq/NorthwindDbCreator.cs
+    ignoreSearchForAsyncCounterparts:
+    - name: Wait
+      containingTypeName: Task
+    - name: Prepare
+      containingTypeName: DbCommand
+    - name: Close
+      containingTypeName: DbConnection
+    - name: Close
+      containingTypeName: DbDataReader    
     cancellationTokens:
       enabled: true
     scanMethodBody: true

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

@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <NhVbNet>true</NhVbNet>
-  </PropertyGroup>
   <Import Project="../../build-common/NHibernate.props" />
   <PropertyGroup>
     <Description>The Visual Basic Unit Tests for NHibernate.</Description>
@@ -11,18 +8,14 @@
     <OptionExplicit>On</OptionExplicit>
     <OptionStrict>On</OptionStrict>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
-    <DefineConstants>NETCOREAPP2_0,$(DefineConstants)</DefineConstants>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <OutputType>Exe</OutputType>
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
-  <PropertyGroup Condition="$(NhNetFx)">
-    <DefineConstants>NETFX,$(DefineConstants)</DefineConstants>
-  </PropertyGroup>
   <ItemGroup>
     <None Remove="**\*.hbm.xml" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.0'">
+  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
     <Compile Remove="**\Issues\NH3302\**" />
   </ItemGroup>
   <ItemGroup>
@@ -32,12 +25,12 @@
     <None Include="..\NHibernate.Test\App.config" Link="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
     <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <PackageReference Include="NUnitLite" Version="3.13.2" />
   </ItemGroup>
   <ItemGroup>

src/NHibernate.Test.VisualBasic/Program.vb

@@ -1,4 +1,4 @@
-#If NETCOREAPP2_0
+#If NETCOREAPP2_0_OR_GREATER
 Public Class Program
     Public Shared Function Main(args As String()) As Integer
         Return New NUnitLite.AutoRun(GetType(Program).Assembly).Execute(args)

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

@@ -205,6 +205,7 @@ public async Task EntityProjectionForEntityJoinAsync()
 		[Test]
 		public async Task MixOfJoinsForAssociatedAndNotAssociatedEntitiesAsync()
 		{
+#pragma warning disable CS8073 //The result of the expression is always 'false'
 			using (var sqlLog = new SqlLogSpy())
 			using (var session = OpenSession())
 			{
@@ -223,6 +224,7 @@ public async Task MixOfJoinsForAssociatedAndNotAssociatedEntitiesAsync()
 						.Take(1)
 						.SingleOrDefaultAsync<object>());
 			}
+#pragma warning restore CS8073 //The result of the expression is always 'false'
 		}
 
 		[Test]
@@ -248,6 +250,7 @@ public async Task EntityJoinForCompositeKeyAsync()
 		[Test]
 		public async Task NullLeftEntityJoinAsync()
 		{
+#pragma warning disable CS8073 //The result of the expression is always 'false'
 			using (var sqlLog = new SqlLogSpy())
 			using (var session = OpenSession())
 			{
@@ -263,11 +266,13 @@ public async Task NullLeftEntityJoinAsync()
 				Assert.That(NHibernateUtil.IsInitialized(root), Is.True);
 				Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");
 			}
+#pragma warning restore CS8073 //The result of the expression is always 'false'
 		}	
 
 		[Test]
 		public async Task NullLeftEntityJoinWithEntityProjectionAsync()
 		{
+#pragma warning disable CS8073 //The result of the expression is always 'false'
 			using (var sqlLog = new SqlLogSpy())
 			using (var session = OpenSession())
 			{
@@ -287,6 +292,7 @@ public async Task NullLeftEntityJoinWithEntityProjectionAsync()
 				Assert.That(ejLeftNull, Is.Null, "Entity join should be null");
 				Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");
 			}
+#pragma warning restore CS8073 //The result of the expression is always 'false'
 		}
 
 		[Test]

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

@@ -376,6 +376,7 @@ public async Task EntityProjectionWithLazyPropertiesSinglePropertyFetchAsync()
 		[Test]
 		public async Task NullEntityProjectionAsync()
 		{
+#pragma warning disable CS8073 //The result of the expression is always 'false'
 			using (var session = OpenSession())
 			{
 				EntitySimpleChild child1 = null;
@@ -388,6 +389,7 @@ public async Task NullEntityProjectionAsync()
 
 				Assert.That(child1, Is.Null);
 			}
+#pragma warning restore CS8073 //The result of the expression is always 'false'
 		}
 
 		[Test]

src/NHibernate.Test/Async/Hql/EntityJoinHqlTest.cs

@@ -346,9 +346,9 @@ public async Task NullableEntityProjectionAsync()
 				var withNullManyToOneList = await (session.Query<NullableOwner>().Where(x => x.ManyToOne == null).ToListAsync());
 				var withNullManyToOneJoinedList =
 					await ((from x in session.Query<NullableOwner>()
-							from x2 in session.Query<NullableOwner>()
-							where x == x2 && x.ManyToOne == null && x.OneToOne.Name == null
-							select x2).ToListAsync());
+					from x2 in session.Query<NullableOwner>()
+					where x == x2 && x.ManyToOne == null && x.OneToOne.Name == null
+					select x2).ToListAsync());
 				Assert.That(fullList.Count, Is.EqualTo(2));
 				Assert.That(withValidManyToOneList.Count, Is.EqualTo(0));
 				Assert.That(withValidManyToOneList2.Count, Is.EqualTo(0));