Use new type "Lock" instead of object in .NET 9

Author: PawelGerr

Directory.Build.props

@@ -12,7 +12,7 @@
     <RepositoryUrl>https://[email protected]/pawelgerr/Thinktecture.EntityFrameworkCore/_git/Thinktecture.EntityFrameworkCore</RepositoryUrl>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <RootNamespace>Thinktecture</RootNamespace>
-    <TargetFramework>net8.0</TargetFramework> 
+    <TargetFrameworks>net8.0;net9.0;</TargetFrameworks> 
     <LangVersion>13.0</LangVersion>
     <Nullable>enable</Nullable>
     <NoWarn>$(NoWarn);CA1303;MSB3884;</NoWarn>

src/Thinktecture.EntityFrameworkCore.BulkOperations/EntityFrameworkCore/TempTables/NameSuffixing/TempTableSuffixCache.cs

@@ -5,12 +5,12 @@ namespace Thinktecture.EntityFrameworkCore.TempTables.NameSuffixing;
 
 internal class TempTableSuffixCache
 {
-   private readonly object _lock;
+   private readonly Lock _lock;
    private readonly Dictionary<DbConnection, CachedTempTableSuffixes> _globalCache;
 
    public TempTableSuffixCache()
    {
-      _lock = new object();
+      _lock = new Lock();
       _globalCache = new Dictionary<DbConnection, CachedTempTableSuffixes>();
    }
 

src/Thinktecture.EntityFrameworkCore.BulkOperations/EntityFrameworkCore/TempTables/NameSuffixing/TempTableSuffixLeasing.cs

@@ -6,7 +6,7 @@ namespace Thinktecture.EntityFrameworkCore.TempTables.NameSuffixing;
 
 internal class TempTableSuffixLeasing : IDisposable
 {
-   private readonly object _lock;
+   private readonly Lock _lock;
    private readonly TempTableSuffixCache _cache;
    private readonly ICurrentDbContext _currentDbContext;
    private DbConnection? _connection;
@@ -20,7 +20,7 @@ public TempTableSuffixLeasing(
    {
       _cache = cache ?? throw new ArgumentNullException(nameof(cache));
       _currentDbContext = currentDbContext ?? throw new ArgumentNullException(nameof(currentDbContext));
-      _lock = new object();
+      _lock = new Lock();
 
       // don't fetch the connection and suffix lookup immediately but on first use only
    }

src/Thinktecture.EntityFrameworkCore.BulkOperations/Globals.cs

@@ -0,0 +1,6 @@
+global using Lock =
+#if NET9_0_OR_GREATER
+   System.Threading.Lock;
+#else
+   System.Object;
+#endif

src/Thinktecture.EntityFrameworkCore.SqlServer.Testing/EntityFrameworkCore/Testing/SqlServerTestDbContextProvider.cs

@@ -13,14 +13,14 @@ namespace Thinktecture.EntityFrameworkCore.Testing;
 /// </summary>
 public abstract class SqlServerTestDbContextProvider
 {
-   private static readonly object _sharedLock = new();
+   private static readonly Lock _sharedLock = new();
 
    /// <summary>
    /// Provides a lock object for database-wide operations like creation of tables.
    /// </summary>
    /// <param name="ctx">Current database context.</param>
    /// <returns>A lock object.</returns>
-   protected virtual object GetSharedLock(DbContext ctx)
+   protected virtual Lock GetSharedLock(DbContext ctx)
    {
       return _sharedLock;
    }
@@ -33,7 +33,7 @@ protected virtual object GetSharedLock(DbContext ctx)
 public class SqlServerTestDbContextProvider<T> : SqlServerTestDbContextProvider, ITestDbContextProvider<T>
    where T : DbContext
 {
-   private readonly object _instanceWideLock;
+   private readonly Lock _instanceWideLock;
    private readonly ITestIsolationOptions _isolationOptions;
    private readonly DbContextOptions<T> _masterDbContextOptions;
    private readonly DbContextOptions<T> _dbContextOptions;
@@ -93,7 +93,7 @@ protected internal SqlServerTestDbContextProvider(SqlServerTestDbContextProvider
    {
       ArgumentNullException.ThrowIfNull(options);
 
-      _instanceWideLock = new object();
+      _instanceWideLock = new Lock();
       Schema = options.Schema;
       _sharedTablesIsolationLevel = ValidateIsolationLevel(options.SharedTablesIsolationLevel);
       _isolationOptions = options.IsolationOptions;

src/Thinktecture.EntityFrameworkCore.SqlServer.Testing/Globals.cs

@@ -0,0 +1,6 @@
+global using Lock =
+#if NET9_0_OR_GREATER
+   System.Threading.Lock;
+#else
+   System.Object;
+#endif

src/Thinktecture.EntityFrameworkCore.Sqlite.Testing/EntityFrameworkCore/Testing/SqliteTestDbContextProvider.cs

@@ -12,7 +12,7 @@ namespace Thinktecture.EntityFrameworkCore.Testing;
 public class SqliteTestDbContextProvider<T> : ITestDbContextProvider<T>
    where T : DbContext
 {
-   private readonly object _lock = new();
+   private readonly Lock _lock = new();
 
    private readonly DbContextOptions<T> _masterDbContextOptions;
    private readonly DbContextOptions<T> _dbContextOptions;

src/Thinktecture.EntityFrameworkCore.Sqlite.Testing/Globals.cs

@@ -0,0 +1,6 @@
+global using Lock =
+#if NET9_0_OR_GREATER
+   System.Threading.Lock;
+#else
+   System.Object;
+#endif

src/Thinktecture.EntityFrameworkCore.Testing/Globals.cs

@@ -0,0 +1,6 @@
+global using Lock =
+#if NET9_0_OR_GREATER
+   System.Threading.Lock;
+#else
+   System.Object;
+#endif

src/Thinktecture.EntityFrameworkCore.Testing/Logging/SubLoggerFactory.cs

@@ -5,7 +5,7 @@ namespace Thinktecture.Logging;
 internal class SubLoggerFactory : ILoggerProvider
 {
    private readonly Dictionary<string, SubLogger> _loggers = new(StringComparer.Ordinal);
-   private readonly object _sync = new();
+   private readonly Lock _sync = new();
 
    private readonly ILoggerFactory _loggerFactory;