Remove Backport.System.Threading.Lock dependency (#4724)

StefanOssendorf · web-flow · commit 98774d54664f · 2025-09-22T09:57:29.000-05:00
* Remove Backport.System.Threading.Lock dependency

* Remove Backport.System.Threading.Lock dependency from test projects
diff --git a/Source/Csla.Analyzers/Csla.Analyzers/Csla.Analyzers.csproj b/Source/Csla.Analyzers/Csla.Analyzers/Csla.Analyzers.csproj
@@ -41,11 +41,4 @@
     </EmbeddedResource>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Backport.System.Threading.Lock" Version="3.1.4" />
-    <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>
-
 </Project>
diff --git a/Source/Csla.Channels.RabbitMq/Csla.Channels.RabbitMq.csproj b/Source/Csla.Channels.RabbitMq/Csla.Channels.RabbitMq.csproj
@@ -26,11 +26,4 @@
     <ProjectReference Include="..\Csla\Csla.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Backport.System.Threading.Lock" Version="3.1.4" />
-    <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>
-
 </Project>
diff --git a/Source/Csla.Channels.RabbitMq/ProxyListener.cs b/Source/Csla.Channels.RabbitMq/ProxyListener.cs
@@ -109,7 +109,11 @@ private async Task InitializeRabbitMQ()
     }
 
     private volatile bool IsListening;
-    private readonly Lock ListeningLock = LockFactory.Create();
+#if NET9_0_OR_GREATER
+    private readonly Lock ListeningLock = new();
+#else
+    private readonly object ListeningLock = new();
+#endif
 
     public async Task StartListening()
     {
diff --git a/Source/Csla.Generators/cs/AutoImplementProperties/Csla.Generator.AutoImplementProperties.Attributes.CSharp/Csla.Generator.AutoImplementProperties.Attributes.CSharp.csproj b/Source/Csla.Generators/cs/AutoImplementProperties/Csla.Generator.AutoImplementProperties.Attributes.CSharp/Csla.Generator.AutoImplementProperties.Attributes.CSharp.csproj
@@ -18,11 +18,4 @@
     <DelaySign>false</DelaySign>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Backport.System.Threading.Lock" Version="3.1.4" />
-    <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>
 </Project>
diff --git a/Source/Csla.Generators/cs/AutoImplementProperties/Csla.Generator.AutoImplementProperties.CSharp/Csla.Generator.AutoImplementProperties.CSharp.csproj b/Source/Csla.Generators/cs/AutoImplementProperties/Csla.Generator.AutoImplementProperties.CSharp/Csla.Generator.AutoImplementProperties.CSharp.csproj
@@ -39,19 +39,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Csla.Generator.AutoImplementProperties.Attributes.CSharp\Csla.Generator.AutoImplementProperties.Attributes.CSharp.csproj" 
-                      PrivateAssets="All"/>
+    <ProjectReference Include="..\Csla.Generator.AutoImplementProperties.Attributes.CSharp\Csla.Generator.AutoImplementProperties.Attributes.CSharp.csproj" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Polyfill" Version="7.4.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Backport.System.Threading.Lock" Version="3.1.4" />
-    <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>
 
 </Project>
diff --git a/Source/Csla.Generators/cs/AutoSerialization/Csla.Generator.AutoSerialization.Attributes.CSharp/Csla.Generator.AutoSerialization.Attributes.CSharp.csproj b/Source/Csla.Generators/cs/AutoSerialization/Csla.Generator.AutoSerialization.Attributes.CSharp/Csla.Generator.AutoSerialization.Attributes.CSharp.csproj
@@ -17,11 +17,4 @@
     <DelaySign>false</DelaySign>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Backport.System.Threading.Lock" Version="3.1.4" />
-    <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>
 </Project>
diff --git a/Source/Csla.Generators/cs/AutoSerialization/Csla.Generator.AutoSerialization.CSharp/Csla.Generator.AutoSerialization.CSharp.csproj b/Source/Csla.Generators/cs/AutoSerialization/Csla.Generator.AutoSerialization.CSharp/Csla.Generator.AutoSerialization.CSharp.csproj
@@ -38,19 +38,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Csla.Generator.AutoSerialization.Attributes.CSharp\Csla.Generator.AutoSerialization.Attributes.CSharp.csproj" 
-                      PrivateAssets="All" />
+    <ProjectReference Include="..\Csla.Generator.AutoSerialization.Attributes.CSharp\Csla.Generator.AutoSerialization.Attributes.CSharp.csproj" PrivateAssets="All" />
   </ItemGroup>
   
   <ItemGroup>
     <PackageReference Include="Polyfill" Version="7.4.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Backport.System.Threading.Lock" Version="3.1.4" />    
-    <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>
 
 </Project>
diff --git a/Source/Csla/ApplicationContext.cs b/Source/Csla/ApplicationContext.cs
@@ -106,7 +106,11 @@ public IContextDictionary LocalContext
       }
     }
 
