Addresses #4450 (Fix issues with Backport.System.Threading.Lock package)

MarimerLLC · Feb 8, 2025 · 1fdb007 · 1fdb007
1 parent 6f10aaa
commit 1fdb007
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 9 deletions.
diff --git a/Source/Csla.Analyzers/Csla.Analyzers/Csla.Analyzers.csproj b/Source/Csla.Analyzers/Csla.Analyzers/Csla.Analyzers.csproj
@@ -16,7 +16,6 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0" PrivateAssets="all" />
     <PackageReference Update="NETStandard.Library" PrivateAssets="all" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="Backport.System.Threading.Lock" Version="3.1.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -39,4 +38,11 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Backport.System.Threading.Lock" Version="3.1.0" />
+    <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
@@ -23,4 +23,11 @@
     <ProjectReference Include="..\Csla\Csla.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Backport.System.Threading.Lock" Version="3.1.0" />
+    <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/...perties.Attributes.CSharp/Csla.Generator.AutoImplementProperties.Attributes.CSharp.csproj b/...perties.Attributes.CSharp/Csla.Generator.AutoImplementProperties.Attributes.CSharp.csproj
@@ -19,5 +19,8 @@
 
   <ItemGroup>
     <PackageReference Include="Backport.System.Threading.Lock" Version="3.1.0" />
+    <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/...rator.AutoImplementProperties.CSharp/Csla.Generator.AutoImplementProperties.CSharp.csproj b/...rator.AutoImplementProperties.CSharp/Csla.Generator.AutoImplementProperties.CSharp.csproj
@@ -33,7 +33,6 @@
     <PackageReference Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" PrivateAssets="all" />
-     <PackageReference Include="Backport.System.Threading.Lock" Version="3.1.0" />
    </ItemGroup>
 
   <ItemGroup>
@@ -46,4 +45,11 @@
                       PrivateAssets="All"/>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Backport.System.Threading.Lock" Version="3.1.0" />
+    <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/...Serialization.Attributes.CSharp/Csla.Generator.AutoSerialization.Attributes.CSharp.csproj b/...Serialization.Attributes.CSharp/Csla.Generator.AutoSerialization.Attributes.CSharp.csproj
@@ -18,5 +18,8 @@
 
   <ItemGroup>
     <PackageReference Include="Backport.System.Threading.Lock" Version="3.1.0" />
+    <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/...on/Csla.Generator.AutoSerialization.CSharp/Csla.Generator.AutoSerialization.CSharp.csproj b/...on/Csla.Generator.AutoSerialization.CSharp/Csla.Generator.AutoSerialization.CSharp.csproj
@@ -32,7 +32,6 @@
    <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" PrivateAssets="all" />
-     <PackageReference Include="Backport.System.Threading.Lock" Version="3.1.0" />
    </ItemGroup>
 
   <ItemGroup>
@@ -44,5 +43,12 @@
     <ProjectReference Include="..\Csla.Generator.AutoSerialization.Attributes.CSharp\Csla.Generator.AutoSerialization.Attributes.CSharp.csproj" 
                       PrivateAssets="All" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Backport.System.Threading.Lock" Version="3.1.0" />    
+    <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/Csla.csproj b/Source/Csla/Csla.csproj
@@ -102,7 +102,6 @@
     <PackageReference Include="System.Text.Json" Version="8.0.5" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
-    <PackageReference Include="Backport.System.Threading.Lock" Version="3.1.0" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\bin\Release\netstandard2.0\Csla.Analyzers.dll">
@@ -123,5 +122,11 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Backport.System.Threading.Lock" Version="3.1.0" />    
+    <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/Directory.Build.props b/Source/Directory.Build.props
@@ -20,9 +20,4 @@
    <NeutralLanguage>en-US</NeutralLanguage>
    <DefaultLanguage>en-US</DefaultLanguage>
  </PropertyGroup>
- <ItemGroup>
-  <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>