Skip to content

Switched from AsyncDuplicateLock to AsyncKeyedLock #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 52 commits into
base: master
Choose a base branch
from
Open

Switched from AsyncDuplicateLock to AsyncKeyedLock #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
16dc11d
Switched from AsyncDuplicateLock to AsyncKeyedLock
MarkCiliaVincenti Nov 19, 2022
9995181
Bump AsyncKeyedLock to 5.0.3
MarkCiliaVincenti Nov 26, 2022
9006418
Update to AsyncKeyedLock 5.0.4
MarkCiliaVincenti Nov 28, 2022
1942563
Update to AsyncKeyedLock 5.1.0
MarkCiliaVincenti Dec 3, 2022
4594f70
Updated to AsyncKeyedLock 5.1.1
MarkCiliaVincenti Dec 13, 2022
25bda1f
Merge
MarkCiliaVincenti Dec 13, 2022
834070b
Revert
MarkCiliaVincenti Dec 13, 2022
9259257
Updated target framework
MarkCiliaVincenti Dec 13, 2022
86daae3
Revert
MarkCiliaVincenti Dec 13, 2022
882a2d1
Performance improvement
MarkCiliaVincenti Dec 13, 2022
479e938
Update to AsyncKeyedLock 5.1.2
MarkCiliaVincenti Dec 16, 2022
ca4c813
Update to AsyncKeyedLock 6.0.1
MarkCiliaVincenti Dec 17, 2022
119c61e
Update to AsyncKeyedLock 6.0.2
MarkCiliaVincenti Dec 18, 2022
6c1fa0c
Update AsyncKeyedLocker to 6.0.3
MarkCiliaVincenti Dec 29, 2022
7976e6e
Update AsyncKeyedLocker to 6.0.3
MarkCiliaVincenti Dec 29, 2022
2655657
Update AsyncKeyedLocker to 6.0.3
MarkCiliaVincenti Dec 29, 2022
c4b3e1d
Update AsyncKeyedLocker to 6.0.3
MarkCiliaVincenti Dec 29, 2022
a0b003e
Update AsyncKeyedLocker to 6.0.3
MarkCiliaVincenti Dec 29, 2022
143734c
Update to AsyncKeyedLock 6.0.4
MarkCiliaVincenti Dec 30, 2022
bc0ae43
Update to AsyncKeyedLock 6.0.4
MarkCiliaVincenti Dec 30, 2022
b2db2cc
Update to AsyncKeyedLock 6.0.4
MarkCiliaVincenti Dec 30, 2022
8f90aba
Update to AsyncKeyedLock 6.0.4
MarkCiliaVincenti Dec 30, 2022
4559cb0
Update to AsyncKeyedLock 6.0.4
MarkCiliaVincenti Dec 30, 2022
d2eb103
Update to AsyncKeyedLock 6.0.5
MarkCiliaVincenti Jan 2, 2023
8a64375
Update to AsyncKeyedLock 6.0.5
MarkCiliaVincenti Jan 2, 2023
013b48e
Update to AsyncKeyedLock 6.0.5
MarkCiliaVincenti Jan 2, 2023
44ff9f4
Update to AsyncKeyedLock 6.0.5
MarkCiliaVincenti Jan 2, 2023
730f7e9
Update to AsyncKeyedLock 6.0.5
MarkCiliaVincenti Jan 2, 2023
927a1cc
Fixes
MarkCiliaVincenti Jan 10, 2023
b30997b
Switch all target frameworks of NuGet packages from net461 to net462,…
MarkCiliaVincenti Jan 15, 2023
bbdeeb0
Enabled pooling for AsyncKeyedLock
MarkCiliaVincenti Jan 22, 2023
b0b3014
Fixed syntax error
MarkCiliaVincenti Jan 23, 2023
06a4143
Update to AsyncKeyedLock 6.1.0
MarkCiliaVincenti Jan 26, 2023
b7ff01b
Update to AsyncKeyedLock 6.1.0
MarkCiliaVincenti Jan 26, 2023
36b6152
Update to AsyncKeyedLock 6.1.0
MarkCiliaVincenti Jan 26, 2023
f1f8940
Update to AsyncKeyedLock 6.1.0
MarkCiliaVincenti Jan 26, 2023
84819bb
Update to AsyncKeyedLock 6.1.1
MarkCiliaVincenti Jan 27, 2023
813b1ec
Update to AsyncKeyedLock 6.1.1
MarkCiliaVincenti Jan 27, 2023
4ed308f
Update to AsyncKeyedLock 6.1.1
MarkCiliaVincenti Jan 27, 2023
0e9d4de
Update to AsyncKeyedLock 6.1.1
MarkCiliaVincenti Jan 27, 2023
1ffb83b
Update to AsyncKeyedLock 6.2.0
MarkCiliaVincenti Feb 25, 2023
8718f29
Update to AsyncKeyedLock 6.2.0
MarkCiliaVincenti Feb 25, 2023
f03605a
Update to AsyncKeyedLock 6.2.0
MarkCiliaVincenti Feb 25, 2023
dde71e3
Update to AsyncKeyedLock 6.2.0
MarkCiliaVincenti Feb 25, 2023
9813b77
Merge branch 'openactive:master' into AsyncKeyedLock
MarkCiliaVincenti Apr 7, 2023
972fa73
Merge branch 'master' into AsyncKeyedLock
MarkCiliaVincenti May 14, 2023
7f6f01f
Merge branch 'master' into AsyncKeyedLock
MarkCiliaVincenti Dec 21, 2023
858a160
Update BookingSystem.AspNetFramework.Tests.csproj
MarkCiliaVincenti Dec 21, 2023
6b9128a
Update packages.config
MarkCiliaVincenti Dec 21, 2023
098a245
Update BookingSystem.AspNetFramework.csproj
MarkCiliaVincenti Dec 21, 2023
f6e71f4
Update OpenActive.Server.NET.csproj
MarkCiliaVincenti Dec 21, 2023
d1c8bb0
Merge branch 'master' into AsyncKeyedLock
MarkCiliaVincenti Apr 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 40 additions & 40 deletions Examples/BookingSystem.AspNetFramework.Tests/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!--
Note: Add entries to the App.config file for configuration settings
that apply only to the Test project.
Expand All @@ -14,81 +14,81 @@
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0"/>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930"/>
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
<assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
<assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.IdentityModel.Logging" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0"/>
<assemblyIdentity name="Microsoft.IdentityModel.Logging" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0"/>
<assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0"/>
<assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.IdentityModel.Protocols.OpenIdConnect" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.2.1.0" newVersion="5.2.1.0"/>
<assemblyIdentity name="Microsoft.IdentityModel.Protocols.OpenIdConnect" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.1.0" newVersion="5.2.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.IdentityModel.Protocols" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.2.1.0" newVersion="5.2.1.0"/>
<assemblyIdentity name="Microsoft.IdentityModel.Protocols" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.1.0" newVersion="5.2.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Cryptography.Cng" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0"/>
<assemblyIdentity name="System.Security.Cryptography.Cng" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1"/>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1"/>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Schema.NET" publicKeyToken="fc5550082a9c642c" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.0.1.0" newVersion="7.0.1.0"/>
<assemblyIdentity name="Schema.NET" publicKeyToken="fc5550082a9c642c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.0.1.0" newVersion="7.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1"/>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0"/>
<assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>
12 changes: 11 additions & 1 deletion Examples/BookingSystem.AspNetFramework.Tests/BookingSystem.AspNetFramework.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="AsyncKeyedLock, Version=6.2.4.0, Culture=neutral, PublicKeyToken=c6dde91429ba0f2f, processorArchitecture=MSIL">
<HintPath>..\..\packages\AsyncKeyedLock.6.2.4\lib\netstandard2.0\AsyncKeyedLock.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework">
<HintPath>..\..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
Expand All @@ -48,6 +52,12 @@
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.Web.Extensions" />
Expand Down Expand Up @@ -132,4 +142,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
25 changes: 14 additions & 11 deletions Examples/BookingSystem.AspNetFramework.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net461" />
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net461" />
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net461" />
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net461" />
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net461" />
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net461" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
<package id="MSTest.TestAdapter" version="1.2.0" targetFramework="net461" />
<package id="MSTest.TestFramework" version="1.2.0" targetFramework="net461" />
<package id="Newtonsoft.Json" version="11.0.1" targetFramework="net461" />
</packages>
<package id="AsyncKeyedLock" version="6.2.4" targetFramework="net462" />
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net462" />
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net462" />
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net462" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net462" />
<package id="MSTest.TestAdapter" version="1.2.0" targetFramework="net462" />
<package id="MSTest.TestFramework" version="1.2.0" targetFramework="net462" />
<package id="Newtonsoft.Json" version="11.0.1" targetFramework="net462" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
</packages>
6 changes: 5 additions & 1 deletion Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="AsyncKeyedLock, Version=6.2.4.0, Culture=neutral, PublicKeyToken=c6dde91429ba0f2f, processorArchitecture=MSIL">
<HintPath>..\..\packages\AsyncKeyedLock.6.2.4\lib\netstandard2.0\AsyncKeyedLock.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Bogus, Version=33.0.2.0, Culture=neutral, PublicKeyToken=fa1bb3f3f218129a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Bogus.33.0.2\lib\net40\Bogus.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -540,4 +544,4 @@
</Target>
<Target Name="AfterBuild">
</Target> -->
</Project>
</Project>
6 changes: 3 additions & 3 deletions Examples/BookingSystem.AspNetFramework/Web.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>
<!--
For more information on how to configure your ASP.NET application, please visit
https://go.microsoft.com/fwlink/?LinkId=301879
Expand Down Expand Up @@ -40,7 +40,7 @@
<add assembly="System.ComponentModel.Composition, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</assemblies>
</compilation>
<httpRuntime targetFramework="4.6.1" />
<httpRuntime targetFramework="4.6.2" />
</system.web>
<system.webServer>
<modules>
Expand Down Expand Up @@ -385,4 +385,4 @@
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
</compilers>
</system.codedom>
</configuration>
</configuration>
Loading