Support tests in VS 2022 #3035

fredericDelaporte · 2022-03-13T20:29:41Z

Tests fail to run in VS 2022, which is unpractical.

fredericDelaporte · 2022-03-13T20:32:01Z

build-common/NHibernate.props

@@ -13,7 +13,7 @@
    <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;netcoreapp2.1</NhAppTargetFrameworks>


In order to run tests in VS 2022, the NUnit test adapter has to be updated to its fourth version at least. But this version does no more support the netcoreapp2.0 target, and requires at least netcoreapp2.1.

May we have better to directly target net6.0 for our tests?

I think 2.1 should be enough.

fredericDelaporte · 2022-03-13T20:34:16Z

src/AsyncGenerator.yml

@@ -183,7 +183,7 @@
    scanForMissingAsyncMembers:
    - all: true
 - filePath: NHibernate.Test/NHibernate.Test.csproj
-  targetFramework: netcoreapp2.0
+  targetFramework: netcoreapp2.1


I have upgraded only the test project. Unfortunately, it seems the async generator does not support generating a project for core 2.1 which depends on core 2.0 libs : it tries to compile the 2.0 libs as 2.1 libs.
@maca88

A workaround would be to add a core 2.1 target to the NHibernate libs too, but just for being able able to runs tests in VS2022, it sounds overkill to me.

Unfortunately, it seems the async generator does not support generating a project for core 2.1 which depends on core 2.0 libs : it tries to compile the 2.0 libs as 2.1 libs.

I do apologize as I didn't saw this earlier. Unfortunately, I didn't found a workaround yet that would not require to add netcoreapp2.1 to other projects.

A workaround would be to add a core 2.1 target to the NHibernate libs too

Another workaround would be to use netcoreapp3.1 for the test project which works fine as opposed to netcoreapp2.1.

No apologies are required! We are all contributors on our free time, no one is supposed to have any "SLA" with short response time, ...

Thanks for your investigation. So, you say it work well to generate async code for a project targeting 3.1 and referencing a project targeting 2.0?

That would be better than my current workaround, targeting both 2.0 and 2.1 in the test project and generating async for 2.0. @hazzik, are you agree?

So you say it work well to generate async code for a project targeting 3.1 and referencing project targeting 2.0?

That is correct, here you can find the changes that I used to test 3.1.

fredericDelaporte · 2022-03-13T20:37:43Z

src/NHibernate/Collection/Generic/SetHelpers/SetSnapShot.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-#if NETCOREAPP2_0
+#if NETCOREAPP2_0 || NETCOREAPP2_1


This file is directly included as source in the test project too. So here we need to handle core 2.0 and 2.1 compilation.

build-common/NHibernate.props

src/NHibernate.Test/Async/Linq/LinqQuerySamples.cs

src/NHibernate.Test/Linq/WhereTests.cs

fix nhibernate#3035

src/NHibernate/Collection/Generic/SetHelpers/SetSnapShot.cs

src/NHibernate.TestDatabaseSetup/Program.cs

hazzik · 2022-03-27T23:59:33Z

src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj

  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
-    <PackageReference Include="NUnitLite" Version="3.12.0" />
+  <ItemGroup Condition="$(NhNetFx)">


This and 2 following groups are confusing, I'm not sure I understand the intention.

netcoreapp2.0 cannot compile with a reference to NUnit3TestAdapter. So it has to be referenced only for netFx and 2.1.

Maybe I should not mix $(NhNetCoreApp) references (for both 2.0 and 2.1) and explicit 2.1 references, for easing understanding what is done.

Or even maybe I could just drop the NUniteLite reference for 2.0 too, I have not checked.

I cannot remove NUniteLite reference for netcoreap2.0, or else I would have to use a NETCOREAPP2_1 only condition in test program files, instead of using the NETCOREAPP2_0_OR_GREATER condition already in master.

So I have changed for using explicit target framework references for netcore, which duplicates quite a few references for the main test project.

src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj

fredericDelaporte added c: Tests p: Minor t: Tests labels Mar 13, 2022

fredericDelaporte added this to the 5.3.12 milestone Mar 13, 2022

fredericDelaporte added a commit to fredericDelaporte/nhibernate-core that referenced this pull request Mar 13, 2022

Supports tests in VS 2022

276feb4

fix nhibernate#3035

