Skip to content

Commit b116a3f

Browse files
fredericDelaportefredericDelaporte
authored
Supports tests in VS 2022 (#3035)
fix #3035
1 parent 2344bd8 commit b116a3f

File tree

13 files changed

+55
-30
lines changed

13 files changed

+55
-30
lines changed

‎Tools/packages.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="CSharpAsyncGenerator.CommandLine" Version="0.18.3" />
14+
<PackageReference Include="CSharpAsyncGenerator.CommandLine" Version="0.18.4" />
1515
<PackageReference Include="vswhere" Version="2.1.4" />
1616
<PackageReference Include="NUnit.Console" Version="3.10.0" />
1717
<PackageReference Include="GitReleaseManager" Version="0.11.0" />

‎build-common/NHibernate.props

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,14 @@
1313
<FileVersion Condition="'$(VersionSuffix)' != '' AND '$(BuildNumber)' != ''">$(VersionPrefix).$(BuildNumber)</FileVersion>
1414
<FileVersion Condition="'$(FileVersion)' == ''">$(VersionPrefix).0</FileVersion>
1515

16-
<NhAppTargetFrameworks Condition ="$(NhAppTargetFrameworks) == ''">net461;netcoreapp2.0</NhAppTargetFrameworks>
16+
<NhAppTargetFrameworks Condition ="$(NhAppTargetFrameworks) == ''">net461;netcoreapp2.0;netcoreapp2.1</NhAppTargetFrameworks>
1717
<NhLibTargetFrameworks Condition ="$(NhLibTargetFrameworks) == ''">net461;netcoreapp2.0;netstandard2.0</NhLibTargetFrameworks>
1818
<NhNetFx>false</NhNetFx>
1919
<NhNetFx Condition="$(TargetFramework.StartsWith('net4'))">true</NhNetFx>
2020
<DefineConstants Condition="$(NhNetFx) AND $(NhVbNet) == ''" >NETFX;$(DefineConstants)</DefineConstants>
21+
<NhNetCoreApp>false</NhNetCoreApp>
22+
<NhNetCoreApp Condition="$(TargetFramework.StartsWith('netcoreapp'))">true</NhNetCoreApp>
23+
<DefineConstants Condition="$(NhNetCoreApp) AND $(NhVbNet) == ''" >NETCOREAPP2_0_OR_GREATER;$(DefineConstants)</DefineConstants>
2124

2225
<Product>NHibernate</Product>
2326
<Company>NHibernate.info</Company>

‎psake.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ Task Test -depends Build {
108108
'NHibernate.Test',
109109
'NHibernate.Test.VisualBasic'
110110
) | ForEach-Object {
111-
$assembly = [IO.Path]::Combine("src", $_, "bin", "Release", "netcoreapp2.0", "$_.dll")
111+
$assembly = [IO.Path]::Combine("src", $_, "bin", "Release", "netcoreapp2.1", "$_.dll")
112112
Exec {
113113
dotnet $assembly --labels=before --nocolor "--result=$_-TestResult.xml"
114114
}

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<OptionExplicit>On</OptionExplicit>
1212
<OptionStrict>On</OptionStrict>
1313
</PropertyGroup>
14-
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
15-
<DefineConstants>NETCOREAPP2_0,$(DefineConstants)</DefineConstants>
14+
<PropertyGroup Condition="$(NhNetCoreApp)">
15+
<DefineConstants>NETCOREAPP2_0_OR_GREATER,$(DefineConstants)</DefineConstants>
1616
<OutputType>Exe</OutputType>
1717
<GenerateProgramFile>false</GenerateProgramFile>
1818
</PropertyGroup>
@@ -22,7 +22,7 @@
2222
<ItemGroup>
2323
<None Remove="**\*.hbm.xml" />
2424
</ItemGroup>
25-
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.0'">
25+
<ItemGroup Condition="$(NhNetCoreApp)">
2626
<Compile Remove="**\Issues\NH3302\**" />
2727
</ItemGroup>
2828
<ItemGroup>
@@ -34,11 +34,17 @@
3434
<ItemGroup>
3535
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
3636
<PackageReference Include="Microsoft.VisualBasic" Version="10.2.0" />
37-
<PackageReference Include="NUnit" Version="3.12.0" />
38-
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
37+
<PackageReference Include="NUnit" Version="3.13.2" />
38+
</ItemGroup>
39+
<ItemGroup Condition="$(NhNetFx)">
40+
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
3941
</ItemGroup>
4042
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
41-
<PackageReference Include="NUnitLite" Version="3.12.0" />
43+
<PackageReference Include="NUnitLite" Version="3.13.2" />
44+
</ItemGroup>
45+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
46+
<PackageReference Include="NUnitLite" Version="3.13.2" />
47+
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
4248
</ItemGroup>
4349
<ItemGroup>
4450
<ProjectReference Include="..\NHibernate\NHibernate.csproj" />

‎src/NHibernate.Test.VisualBasic/Program.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#If NETCOREAPP2_0
1+
#If NETCOREAPP2_0_OR_GREATER
22
Public Class Program
33
Public Shared Function Main(args As String()) As Integer
44
Return New NUnitLite.AutoRun(GetType(Program).Assembly).Execute(args)
55
End Function
66
End Class
7-
#End If
7+
#End If

‎src/NHibernate.Test/Async/Linq/WhereTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ public void StringComparisonParamEmitsWarningAsync()
444444
await (AssertStringComparisonWarningAsync(x => x.CustomerId.EndsWith("ANATR", StringComparison.Ordinal), 1));
445445
await (AssertStringComparisonWarningAsync(x => x.CustomerId.IndexOf("ANATR", StringComparison.Ordinal) == 0, 1));
446446
await (AssertStringComparisonWarningAsync(x => x.CustomerId.IndexOf("ANATR", 0, StringComparison.Ordinal) == 0, 1));
447-
#if NETCOREAPP2_0
447+
#if NETCOREAPP2_0_OR_GREATER
448448
await (AssertStringComparisonWarningAsync(x => x.CustomerId.Replace("AN", "XX", StringComparison.Ordinal) == "XXATR", 1));
449449
#endif
450450
});

