Update OpenMcdf to latest version. Fixes #37

neilharvey · Aug 10, 2021 · f7537f4 · f7537f4 · arachnodedotnet · Aug 11, 2021
1 parent be76567
commit f7537f4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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>
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
                 {
@@ Expand Down @@