Skip to content

Commit a65dbf9

Browse files
csharper2010csharper2010
authored
Merge branch 'nhibernate:master' into master
2 parents 0398d47 + c4c711d commit a65dbf9

File tree

124 files changed

+3269
-1068
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+3269
-1068
lines changed

‎.github/renovate.json

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
33
"extends": [
4-
"config:base"
4+
"config:recommended"
55
],
66
"configMigration": true,
77
"pruneStaleBranches": false,
@@ -15,20 +15,10 @@
1515
],
1616
"packageRules": [
1717
{
18-
"matchPackagePrefixes": [
19-
"NUnit"
18+
"matchSourceUrls": [
19+
"https://github.com/nunit/nunit"
2020
],
2121
"groupName": "NUnit"
22-
},
23-
{
24-
"matchPackageNames": [
25-
"Microsoft.AspNetCore",
26-
"Microsoft.AspNetCore.Mvc",
27-
"Microsoft.AspNetCore.Mvc.Razor.ViewCompilation",
28-
"Microsoft.AspNetCore.StaticFiles"
29-
],
30-
"groupName": "Microsoft.AspNetCore 2.0",
31-
"allowedVersions": "~2.1.0"
3222
},
3323
{
3424
"matchPackagePrefixes": [

‎.github/workflows/NetCoreTests.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ jobs:
1212
CONNECTION_STRING: "Server=localhost;initial catalog=nhibernate;User Id=sa;Password=P@ssw0rd;packet size=4096;"
1313
DB_INIT: |
1414
docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=P@ssw0rd" -e "MSSQL_PID=Express" -p 1433:1433 -d --name sqlexpress mcr.microsoft.com/mssql/server:2019-latest;
15+
- DB: SqlServer2008-MicrosoftDataSqlClientDriver
16+
CONNECTION_STRING: "Server=localhost;initial catalog=nhibernate;User Id=sa;Password=P@ssw0rd;packet size=4096;"
17+
DB_INIT: |
18+
docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=P@ssw0rd" -e "MSSQL_PID=Express" -p 1433:1433 -d --name sqlexpress mcr.microsoft.com/mssql/server:2019-latest;
1519
- DB: PostgreSQL
1620
CONNECTION_STRING: "Host=localhost;Username=nhibernate;Password=nhibernate;Database=nhibernate;Enlist=true;"
1721
DB_INIT: |

‎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="NUnit.Console" Version="3.10.0" />
14+
<PackageReference Include="NUnit.Console" Version="3.16.3" />
1515
</ItemGroup>
1616

1717
</Project>

‎appveyor.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ environment:
44
matrix:
55
- DB: SqlServer2008
66
CONNECTION_STRING: Server=(local)\SQL2017;User ID=sa;Password=Password12!;initial catalog=nhibernate;
7+
- DB: SqlServer2008-MicrosoftDataSqlClientDriver
8+
CONNECTION_STRING: Server=(local)\SQL2017;User ID=sa;Password=Password12!;initial catalog=nhibernate;
79
- DB: PostgreSQL
810
CONNECTION_STRING: Host=localhost;Port=5432;Username=postgres;Password=Password12!;Database=nhibernate;Enlist=true;
911
- DB: Firebird
@@ -73,7 +75,9 @@ before_test:
7375
Start-Service 'postgresql-x64-10'
7476
}
7577
'SqlServer2008' { Start-Service 'MSSQL$SQL2017' }
78+
'SqlServer2008-MicrosoftDataSqlClientDriver' { Start-Service 'MSSQL$SQL2017' }
7679
'SqlServer2012' { Start-Service 'MSSQL$SQL2017' }
80+
'SqlServer2012-MicrosoftDataSqlClientDriver' { Start-Service 'MSSQL$SQL2017' }
7781
'SQLite' { }
7882
}
7983
test_script:

‎psake.ps1

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,22 @@ Task Set-Configuration {
6363
};
6464
'SqlServer2008' = @{
6565
'connection.connection_string' = 'Server=(local)\SQL2017;User ID=sa;Password=Password12!;initial catalog=nhibernate;'
66+
'connection.driver_class' = 'NHibernate.Driver.Sql2008ClientDriver';
67+
'dialect' = 'NHibernate.Dialect.MsSql2008Dialect'
6668
};
6769
'SqlServer2012' = @{
6870
'connection.connection_string' = 'Server=(local)\SQL2017;User ID=sa;Password=Password12!;initial catalog=nhibernate;';
71+
'connection.driver_class' = 'NHibernate.Driver.Sql2008ClientDriver';
72+
'dialect' = 'NHibernate.Dialect.MsSql2012Dialect'
73+
};
74+
'SqlServer2008-MicrosoftDataSqlClientDriver' = @{
75+
'connection.connection_string' = 'Server=(local)\SQL2017;User ID=sa;Password=Password12!;initial catalog=nhibernate;'
76+
'connection.driver_class' = 'NHibernate.Driver.MicrosoftDataSqlClientDriver';
77+
'dialect' = 'NHibernate.Dialect.MsSql2008Dialect'
78+
};
79+
'SqlServer2012-MicrosoftDataSqlClientDriver' = @{
80+
'connection.connection_string' = 'Server=(local)\SQL2017;User ID=sa;Password=Password12!;initial catalog=nhibernate;';
81+
'connection.driver_class' = 'NHibernate.Driver.MicrosoftDataSqlClientDriver';
6982
'dialect' = 'NHibernate.Dialect.MsSql2012Dialect'
7083
};
7184
'Oracle' = @{

‎releasenotes.txt

Lines changed: 62 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,29 @@
1-
Build 5.4.2
1+
Build 5.4.3
2+
=============================
3+
4+
Release notes - NHibernate - Version 5.4.3
5+
6+
11 issues were resolved in this release.
7+
8+
** Bug
9+
10+
* #3317 Issue with components list lazy loading with not lazy association
11+
* #3307 IsDirty performance hit since 5.4.0
12+
* #3295 C# 8/11 Static interface members support
13+
* #3291 Npgsql 6+ issues with null DateTime parameter types
14+
* #3290 Incorrect fetch of Many-to-Many relation
15+
* #3289 Fetching lazy loaded component causes n + 1 query when querying a subclass abstraction
16+
* #3288 NullReferenceException is thrown when using Fetch
17+
18+
** Task
19+
20+
* #3349 Release 5.4.3
21+
* #3348 Merge 5.3.18 in 5.4.x
22+
* #3318 Merge 5.3.17 in 5.4.x
23+
* #3302 Upgrade NUnit3TestAdapter to fix "Unknown framework version 7.0"
24+
25+
26+
Build 5.4.2
227
=============================
328

429
Release notes - NHibernate - Version 5.4.2
@@ -234,6 +259,42 @@ Release notes - NHibernate - Version 5.4.0
234259
* #2242 Test case for NH-3972 - SQL error when selecting a column of a subclass when sibling classes have a column of the same name
235260

236261

262+
Build 5.3.18
263+
=============================
264+
265+
Release notes - NHibernate - Version 5.3.18
266+
267+
3 issues were resolved in this release.
268+
269+
** Bug
270+
271+
* #3333 Lazy property with nosetter accessor remains uninitialized
272+
* #3330 Linq with FetchLazyProperties() resets lazy property changes
273+
274+
** Task
275+
276+
* #3346 Release 5.3.18
277+
278+
279+
Build 5.3.17
280+
=============================
281+
282+
Release notes - NHibernate - Version 5.3.17
283+
284+
5 issues were resolved in this release.
285+
286+
** Bug
287+
288+
* #3306 Invalid SQL when referencing nullable entity in correlated subquery
289+
* #3304 Fix SetSnapShot CopyTo variance failure
290+
* #3294 Undefined join type failure with cross joins and Informix
291+
292+
** Task
293+
294+
* #3315 Release 5.3.17
295+
* #3300 Backport handling of null DateTime parameters in Npgsql 6+
296+
297+
237298
Build 5.3.16
238299
=============================
239300

‎src/NHibernate.Everything.sln

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -70,93 +70,54 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.Tool.HbmXsd", "N
7070
EndProject
7171
Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "NHibernate.Test.VisualBasic", "NHibernate.Test.VisualBasic\NHibernate.Test.VisualBasic.vbproj", "{7C2EF610-BCA0-4D1F-898A-DE9908E4970C}"
7272
EndProject
73-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.Example.Web", "NHibernate.Example.Web\NHibernate.Example.Web.csproj", "{B291C1C1-599B-418E-8591-8A8CF1CAA188}"
74-
EndProject
7573
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.TestDatabaseSetup", "NHibernate.TestDatabaseSetup\NHibernate.TestDatabaseSetup.csproj", "{783DB85E-2EED-4377-8EF4-8D6EFE042007}"
7674
EndProject
7775
Global
7876
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7977
Debug|.NET = Debug|.NET
8078
Debug|Any CPU = Debug|Any CPU
81-
Debug|Mixed Platforms = Debug|Mixed Platforms
8279
Release|.NET = Release|.NET
8380
Release|Any CPU = Release|Any CPU
84-
Release|Mixed Platforms = Release|Mixed Platforms
8581
EndGlobalSection
8682
GlobalSection(ProjectConfigurationPlatforms) = postSolution
8783
{5909BFE7-93CF-4E5F-BE22-6293368AF01D}.Debug|.NET.ActiveCfg = Debug|Any CPU
8884
{5909BFE7-93CF-4E5F-BE22-6293368AF01D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8985
{5909BFE7-93CF-4E5F-BE22-6293368AF01D}.Debug|Any CPU.Build.0 = Debug|Any CPU
90-
{5909BFE7-93CF-4E5F-BE22-6293368AF01D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
91-
{5909BFE7-93CF-4E5F-BE22-6293368AF01D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
9286
{5909BFE7-93CF-4E5F-BE22-6293368AF01D}.Release|.NET.ActiveCfg = Release|Any CPU
9387
{5909BFE7-93CF-4E5F-BE22-6293368AF01D}.Release|Any CPU.ActiveCfg = Release|Any CPU
9488
{5909BFE7-93CF-4E5F-BE22-6293368AF01D}.Release|Any CPU.Build.0 = Release|Any CPU
95-
{5909BFE7-93CF-4E5F-BE22-6293368AF01D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
96-
{5909BFE7-93CF-4E5F-BE22-6293368AF01D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
9789
{5C649B55-1B3F-4C38-9998-1B043E94A244}.Debug|.NET.ActiveCfg = Debug|Any CPU
9890
{5C649B55-1B3F-4C38-9998-1B043E94A244}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
9991
{5C649B55-1B3F-4C38-9998-1B043E94A244}.Debug|Any CPU.Build.0 = Debug|Any CPU
100-
{5C649B55-1B3F-4C38-9998-1B043E94A244}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
101-
{5C649B55-1B3F-4C38-9998-1B043E94A244}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
10292
{5C649B55-1B3F-4C38-9998-1B043E94A244}.Release|.NET.ActiveCfg = Release|Any CPU
10393
{5C649B55-1B3F-4C38-9998-1B043E94A244}.Release|Any CPU.ActiveCfg = Release|Any CPU
10494
{5C649B55-1B3F-4C38-9998-1B043E94A244}.Release|Any CPU.Build.0 = Release|Any CPU
105-
{5C649B55-1B3F-4C38-9998-1B043E94A244}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
106-
{5C649B55-1B3F-4C38-9998-1B043E94A244}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
10795
{7AEE5B37-C552-4E59-9B6F-88755BCB5070}.Debug|.NET.ActiveCfg = Debug|Any CPU
10896
{7AEE5B37-C552-4E59-9B6F-88755BCB5070}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10997
{7AEE5B37-C552-4E59-9B6F-88755BCB5070}.Debug|Any CPU.Build.0 = Debug|Any CPU
110-
{7AEE5B37-C552-4E59-9B6F-88755BCB5070}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
111-
{7AEE5B37-C552-4E59-9B6F-88755BCB5070}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
11298
{7AEE5B37-C552-4E59-9B6F-88755BCB5070}.Release|.NET.ActiveCfg = Release|Any CPU
11399
{7AEE5B37-C552-4E59-9B6F-88755BCB5070}.Release|Any CPU.ActiveCfg = Release|Any CPU
114100
{7AEE5B37-C552-4E59-9B6F-88755BCB5070}.Release|Any CPU.Build.0 = Release|Any CPU
115-
{7AEE5B37-C552-4E59-9B6F-88755BCB5070}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
116-
{7AEE5B37-C552-4E59-9B6F-88755BCB5070}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
117101
{446E148D-A9D5-4D7D-A706-BEDD45B2BC7D}.Debug|.NET.ActiveCfg = Debug|Any CPU
118102
{446E148D-A9D5-4D7D-A706-BEDD45B2BC7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
119103
{446E148D-A9D5-4D7D-A706-BEDD45B2BC7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
120-
{446E148D-A9D5-4D7D-A706-BEDD45B2BC7D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
121-
{446E148D-A9D5-4D7D-A706-BEDD45B2BC7D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
122104
{446E148D-A9D5-4D7D-A706-BEDD45B2BC7D}.Release|.NET.ActiveCfg = Release|Any CPU
123105
{446E148D-A9D5-4D7D-A706-BEDD45B2BC7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
124106
{446E148D-A9D5-4D7D-A706-BEDD45B2BC7D}.Release|Any CPU.Build.0 = Release|Any CPU
125-
{446E148D-A9D5-4D7D-A706-BEDD45B2BC7D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
126107
{7C2EF610-BCA0-4D1F-898A-DE9908E4970C}.Debug|.NET.ActiveCfg = Debug|Any CPU
127108
{7C2EF610-BCA0-4D1F-898A-DE9908E4970C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
128109
{7C2EF610-BCA0-4D1F-898A-DE9908E4970C}.Debug|Any CPU.Build.0 = Debug|Any CPU
129-
{7C2EF610-BCA0-4D1F-898A-DE9908E4970C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
130-
{7C2EF610-BCA0-4D1F-898A-DE9908E4970C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
131110
{7C2EF610-BCA0-4D1F-898A-DE9908E4970C}.Release|.NET.ActiveCfg = Release|Any CPU
132111
{7C2EF610-BCA0-4D1F-898A-DE9908E4970C}.Release|Any CPU.ActiveCfg = Release|Any CPU
133112
{7C2EF610-BCA0-4D1F-898A-DE9908E4970C}.Release|Any CPU.Build.0 = Release|Any CPU
134-
{7C2EF610-BCA0-4D1F-898A-DE9908E4970C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
135-
{7C2EF610-BCA0-4D1F-898A-DE9908E4970C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
136-
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Debug|.NET.ActiveCfg = Debug|Any CPU
137-
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Debug|.NET.Build.0 = Debug|Any CPU
138-
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
139-
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Debug|Any CPU.Build.0 = Debug|Any CPU
140-
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
141-
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
142-
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Release|.NET.ActiveCfg = Release|Any CPU
143-
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Release|.NET.Build.0 = Release|Any CPU
144-
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Release|Any CPU.ActiveCfg = Release|Any CPU
145-
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Release|Any CPU.Build.0 = Release|Any CPU
146-
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
147-
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Release|Mixed Platforms.Build.0 = Release|Any CPU
148113
{783DB85E-2EED-4377-8EF4-8D6EFE042007}.Debug|.NET.ActiveCfg = Debug|Any CPU
149114
{783DB85E-2EED-4377-8EF4-8D6EFE042007}.Debug|.NET.Build.0 = Debug|Any CPU
150115
{783DB85E-2EED-4377-8EF4-8D6EFE042007}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
151116
{783DB85E-2EED-4377-8EF4-8D6EFE042007}.Debug|Any CPU.Build.0 = Debug|Any CPU
152-
{783DB85E-2EED-4377-8EF4-8D6EFE042007}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
153-
{783DB85E-2EED-4377-8EF4-8D6EFE042007}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
154117
{783DB85E-2EED-4377-8EF4-8D6EFE042007}.Release|.NET.ActiveCfg = Release|Any CPU
155118
{783DB85E-2EED-4377-8EF4-8D6EFE042007}.Release|.NET.Build.0 = Release|Any CPU
156119
{783DB85E-2EED-4377-8EF4-8D6EFE042007}.Release|Any CPU.ActiveCfg = Release|Any CPU
157120
{783DB85E-2EED-4377-8EF4-8D6EFE042007}.Release|Any CPU.Build.0 = Release|Any CPU
158-
{783DB85E-2EED-4377-8EF4-8D6EFE042007}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
159-
{783DB85E-2EED-4377-8EF4-8D6EFE042007}.Release|Mixed Platforms.Build.0 = Release|Any CPU
160121
EndGlobalSection
161122
GlobalSection(SolutionProperties) = preSolution
162123
HideSolutionNode = FALSE

‎src/NHibernate.Example.Web/Infrastructure/AppSessionFactory.cs

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎src/NHibernate.Example.Web/Infrastructure/NHibernateToMicrosoftLogger.cs

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎src/NHibernate.Example.Web/Infrastructure/NHibernateToMicrosoftLoggerFactory.cs

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)