fredericDelaporte force-pushed the support-vs2022 branch from fc533ea to 276feb4 Compare March 13, 2022 20:35

fredericDelaporte commented Mar 13, 2022

View reviewed changes

fredericDelaporte changed the title ~~WIP - Supports tests in VS 2022~~ Supports tests in VS 2022 Mar 26, 2022

fredericDelaporte commented Mar 26, 2022

View reviewed changes

build-common/NHibernate.props Show resolved Hide resolved

src/NHibernate.Test/Async/Linq/LinqQuerySamples.cs Outdated Show resolved Hide resolved

src/NHibernate.Test/Linq/WhereTests.cs Outdated Show resolved Hide resolved

fredericDelaporte added 2 commits March 27, 2022 12:12

Supports tests in VS 2022

a28a395

fix nhibernate#3035

Fix async generation

8176ac8

fredericDelaporte force-pushed the support-vs2022 branch from 3b6ac4c to 8176ac8 Compare March 27, 2022 10:12

fredericDelaporte added 2 commits March 27, 2022 22:41

Simplify conditional statements in tests

1ecf4d1

Upgrade async generator and regenerate

9f9b0c3

hazzik reviewed Mar 27, 2022

View reviewed changes

src/NHibernate/Collection/Generic/SetHelpers/SetSnapShot.cs Outdated Show resolved Hide resolved

hazzik reviewed Mar 27, 2022

View reviewed changes

src/NHibernate.TestDatabaseSetup/Program.cs Outdated Show resolved Hide resolved

hazzik reviewed Mar 27, 2022

View reviewed changes

hazzik reviewed Mar 28, 2022

View reviewed changes

src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj Outdated Show resolved Hide resolved

fredericDelaporte added 4 commits April 3, 2022 12:41

Switch to NETCOREAPP2_0_OR_GREATER

820aca1

Avoid mixing condition types for references

76176c2

Downgrade test adapter to master version

93e44fd

Adjust a spacing discrepancy

19cf016

hazzik approved these changes Apr 7, 2022

View reviewed changes

fredericDelaporte merged commit b116a3f into nhibernate:5.3.x Apr 8, 2022

fredericDelaporte deleted the support-vs2022 branch April 8, 2022 21:51

fredericDelaporte added the r: Fixed label Apr 17, 2022

fredericDelaporte changed the title ~~Supports tests in VS 2022~~ Support tests in VS 2022 Apr 19, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support tests in VS 2022 #3035

Support tests in VS 2022 #3035

fredericDelaporte commented Mar 13, 2022 •

edited

Loading

fredericDelaporte Mar 13, 2022 •

edited

Loading

hazzik Mar 13, 2022

fredericDelaporte Mar 13, 2022 •

edited

Loading

maca88 Mar 27, 2022

fredericDelaporte Mar 27, 2022 •

edited

Loading

maca88 Mar 27, 2022

fredericDelaporte Mar 13, 2022

hazzik Mar 27, 2022

fredericDelaporte Mar 29, 2022

fredericDelaporte Apr 3, 2022 •

edited

Loading

Support tests in VS 2022 #3035

Support tests in VS 2022 #3035

Conversation

fredericDelaporte commented Mar 13, 2022 • edited Loading

fredericDelaporte Mar 13, 2022 • edited Loading

Choose a reason for hiding this comment

hazzik Mar 13, 2022

Choose a reason for hiding this comment

fredericDelaporte Mar 13, 2022 • edited Loading

Choose a reason for hiding this comment

maca88 Mar 27, 2022

Choose a reason for hiding this comment

fredericDelaporte Mar 27, 2022 • edited Loading

Choose a reason for hiding this comment

maca88 Mar 27, 2022

Choose a reason for hiding this comment

fredericDelaporte Mar 13, 2022

Choose a reason for hiding this comment

hazzik Mar 27, 2022

Choose a reason for hiding this comment

fredericDelaporte Mar 29, 2022

Choose a reason for hiding this comment

fredericDelaporte Apr 3, 2022 • edited Loading

Choose a reason for hiding this comment

fredericDelaporte commented Mar 13, 2022 •

edited

Loading

fredericDelaporte Mar 13, 2022 •

edited

Loading

fredericDelaporte Mar 13, 2022 •

edited

Loading

fredericDelaporte Mar 27, 2022 •

edited

Loading

fredericDelaporte Apr 3, 2022 •

edited

Loading