From 8ee79a15c844457db063bd09959d7c16d804f70f Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 14 Mar 2025 09:45:43 +1000 Subject: [PATCH 01/19] 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 | 8 +++----- .../NHibernate.TestDatabaseSetup.csproj | 4 ++-- src/NHibernate.sln.DotSettings | 6 +++--- src/NHibernate/NHibernate.csproj | 2 +- 12 files changed, 25 insertions(+), 23 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 6e9b2aa3be3..c26ca5d888f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,6 +14,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 8385e5451f3..2422e79b8bc 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 ff258df5705..bc812502851 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 - + @@ -29,7 +29,7 @@ - + diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj index ff728f12045..218e73d789e 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 - + @@ -86,7 +84,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 99072181f80..b77ef433c2a 100644 --- a/src/NHibernate.sln.DotSettings +++ b/src/NHibernate.sln.DotSettings @@ -21,9 +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" 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" 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" Prefix="_" Suffix="" Style="aaBb" /></Policy> + <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 diff --git a/src/NHibernate/NHibernate.csproj b/src/NHibernate/NHibernate.csproj index e1d9b685f93..23b7895ffaf 100644 --- a/src/NHibernate/NHibernate.csproj +++ b/src/NHibernate/NHibernate.csproj @@ -53,7 +53,7 @@ - + From af1c4ddcf00cce2d7c6e4973df9ba9900456972c Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 14 Mar 2025 09:47:40 +1000 Subject: [PATCH 02/19] 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 2422e79b8bc..81c381dfb9c 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 5a0af719a8585898e82366b6f6688a8e1d744977 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 14 Mar 2025 09:49:48 +1000 Subject: [PATCH 03/19] 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 3cc770f2bbb..869ec1fa153 100644 --- a/.github/workflows/GenerateAsyncCode.yml +++ b/.github/workflows/GenerateAsyncCode.yml @@ -21,7 +21,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v5 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 5440cd919d0..6cdd67f97ff 100644 --- a/.github/workflows/NetCoreTests.yml +++ b/.github/workflows/NetCoreTests.yml @@ -66,7 +66,7 @@ jobs: - name: Set up .NET uses: actions/setup-dotnet@v5 with: - dotnet-version: 8.0.x + dotnet-version: 10.0.x - name: Checkout uses: actions/checkout@v5 From b8b531c6c001123e7b93c7e58780e10a8220ac1e Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 14 Mar 2025 09:52:39 +1000 Subject: [PATCH 04/19] 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 81c381dfb9c..198479bf0c3 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 5d8275af0d094bb6f9e808bfcc537712c1df3151 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 14 Mar 2025 10:08:59 +1000 Subject: [PATCH 05/19] 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 23b7895ffaf..a9599378b16 100644 --- a/src/NHibernate/NHibernate.csproj +++ b/src/NHibernate/NHibernate.csproj @@ -53,10 +53,14 @@ - + + + + + From 23ac5c5cd65f2797a1122ae8529e4a36602b1197 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 14 Mar 2025 10:12:49 +1000 Subject: [PATCH 06/19] 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 bc812502851..d05f1a030a8 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 218e73d789e..aff9610b51f 100644 --- a/src/NHibernate.Test/NHibernate.Test.csproj +++ b/src/NHibernate.Test/NHibernate.Test.csproj @@ -63,7 +63,7 @@ - + @@ -85,7 +85,7 @@ - + From fdc80cd9d99ea87e06b25a118a245e853e1adba1 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 14 Mar 2025 12:16:49 +1000 Subject: [PATCH 07/19] 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 aff9610b51f..918601f8fec 100644 --- a/src/NHibernate.Test/NHibernate.Test.csproj +++ b/src/NHibernate.Test/NHibernate.Test.csproj @@ -93,7 +93,6 @@ - From a13fd894be21574e73ae096966453b4b41eff456 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 14 Mar 2025 22:29:25 +1000 Subject: [PATCH 08/19] 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 918601f8fec..b5830c06246 100644 --- a/src/NHibernate.Test/NHibernate.Test.csproj +++ b/src/NHibernate.Test/NHibernate.Test.csproj @@ -87,12 +87,13 @@ + compile + - From 380f5a623667d736c0a03cb3775b0856fe3bda89 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 22 Aug 2025 10:32:45 +1000 Subject: [PATCH 09/19] Bump to Preview 7 --- global.json | 2 +- src/NHibernate.Test/NHibernate.Test.csproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/global.json b/global.json index 58db997b113..c5c8033dc48 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-preview.1.25120.13", + "version": "10.0.100-preview.7.25380.108", "rollForward": "latestFeature" } } diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj index b5830c06246..4bb5617a22b 100644 --- a/src/NHibernate.Test/NHibernate.Test.csproj +++ b/src/NHibernate.Test/NHibernate.Test.csproj @@ -85,14 +85,14 @@ - + compile - + From 32080cfec92e857db1e7bb01e43866a2ea980037 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 22 Aug 2025 10:40:03 +1000 Subject: [PATCH 10/19] Bump --- src/NHibernate/NHibernate.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NHibernate/NHibernate.csproj b/src/NHibernate/NHibernate.csproj index a9599378b16..112468241a0 100644 --- a/src/NHibernate/NHibernate.csproj +++ b/src/NHibernate/NHibernate.csproj @@ -58,7 +58,7 @@ - + From 0882a743c0fe6a4e11c3f881c452f10a05e96b29 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Tue, 23 Sep 2025 10:44:09 +1000 Subject: [PATCH 11/19] Bump sdk to rc1 --- global.json | 2 +- src/NHibernate.Test/NHibernate.Test.csproj | 2 +- src/NHibernate/NHibernate.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/global.json b/global.json index c5c8033dc48..dfba20f63f1 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-preview.7.25380.108", + "version": "10.0.100-rc.1.25451.107", "rollForward": "latestFeature" } } diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj index 4bb5617a22b..65443cbeb19 100644 --- a/src/NHibernate.Test/NHibernate.Test.csproj +++ b/src/NHibernate.Test/NHibernate.Test.csproj @@ -85,7 +85,7 @@ - + diff --git a/src/NHibernate/NHibernate.csproj b/src/NHibernate/NHibernate.csproj index 112468241a0..accb90b118a 100644 --- a/src/NHibernate/NHibernate.csproj +++ b/src/NHibernate/NHibernate.csproj @@ -58,7 +58,7 @@ - + From 55676cfbed9454cfaa290e28732ddcda66d3f89e Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Wed, 12 Nov 2025 11:19:02 +0000 Subject: [PATCH 12/19] Use release version --- global.json | 2 +- src/NHibernate.Test/NHibernate.Test.csproj | 2 +- src/NHibernate/NHibernate.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/global.json b/global.json index dfba20f63f1..512142d2bea 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-rc.1.25451.107", + "version": "10.0.100", "rollForward": "latestFeature" } } diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj index 65443cbeb19..4565c70afa0 100644 --- a/src/NHibernate.Test/NHibernate.Test.csproj +++ b/src/NHibernate.Test/NHibernate.Test.csproj @@ -85,7 +85,7 @@ - + diff --git a/src/NHibernate/NHibernate.csproj b/src/NHibernate/NHibernate.csproj index accb90b118a..222349e9fbb 100644 --- a/src/NHibernate/NHibernate.csproj +++ b/src/NHibernate/NHibernate.csproj @@ -58,7 +58,7 @@ - + From f53d9bf7271fecdf1764079b85462a97ee324af5 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Wed, 12 Nov 2025 11:20:47 +0000 Subject: [PATCH 13/19] Use System.Runtime.Serialization.Formatters 10 --- src/NHibernate.Test/NHibernate.Test.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj index 4565c70afa0..c4e977dfbc5 100644 --- a/src/NHibernate.Test/NHibernate.Test.csproj +++ b/src/NHibernate.Test/NHibernate.Test.csproj @@ -92,7 +92,7 @@ compile - + From 3e3ec6d3d400d070c86baf018599e9d9746d4b4d Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Wed, 12 Nov 2025 11:21:57 +0000 Subject: [PATCH 14/19] Revert unintended change --- src/NHibernate.sln.DotSettings | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/NHibernate.sln.DotSettings b/src/NHibernate.sln.DotSettings index b77ef433c2a..99072181f80 100644 --- a/src/NHibernate.sln.DotSettings +++ b/src/NHibernate.sln.DotSettings @@ -21,9 +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> + <Policy><Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static readonly fields (private)"><ElementKinds><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" 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" 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" Prefix="_" Suffix="" Style="aaBb" /></Policy> True True True From dfc16b6fe505b32b1677eca79ba6336a1c27e581 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Wed, 12 Nov 2025 11:34:47 +0000 Subject: [PATCH 15/19] Add devcontainer --- .devcontainer/devcontainer.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000000..900336d80dc --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,7 @@ +{ + "name": "C# (.NET)", + "image": "mcr.microsoft.com/devcontainers/dotnet:10.0", + "features": { + "ghcr.io/devcontainers/features/dotnet:2": {} + } +} From c27e0a1ab12d0d85d4358ff6f2f8051c576d312b Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Wed, 12 Nov 2025 11:49:25 +0000 Subject: [PATCH 16/19] Revert "Add devcontainer" This reverts commit dfc16b6fe505b32b1677eca79ba6336a1c27e581. --- .devcontainer/devcontainer.json | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index 900336d80dc..00000000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "C# (.NET)", - "image": "mcr.microsoft.com/devcontainers/dotnet:10.0", - "features": { - "ghcr.io/devcontainers/features/dotnet:2": {} - } -} From 27c7917a048c45d043153bb1a88bcf1856c841c6 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Tue, 23 Sep 2025 10:50:47 +1000 Subject: [PATCH 17/19] Field is a reserved keyword in C# preview version --- src/NHibernate.Test/NHSpecificTest/NH1304/Funny.cs | 4 ++-- src/NHibernate.Test/NHSpecificTest/NH1487/Fixture.cs | 8 ++++---- src/NHibernate/Properties/FieldAccessor.cs | 4 ++-- src/NHibernate/Proxy/DynamicProxy/ProxyImplementor.cs | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/NHibernate.Test/NHSpecificTest/NH1304/Funny.cs b/src/NHibernate.Test/NHSpecificTest/NH1304/Funny.cs index 177d3df86d5..990fd9d6aa8 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1304/Funny.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1304/Funny.cs @@ -29,8 +29,8 @@ public virtual int Id public virtual string Field { - get { return field; } - set { field = value; } + get { return this.field; } + set { this.field = value; } } public virtual string FieldCamelcase diff --git a/src/NHibernate.Test/NHSpecificTest/NH1487/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1487/Fixture.cs index 4458ee19c90..16f083f5c49 100644 --- a/src/NHibernate.Test/NHSpecificTest/NH1487/Fixture.cs +++ b/src/NHibernate.Test/NHSpecificTest/NH1487/Fixture.cs @@ -10,10 +10,10 @@ namespace NHibernate.Test.NHSpecificTest.NH1487 public class Entity { int field; - public int Id { get { return field; } set { field = value; } } - public int A { get { return field; } set { field = value; } } - public int B { get { return field; } set { field = value; } } - public int C { get { return field; } set { field = value; } } + public int Id { get { return this.field; } set { this.field = value; } } + public int A { get { return this.field; } set { this.field = value; } } + public int B { get { return this.field; } set { this.field = value; } } + public int C { get { return this.field; } set { this.field = value; } } } /// diff --git a/src/NHibernate/Properties/FieldAccessor.cs b/src/NHibernate/Properties/FieldAccessor.cs index 5a4b4df3854..dfd78405d24 100644 --- a/src/NHibernate/Properties/FieldAccessor.cs +++ b/src/NHibernate/Properties/FieldAccessor.cs @@ -204,7 +204,7 @@ public object Get(object target) /// The that the Field returns. public System.Type ReturnType { - get { return field.FieldType; } + get { return this.field.FieldType; } } /// @@ -322,7 +322,7 @@ public MethodInfo Method public System.Type Type { - get { return field.FieldType; } + get { return @field.FieldType; } } #endregion diff --git a/src/NHibernate/Proxy/DynamicProxy/ProxyImplementor.cs b/src/NHibernate/Proxy/DynamicProxy/ProxyImplementor.cs index 42913cb50f6..bd34f326b36 100644 --- a/src/NHibernate/Proxy/DynamicProxy/ProxyImplementor.cs +++ b/src/NHibernate/Proxy/DynamicProxy/ProxyImplementor.cs @@ -27,7 +27,7 @@ internal class ProxyImplementor public FieldBuilder InterceptorField { - get { return field; } + get { return this.field; } } public void ImplementProxy(TypeBuilder typeBuilder) From a1cefc6356219625aa6bed86576559aade132a2f Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Wed, 12 Nov 2025 22:25:36 +1000 Subject: [PATCH 18/19] Fix regex to work in .NET 10 --- src/NHibernate/Dialect/MsSql2000Dialect.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NHibernate/Dialect/MsSql2000Dialect.cs b/src/NHibernate/Dialect/MsSql2000Dialect.cs index d6fb0e16781..9da139dd8d9 100644 --- a/src/NHibernate/Dialect/MsSql2000Dialect.cs +++ b/src/NHibernate/Dialect/MsSql2000Dialect.cs @@ -809,7 +809,7 @@ public LockHintAppender(MsSql2000Dialect dialect, IDictionary // Match < alias >, < alias,>, or < alias$>, the intent is to capture alias names // in various kinds of "FROM table1 alias1, table2 alias2". _matchRegex = new Regex(" (" + aliasesPattern + ")([, ]|$)"); - _unionSubclassRegex = new Regex(@"from\s+\(((?:.|\r|\n)*)\)(?:\s+as)?\s+(?" + aliasesPattern + ")", RegexOptions.IgnoreCase | RegexOptions.Multiline); + _unionSubclassRegex = new Regex(@"from\s+\(([\s\S]+)\)(?:\s+as)?\s+(?" + aliasesPattern + ")", RegexOptions.IgnoreCase | RegexOptions.Multiline); } public SqlString AppendLockHint(SqlString sql) From 6d2dec2a2a7141fe7314d136b630ce2d6aa24efe Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Wed, 12 Nov 2025 22:27:19 +1000 Subject: [PATCH 19/19] fixup! Field is a reserved keyword in C# preview version --- src/NHibernate/Properties/FieldAccessor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NHibernate/Properties/FieldAccessor.cs b/src/NHibernate/Properties/FieldAccessor.cs index dfd78405d24..7db93919893 100644 --- a/src/NHibernate/Properties/FieldAccessor.cs +++ b/src/NHibernate/Properties/FieldAccessor.cs @@ -322,7 +322,7 @@ public MethodInfo Method public System.Type Type { - get { return @field.FieldType; } + get { return this.field.FieldType; } } #endregion