‎src/NHibernate.Test/Linq/MathFTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if NETCOREAPP2_0
1+
#if NETCOREAPP2_0_OR_GREATER
22
using System;
33
using System.Linq;
44
using System.Linq.Expressions;

‎src/NHibernate.Test/Linq/WhereTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ public void StringComparisonParamEmitsWarning()
432432
AssertStringComparisonWarning(x => x.CustomerId.EndsWith("ANATR", StringComparison.Ordinal), 1);
433433
AssertStringComparisonWarning(x => x.CustomerId.IndexOf("ANATR", StringComparison.Ordinal) == 0, 1);
434434
AssertStringComparisonWarning(x => x.CustomerId.IndexOf("ANATR", 0, StringComparison.Ordinal) == 0, 1);
435-
#if NETCOREAPP2_0
435+
#if NETCOREAPP2_0_OR_GREATER
436436
AssertStringComparisonWarning(x => x.CustomerId.Replace("AN", "XX", StringComparison.Ordinal) == "XXATR", 1);
437437
#endif
438438
});

‎src/NHibernate.Test/NHibernate.Test.csproj

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<NoWarn>$(NoWarn);3001;3002;3003;3005</NoWarn>
88
<ContentSQLiteInteropFiles>true</ContentSQLiteInteropFiles>
99
</PropertyGroup>
10-
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
10+
<PropertyGroup Condition="$(NhNetCoreApp)">
1111
<OutputType>Exe</OutputType>
1212
<GenerateProgramFile>false</GenerateProgramFile>
1313
</PropertyGroup>
@@ -35,7 +35,7 @@
3535
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
3636
</Content>
3737
</ItemGroup>
38-
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.0'">
38+
<ItemGroup Condition="$(NhNetCoreApp)">
3939
<Compile Remove="**\CfgTest\DefaultNsAssmFixture.cs" />
4040
<Compile Remove="**\CfgTest\HbmOrderingFixture.cs" />
4141
<Compile Remove="**\DynamicProxyTests\PeVerifyFixture.cs" />
@@ -60,8 +60,7 @@
6060
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.109.2" />
6161
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.8.11" />
6262
<PackageReference Include="NSubstitute" Version="3.1.0" />
63-
<PackageReference Include="NUnit" Version="3.12.0" />
64-
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
63+
<PackageReference Include="NUnit" Version="3.13.2" />
6564
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
6665
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="6.6.0" />
6766
<PackageReference Include="Npgsql" Version="5.0.11" />
@@ -72,6 +71,7 @@
7271
<Reference Include="System.Transactions" />
7372
<Reference Include="System.Threading.Tasks" />
7473
<Reference Include="System.Data.OracleClient" />
74+
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
7575
<PackageReference Include="Microsoft.SqlServer.Compact" Version="4.0.8876.1" />
7676
<PackageReference Include="Oracle.ManagedDataAccess" Version="12.1.2400" />
7777
<PackageReference Include="MySql.Data" Version="6.9.11" />
@@ -82,8 +82,18 @@
8282
<PackageReference Include="System.Data.OracleClient" Version="1.0.8" />
8383
<PackageReference Include="System.Data.Odbc" Version="4.5.0" />
8484
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
85-
<PackageReference Include="NUnitLite" Version="3.12.0" />
8685
<PackageReference Include="MySql.Data" Version="6.10.6" />
86+
<PackageReference Include="NUnitLite" Version="3.13.2" />
87+
</ItemGroup>
88+
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
89+
<PackageReference Include="System.CodeDom" Version="4.4.0" />
90+
<PackageReference Include="System.Data.SqlClient" Version="4.4.2" />
91+
<PackageReference Include="System.Data.OracleClient" Version="1.0.8" />
92+
<PackageReference Include="System.Data.Odbc" Version="4.5.0" />
93+
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
94+
<PackageReference Include="MySql.Data" Version="6.10.6" />
95+
<PackageReference Include="NUnitLite" Version="3.13.2" />
96+
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
8797
</ItemGroup>
8898
<ItemGroup Condition=" '$(NuGetPackageRoot)' != '' ">
8999
<NativeBinaries Include="$(NuGetPackageRoot)microsoft.sqlserver.compact\4.0.8876.1\NativeBinaries\**\*.*" />