-    private readonly Lock _syncContext = LockFactory.Create();
+#if NET9_0_OR_GREATER
+    private readonly Lock _syncContext = new();
+#else
+    private readonly object _syncContext = new();
+#endif
 
     /// <summary>
     /// Returns the application-specific context data provided
diff --git a/Source/Csla/Core/BusinessBase.cs b/Source/Csla/Core/BusinessBase.cs
@@ -3849,7 +3849,11 @@ protected override void OnSetChildren(SerializationInfo info, MobileFormatter fo
     protected internal class BypassPropertyChecksObject : IDisposable
     {
       private BusinessBase? _businessObject;
-      private static Lock _lock = LockFactory.Create();
+#if NET9_0_OR_GREATER
+      private static Lock _lock = new();
+#else
+      private static object _lock = new();
+#endif
 
       internal BypassPropertyChecksObject(BusinessBase businessObject)
       {
diff --git a/Source/Csla/Core/FieldManager/PropertyInfoManager.cs b/Source/Csla/Core/FieldManager/PropertyInfoManager.cs
@@ -36,7 +36,11 @@ public override int Compare(IPropertyInfo? x, IPropertyInfo? y)
   /// </summary>
   public static class PropertyInfoManager
   {
-    private static readonly Lock _cacheLock = LockFactory.Create();
+#if NET9_0_OR_GREATER
+    private static readonly Lock _cacheLock = new();
+#else
+    private static readonly object _cacheLock = new();
+#endif
 
 #if NET8_0_OR_GREATER
     private static ConcurrentDictionary<Type, Tuple<string?, PropertyInfoList>>? _propertyInfoCache;
diff --git a/Source/Csla/Core/LoadManager/AsyncLoadManager.cs b/Source/Csla/Core/LoadManager/AsyncLoadManager.cs
@@ -23,7 +23,12 @@ public AsyncLoadManager(IManageProperties target, Action<IPropertyInfo> onProper
 
     }
 
-    private Lock _syncRoot = LockFactory.Create();
+#if NET9_0_OR_GREATER
+    private Lock _syncRoot = new();
+#else
+    private object _syncRoot = new();
+#endif
+
     private readonly ObservableCollection<IAsyncLoader> _loading = [];
 
     public bool IsLoading
diff --git a/Source/Csla/Csla.csproj b/Source/Csla/Csla.csproj
@@ -138,11 +138,5 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Backport.System.Threading.Lock" Version="3.1.4" />    
-    <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>
 
 </Project>
diff --git a/Source/Csla/LazySingleton.cs b/Source/Csla/LazySingleton.cs
@@ -9,7 +9,11 @@ namespace Csla
   public sealed class LazySingleton<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T> : Core.IUseApplicationContext
     where T : class
   {
-    private readonly Lock _syncRoot = LockFactory.Create();
+#if NET9_0_OR_GREATER
+    private readonly Lock _syncRoot = new();
+#else
+    private readonly object _syncRoot = new();
+#endif
     private T? _value;
     private readonly Func<T> _delegate;
 
diff --git a/Source/Csla/Rules/BrokenRulesCollection.cs b/Source/Csla/Rules/BrokenRulesCollection.cs
@@ -23,7 +23,11 @@ namespace Csla.Rules
   [Serializable]
   public class BrokenRulesCollection : Core.ReadOnlyObservableBindingList<BrokenRule>
   {
-    private Lock _syncRoot = LockFactory.Create();
+#if NET9_0_OR_GREATER
+    private Lock _syncRoot = new();
+#else
+    private object _syncRoot = new();
+#endif
 
 
     /// <summary>
diff --git a/Source/Csla/Rules/BusinessRules.cs b/Source/Csla/Rules/BusinessRules.cs
@@ -42,8 +42,13 @@ public BusinessRules(ApplicationContext applicationContext, IHostRules target)
       _target = target ?? throw new ArgumentNullException(nameof(target));
     }
 
+#if NET9_0_OR_GREATER
     [NonSerialized]
-    private Lock _syncRoot = LockFactory.Create();
+    private Lock _syncRoot = new();
+#else
+    [NonSerialized]
+    private object _syncRoot = new();
+#endif
 
     private ApplicationContext _applicationContext;
 
@@ -1306,7 +1311,7 @@ void ISerializationNotification.Deserialized()
     [System.Runtime.Serialization.OnDeserialized]
     private void OnDeserializedHandler(System.Runtime.Serialization.StreamingContext context)
     {
-      _syncRoot = LockFactory.Create();
+      _syncRoot = new();
     }
 
     #endregion
diff --git a/Source/tests/GraphMergerTest/GraphMergerTest.Dal/GraphMergerTest.Dal.csproj b/Source/tests/GraphMergerTest/GraphMergerTest.Dal/GraphMergerTest.Dal.csproj
@@ -8,11 +8,4 @@
     <PackageReference Include="System.Memory.Data" Version="8.0.0" />
     <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Backport.System.Threading.Lock" Version="3.1.4" />
-    <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>  
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,11 @@ private async Task InitializeRabbitMQ()`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`private volatile bool IsListening;`
`112`		`- private readonly Lock ListeningLock = LockFactory.Create();`
	`112`	`+#if NET9_0_OR_GREATER`
	`113`	`+ private readonly Lock ListeningLock = new();`
	`114`	`+#else`
	`115`	`+ private readonly object ListeningLock = new();`
	`116`	`+#endif`
`113`	`117`
`114`	`118`	`public async Task StartListening()`
`115`	`119`	`{`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,11 @@ public IContextDictionary LocalContext`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
`109`		`- private readonly Lock _syncContext = LockFactory.Create();`
	`109`	`+#if NET9_0_OR_GREATER`
	`110`	`+ private readonly Lock _syncContext = new();`
	`111`	`+#else`
	`112`	`+ private readonly object _syncContext = new();`
	`113`	`+#endif`
`110`	`114`
`111`	`115`	`/// <summary>`
`112`	`116`	`/// Returns the application-specific context data provided`
Original file line number	Diff line number	Diff line change
`@@ -3849,7 +3849,11 @@ protected override void OnSetChildren(SerializationInfo info, MobileFormatter fo`
`3849`	`3849`	`protected internal class BypassPropertyChecksObject : IDisposable`
`3850`	`3850`	`{`
`3851`	`3851`	`private BusinessBase? _businessObject;`
`3852`		`- private static Lock _lock = LockFactory.Create();`
	`3852`	`+#if NET9_0_OR_GREATER`
	`3853`	`+ private static Lock _lock = new();`
	`3854`	`+#else`
	`3855`	`+ private static object _lock = new();`
	`3856`	`+#endif`
`3853`	`3857`
`3854`	`3858`	`internal BypassPropertyChecksObject(BusinessBase businessObject)`
`3855`	`3859`	`{`