Used source generator instead.

Author: MarkCiliaVincenti

build-common/NHibernate.props

@@ -6,7 +6,7 @@
     <VersionPatch  Condition="'$(VersionPatch)'  == ''">0</VersionPatch>
     <!-- Clear VersionSuffix for making release and set it to dev for making development builds -->
     <VersionSuffix Condition="'$(VersionSuffix)' == ''">dev</VersionSuffix>
-    <LangVersion Condition="'$(MSBuildProjectExtension)' != '.vbproj'">preview</LangVersion>
+    <LangVersion Condition="'$(MSBuildProjectExtension)' != '.vbproj'">13.0</LangVersion>
 
     <VersionPrefix Condition="'$(VersionPrefix)' == ''">$(NhVersion).$(VersionPatch)</VersionPrefix>
     <VersionSuffix Condition="'$(VersionSuffix)' != '' AND '$(BuildNumber)' != ''">$(VersionSuffix).$(BuildNumber)</VersionSuffix>

src/NHibernate/Cache/Timestamper.cs

@@ -12,7 +12,7 @@ namespace NHibernate.Cache
 	///	</remarks>
 	public static class Timestamper
 	{
-		private static Lock lockObject = new Lock();
+		private static Lock lockObject = LockFactory.Create();
 
 		// hibernate is using System.currentMilliSeconds which is calculated
 		// from jan 1, 1970

src/NHibernate/Context/MapBasedSessionContext.cs

@@ -10,7 +10,7 @@ public abstract class MapBasedSessionContext : CurrentSessionContext
 		private readonly ISessionFactoryImplementor _factory;
 
 		// Must be static, different instances of MapBasedSessionContext may have to yield the same map.
-		private static readonly Lock _locker = new Lock();
+		private static readonly Lock _locker = LockFactory.Create();
 
 		protected MapBasedSessionContext(ISessionFactoryImplementor factory)
 		{

src/NHibernate/NHibernate.csproj

@@ -73,8 +73,14 @@
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
-    <PackageReference Include="Backport.System.Threading.Lock" Version="1.1.6" />
+  <ItemGroup>
+    <PackageReference Include="Backport.System.Threading.Lock" Version="3.1.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>analyzers</IncludeAssets>
+    </PackageReference>
+    <Using Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" Alias="Lock" Include="System.Threading.Lock" />
+    <Using Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" Alias="Lock" Include="Backport.System.Threading.Lock" />
+    <Using Alias="LockFactory" Include="Backport.System.Threading.LockFactory" />
   </ItemGroup>
 
   <ItemGroup>

src/NHibernate/Stat/StatisticsImpl.cs

@@ -9,7 +9,7 @@ namespace NHibernate.Stat
 {
 	public class StatisticsImpl : IStatistics, IStatisticsImplementor
 	{
-		private readonly Lock _syncRoot = new Lock();
+		private readonly Lock _syncRoot = LockFactory.Create();
 
 		private static readonly INHibernateLogger log = NHibernateLogger.For(typeof(StatisticsImpl));
 		private readonly ISessionFactoryImplementor sessionFactory;

src/NHibernate/Util/AsyncReaderWriterLock.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -9,6 +9,7 @@ namespace NHibernate.Util
 	// https://devblogs.microsoft.com/pfxteam/building-async-coordination-primitives-part-7-asyncreaderwriterlock/
 	internal class AsyncReaderWriterLock : IDisposable, Cache.ICacheLock
 	{
+		private readonly Lock _writeLockLock = LockFactory.Create();
 		private readonly SemaphoreSlim _writeLockSemaphore = new SemaphoreSlim(1, 1);
 		private readonly SemaphoreSlim _readLockSemaphore = new SemaphoreSlim(0, 1);
 		private readonly Releaser _writerReleaser;
@@ -48,7 +49,7 @@ public Releaser WriteLock()
 			if (!CanEnterWriteLock(out var waitForReadLocks))
 			{
 				_writeLockSemaphore.Wait();
-				lock (_writeLockSemaphore)
+				lock (_writeLockLock)
 				{
 					_writersWaiting--;
 				}
@@ -74,7 +75,7 @@ public async Task<Releaser> WriteLockAsync()
 			if (!CanEnterWriteLock(out var waitForReadLocks))
 			{
 				await _writeLockSemaphore.WaitAsync().ConfigureAwait(false);
-				lock (_writeLockSemaphore)
+				lock (_writeLockLock)
 				{
 					_writersWaiting--;
 				}
@@ -126,7 +127,7 @@ async Task<Releaser> ReadLockInternalAsync()
 
 		public void Dispose()
 		{
-			lock (_writeLockSemaphore)
+			lock (_writeLockLock)
 			{
 				_writeLockSemaphore.Dispose();
 				_readLockSemaphore.Dispose();
@@ -139,7 +140,7 @@ public void Dispose()
 		private bool CanEnterWriteLock(out bool waitForReadLocks)
 		{
 			waitForReadLocks = false;
-			lock (_writeLockSemaphore)
+			lock (_writeLockLock)
 			{
 				AssertNotDisposed();
 				if (_writeLockSemaphore.CurrentCount > 0 && _writeLockSemaphore.Wait(0))
@@ -156,7 +157,7 @@ private bool CanEnterWriteLock(out bool waitForReadLocks)
 
 		private void ExitWriteLock()
 		{
-			lock (_writeLockSemaphore)
+			lock (_writeLockLock)
 			{
 				AssertNotDisposed();
 				if (_writeLockSemaphore.CurrentCount == 1)
@@ -187,7 +188,7 @@ private void ExitWriteLock()
 
 		private bool CanEnterReadLock(out SemaphoreSlim waitingReadLockSemaphore)
 		{
-			lock (_writeLockSemaphore)
+			lock (_writeLockLock)
 			{
 				AssertNotDisposed();
 				if (_writersWaiting == 0 && _writeLockSemaphore.CurrentCount > 0)
@@ -212,7 +213,7 @@ private bool CanEnterReadLock(out SemaphoreSlim waitingReadLockSemaphore)
 
 		private void ExitReadLock()
 		{
-			lock (_writeLockSemaphore)
+			lock (_writeLockLock)
 			{
 				AssertNotDisposed();
 				if (_currentReaders == 0)

src/NHibernate/Util/SimpleMRUCache.cs

@@ -18,7 +18,7 @@ public class SimpleMRUCache : IDeserializationCallback
 	{
 		private const int DefaultStrongRefCount = 128;
 
-		private readonly Lock _syncRoot = new Lock();
+		private readonly Lock _syncRoot = LockFactory.Create();
 
 		private readonly int strongReferenceCount;
 

src/NHibernate/Util/SoftLimitMRUCache.cs

@@ -24,7 +24,7 @@ namespace NHibernate.Util
 	public class SoftLimitMRUCache : IDeserializationCallback
 	{
 		private const int DefaultStrongRefCount = 128;
-		private readonly Lock _syncRoot = new Lock();
+		private readonly Lock _syncRoot = LockFactory.Create();
 
 		private readonly int strongReferenceCount;