Skip to content

Commit 55dbc8a

Browse files
fredericDelaportefredericDelaporte
authored
Merge pull request #692 from fredericDelaporte/NH-3905
NH-3905 - upgrade async generator and regen
2 parents 623d798 + 2a43817 commit 55dbc8a

File tree

329 files changed

+16
-1131
lines changed

Some content is hidden

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

329 files changed

+16
-1131
lines changed

‎Tools/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />
88
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net461" />
99
<package id="NUnit.Extension.VSProjectLoader" version="3.6.0" targetFramework="net461" />
10-
<package id="CSharpAsyncGenerator.CommandLine" version="0.4.4" targetFramework="net461" />
10+
<package id="CSharpAsyncGenerator.CommandLine" version="0.5.0" targetFramework="net461" />
1111
<package id="vswhere" version="2.1.4" targetFramework="net461" />
1212
</packages>

‎doc/reference/modules/quickstart.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,12 @@ finally
420420
cases.
421421
</para>
422422

423+
<para>
424+
Since NHibernate 5.0, the session and its queries IO bound methods have async counterparts.
425+
Each call to an async method must be awaited before further interacting with the session or
426+
its queries.
427+
</para>
428+
423429
</sect1>
424430

425431
<sect1 id="quickstart-summary">

‎doc/reference/modules/transactions.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,11 @@
9393
Never access the same <literal>ISession</literal> in two concurrent threads.
9494
An <literal>ISession</literal> is usually only a single unit-of-work!
9595
</para>
96+
<para>
97+
Since NHibernate 5.0, the session and its queries IO bound methods have async counterparts.
98+
Each call to an async method must be awaited before further interacting with the session or
99+
its queries.
100+
</para>
96101
</listitem>
97102
</itemizedlist>
98103
</sect1>

‎src/AsyncGenerator.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,6 @@
184184
- hasAttributeName: TestAttribute
185185
- hasAttributeName: TheoryAttribute
186186
typeConversion:
187-
- conversion: Ignore
188-
name: NorthwindDbCreator
189187
- conversion: Ignore
190188
name: ObjectAssert
191189
- conversion: Ignore
@@ -200,9 +198,13 @@
200198
rule: IsTestCase
201199
- conversion: Ignore
202200
anyBaseTypeRule: IsTestCase
201+
ignoreSearchForMethodReferences:
202+
- hasAttributeName: TheoryAttribute
203+
- hasAttributeName: TestAttribute
203204
ignoreDocuments:
204205
- filePathEndsWith: Linq\MathTests.cs
205206
- filePathEndsWith: Linq\ExpressionSessionLeakTest.cs
207+
- filePathEndsWith: Linq\NorthwindDbCreator.cs
206208
cancellationTokens:
207209
withoutCancellationToken:
208210
- hasAttributeName: TestAttribute

