diff --git a/.github/workflows/GenerateAsyncCode.yml b/.github/workflows/GenerateAsyncCode.yml
index f8087f5348b..ebf876f679b 100644
--- a/.github/workflows/GenerateAsyncCode.yml
+++ b/.github/workflows/GenerateAsyncCode.yml
@@ -21,7 +21,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
- dotnet-version: 8.0.x
+ dotnet-version: 10.0.x
- name: Generate Async code
run: |
diff --git a/.github/workflows/NetCoreTests.yml b/.github/workflows/NetCoreTests.yml
index 3a7bd42c149..9d9ac4db26e 100644
--- a/.github/workflows/NetCoreTests.yml
+++ b/.github/workflows/NetCoreTests.yml
@@ -66,7 +66,7 @@ jobs:
- name: Set up .NET
uses: actions/setup-dotnet@v4
with:
- dotnet-version: 8.0.x
+ dotnet-version: 10.0.x
- name: Checkout
uses: actions/checkout@v5
diff --git a/ShowBuildMenu.sh b/ShowBuildMenu.sh
index 67d44f121dd..878e4dbe6a0 100755
--- a/ShowBuildMenu.sh
+++ b/ShowBuildMenu.sh
@@ -172,8 +172,8 @@ testSetupMenu() {
}
testRun(){
- dotnet test ./src/NHibernate.Test/NHibernate.Test.csproj -f net8.0
- dotnet test ./src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj -f net8.0
+ dotnet test ./src/NHibernate.Test/NHibernate.Test.csproj -f net10.0
+ dotnet test ./src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj -f net10.0
mainMenu
}
diff --git a/Tools/BuildTool/BuildTool.csproj b/Tools/BuildTool/BuildTool.csproj
index b3587f9d5a3..8af316fd826 100644
--- a/Tools/BuildTool/BuildTool.csproj
+++ b/Tools/BuildTool/BuildTool.csproj
@@ -1,6 +1,6 @@
Exe
- net8.0
+ net10.0
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
index 9a26700c4cb..eab0f6dc89f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,6 +13,10 @@ environment:
init:
# Required for having windows endlines in sources zip
- git config --global core.autocrlf true
+ - ps: |
+ Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -UseBasicParsing -OutFile "$env:temp\dotnet-install.ps1"
+ & $env:temp\dotnet-install.ps1 -Channel 10.0 -Quality preview -InstallDir "$env:ProgramFiles\dotnet"
+
build: off
before_test:
- ps: |-
diff --git a/build-common/NHibernate.props b/build-common/NHibernate.props
index 09d85864c70..24db9780e64 100644
--- a/build-common/NHibernate.props
+++ b/build-common/NHibernate.props
@@ -14,8 +14,8 @@
$(VersionPrefix).$(BuildNumber)
$(VersionPrefix).0
- net48;net8.0
- net461;net48;netcoreapp2.0;netstandard2.0;netstandard2.1;net6.0;net8.0
+ net48;net10.0
+ net461;net48;netcoreapp2.0;netstandard2.0;netstandard2.1;net6.0;net8.0;net10.0
2.0.3
false
true
@@ -25,6 +25,7 @@
$(NoWarn);NU1903
$(NoWarn);SYSLIB0011
$(NoWarn);SYSLIB0011;SYSLIB0050;SYSLIB0051
+ $(NoWarn);SYSLIB0011;SYSLIB0050;SYSLIB0051
NHibernate
NHibernate.info
diff --git a/global.json b/global.json
index 391ba3c2a30..c5c8033dc48 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "8.0.100",
+ "version": "10.0.100-preview.7.25380.108",
"rollForward": "latestFeature"
}
}
diff --git a/psake.ps1 b/psake.ps1
index 0eb342b2875..9b42210e404 100644
--- a/psake.ps1
+++ b/psake.ps1
@@ -132,7 +132,7 @@ Task Test -depends Build {
'NHibernate.Test',
'NHibernate.Test.VisualBasic'
) | ForEach-Object {
- $assembly = [IO.Path]::Combine("src", $_, "bin", "Release", "net8.0", "$_.dll")
+ $assembly = [IO.Path]::Combine("src", $_, "bin", "Release", "net10.0", "$_.dll")
Exec {
dotnet $assembly --labels=before --nocolor "--result=$_-TestResult.xml"
}
diff --git a/src/AsyncGenerator.yml b/src/AsyncGenerator.yml
index 9c5f0a43404..9e8a423a26c 100644
--- a/src/AsyncGenerator.yml
+++ b/src/AsyncGenerator.yml
@@ -187,7 +187,7 @@
scanForMissingAsyncMembers:
- all: true
- filePath: NHibernate.Test/NHibernate.Test.csproj
- targetFramework: net8.0
+ targetFramework: net10.0
concurrentRun: true
applyChanges: true
suppressDiagnosticFailures:
diff --git a/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj b/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj
index 5ea684f06b2..d05f1a030a8 100644
--- a/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj
+++ b/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj
@@ -8,14 +8,14 @@
On
On
-
+
Exe
false
-
+
@@ -25,12 +25,11 @@
-
-
+
-
+
diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj
index 847687acb95..7973b371a66 100644
--- a/src/NHibernate.Test/NHibernate.Test.csproj
+++ b/src/NHibernate.Test/NHibernate.Test.csproj
@@ -7,12 +7,10 @@
$(NoWarn);3001;3002;3003;3005;8981;SYSLIB0003;SYSLIB0012
true
true
-
-
true
..\NHibernate.snk
-
+
Exe
false
@@ -43,7 +41,7 @@
PreserveNewest
-
+
@@ -65,7 +63,7 @@
-
+
@@ -79,16 +77,16 @@
-
-
+
+
+
compile
+
-
-
diff --git a/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj b/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj
index f9a3cb308a7..d2ca537210e 100644
--- a/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj
+++ b/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj
@@ -7,7 +7,7 @@
true
$(NoWarn);3001;3002;3003;3005
-
+
Exe
false
@@ -18,7 +18,7 @@
-
+
diff --git a/src/NHibernate/NHibernate.csproj b/src/NHibernate/NHibernate.csproj
index e1d9b685f93..112468241a0 100644
--- a/src/NHibernate/NHibernate.csproj
+++ b/src/NHibernate/NHibernate.csproj
@@ -57,6 +57,10 @@
+
+
+
+