From f7537f418c733ff20a542725f293531d702722ae Mon Sep 17 00:00:00 2001
From: Neil Harvey <neil.harvey@hotmail.co.uk>
Date: Tue, 10 Aug 2021 20:01:08 +0100
Subject: [PATCH] Update OpenMcdf to latest version.  Fixes #37

---
 src/FileSignatures/FileSignatures.csproj              | 11 ++++++-----
 src/FileSignatures/Formats/CompoundFileBinary.cs      |  2 +-
 test/FileSignatures.Tests/FileSignatures.Tests.csproj |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/FileSignatures/FileSignatures.csproj b/src/FileSignatures/FileSignatures.csproj
index 6a663c5..f6d6c20 100644
--- a/src/FileSignatures/FileSignatures.csproj
+++ b/src/FileSignatures/FileSignatures.csproj
@@ -13,12 +13,13 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <Version>4.0.0</Version>
+    <Version>4.0.1</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <AssemblyVersion>4.0.0</AssemblyVersion>
+    <AssemblyVersion>4.0.1</AssemblyVersion>
     <LangVersion>8.0</LangVersion>
     <Nullable>enable</Nullable>
+    <FileVersion>4.0.1</FileVersion>
 
   </PropertyGroup>
 
@@ -35,19 +36,19 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="OpenMcdf">
-      <Version>2.2.1.3</Version>
+      <Version>2.2.1.9</Version>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
     <PackageReference Include="OpenMcdf">
-      <Version>2.2.1.3</Version>
+      <Version>2.2.1.9</Version>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
     <PackageReference Include="OpenMcdf">
-      <Version>2.2.1.3</Version>
+      <Version>2.2.1.9</Version>
     </PackageReference>
   </ItemGroup>
 
diff --git a/src/FileSignatures/Formats/CompoundFileBinary.cs b/src/FileSignatures/Formats/CompoundFileBinary.cs
index 69584e5..a3bb1a0 100644
--- a/src/FileSignatures/Formats/CompoundFileBinary.cs
+++ b/src/FileSignatures/Formats/CompoundFileBinary.cs
@@ -42,7 +42,7 @@ public bool IsMatch(IDisposable? file)
         {
             if(file is CompoundFile cf)
             {
-                return cf.RootStorage.TryGetStream(Storage) != null;
+                return cf.RootStorage.TryGetStream(Storage, out CFStream _);
             }
             else
             {
diff --git a/test/FileSignatures.Tests/FileSignatures.Tests.csproj b/test/FileSignatures.Tests/FileSignatures.Tests.csproj
index a192384..edc64be 100644
--- a/test/FileSignatures.Tests/FileSignatures.Tests.csproj
+++ b/test/FileSignatures.Tests/FileSignatures.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>FileSignatures.Tests</AssemblyName>
     <PackageId>FileSignatures.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>