From 11d50b9ad8bd2e962597ef8faf509e8f5dece7a4 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 14 Mar 2025 09:45:43 +1000 Subject: [PATCH 1/9] Run tests using .NET 10 --- ShowBuildMenu.sh | 4 ++-- Tools/BuildTool/BuildTool.csproj | 2 +- appveyor.yml | 4 ++++ build-common/NHibernate.props | 6 +++--- global.json | 2 +- psake.ps1 | 2 +- src/AsyncGenerator.yml | 2 +- .../NHibernate.Test.VisualBasic.vbproj | 6 +++--- src/NHibernate.Test/NHibernate.Test.csproj | 6 +++--- .../NHibernate.TestDatabaseSetup.csproj | 4 ++-- src/NHibernate.sln.DotSettings | 4 ++++ src/NHibernate/NHibernate.csproj | 2 +- 12 files changed, 26 insertions(+), 18 deletions(-) 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 e497e3469dc..504e1bd5eab 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 c2676d0cd85..8dd09e692d3 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;net10.0 2.0.3 false true @@ -24,7 +24,7 @@ NETFX,$(DefineConstants) $(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..58db997b113 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", + "version": "10.0.100-preview.1.25120.13", "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..d379f44b93b 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 - + @@ -30,7 +30,7 @@ - + diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj index 5bae7bee13b..0681ef1eb63 100644 --- a/src/NHibernate.Test/NHibernate.Test.csproj +++ b/src/NHibernate.Test/NHibernate.Test.csproj @@ -8,7 +8,7 @@ true true - + Exe false @@ -39,7 +39,7 @@ PreserveNewest - + @@ -87,7 +87,7 @@ - + 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.sln.DotSettings b/src/NHibernate.sln.DotSettings index d78384192e9..b77ef433c2a 100644 --- a/src/NHibernate.sln.DotSettings +++ b/src/NHibernate.sln.DotSettings @@ -21,6 +21,9 @@ <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> <Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /> <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy><Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static readonly fields (private)"><ElementKinds><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /></Policy> + <Policy><Descriptor Staticness="Any" AccessRightKinds="Private" Description="Constant fields (private)"><ElementKinds><Kind Name="CONSTANT_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="aaBb" /></Policy> + <Policy><Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"><ElementKinds><Kind Name="FIELD" /><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="_" Suffix="" Style="aaBb" /></Policy> True True True @@ -29,6 +32,7 @@ True True True + True True True True diff --git a/src/NHibernate/NHibernate.csproj b/src/NHibernate/NHibernate.csproj index e38db30c036..d79cc613dd0 100644 --- a/src/NHibernate/NHibernate.csproj +++ b/src/NHibernate/NHibernate.csproj @@ -53,7 +53,7 @@ - + From aca720cf36e06fe675ee916701e091059ae40684 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 14 Mar 2025 09:47:40 +1000 Subject: [PATCH 2/9] Add back .NET 8 --- build-common/NHibernate.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-common/NHibernate.props b/build-common/NHibernate.props index 8dd09e692d3..dc89da4f2e0 100644 --- a/build-common/NHibernate.props +++ b/build-common/NHibernate.props @@ -15,7 +15,7 @@ $(VersionPrefix).0 net48;net10.0 - net461;net48;netcoreapp2.0;netstandard2.0;netstandard2.1;net6.0;net10.0 + net461;net48;netcoreapp2.0;netstandard2.0;netstandard2.1;net6.0;net8.0;net10.0 2.0.3 false true From d895744a38e053eb763f8fac455d6d0524cbe0e6 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 14 Mar 2025 09:49:48 +1000 Subject: [PATCH 3/9] Change NET version to 10 in workflows --- .github/workflows/GenerateAsyncCode.yml | 2 +- .github/workflows/NetCoreTests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/GenerateAsyncCode.yml b/.github/workflows/GenerateAsyncCode.yml index 38b0c0442de..d15802e5732 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 093c1e99534..246f8cbff96 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@v4 From 091a6986316be6b0e4e2f95515b874faf3bfac28 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 14 Mar 2025 09:52:39 +1000 Subject: [PATCH 4/9] Add back condition for NET 8 --- build-common/NHibernate.props | 1 + 1 file changed, 1 insertion(+) diff --git a/build-common/NHibernate.props b/build-common/NHibernate.props index dc89da4f2e0..4c83f6446b8 100644 --- a/build-common/NHibernate.props +++ b/build-common/NHibernate.props @@ -24,6 +24,7 @@ NETFX,$(DefineConstants) $(NoWarn);NU1903 $(NoWarn);SYSLIB0011 + $(NoWarn);SYSLIB0011;SYSLIB0050;SYSLIB0051 $(NoWarn);SYSLIB0011;SYSLIB0050;SYSLIB0051 NHibernate From 45b99bee6e2bc3aceb17adc2bfa279dbb8333944 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 14 Mar 2025 10:08:59 +1000 Subject: [PATCH 5/9] Add missing dependency --- src/NHibernate/NHibernate.csproj | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/NHibernate/NHibernate.csproj b/src/NHibernate/NHibernate.csproj index d79cc613dd0..95f25bafc26 100644 --- a/src/NHibernate/NHibernate.csproj +++ b/src/NHibernate/NHibernate.csproj @@ -53,10 +53,14 @@ - + + + + + From 34f77de95408469b0d23a27b7f8eaaed0c23a81c Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 14 Mar 2025 10:12:49 +1000 Subject: [PATCH 6/9] Update dependencies --- .../NHibernate.Test.VisualBasic.vbproj | 2 +- src/NHibernate.Test/NHibernate.Test.csproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj b/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj index d379f44b93b..8673348f6c2 100644 --- a/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj +++ b/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj @@ -25,7 +25,7 @@ - + diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj index 0df742c3783..8eda1f8b944 100644 --- a/src/NHibernate.Test/NHibernate.Test.csproj +++ b/src/NHibernate.Test/NHibernate.Test.csproj @@ -73,7 +73,7 @@ - + @@ -88,7 +88,7 @@ - + From 2abe5e759c4ee32b90710fdcc1f4072034dde331 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 14 Mar 2025 12:16:49 +1000 Subject: [PATCH 7/9] Remove unnecessary dependency --- src/NHibernate.Test/NHibernate.Test.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj index 8eda1f8b944..ece32fc1c11 100644 --- a/src/NHibernate.Test/NHibernate.Test.csproj +++ b/src/NHibernate.Test/NHibernate.Test.csproj @@ -94,7 +94,6 @@ - From 14350207ffe95cb806ce301cf4d6306af9c5c6e0 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 14 Mar 2025 12:17:45 +1000 Subject: [PATCH 8/9] Remove unnecessary dependency --- .../NHibernate.Test.VisualBasic.vbproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj b/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj index 8673348f6c2..d05f1a030a8 100644 --- a/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj +++ b/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj @@ -26,7 +26,6 @@ - From 57a70112c2d89c6394a0d066b7d39330caea1740 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 14 Mar 2025 22:29:25 +1000 Subject: [PATCH 9/9] Re-enable binary formatters --- src/NHibernate.Test/NHibernate.Test.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj index ece32fc1c11..fd10fb4eb06 100644 --- a/src/NHibernate.Test/NHibernate.Test.csproj +++ b/src/NHibernate.Test/NHibernate.Test.csproj @@ -90,10 +90,11 @@ + + -