Skip to content

Commit 8ee79a1

Browse files
hazzikhazzik
committed
Run tests using .NET 10
1 parent 278d482 commit 8ee79a1

File tree

12 files changed

+25
-23
lines changed

12 files changed

+25
-23
lines changed

‎ShowBuildMenu.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ testSetupMenu() {
172172
}
173173

174174
testRun(){
175-
dotnet test ./src/NHibernate.Test/NHibernate.Test.csproj -f net8.0
176-
dotnet test ./src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj -f net8.0
175+
dotnet test ./src/NHibernate.Test/NHibernate.Test.csproj -f net10.0
176+
dotnet test ./src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj -f net10.0
177177
mainMenu
178178
}
179179

‎Tools/BuildTool/BuildTool.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
</PropertyGroup>
66
</Project>

‎appveyor.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ environment:
1414
init:
1515
# Required for having windows endlines in sources zip
1616
- git config --global core.autocrlf true
17+
- ps: |
18+
Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -UseBasicParsing -OutFile "$env:temp\dotnet-install.ps1"
19+
& $env:temp\dotnet-install.ps1 -Channel 10.0 -Quality preview -InstallDir "$env:ProgramFiles\dotnet"
20+
1721
build: off
1822
before_test:
1923
- ps: |-

‎build-common/NHibernate.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<FileVersion Condition="'$(VersionSuffix)' != '' AND '$(BuildNumber)' != ''">$(VersionPrefix).$(BuildNumber)</FileVersion>
1515
<FileVersion Condition="'$(FileVersion)' == ''">$(VersionPrefix).0</FileVersion>
1616

17-
<NhAppTargetFrameworks Condition ="$(NhAppTargetFrameworks) == ''">net48;net8.0</NhAppTargetFrameworks>
18-
<NhLibTargetFrameworks Condition ="$(NhLibTargetFrameworks) == ''">net461;net48;netcoreapp2.0;netstandard2.0;netstandard2.1;net6.0;net8.0</NhLibTargetFrameworks>
17+
<NhAppTargetFrameworks Condition ="$(NhAppTargetFrameworks) == ''">net48;net10.0</NhAppTargetFrameworks>
18+
<NhLibTargetFrameworks Condition ="$(NhLibTargetFrameworks) == ''">net461;net48;netcoreapp2.0;netstandard2.0;netstandard2.1;net6.0;net10.0</NhLibTargetFrameworks>
1919
<RuntimeFrameworkVersion Condition="'$(TargetFramework)' == 'netcoreapp2.0'">2.0.3</RuntimeFrameworkVersion>
2020
<NhNetFx>false</NhNetFx>
2121
<NhNetFx Condition="$(TargetFramework.StartsWith('net4'))">true</NhNetFx>
@@ -24,7 +24,7 @@
2424
<DefineConstants Condition="$(NhNetFx) AND '$(MSBuildProjectExtension)' == '.vbproj'">NETFX,$(DefineConstants)</DefineConstants>
2525
<NoWarn>$(NoWarn);NU1903</NoWarn>
2626
<NoWarn Condition="'$(TargetFramework)' == 'net6.0'">$(NoWarn);SYSLIB0011</NoWarn>
27-
<NoWarn Condition="'$(TargetFramework)' == 'net8.0'">$(NoWarn);SYSLIB0011;SYSLIB0050;SYSLIB0051</NoWarn>
27+
<NoWarn Condition="'$(TargetFramework)' == 'net10.0'">$(NoWarn);SYSLIB0011;SYSLIB0050;SYSLIB0051</NoWarn>
2828

2929
<Product>NHibernate</Product>
3030
<Company>NHibernate.info</Company>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.100",
3+
"version": "10.0.100-preview.1.25120.13",
44
"rollForward": "latestFeature"
55
}
66
}