‎src/NHibernate.Test/Program.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if NETCOREAPP2_0
1+
#if NETCOREAPP2_0_OR_GREATER
22
namespace NHibernate.Test
33
{
44
public class Program
@@ -9,4 +9,4 @@ public static int Main(string[] args)
99
}
1010
}
1111
}
12-
#endif
12+
#endif

‎src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,25 @@
77
<IsTestProject>true</IsTestProject>
88
<NoWarn>$(NoWarn);3001;3002;3003;3005</NoWarn>
99
</PropertyGroup>
10-
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
10+
<PropertyGroup Condition="$(NhNetCoreApp)">
1111
<OutputType>Exe</OutputType>
1212
<GenerateProgramFile>false</GenerateProgramFile>
1313
</PropertyGroup>
1414
<ItemGroup>
1515
<ProjectReference Include="..\NHibernate.Test\NHibernate.Test.csproj" />
1616
</ItemGroup>
1717
<ItemGroup>
18-
<PackageReference Include="NUnit" Version="3.12.0" />
19-
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
18+
<PackageReference Include="NUnit" Version="3.13.2" />
2019
</ItemGroup>
21-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
22-
<PackageReference Include="NUnitLite" Version="3.12.0" />
20+
<ItemGroup Condition="$(NhNetFx)">
21+
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
22+
</ItemGroup>
23+
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.0'">
24+
<PackageReference Include="NUnitLite" Version="3.13.2" />
25+
</ItemGroup>
26+
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
27+
<PackageReference Include="NUnitLite" Version="3.13.2" />
28+
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
2329
</ItemGroup>
2430
<ItemGroup>
2531
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />

‎src/NHibernate.TestDatabaseSetup/Program.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if NETCOREAPP2_0
1+
#if NETCOREAPP2_0_OR_GREATER
22
namespace NHibernate.TestDatabaseSetup
33
{
44
public class Program
@@ -9,4 +9,4 @@ public static int Main(string[] args)
99
}
1010
}
1111
}
12-
#endif
12+
#endif

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Collections;
33
using System.Collections.Generic;
4-
#if NETCOREAPP2_0
4+
#if NETCOREAPP2_0_OR_GREATER
55
using System.Runtime.Serialization;
66
using System.Threading;
77
#endif
@@ -132,7 +132,7 @@ void ICollection.CopyTo(Array array, int index)
132132
}
133133
#endif
134134

135-
#if NETCOREAPP2_0
135+
#if NETCOREAPP2_0_OR_GREATER
136136
[Serializable]
137137
internal class SetSnapShot<T> : HashSet<T>, ICollection
138138
{

0 commit comments

Comments
 (0)