‎src/NHibernate.DomainModel/Async/CustomPersister.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ namespace NHibernate.DomainModel
2626
{
2727
using System.Threading.Tasks;
2828
using System.Threading;
29-
/// <content>
30-
/// Contains generated async methods
31-
/// </content>
3229
public partial class CustomPersister : IEntityPersister
3330
{
3431

‎src/NHibernate.Test/Async/ConnectionStringTest/NamedConnectionStringFixture.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ namespace NHibernate.Test.ConnectionStringTest
2020
using System.Threading.Tasks;
2121
using System.Threading;
2222

23-
/// <content>
24-
/// Contains generated async methods
25-
/// </content>
2623
public partial class MockConnectionProvider : ConnectionProvider
2724
{
2825

‎src/NHibernate.Test/Async/DebugConnectionProvider.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ namespace NHibernate.Test
1919
{
2020
using System.Threading.Tasks;
2121
using System.Threading;
22-
/// <content>
23-
/// Contains generated async methods
24-
/// </content>
2522
public partial class DebugConnectionProvider : DriverConnectionProvider
2623
{
2724

‎src/NHibernate.Test/Async/DebugSessionFactory.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ namespace NHibernate.Test
3737
{
3838
using System.Threading.Tasks;
3939
using System.Threading;
40-
/// <content>
41-
/// Contains generated async methods
42-
/// </content>
4340
public partial class DebugSessionFactory : ISessionFactoryImplementor
4441
{
4542

‎src/NHibernate.Test/Async/DynamicProxyTests/PeVerifier.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616
namespace NHibernate.Test.DynamicProxyTests
1717
{
1818
using System.Threading.Tasks;
19-
20-
/// <content>
21-
/// Contains generated async methods
22-
/// </content>
23-
2419
public partial class PeVerifier
2520
{
2621

‎src/NHibernate.Test/Async/Events/Collections/CollectionListeners.cs

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717

1818
namespace NHibernate.Test.Events.Collections
1919
{
20-
/// <content>
21-
/// Contains generated async methods
22-
/// </content>
2320
public partial class CollectionListeners
2421
{
2522

@@ -32,9 +29,6 @@ public partial class CollectionListeners
3229

3330
#region Nested type: InitializeCollectionListener
3431

35-
/// <content>
36-
/// Contains generated async methods
37-
/// </content>
3832
public partial class InitializeCollectionListener : DefaultInitializeCollectionEventListener, IListener
3933
{
4034

@@ -53,9 +47,6 @@ public override async Task OnInitializeCollectionAsync(InitializeCollectionEvent
5347

5448
#region Nested type: PostCollectionRecreateListener
5549

56-
/// <content>
57-
/// Contains generated async methods
58-
/// </content>
5950
public partial class PostCollectionRecreateListener : AbstractListener, IPostCollectionRecreateEventListener
6051
{
6152

@@ -81,9 +72,6 @@ public Task OnPostRecreateCollectionAsync(PostCollectionRecreateEvent @event, Ca
8172

8273
#region Nested type: PostCollectionRemoveListener
8374

84-
/// <content>
85-
/// Contains generated async methods
86-
/// </content>
8775
public partial class PostCollectionRemoveListener : AbstractListener, IPostCollectionRemoveEventListener
8876
{
8977

@@ -109,9 +97,6 @@ public Task OnPostRemoveCollectionAsync(PostCollectionRemoveEvent @event, Cancel
10997

11098
#region Nested type: PostCollectionUpdateListener
11199

112-
/// <content>
113-
/// Contains generated async methods
114-
/// </content>
115100
public partial class PostCollectionUpdateListener : AbstractListener, IPostCollectionUpdateEventListener
116101
{
117102

@@ -137,9 +122,6 @@ public Task OnPostUpdateCollectionAsync(PostCollectionUpdateEvent @event, Cancel
137122

138123
#region Nested type: PreCollectionRecreateListener
139124

140-
/// <content>
141-
/// Contains generated async methods
142-
/// </content>
143125
public partial class PreCollectionRecreateListener : AbstractListener, IPreCollectionRecreateEventListener
144126
{
145127

@@ -165,9 +147,6 @@ public Task OnPreRecreateCollectionAsync(PreCollectionRecreateEvent @event, Canc
165147

166148
#region Nested type: PreCollectionRemoveListener
167149

168-
/// <content>
169-
/// Contains generated async methods
170-
/// </content>
171150
public partial class PreCollectionRemoveListener : AbstractListener, IPreCollectionRemoveEventListener
172151
{
173152

@@ -193,9 +172,6 @@ public Task OnPreRemoveCollectionAsync(PreCollectionRemoveEvent @event, Cancella
193172

194173
#region Nested type: PreCollectionUpdateListener
195174

196-
/// <content>
197-
/// Contains generated async methods
198-
/// </content>
199175
public partial class PreCollectionUpdateListener : AbstractListener, IPreCollectionUpdateEventListener
200176
{
201177

‎src/NHibernate.Test/Async/Events/DisposableListenersTest.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ namespace NHibernate.Test.Events
1717
{
1818
using System.Threading.Tasks;
1919
using System.Threading;
20-
/// <content>
21-
/// Contains generated async methods
22-
/// </content>
2320
public partial class MyDisposableListener : IPostUpdateEventListener, IDisposable
2421
{
2522
public Task OnPostUpdateAsync(PostUpdateEvent @event, CancellationToken cancellationToken)

‎src/NHibernate.Test/Async/Events/PostEvents/AssertOldStatePostListener.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ namespace NHibernate.Test.Events.PostEvents
1616
using System.Threading.Tasks;
1717
using System.Threading;
1818

19-
/// <content>
20-
/// Contains generated async methods
21-
/// </content>
2219
public partial class AssertOldStatePostListener : IPostUpdateEventListener
2320
{
2421

‎src/NHibernate.Test/Async/IdGen/Enhanced/SourceMock.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ namespace NHibernate.Test.IdGen.Enhanced
1414
{
1515
using System.Threading.Tasks;
1616
using System.Threading;
17-
/// <content>
18-
/// Contains generated async methods
19-
/// </content>
2017
public partial class SourceMock : IAccessCallback
2118
{
2219

‎src/NHibernate.Test/Async/Insertordering/InsertOrderingFixture.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -677,9 +677,6 @@ public IBatcher CreateBatcher(ConnectionManager connectionManager, IInterceptor
677677

678678
#endregion
679679
}
680-
/// <content>
681-
/// Contains generated async methods
682-
/// </content>
683680
public partial class InsertOrderingFixture : TestCase
684681
{
685682

@@ -695,9 +692,6 @@ public partial class InsertOrderingFixture : TestCase
695692

696693

697694

698-
/// <content>
699-
/// Contains generated async methods
700-
/// </content>
701695
public partial class StatsBatcher : SqlClientBatchingBatcher
702696
{
703697

‎src/NHibernate.Test/Async/Linq/ObjectDumper.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
namespace NHibernate.Test.Linq
1818
{
1919
using System.Threading.Tasks;
20-
/// <content>
21-
/// Contains generated async methods
22-
/// </content>
2320
public partial class ObjectDumper
2421
{
2522

‎src/NHibernate.Test/Async/Linq/QueryTimeoutTests.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,16 +141,10 @@ public IBatcher CreateBatcher(ConnectionManager connectionManager, IInterceptor
141141
}
142142
}
143143
}
144-
/// <content>
145-
/// Contains generated async methods
146-
/// </content>
147144
public partial class QueryTimeoutTests : LinqTestCase
148145
{
149146

150147

151-
/// <content>
152-
/// Contains generated async methods
153-
/// </content>
154148
public partial class TimeoutCatchingNonBatchingBatcher : NonBatchingBatcher
155149
{
156150

‎src/NHibernate.Test/Async/NHSpecificTest/NH1054/DummyTransactionFactory.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1054
1818
{
1919
using System.Threading.Tasks;
2020
using System.Threading;
21-
/// <content>
22-
/// Contains generated async methods
23-
/// </content>
2421
public partial class DummyTransactionFactory : ITransactionFactory
2522
{
2623

‎src/NHibernate.Test/Async/NHSpecificTest/NH1230/PreSaveDoVeto.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1230
1515
{
1616
using System.Threading.Tasks;
1717
using System.Threading;
18-
/// <content>
19-
/// Contains generated async methods
20-
/// </content>
2118
public partial class PreSaveDoVeto : IPreInsertEventListener
2219
{
2320

‎src/NHibernate.Test/Async/NHSpecificTest/NH1270/Fixture.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
namespace NHibernate.Test.NHSpecificTest.NH1270
1919
{
2020
using System.Threading.Tasks;
21-
using System.Threading;
2221
[TestFixture]
2322
public class FixtureAsync
2423
{

‎src/NHibernate.Test/Async/NHSpecificTest/NH1274ExportExclude/NH1274ExportExcludeFixture.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
namespace NHibernate.Test.NHSpecificTest.NH1274ExportExclude
2323
{
2424
using System.Threading.Tasks;
25-
using System.Threading;
2625
[TestFixture]
2726
public class NH1274ExportExcludeFixtureAsync
2827
{

‎src/NHibernate.Test/Async/NHSpecificTest/NH1332/Fixture.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,9 @@ public void OnPostDelete(PostDeleteEvent @event)
8080
}
8181
}
8282
}
83-
/// <content>
84-
/// Contains generated async methods
85-
/// </content>
8683
public partial class Fixture : BugTestCase
8784
{
8885

89-
/// <content>
90-
/// Contains generated async methods
91-
/// </content>
9286
public partial class PostCommitDelete : IPostDeleteEventListener
9387
{
9488
public Task OnPostDeleteAsync(PostDeleteEvent @event, CancellationToken cancellationToken)

‎src/NHibernate.Test/Async/NHSpecificTest/NH1487/Fixture.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
namespace NHibernate.Test.NHSpecificTest.NH1487
1919
{
2020
using System.Threading.Tasks;
21-
using System.Threading;
2221

2322
/// <summary>
2423
/// Summary description for TestTestCase.

‎src/NHibernate.Test/Async/NHSpecificTest/NH1714/UseCaseDemonstrationFixture.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@ public async Task DbCommandsFromEventListenerShouldBeEnlistedInRunningTransactio
6464
}
6565
}
6666

67-
/// <content>
68-
/// Contains generated async methods
69-
/// </content>
7067
public partial class MyCustomEventListener : IPreInsertEventListener
7168
{
7269
public async Task<bool> OnPreInsertAsync(PreInsertEvent e, CancellationToken cancellationToken)

‎src/NHibernate.Test/Async/NHSpecificTest/NH1789/DomainObject.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ namespace NHibernate.Test.NHSpecificTest.NH1789
1515
{
1616
using System.Threading.Tasks;
1717
using System.Threading;
18-
/// <content>
19-
/// Contains generated async methods
20-
/// </content>
2118
public abstract partial class DomainObject : IDomainObject
2219
{
2320

‎src/NHibernate.Test/Async/NHSpecificTest/NH1882/TestCollectionInitializingDuringFlush.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,15 +155,9 @@ public async Task TestInitializationDuringFlushAsync()
155155
Assert.That(listener.FoundAny, Is.True);
156156
}
157157
}
158-
/// <content>
159-
/// Contains generated async methods
160-
/// </content>
161158
public partial class TestCollectionInitializingDuringFlush : TestCaseMappingByCode
162159
{
163160

164-
/// <content>
165-
/// Contains generated async methods
166-
/// </content>
167161
public partial class InitializingPreUpdateEventListener : IPreUpdateEventListener
168162
{
169163

‎src/NHibernate.Test/Async/NHSpecificTest/NH2322/PostUpdateEventListener.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ namespace NHibernate.Test.NHSpecificTest.NH2322
1717
{
1818
using System.Threading.Tasks;
1919
using System.Threading;
20-
/// <content>
21-
/// Contains generated async methods
22-
/// </content>
2320
public partial class PostUpdateEventListener : IPostUpdateEventListener
2421
{
2522
Task IPostUpdateEventListener.OnPostUpdateAsync(PostUpdateEvent @event, CancellationToken cancellationToken)

‎src/NHibernate.Test/Async/NHSpecificTest/NH2583/Domain.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ namespace NHibernate.Test.NHSpecificTest.NH2583
1414
{
1515
using System.Threading.Tasks;
1616
using System.Threading;
17-
/// <content>
18-
/// Contains generated async methods
19-
/// </content>
2017
public partial class MyRef1
2118
{
2219

@@ -41,9 +38,6 @@ public partial class MyRef1
4138
}
4239
}
4340

44-
/// <content>
45-
/// Contains generated async methods
46-
/// </content>
4741
public partial class MyBO
4842
{
4943

0 commit comments

Comments
 (0)