‎psake.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ Task Test -depends Build {
132132
'NHibernate.Test',
133133
'NHibernate.Test.VisualBasic'
134134
) | ForEach-Object {
135-
$assembly = [IO.Path]::Combine("src", $_, "bin", "Release", "net8.0", "$_.dll")
135+
$assembly = [IO.Path]::Combine("src", $_, "bin", "Release", "net10.0", "$_.dll")
136136
Exec {
137137
dotnet $assembly --labels=before --nocolor "--result=$_-TestResult.xml"
138138
}

‎src/AsyncGenerator.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
scanForMissingAsyncMembers:
188188
- all: true
189189
- filePath: NHibernate.Test/NHibernate.Test.csproj
190-
targetFramework: net8.0
190+
targetFramework: net10.0
191191
concurrentRun: true
192192
applyChanges: true
193193
suppressDiagnosticFailures:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
<OptionExplicit>On</OptionExplicit>
99
<OptionStrict>On</OptionStrict>
1010
</PropertyGroup>
11-
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
11+
<PropertyGroup Condition="'$(TargetFramework)' == 'net10.0'">
1212
<OutputType>Exe</OutputType>
1313
<GenerateProgramFile>false</GenerateProgramFile>
1414
</PropertyGroup>
1515
<ItemGroup>
1616
<None Remove="**\*.hbm.xml" />
1717
</ItemGroup>
18-
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
18+
<ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
1919
<Compile Remove="**\Issues\NH3302\**" />
2020
</ItemGroup>
2121
<ItemGroup>
@@ -29,7 +29,7 @@
2929
<PackageReference Include="NUnit" Version="3.14.0" />
3030
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
3131
</ItemGroup>
32-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
32+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
3333
<PackageReference Include="NUnitLite" Version="3.14.0" />
3434
</ItemGroup>
3535
<ItemGroup>

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@
77
<NoWarn>$(NoWarn);3001;3002;3003;3005;8981;SYSLIB0003;SYSLIB0012</NoWarn>
88
<ContentSQLiteInteropFiles>true</ContentSQLiteInteropFiles>
99
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
10-
</PropertyGroup>
11-
<PropertyGroup>
1210
<SignAssembly>true</SignAssembly>
1311
<AssemblyOriginatorKeyFile>..\NHibernate.snk</AssemblyOriginatorKeyFile>
1412
</PropertyGroup>
15-
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
13+
<PropertyGroup Condition="'$(TargetFramework)' == 'net10.0'">
1614
<OutputType>Exe</OutputType>
1715
<GenerateProgramFile>false</GenerateProgramFile>
1816
</PropertyGroup>
@@ -43,7 +41,7 @@
4341
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
4442
</Content>
4543
</ItemGroup>
46-
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
44+
<ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
4745
<Compile Remove="**\CfgTest\DefaultNsAssmFixture.cs" />
4846
<Compile Remove="**\CfgTest\HbmOrderingFixture.cs" />
4947
<Compile Remove="**\DynamicProxyTests\PeVerifyFixture.cs" />
@@ -86,7 +84,7 @@
8684
<PackageReference Include="Microsoft.SqlServer.Compact" Version="4.0.8876.1" />
8785
<PackageReference Include="Oracle.ManagedDataAccess" Version="21.14.0" />
8886
</ItemGroup>
89-
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
87+
<ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
9088
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" />
9189
<PackageReference Include="System.CodeDom" Version="4.7.0" />
9290
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<IsTestProject>true</IsTestProject>
88
<NoWarn>$(NoWarn);3001;3002;3003;3005</NoWarn>
99
</PropertyGroup>
10-
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
10+
<PropertyGroup Condition="'$(TargetFramework)' == 'net10.0'">
1111
<OutputType>Exe</OutputType>
1212
<GenerateProgramFile>false</GenerateProgramFile>
1313
</PropertyGroup>
@@ -18,7 +18,7 @@
1818
<PackageReference Include="NUnit" Version="3.14.0" />
1919
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
2020
</ItemGroup>
21-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
21+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
2222
<PackageReference Include="NUnitLite" Version="3.14.0" />
2323
</ItemGroup>
2424
<ItemGroup>

0 commit comments

Comments
 (0)