From 16dc11d4e39b931cb854756b225e90b3e1336839 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Sat, 19 Nov 2022 14:48:22 +0100 Subject: [PATCH 01/47] Switched from AsyncDuplicateLock to AsyncKeyedLock --- .../CustomBookingEngine.cs | 17 +++-- .../OpenActive.Server.NET.csproj | 1 + .../Async/AsyncDuplicateLock.cs | 73 ------------------- 3 files changed, 10 insertions(+), 81 deletions(-) delete mode 100644 OpenActive.Server.NET/OpenBookingHelper/Async/AsyncDuplicateLock.cs diff --git a/OpenActive.Server.NET/CustomBookingEngine/CustomBookingEngine.cs b/OpenActive.Server.NET/CustomBookingEngine/CustomBookingEngine.cs index e3a9ca45..6d45bb14 100644 --- a/OpenActive.Server.NET/CustomBookingEngine/CustomBookingEngine.cs +++ b/OpenActive.Server.NET/CustomBookingEngine/CustomBookingEngine.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Net; using System.Threading.Tasks; +using AsyncKeyedLock; using OpenActive.DatasetSite.NET; using OpenActive.NET; using OpenActive.NET.Rpde.Version1; @@ -130,7 +131,7 @@ public CustomBookingEngine(BookingEngineSettings settings, Uri openBookingAPIBas private Uri openDataFeedBaseUrl; private Dictionary> idConfigurationLookup; private Dictionary feedAssignedTemplates; - private static readonly AsyncDuplicateLock asyncDuplicateLock = new AsyncDuplicateLock(); + private static readonly AsyncKeyedLocker asyncKeyedLock = new AsyncKeyedLocker(); protected Dictionary OpportunityTemplateLookup { get; } @@ -403,7 +404,7 @@ private async Task ProcessCheckpoint(string clientId, Uri selle throw new OpenBookingException(new UnexpectedOrderTypeError(), "OrderQuote is required for C1 and C2"); } var (orderId, sellerIdComponents, seller, customerAccountIdComponents) = await ConstructIdsFromRequest(clientId, sellerId, customerAccountId, uuidString, orderType); - using (await asyncDuplicateLock.LockAsync(GetParallelLockKey(orderId))) + using (await asyncKeyedLock.LockAsync(GetParallelLockKey(orderId))) { var orderResponse = await ProcessFlowRequest(ValidateFlowRequest(orderId, sellerIdComponents, seller, customerAccountIdComponents, flowStage, orderQuote), orderQuote); @@ -423,7 +424,7 @@ public async Task ProcessOrderCreationB(string clientId, Uri se throw new OpenBookingException(new UnexpectedOrderTypeError(), "Order is required for B"); } var (orderId, sellerIdComponents, seller, customerAccountIdComponents) = await ConstructIdsFromRequest(clientId, sellerId, customerAccountId, uuidString, OrderType.Order); - using (await asyncDuplicateLock.LockAsync(GetParallelLockKey(orderId))) + using (await asyncKeyedLock.LockAsync(GetParallelLockKey(orderId))) { var response = order.OrderProposalVersion != null ? await ProcessOrderCreationFromOrderProposal(orderId, settings.OrderIdTemplate, seller, sellerIdComponents, customerAccountIdComponents, order) : @@ -446,7 +447,7 @@ public async Task ProcessOrderProposalCreationP(string clientId throw new OpenBookingException(new UnexpectedOrderTypeError(), "OrderProposal is required for P"); } var (orderId, sellerIdComponents, seller, customerAccountIdComponents) = await ConstructIdsFromRequest(clientId, sellerId, customerAccountId, uuidString, OrderType.OrderProposal); - using (await asyncDuplicateLock.LockAsync(GetParallelLockKey(orderId))) + using (await asyncKeyedLock.LockAsync(GetParallelLockKey(orderId))) { var response = await ProcessFlowRequest(ValidateFlowRequest(orderId, sellerIdComponents, seller, customerAccountIdComponents, FlowStage.P, order), order); @@ -482,7 +483,7 @@ private SimpleIdComponents GetCustomerAccountIdComponentsFromApiKey(Uri customer public async Task DeleteOrder(string clientId, Uri sellerId, string uuidString, Uri customerAccountId = null) { var orderId = new OrderIdComponents { ClientId = clientId, OrderType = OrderType.Order, uuid = ConvertToGuid(uuidString) }; - using (await asyncDuplicateLock.LockAsync(GetParallelLockKey(orderId))) + using (await asyncKeyedLock.LockAsync(GetParallelLockKey(orderId))) { var result = await ProcessOrderDeletion(orderId, GetSimpleIdComponentsFromApiKey(sellerId), GetCustomerAccountIdComponentsFromApiKey(customerAccountId)); switch (result) @@ -502,7 +503,7 @@ public async Task DeleteOrder(string clientId, Uri sellerId, st public async Task DeleteOrderQuote(string clientId, Uri sellerId, string uuidString, Uri customerAccountId = null) { var orderId = new OrderIdComponents { ClientId = clientId, OrderType = OrderType.OrderQuote, uuid = ConvertToGuid(uuidString) }; - using (await asyncDuplicateLock.LockAsync(GetParallelLockKey(orderId))) + using (await asyncKeyedLock.LockAsync(GetParallelLockKey(orderId))) { await ProcessOrderQuoteDeletion(orderId, GetSimpleIdComponentsFromApiKey(sellerId), GetCustomerAccountIdComponentsFromApiKey(customerAccountId)); return ResponseContent.OpenBookingNoContentResponse(); @@ -514,7 +515,7 @@ public async Task DeleteOrderQuote(string clientId, Uri sellerI public async Task ProcessOrderUpdate(string clientId, Uri sellerId, string uuidString, string orderJson, Uri customerAccountId = null) { var orderId = new OrderIdComponents { ClientId = clientId, OrderType = OrderType.Order, uuid = ConvertToGuid(uuidString) }; - using (await asyncDuplicateLock.LockAsync(GetParallelLockKey(orderId))) + using (await asyncKeyedLock.LockAsync(GetParallelLockKey(orderId))) { Order order = OpenActiveSerializer.Deserialize(orderJson); SimpleIdComponents sellerIdComponents = GetSimpleIdComponentsFromApiKey(sellerId); @@ -575,7 +576,7 @@ public async Task ProcessOrderUpdate(string clientId, Uri selle public async Task ProcessOrderProposalUpdate(string clientId, Uri sellerId, string uuidString, string orderProposalJson, Uri customerAccountId = null) { var orderId = new OrderIdComponents { ClientId = clientId, OrderType = OrderType.OrderProposal, uuid = ConvertToGuid(uuidString) }; - using (await asyncDuplicateLock.LockAsync(GetParallelLockKey(orderId))) + using (await asyncKeyedLock.LockAsync(GetParallelLockKey(orderId))) { OrderProposal orderProposal = OpenActiveSerializer.Deserialize(orderProposalJson); SimpleIdComponents sellerIdComponents = GetSimpleIdComponentsFromApiKey(sellerId); diff --git a/OpenActive.Server.NET/OpenActive.Server.NET.csproj b/OpenActive.Server.NET/OpenActive.Server.NET.csproj index 1dd2ab94..0c14ad3c 100644 --- a/OpenActive.Server.NET/OpenActive.Server.NET.csproj +++ b/OpenActive.Server.NET/OpenActive.Server.NET.csproj @@ -26,6 +26,7 @@ + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/OpenActive.Server.NET/OpenBookingHelper/Async/AsyncDuplicateLock.cs b/OpenActive.Server.NET/OpenBookingHelper/Async/AsyncDuplicateLock.cs deleted file mode 100644 index 37575f7a..00000000 --- a/OpenActive.Server.NET/OpenBookingHelper/Async/AsyncDuplicateLock.cs +++ /dev/null @@ -1,73 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; - -namespace OpenActive.Server.NET.OpenBookingHelper -{ - public sealed class AsyncDuplicateLock - { - private sealed class RefCounted - { - public RefCounted(T value) - { - RefCount = 1; - Value = value; - } - - public int RefCount { get; set; } - public T Value { get; private set; } - } - - private static readonly Dictionary> SemaphoreSlims - = new Dictionary>(); - - private SemaphoreSlim GetOrCreate(object key) - { - RefCounted item; - lock (SemaphoreSlims) - { - if (SemaphoreSlims.TryGetValue(key, out item)) - { - ++item.RefCount; - } - else - { - item = new RefCounted(new SemaphoreSlim(1, 1)); - SemaphoreSlims[key] = item; - } - } - return item.Value; - } - - public IDisposable Lock(object key) - { - GetOrCreate(key).Wait(); - return new Releaser { Key = key }; - } - - public async Task LockAsync(object key) - { - await GetOrCreate(key).WaitAsync().ConfigureAwait(false); - return new Releaser { Key = key }; - } - - private sealed class Releaser : IDisposable - { - public object Key { get; set; } - - public void Dispose() - { - RefCounted item; - lock (SemaphoreSlims) - { - item = SemaphoreSlims[Key]; - --item.RefCount; - if (item.RefCount == 0) - SemaphoreSlims.Remove(Key); - } - item.Value.Release(); - } - } - } -} From 9995181c1a54ab3357914da5a4fe0387e6f699a0 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Sat, 26 Nov 2022 23:04:03 +0100 Subject: [PATCH 02/47] Bump AsyncKeyedLock to 5.0.3 --- OpenActive.Server.NET/OpenActive.Server.NET.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenActive.Server.NET/OpenActive.Server.NET.csproj b/OpenActive.Server.NET/OpenActive.Server.NET.csproj index 0c14ad3c..b3629b95 100644 --- a/OpenActive.Server.NET/OpenActive.Server.NET.csproj +++ b/OpenActive.Server.NET/OpenActive.Server.NET.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 9006418d346e04a9e983f5643f6d95dc32991f20 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Mon, 28 Nov 2022 09:35:04 +0100 Subject: [PATCH 03/47] Update to AsyncKeyedLock 5.0.4 --- OpenActive.Server.NET/OpenActive.Server.NET.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenActive.Server.NET/OpenActive.Server.NET.csproj b/OpenActive.Server.NET/OpenActive.Server.NET.csproj index b3629b95..595775fd 100644 --- a/OpenActive.Server.NET/OpenActive.Server.NET.csproj +++ b/OpenActive.Server.NET/OpenActive.Server.NET.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 19425635ebcef8746b1ef183d4b008e0635eaa28 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Sat, 3 Dec 2022 18:54:03 +0100 Subject: [PATCH 04/47] Update to AsyncKeyedLock 5.1.0 --- OpenActive.Server.NET/OpenActive.Server.NET.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenActive.Server.NET/OpenActive.Server.NET.csproj b/OpenActive.Server.NET/OpenActive.Server.NET.csproj index 595775fd..1f58e172 100644 --- a/OpenActive.Server.NET/OpenActive.Server.NET.csproj +++ b/OpenActive.Server.NET/OpenActive.Server.NET.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 4594f70f2731fb5ee469a7b3a4ecf77743f1a6c0 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Tue, 13 Dec 2022 11:23:15 +0100 Subject: [PATCH 05/47] Updated to AsyncKeyedLock 5.1.1 --- .../App.config | 80 ++-- ...BookingSystem.AspNetFramework.Tests.csproj | 9 + .../packages.config | 3 + .../BookingSystem.AspNetFramework.csproj | 3 + .../BookingSystem.AspNetFramework/Web.config | 378 +++++++++--------- .../packages.config | 1 + .../OpenActive.Server.NET.csproj | 2 +- 7 files changed, 246 insertions(+), 230 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework.Tests/App.config b/Examples/BookingSystem.AspNetFramework.Tests/App.config index 18291db0..40607753 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/App.config +++ b/Examples/BookingSystem.AspNetFramework.Tests/App.config @@ -1,4 +1,4 @@ - + - + - - - - - - + + + + + + - + - - - - - - - - + + + + + + + + - + - + - - - - + + + + - - - - - - - - + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + \ No newline at end of file diff --git a/Examples/BookingSystem.AspNetFramework/packages.config b/Examples/BookingSystem.AspNetFramework/packages.config index 38b069d0..0c6a15ea 100644 --- a/Examples/BookingSystem.AspNetFramework/packages.config +++ b/Examples/BookingSystem.AspNetFramework/packages.config @@ -1,6 +1,7 @@  + diff --git a/OpenActive.Server.NET/OpenActive.Server.NET.csproj b/OpenActive.Server.NET/OpenActive.Server.NET.csproj index 0c14ad3c..8421ee81 100644 --- a/OpenActive.Server.NET/OpenActive.Server.NET.csproj +++ b/OpenActive.Server.NET/OpenActive.Server.NET.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 834070bb75ebfbcd2dc6d0e879cd465bc142db8b Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Tue, 13 Dec 2022 15:53:07 +0100 Subject: [PATCH 06/47] Revert --- .../App.config | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework.Tests/App.config b/Examples/BookingSystem.AspNetFramework.Tests/App.config index 40607753..18291db0 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/App.config +++ b/Examples/BookingSystem.AspNetFramework.Tests/App.config @@ -1,4 +1,4 @@ - + - + - - - - - - + + + + + + - + - - - - - - - - + + + + + + + + - + - + - - - - + + + + - - - - - - - - + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - \ No newline at end of file + From 882a2d1e908adf5f651f7fece34c6399cc640780 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Tue, 13 Dec 2022 16:06:33 +0100 Subject: [PATCH 09/47] Performance improvement --- .../BookingSystem.AspNetFramework/packages.config | 2 +- .../CustomBookingEngine/CustomBookingEngine.cs | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework/packages.config b/Examples/BookingSystem.AspNetFramework/packages.config index 0c6a15ea..efe4f9ee 100644 --- a/Examples/BookingSystem.AspNetFramework/packages.config +++ b/Examples/BookingSystem.AspNetFramework/packages.config @@ -1,7 +1,7 @@  - + diff --git a/OpenActive.Server.NET/CustomBookingEngine/CustomBookingEngine.cs b/OpenActive.Server.NET/CustomBookingEngine/CustomBookingEngine.cs index 6d45bb14..e7e97b85 100644 --- a/OpenActive.Server.NET/CustomBookingEngine/CustomBookingEngine.cs +++ b/OpenActive.Server.NET/CustomBookingEngine/CustomBookingEngine.cs @@ -404,7 +404,7 @@ private async Task ProcessCheckpoint(string clientId, Uri selle throw new OpenBookingException(new UnexpectedOrderTypeError(), "OrderQuote is required for C1 and C2"); } var (orderId, sellerIdComponents, seller, customerAccountIdComponents) = await ConstructIdsFromRequest(clientId, sellerId, customerAccountId, uuidString, orderType); - using (await asyncKeyedLock.LockAsync(GetParallelLockKey(orderId))) + using (await asyncKeyedLock.LockAsync(GetParallelLockKey(orderId)).ConfigureAwait(false)) { var orderResponse = await ProcessFlowRequest(ValidateFlowRequest(orderId, sellerIdComponents, seller, customerAccountIdComponents, flowStage, orderQuote), orderQuote); @@ -424,7 +424,7 @@ public async Task ProcessOrderCreationB(string clientId, Uri se throw new OpenBookingException(new UnexpectedOrderTypeError(), "Order is required for B"); } var (orderId, sellerIdComponents, seller, customerAccountIdComponents) = await ConstructIdsFromRequest(clientId, sellerId, customerAccountId, uuidString, OrderType.Order); - using (await asyncKeyedLock.LockAsync(GetParallelLockKey(orderId))) + using (await asyncKeyedLock.LockAsync(GetParallelLockKey(orderId)).ConfigureAwait(false)) { var response = order.OrderProposalVersion != null ? await ProcessOrderCreationFromOrderProposal(orderId, settings.OrderIdTemplate, seller, sellerIdComponents, customerAccountIdComponents, order) : @@ -447,7 +447,7 @@ public async Task ProcessOrderProposalCreationP(string clientId throw new OpenBookingException(new UnexpectedOrderTypeError(), "OrderProposal is required for P"); } var (orderId, sellerIdComponents, seller, customerAccountIdComponents) = await ConstructIdsFromRequest(clientId, sellerId, customerAccountId, uuidString, OrderType.OrderProposal); - using (await asyncKeyedLock.LockAsync(GetParallelLockKey(orderId))) + using (await asyncKeyedLock.LockAsync(GetParallelLockKey(orderId)).ConfigureAwait(false)) { var response = await ProcessFlowRequest(ValidateFlowRequest(orderId, sellerIdComponents, seller, customerAccountIdComponents, FlowStage.P, order), order); @@ -483,7 +483,7 @@ private SimpleIdComponents GetCustomerAccountIdComponentsFromApiKey(Uri customer public async Task DeleteOrder(string clientId, Uri sellerId, string uuidString, Uri customerAccountId = null) { var orderId = new OrderIdComponents { ClientId = clientId, OrderType = OrderType.Order, uuid = ConvertToGuid(uuidString) }; - using (await asyncKeyedLock.LockAsync(GetParallelLockKey(orderId))) + using (await asyncKeyedLock.LockAsync(GetParallelLockKey(orderId)).ConfigureAwait(false)) { var result = await ProcessOrderDeletion(orderId, GetSimpleIdComponentsFromApiKey(sellerId), GetCustomerAccountIdComponentsFromApiKey(customerAccountId)); switch (result) @@ -503,7 +503,7 @@ public async Task DeleteOrder(string clientId, Uri sellerId, st public async Task DeleteOrderQuote(string clientId, Uri sellerId, string uuidString, Uri customerAccountId = null) { var orderId = new OrderIdComponents { ClientId = clientId, OrderType = OrderType.OrderQuote, uuid = ConvertToGuid(uuidString) }; - using (await asyncKeyedLock.LockAsync(GetParallelLockKey(orderId))) + using (await asyncKeyedLock.LockAsync(GetParallelLockKey(orderId)).ConfigureAwait(false)) { await ProcessOrderQuoteDeletion(orderId, GetSimpleIdComponentsFromApiKey(sellerId), GetCustomerAccountIdComponentsFromApiKey(customerAccountId)); return ResponseContent.OpenBookingNoContentResponse(); @@ -515,7 +515,7 @@ public async Task DeleteOrderQuote(string clientId, Uri sellerI public async Task ProcessOrderUpdate(string clientId, Uri sellerId, string uuidString, string orderJson, Uri customerAccountId = null) { var orderId = new OrderIdComponents { ClientId = clientId, OrderType = OrderType.Order, uuid = ConvertToGuid(uuidString) }; - using (await asyncKeyedLock.LockAsync(GetParallelLockKey(orderId))) + using (await asyncKeyedLock.LockAsync(GetParallelLockKey(orderId)).ConfigureAwait(false)) { Order order = OpenActiveSerializer.Deserialize(orderJson); SimpleIdComponents sellerIdComponents = GetSimpleIdComponentsFromApiKey(sellerId); @@ -576,7 +576,7 @@ public async Task ProcessOrderUpdate(string clientId, Uri selle public async Task ProcessOrderProposalUpdate(string clientId, Uri sellerId, string uuidString, string orderProposalJson, Uri customerAccountId = null) { var orderId = new OrderIdComponents { ClientId = clientId, OrderType = OrderType.OrderProposal, uuid = ConvertToGuid(uuidString) }; - using (await asyncKeyedLock.LockAsync(GetParallelLockKey(orderId))) + using (await asyncKeyedLock.LockAsync(GetParallelLockKey(orderId)).ConfigureAwait(false)) { OrderProposal orderProposal = OpenActiveSerializer.Deserialize(orderProposalJson); SimpleIdComponents sellerIdComponents = GetSimpleIdComponentsFromApiKey(sellerId); From 479e938898b5142c06898e9e9e9f017e43e210a2 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Fri, 16 Dec 2022 17:59:20 +0100 Subject: [PATCH 10/47] Update to AsyncKeyedLock 5.1.2 --- .../BookingSystem.AspNetFramework.Tests.csproj | 4 ++-- Examples/BookingSystem.AspNetFramework.Tests/packages.config | 4 ++-- .../BookingSystem.AspNetFramework.csproj | 4 ++-- Examples/BookingSystem.AspNetFramework/packages.config | 2 +- OpenActive.Server.NET/OpenActive.Server.NET.csproj | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj b/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj index 0b532cf2..d9f47a64 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj +++ b/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj @@ -36,8 +36,8 @@ 4 - - ..\..\packages\AsyncKeyedLock.5.1.1\lib\netstandard2.0\AsyncKeyedLock.dll + + ..\..\packages\AsyncKeyedLock.5.1.2\lib\netstandard2.0\AsyncKeyedLock.dll diff --git a/Examples/BookingSystem.AspNetFramework.Tests/packages.config b/Examples/BookingSystem.AspNetFramework.Tests/packages.config index 5009c159..2ca4805d 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/packages.config +++ b/Examples/BookingSystem.AspNetFramework.Tests/packages.config @@ -1,6 +1,6 @@  - + @@ -13,4 +13,4 @@ - + \ No newline at end of file diff --git a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj index 9c61778d..3f665417 100644 --- a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj +++ b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj @@ -47,8 +47,8 @@ 4 - - ..\..\packages\AsyncKeyedLock.5.1.1\lib\netstandard2.0\AsyncKeyedLock.dll + + ..\..\packages\AsyncKeyedLock.5.1.2\lib\netstandard2.0\AsyncKeyedLock.dll ..\..\packages\Bogus.33.0.2\lib\net40\Bogus.dll diff --git a/Examples/BookingSystem.AspNetFramework/packages.config b/Examples/BookingSystem.AspNetFramework/packages.config index efe4f9ee..8e8ba17c 100644 --- a/Examples/BookingSystem.AspNetFramework/packages.config +++ b/Examples/BookingSystem.AspNetFramework/packages.config @@ -1,7 +1,7 @@  - + diff --git a/OpenActive.Server.NET/OpenActive.Server.NET.csproj b/OpenActive.Server.NET/OpenActive.Server.NET.csproj index 8421ee81..c39ad040 100644 --- a/OpenActive.Server.NET/OpenActive.Server.NET.csproj +++ b/OpenActive.Server.NET/OpenActive.Server.NET.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From ca4c8132765e336d31d3adfd00dbc10b8f692136 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Sat, 17 Dec 2022 20:47:54 +0100 Subject: [PATCH 11/47] Update to AsyncKeyedLock 6.0.1 --- .../BookingSystem.AspNetFramework.Tests.csproj | 4 ++-- Examples/BookingSystem.AspNetFramework.Tests/packages.config | 2 +- .../BookingSystem.AspNetFramework.csproj | 4 ++-- Examples/BookingSystem.AspNetFramework/packages.config | 2 +- OpenActive.Server.NET/OpenActive.Server.NET.csproj | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj b/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj index d9f47a64..a10847b2 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj +++ b/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj @@ -36,8 +36,8 @@ 4 - - ..\..\packages\AsyncKeyedLock.5.1.2\lib\netstandard2.0\AsyncKeyedLock.dll + + ..\..\packages\AsyncKeyedLock.6.0.1\lib\netstandard2.0\AsyncKeyedLock.dll diff --git a/Examples/BookingSystem.AspNetFramework.Tests/packages.config b/Examples/BookingSystem.AspNetFramework.Tests/packages.config index 2ca4805d..8bae4417 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/packages.config +++ b/Examples/BookingSystem.AspNetFramework.Tests/packages.config @@ -1,6 +1,6 @@  - + diff --git a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj index 3f665417..38fc70e4 100644 --- a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj +++ b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj @@ -47,8 +47,8 @@ 4 - - ..\..\packages\AsyncKeyedLock.5.1.2\lib\netstandard2.0\AsyncKeyedLock.dll + + ..\..\packages\AsyncKeyedLock.6.0.1\lib\netstandard2.0\AsyncKeyedLock.dll ..\..\packages\Bogus.33.0.2\lib\net40\Bogus.dll diff --git a/Examples/BookingSystem.AspNetFramework/packages.config b/Examples/BookingSystem.AspNetFramework/packages.config index 8e8ba17c..dd08b9ec 100644 --- a/Examples/BookingSystem.AspNetFramework/packages.config +++ b/Examples/BookingSystem.AspNetFramework/packages.config @@ -1,7 +1,7 @@  - + diff --git a/OpenActive.Server.NET/OpenActive.Server.NET.csproj b/OpenActive.Server.NET/OpenActive.Server.NET.csproj index c39ad040..774856bc 100644 --- a/OpenActive.Server.NET/OpenActive.Server.NET.csproj +++ b/OpenActive.Server.NET/OpenActive.Server.NET.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 119c61e2624d5acb1d9bd90c27cab5c40cee1698 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Sun, 18 Dec 2022 10:01:40 +0100 Subject: [PATCH 12/47] Update to AsyncKeyedLock 6.0.2 --- .../BookingSystem.AspNetFramework.Tests.csproj | 4 ++-- Examples/BookingSystem.AspNetFramework.Tests/packages.config | 2 +- .../BookingSystem.AspNetFramework.csproj | 4 ++-- Examples/BookingSystem.AspNetFramework/packages.config | 2 +- OpenActive.Server.NET/OpenActive.Server.NET.csproj | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj b/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj index a10847b2..719c69ae 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj +++ b/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj @@ -36,8 +36,8 @@ 4 - - ..\..\packages\AsyncKeyedLock.6.0.1\lib\netstandard2.0\AsyncKeyedLock.dll + + ..\..\packages\AsyncKeyedLock.6.0.2\lib\netstandard2.0\AsyncKeyedLock.dll diff --git a/Examples/BookingSystem.AspNetFramework.Tests/packages.config b/Examples/BookingSystem.AspNetFramework.Tests/packages.config index 8bae4417..b95cd3be 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/packages.config +++ b/Examples/BookingSystem.AspNetFramework.Tests/packages.config @@ -1,6 +1,6 @@  - + diff --git a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj index 38fc70e4..e1aa17bf 100644 --- a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj +++ b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj @@ -47,8 +47,8 @@ 4 - - ..\..\packages\AsyncKeyedLock.6.0.1\lib\netstandard2.0\AsyncKeyedLock.dll + + ..\..\packages\AsyncKeyedLock.6.0.2\lib\netstandard2.0\AsyncKeyedLock.dll ..\..\packages\Bogus.33.0.2\lib\net40\Bogus.dll diff --git a/Examples/BookingSystem.AspNetFramework/packages.config b/Examples/BookingSystem.AspNetFramework/packages.config index dd08b9ec..9d74c47e 100644 --- a/Examples/BookingSystem.AspNetFramework/packages.config +++ b/Examples/BookingSystem.AspNetFramework/packages.config @@ -1,7 +1,7 @@  - + diff --git a/OpenActive.Server.NET/OpenActive.Server.NET.csproj b/OpenActive.Server.NET/OpenActive.Server.NET.csproj index 774856bc..15161818 100644 --- a/OpenActive.Server.NET/OpenActive.Server.NET.csproj +++ b/OpenActive.Server.NET/OpenActive.Server.NET.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 6c1fa0ceb802a8cfbd25f869ea9a2399d136a326 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Thu, 29 Dec 2022 09:57:50 +0100 Subject: [PATCH 13/47] Update AsyncKeyedLocker to 6.0.3 --- .../BookingSystem.AspNetFramework.Tests.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj b/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj index 719c69ae..ddcde521 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj +++ b/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj @@ -36,8 +36,8 @@ 4 - - ..\..\packages\AsyncKeyedLock.6.0.2\lib\netstandard2.0\AsyncKeyedLock.dll + + ..\..\packages\AsyncKeyedLock.6.0.3\lib\netstandard2.0\AsyncKeyedLock.dll @@ -141,4 +141,4 @@ --> - \ No newline at end of file + From 7976e6ec7049b07c2ef74ae1008922b28bbff553 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Thu, 29 Dec 2022 09:57:57 +0100 Subject: [PATCH 14/47] Update AsyncKeyedLocker to 6.0.3 --- Examples/BookingSystem.AspNetFramework.Tests/packages.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework.Tests/packages.config b/Examples/BookingSystem.AspNetFramework.Tests/packages.config index b95cd3be..8152aa21 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/packages.config +++ b/Examples/BookingSystem.AspNetFramework.Tests/packages.config @@ -1,6 +1,6 @@  - + @@ -13,4 +13,4 @@ - \ No newline at end of file + From 2655657ade368c7f0b062cbaba56a0a0b820d785 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Thu, 29 Dec 2022 09:58:11 +0100 Subject: [PATCH 15/47] Update AsyncKeyedLocker to 6.0.3 --- .../BookingSystem.AspNetFramework.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj index e1aa17bf..1e5e38b2 100644 --- a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj +++ b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj @@ -47,8 +47,8 @@ 4 - - ..\..\packages\AsyncKeyedLock.6.0.2\lib\netstandard2.0\AsyncKeyedLock.dll + + ..\..\packages\AsyncKeyedLock.6.0.3\lib\netstandard2.0\AsyncKeyedLock.dll ..\..\packages\Bogus.33.0.2\lib\net40\Bogus.dll @@ -543,4 +543,4 @@ --> - \ No newline at end of file + From c4b3e1d6642c91a73bc9cd9b69f12113d491c1b6 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Thu, 29 Dec 2022 09:58:19 +0100 Subject: [PATCH 16/47] Update AsyncKeyedLocker to 6.0.3 --- Examples/BookingSystem.AspNetFramework/packages.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework/packages.config b/Examples/BookingSystem.AspNetFramework/packages.config index 9d74c47e..dd463696 100644 --- a/Examples/BookingSystem.AspNetFramework/packages.config +++ b/Examples/BookingSystem.AspNetFramework/packages.config @@ -1,7 +1,7 @@  - + @@ -128,4 +128,4 @@ - \ No newline at end of file + From a0b003eb5926eb9b9351bcec59d07bb8a545c358 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Thu, 29 Dec 2022 09:58:28 +0100 Subject: [PATCH 17/47] Update AsyncKeyedLocker to 6.0.3 --- OpenActive.Server.NET/OpenActive.Server.NET.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenActive.Server.NET/OpenActive.Server.NET.csproj b/OpenActive.Server.NET/OpenActive.Server.NET.csproj index 15161818..2a58b6d7 100644 --- a/OpenActive.Server.NET/OpenActive.Server.NET.csproj +++ b/OpenActive.Server.NET/OpenActive.Server.NET.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 143734c175367aae3d74025a1cfe4ed8b47ed79b Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Fri, 30 Dec 2022 14:38:44 +0100 Subject: [PATCH 18/47] Update to AsyncKeyedLock 6.0.4 --- .../BookingSystem.AspNetFramework.Tests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj b/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj index ddcde521..39b4ac19 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj +++ b/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj @@ -36,8 +36,8 @@ 4 - - ..\..\packages\AsyncKeyedLock.6.0.3\lib\netstandard2.0\AsyncKeyedLock.dll + + ..\..\packages\AsyncKeyedLock.6.0.4\lib\netstandard2.0\AsyncKeyedLock.dll From bc0ae43eb955f0e6d16b2089fa769042ba9938e3 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Fri, 30 Dec 2022 14:38:52 +0100 Subject: [PATCH 19/47] Update to AsyncKeyedLock 6.0.4 --- Examples/BookingSystem.AspNetFramework.Tests/packages.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/BookingSystem.AspNetFramework.Tests/packages.config b/Examples/BookingSystem.AspNetFramework.Tests/packages.config index 8152aa21..772db2e1 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/packages.config +++ b/Examples/BookingSystem.AspNetFramework.Tests/packages.config @@ -1,6 +1,6 @@  - + From b2db2ccc92378b6ac94e67c16389f93b36f49c7d Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Fri, 30 Dec 2022 14:39:05 +0100 Subject: [PATCH 20/47] Update to AsyncKeyedLock 6.0.4 --- .../BookingSystem.AspNetFramework.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj index 1e5e38b2..c57888f0 100644 --- a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj +++ b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj @@ -47,8 +47,8 @@ 4 - - ..\..\packages\AsyncKeyedLock.6.0.3\lib\netstandard2.0\AsyncKeyedLock.dll + + ..\..\packages\AsyncKeyedLock.6.0.4\lib\netstandard2.0\AsyncKeyedLock.dll ..\..\packages\Bogus.33.0.2\lib\net40\Bogus.dll From 8f90abad1d30c0fe9ed3e2bffabc34f3581c474f Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Fri, 30 Dec 2022 14:39:16 +0100 Subject: [PATCH 21/47] Update to AsyncKeyedLock 6.0.4 --- Examples/BookingSystem.AspNetFramework/packages.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/BookingSystem.AspNetFramework/packages.config b/Examples/BookingSystem.AspNetFramework/packages.config index dd463696..7badeed2 100644 --- a/Examples/BookingSystem.AspNetFramework/packages.config +++ b/Examples/BookingSystem.AspNetFramework/packages.config @@ -1,7 +1,7 @@  - + From 4559cb0b5953fa273c6982b8104eb3d1d8b1d96c Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Fri, 30 Dec 2022 14:39:29 +0100 Subject: [PATCH 22/47] Update to AsyncKeyedLock 6.0.4 --- OpenActive.Server.NET/OpenActive.Server.NET.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenActive.Server.NET/OpenActive.Server.NET.csproj b/OpenActive.Server.NET/OpenActive.Server.NET.csproj index 2a58b6d7..10487d64 100644 --- a/OpenActive.Server.NET/OpenActive.Server.NET.csproj +++ b/OpenActive.Server.NET/OpenActive.Server.NET.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From d2eb1035539f163d95d3d481cd4dad69e1d6a490 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Mon, 2 Jan 2023 09:10:52 +0100 Subject: [PATCH 23/47] Update to AsyncKeyedLock 6.0.5 --- .../BookingSystem.AspNetFramework.Tests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj b/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj index 39b4ac19..28043670 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj +++ b/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj @@ -36,8 +36,8 @@ 4 - - ..\..\packages\AsyncKeyedLock.6.0.4\lib\netstandard2.0\AsyncKeyedLock.dll + + ..\..\packages\AsyncKeyedLock.6.0.5\lib\netstandard2.0\AsyncKeyedLock.dll From 8a643759352339480b72ebc7e1567c90baefb622 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Mon, 2 Jan 2023 09:10:58 +0100 Subject: [PATCH 24/47] Update to AsyncKeyedLock 6.0.5 --- Examples/BookingSystem.AspNetFramework.Tests/packages.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/BookingSystem.AspNetFramework.Tests/packages.config b/Examples/BookingSystem.AspNetFramework.Tests/packages.config index 772db2e1..0869ce3a 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/packages.config +++ b/Examples/BookingSystem.AspNetFramework.Tests/packages.config @@ -1,6 +1,6 @@  - + From 013b48e9a9cf70bef0184998aac488e89223d1b8 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Mon, 2 Jan 2023 09:11:10 +0100 Subject: [PATCH 25/47] Update to AsyncKeyedLock 6.0.5 --- .../BookingSystem.AspNetFramework.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj index c57888f0..df2f5053 100644 --- a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj +++ b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj @@ -47,8 +47,8 @@ 4 - - ..\..\packages\AsyncKeyedLock.6.0.4\lib\netstandard2.0\AsyncKeyedLock.dll + + ..\..\packages\AsyncKeyedLock.6.0.5\lib\netstandard2.0\AsyncKeyedLock.dll ..\..\packages\Bogus.33.0.2\lib\net40\Bogus.dll From 44ff9f478aa42c532297c323c400428c6c83cd43 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Mon, 2 Jan 2023 09:11:17 +0100 Subject: [PATCH 26/47] Update to AsyncKeyedLock 6.0.5 --- Examples/BookingSystem.AspNetFramework/packages.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/BookingSystem.AspNetFramework/packages.config b/Examples/BookingSystem.AspNetFramework/packages.config index 7badeed2..5c435878 100644 --- a/Examples/BookingSystem.AspNetFramework/packages.config +++ b/Examples/BookingSystem.AspNetFramework/packages.config @@ -1,7 +1,7 @@  - + From 730f7e9060b8ce77fcd17376e15af3fbc8b56233 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Mon, 2 Jan 2023 09:11:28 +0100 Subject: [PATCH 27/47] Update to AsyncKeyedLock 6.0.5 --- OpenActive.Server.NET/OpenActive.Server.NET.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenActive.Server.NET/OpenActive.Server.NET.csproj b/OpenActive.Server.NET/OpenActive.Server.NET.csproj index 10487d64..8d19a518 100644 --- a/OpenActive.Server.NET/OpenActive.Server.NET.csproj +++ b/OpenActive.Server.NET/OpenActive.Server.NET.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 927a1cc7dfb52c918ed32c54e62954087dbeb887 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Tue, 10 Jan 2023 09:18:28 +0100 Subject: [PATCH 28/47] Fixes --- .../App.config | 80 ++-- ...BookingSystem.AspNetFramework.Tests.csproj | 3 +- .../packages.config | 4 +- .../BookingSystem.AspNetFramework.csproj | 3 +- .../BookingSystem.AspNetFramework/Web.config | 378 +++++++++--------- .../packages.config | 4 +- 6 files changed, 237 insertions(+), 235 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework.Tests/App.config b/Examples/BookingSystem.AspNetFramework.Tests/App.config index 18291db0..40607753 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/App.config +++ b/Examples/BookingSystem.AspNetFramework.Tests/App.config @@ -1,4 +1,4 @@ - + - + \ No newline at end of file diff --git a/Examples/BookingSystem.AspNetFramework.Tests/packages.config b/Examples/BookingSystem.AspNetFramework.Tests/packages.config index 0869ce3a..83e0a409 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/packages.config +++ b/Examples/BookingSystem.AspNetFramework.Tests/packages.config @@ -1,6 +1,6 @@  - + @@ -13,4 +13,4 @@ - + \ No newline at end of file diff --git a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj index df2f5053..134da3e1 100644 --- a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj +++ b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj @@ -49,6 +49,7 @@ ..\..\packages\AsyncKeyedLock.6.0.5\lib\netstandard2.0\AsyncKeyedLock.dll + True ..\..\packages\Bogus.33.0.2\lib\net40\Bogus.dll @@ -543,4 +544,4 @@ --> - + \ No newline at end of file diff --git a/Examples/BookingSystem.AspNetFramework/Web.config b/Examples/BookingSystem.AspNetFramework/Web.config index a8929689..62fad715 100644 --- a/Examples/BookingSystem.AspNetFramework/Web.config +++ b/Examples/BookingSystem.AspNetFramework/Web.config @@ -1,4 +1,4 @@ - + - + - - - - - - + + + + + + - + - - - - - - - - + + + + + + + + - + - + - - - - + + + + - - - - - - - - + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/Examples/BookingSystem.AspNetFramework/packages.config b/Examples/BookingSystem.AspNetFramework/packages.config index 5c435878..ea5de7c2 100644 --- a/Examples/BookingSystem.AspNetFramework/packages.config +++ b/Examples/BookingSystem.AspNetFramework/packages.config @@ -1,7 +1,7 @@  - + @@ -128,4 +128,4 @@ - + \ No newline at end of file From b30997bc007c39a356b9bfbdc4242a6c00e10866 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Sun, 15 Jan 2023 11:13:07 +0100 Subject: [PATCH 29/47] Switch all target frameworks of NuGet packages from net461 to net462, as per project framework. --- .../packages.config | 24 +- .../packages.config | 254 +++++++++--------- 2 files changed, 139 insertions(+), 139 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework.Tests/packages.config b/Examples/BookingSystem.AspNetFramework.Tests/packages.config index 83e0a409..c1b49eaf 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/packages.config +++ b/Examples/BookingSystem.AspNetFramework.Tests/packages.config @@ -1,16 +1,16 @@  - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/Examples/BookingSystem.AspNetFramework/packages.config b/Examples/BookingSystem.AspNetFramework/packages.config index ea5de7c2..b7c0d74e 100644 --- a/Examples/BookingSystem.AspNetFramework/packages.config +++ b/Examples/BookingSystem.AspNetFramework/packages.config @@ -1,131 +1,131 @@  - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From bbdeeb04d2fba922a7c17e71019b2e48043909cb Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Sun, 22 Jan 2023 18:18:34 +0100 Subject: [PATCH 30/47] Enabled pooling for AsyncKeyedLock --- .../CustomBookingEngine/CustomBookingEngine.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenActive.Server.NET/CustomBookingEngine/CustomBookingEngine.cs b/OpenActive.Server.NET/CustomBookingEngine/CustomBookingEngine.cs index e7e97b85..4e8f14ed 100644 --- a/OpenActive.Server.NET/CustomBookingEngine/CustomBookingEngine.cs +++ b/OpenActive.Server.NET/CustomBookingEngine/CustomBookingEngine.cs @@ -131,7 +131,11 @@ public CustomBookingEngine(BookingEngineSettings settings, Uri openBookingAPIBas private Uri openDataFeedBaseUrl; private Dictionary> idConfigurationLookup; private Dictionary feedAssignedTemplates; - private static readonly AsyncKeyedLocker asyncKeyedLock = new AsyncKeyedLocker(); + private static readonly AsyncKeyedLocker asyncKeyedLock = new AsyncKeyedLocker(o => + { + o.PoolSize = 20; + o.PoolInitialFill = 1; + })); protected Dictionary OpportunityTemplateLookup { get; } From b0b3014c834e8a22e3b6205bf7bd1be4812fcbd6 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Mon, 23 Jan 2023 16:19:12 +0100 Subject: [PATCH 31/47] Fixed syntax error --- .../CustomBookingEngine/CustomBookingEngine.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenActive.Server.NET/CustomBookingEngine/CustomBookingEngine.cs b/OpenActive.Server.NET/CustomBookingEngine/CustomBookingEngine.cs index 4e8f14ed..f1fecdf4 100644 --- a/OpenActive.Server.NET/CustomBookingEngine/CustomBookingEngine.cs +++ b/OpenActive.Server.NET/CustomBookingEngine/CustomBookingEngine.cs @@ -135,7 +135,7 @@ public CustomBookingEngine(BookingEngineSettings settings, Uri openBookingAPIBas { o.PoolSize = 20; o.PoolInitialFill = 1; - })); + }); protected Dictionary OpportunityTemplateLookup { get; } From 06a414370155fc62cef29ae3c14a9f916196712a Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Thu, 26 Jan 2023 09:32:53 +0100 Subject: [PATCH 32/47] Update to AsyncKeyedLock 6.1.0 --- .../BookingSystem.AspNetFramework.Tests.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj b/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj index 2aa94c4f..b9cf9191 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj +++ b/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj @@ -36,8 +36,8 @@ 4 - - ..\..\packages\AsyncKeyedLock.6.0.5\lib\netstandard2.0\AsyncKeyedLock.dll + + ..\..\packages\AsyncKeyedLock.6.1.0\lib\netstandard2.0\AsyncKeyedLock.dll True @@ -142,4 +142,4 @@ --> - \ No newline at end of file + From b7ff01bea5b9eaf29962f99a0e5e40807492feea Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Thu, 26 Jan 2023 09:33:12 +0100 Subject: [PATCH 33/47] Update to AsyncKeyedLock 6.1.0 --- Examples/BookingSystem.AspNetFramework.Tests/packages.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework.Tests/packages.config b/Examples/BookingSystem.AspNetFramework.Tests/packages.config index c1b49eaf..5a3491fe 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/packages.config +++ b/Examples/BookingSystem.AspNetFramework.Tests/packages.config @@ -1,6 +1,6 @@  - + @@ -13,4 +13,4 @@ - \ No newline at end of file + From 36b6152a89fd40b47050c28455dc04978d59d8f5 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Thu, 26 Jan 2023 09:33:29 +0100 Subject: [PATCH 34/47] Update to AsyncKeyedLock 6.1.0 --- .../BookingSystem.AspNetFramework.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj index 134da3e1..87956b96 100644 --- a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj +++ b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj @@ -47,8 +47,8 @@ 4 - - ..\..\packages\AsyncKeyedLock.6.0.5\lib\netstandard2.0\AsyncKeyedLock.dll + + ..\..\packages\AsyncKeyedLock.6.1.0\lib\netstandard2.0\AsyncKeyedLock.dll True @@ -544,4 +544,4 @@ --> - \ No newline at end of file + From f1f89409c806e384bbb16e95db0a43f9608fb3d4 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Thu, 26 Jan 2023 09:33:59 +0100 Subject: [PATCH 35/47] Update to AsyncKeyedLock 6.1.0 --- OpenActive.Server.NET/OpenActive.Server.NET.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenActive.Server.NET/OpenActive.Server.NET.csproj b/OpenActive.Server.NET/OpenActive.Server.NET.csproj index 8d19a518..b85c7a8e 100644 --- a/OpenActive.Server.NET/OpenActive.Server.NET.csproj +++ b/OpenActive.Server.NET/OpenActive.Server.NET.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 84819bba8dbe72eef41463d6768034d0773eff97 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Fri, 27 Jan 2023 19:14:32 +0100 Subject: [PATCH 36/47] Update to AsyncKeyedLock 6.1.1 --- OpenActive.Server.NET/OpenActive.Server.NET.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenActive.Server.NET/OpenActive.Server.NET.csproj b/OpenActive.Server.NET/OpenActive.Server.NET.csproj index b85c7a8e..985ae5f5 100644 --- a/OpenActive.Server.NET/OpenActive.Server.NET.csproj +++ b/OpenActive.Server.NET/OpenActive.Server.NET.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 813b1ec5668c6f27141392a3c32c2248ed413f5c Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Fri, 27 Jan 2023 19:14:43 +0100 Subject: [PATCH 37/47] Update to AsyncKeyedLock 6.1.1 --- .../BookingSystem.AspNetFramework.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj index 87956b96..2f79e191 100644 --- a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj +++ b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj @@ -47,8 +47,8 @@ 4 - - ..\..\packages\AsyncKeyedLock.6.1.0\lib\netstandard2.0\AsyncKeyedLock.dll + + ..\..\packages\AsyncKeyedLock.6.1.1\lib\netstandard2.0\AsyncKeyedLock.dll True From 4ed308f5c6018f8d5cef49e5b90fa39fa524ea4b Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Fri, 27 Jan 2023 19:14:49 +0100 Subject: [PATCH 38/47] Update to AsyncKeyedLock 6.1.1 --- Examples/BookingSystem.AspNetFramework.Tests/packages.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/BookingSystem.AspNetFramework.Tests/packages.config b/Examples/BookingSystem.AspNetFramework.Tests/packages.config index 5a3491fe..c3ac1fdf 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/packages.config +++ b/Examples/BookingSystem.AspNetFramework.Tests/packages.config @@ -1,6 +1,6 @@  - + From 0e9d4dee8f7c9feca2755b889aed12e8d5657f04 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Fri, 27 Jan 2023 19:15:18 +0100 Subject: [PATCH 39/47] Update to AsyncKeyedLock 6.1.1 --- .../BookingSystem.AspNetFramework.Tests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj b/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj index b9cf9191..2f11d708 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj +++ b/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj @@ -36,8 +36,8 @@ 4 - - ..\..\packages\AsyncKeyedLock.6.1.0\lib\netstandard2.0\AsyncKeyedLock.dll + + ..\..\packages\AsyncKeyedLock.6.1.1\lib\netstandard2.0\AsyncKeyedLock.dll True From 1ffb83b6b02365452ab7ea73008dfff9ea902569 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Sat, 25 Feb 2023 14:17:27 +0100 Subject: [PATCH 40/47] Update to AsyncKeyedLock 6.2.0 --- .../BookingSystem.AspNetFramework.Tests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj b/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj index 2f11d708..eeb5abca 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj +++ b/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj @@ -36,8 +36,8 @@ 4 - - ..\..\packages\AsyncKeyedLock.6.1.1\lib\netstandard2.0\AsyncKeyedLock.dll + + ..\..\packages\AsyncKeyedLock.6.2.0\lib\netstandard2.0\AsyncKeyedLock.dll True From 8718f297dddcb793f166dbab8f4661cade0f19f0 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Sat, 25 Feb 2023 14:17:57 +0100 Subject: [PATCH 41/47] Update to AsyncKeyedLock 6.2.0 --- Examples/BookingSystem.AspNetFramework.Tests/packages.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/BookingSystem.AspNetFramework.Tests/packages.config b/Examples/BookingSystem.AspNetFramework.Tests/packages.config index c3ac1fdf..7203918f 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/packages.config +++ b/Examples/BookingSystem.AspNetFramework.Tests/packages.config @@ -1,6 +1,6 @@  - + From f03605a75093dc6a238fe7a05bba878da8865032 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Sat, 25 Feb 2023 14:18:18 +0100 Subject: [PATCH 42/47] Update to AsyncKeyedLock 6.2.0 --- .../BookingSystem.AspNetFramework.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj index 2f79e191..e048b3ff 100644 --- a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj +++ b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj @@ -47,8 +47,8 @@ 4 - - ..\..\packages\AsyncKeyedLock.6.1.1\lib\netstandard2.0\AsyncKeyedLock.dll + + ..\..\packages\AsyncKeyedLock.6.2.0\lib\netstandard2.0\AsyncKeyedLock.dll True From dde71e3b21c761489ebe2afbe0d27a5746ba3554 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Sat, 25 Feb 2023 14:18:40 +0100 Subject: [PATCH 43/47] Update to AsyncKeyedLock 6.2.0 --- OpenActive.Server.NET/OpenActive.Server.NET.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenActive.Server.NET/OpenActive.Server.NET.csproj b/OpenActive.Server.NET/OpenActive.Server.NET.csproj index 985ae5f5..c0cb7b60 100644 --- a/OpenActive.Server.NET/OpenActive.Server.NET.csproj +++ b/OpenActive.Server.NET/OpenActive.Server.NET.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 858a1603ea88a198a2b7eb0746bc65a77627bfc1 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Thu, 21 Dec 2023 09:49:44 +0100 Subject: [PATCH 44/47] Update BookingSystem.AspNetFramework.Tests.csproj --- .../BookingSystem.AspNetFramework.Tests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj b/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj index eeb5abca..1bd7a5ea 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj +++ b/Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj @@ -36,8 +36,8 @@ 4 - - ..\..\packages\AsyncKeyedLock.6.2.0\lib\netstandard2.0\AsyncKeyedLock.dll + + ..\..\packages\AsyncKeyedLock.6.2.4\lib\netstandard2.0\AsyncKeyedLock.dll True From 6b9128ab3b94ecc0ea7dac24ef8a37ef3aee42e9 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Thu, 21 Dec 2023 09:50:10 +0100 Subject: [PATCH 45/47] Update packages.config --- Examples/BookingSystem.AspNetFramework.Tests/packages.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/BookingSystem.AspNetFramework.Tests/packages.config b/Examples/BookingSystem.AspNetFramework.Tests/packages.config index 7203918f..ae3cf376 100644 --- a/Examples/BookingSystem.AspNetFramework.Tests/packages.config +++ b/Examples/BookingSystem.AspNetFramework.Tests/packages.config @@ -1,6 +1,6 @@  - + From 098a245797b7b9369add832810d452e57ec9aea8 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Thu, 21 Dec 2023 09:50:34 +0100 Subject: [PATCH 46/47] Update BookingSystem.AspNetFramework.csproj --- .../BookingSystem.AspNetFramework.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj index e048b3ff..61444d42 100644 --- a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj +++ b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj @@ -47,8 +47,8 @@ 4 - - ..\..\packages\AsyncKeyedLock.6.2.0\lib\netstandard2.0\AsyncKeyedLock.dll + + ..\..\packages\AsyncKeyedLock.6.2.4\lib\netstandard2.0\AsyncKeyedLock.dll True From f6e71f453b7e42976ac67c63950aa3d2fcff84d7 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Thu, 21 Dec 2023 09:51:17 +0100 Subject: [PATCH 47/47] Update OpenActive.Server.NET.csproj --- OpenActive.Server.NET/OpenActive.Server.NET.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenActive.Server.NET/OpenActive.Server.NET.csproj b/OpenActive.Server.NET/OpenActive.Server.NET.csproj index c0cb7b60..58f49632 100644 --- a/OpenActive.Server.NET/OpenActive.Server.NET.csproj +++ b/OpenActive.Server.NET/OpenActive.Server.NET.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive