From 60a3a74862052361be60fed93b85bbf0c4f0395c Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Tue, 25 Feb 2025 21:21:32 -0500
Subject: [PATCH] Fix how conditions are used for references

---
 .../BinaryObjectScanner.Test.csproj           |  8 +++----
 .../BinaryObjectScanner.csproj                | 22 +++++--------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/BinaryObjectScanner.Test/BinaryObjectScanner.Test.csproj b/BinaryObjectScanner.Test/BinaryObjectScanner.Test.csproj
index 1ded8921..32cf69b7 100644
--- a/BinaryObjectScanner.Test/BinaryObjectScanner.Test.csproj
+++ b/BinaryObjectScanner.Test/BinaryObjectScanner.Test.csproj
@@ -12,14 +12,14 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="6.0.3">
+        <PackageReference Include="coverlet.collector" Version="6.0.4">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
         <PackageReference Include="SabreTools.Serialization" Version="1.8.6" />
-        <PackageReference Include="xunit" Version="2.9.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
diff --git a/BinaryObjectScanner/BinaryObjectScanner.csproj b/BinaryObjectScanner/BinaryObjectScanner.csproj
index 2073d9a2..5f5cb0f5 100644
--- a/BinaryObjectScanner/BinaryObjectScanner.csproj
+++ b/BinaryObjectScanner/BinaryObjectScanner.csproj
@@ -70,28 +70,18 @@
         <InternalsVisibleTo Include="BinaryObjectScanner.Test" />
     </ItemGroup>
 
-    <!-- Support for old .NET versions -->
-    <ItemGroup Condition="$(TargetFramework.StartsWith(`net2`))">
-        <PackageReference Include="Net35.Actions" Version="1.1.0" />
-    </ItemGroup>
-    <ItemGroup Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`))">
-        <PackageReference Include="OpenMcdf" Version="2.3.1" />
-    </ItemGroup>
-    <ItemGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net40`))">
-        <PackageReference Include="MinAsyncBridge" Version="0.12.4" />
-    </ItemGroup>
-    <ItemGroup Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))">
-        <PackageReference Include="SharpCompress" Version="0.38.0" />
-        <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
-    </ItemGroup>
-
     <ItemGroup>
+        <PackageReference Include="MinAsyncBridge" Version="0.12.4" Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net40`))" />
+        <PackageReference Include="Net35.Actions" Version="1.1.0" Condition="$(TargetFramework.StartsWith(`net2`))" />
+        <PackageReference Include="OpenMcdf" Version="2.4.1" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`))" />
         <PackageReference Include="SabreTools.Compression" Version="0.6.3" />
-        <PackageReference Include="SabreTools.Hashing" Version="1.4.1" />
+        <PackageReference Include="SabreTools.Hashing" Version="1.4.2" />
         <PackageReference Include="SabreTools.IO" Version="1.6.2" />
         <PackageReference Include="SabreTools.Matching" Version="1.5.1" />
         <PackageReference Include="SabreTools.Models" Version="1.5.8" />
         <PackageReference Include="SabreTools.Serialization" Version="1.8.6" />
+        <PackageReference Include="SharpCompress" Version="0.39.0" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
+        <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.2" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
         <PackageReference Include="UnshieldSharp" Version="1.9.4" />
         <PackageReference Include="WiseUnpacker" Version="1.5.6" />
     </ItemGroup>