Update to OpenMcdf 3.0.3 (#605)

Author: DavidBoike

src/Directory.Build.props

@@ -3,10 +3,9 @@
   <PropertyGroup>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <LangVersion>preview</LangVersion>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
     <NoWarn>NU1608</NoWarn>
-    <AssemblyOriginatorKeyFile>../key.snk</AssemblyOriginatorKeyFile>
-    <Version>2.0.1</Version>
+    <Version>3.0.0</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <DebugType>embedded</DebugType>

src/Directory.Packages.props

@@ -7,7 +7,7 @@
     <PackageVersion Include="MarkdownSnippets.MsBuild" Version="28.0.0-beta.2" />
     <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageVersion Include="OpenMcdf" Version="2.4.1" />
+    <PackageVersion Include="OpenMcdf" Version="3.0.3" />
     <PackageVersion Include="Polyfill" Version="8.8.1" />
     <PackageVersion Include="ProjectDefaults" Version="1.0.157" />
     <PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />

src/SetStartupProjects/InternalsVisibleTo.cs

@@ -1 +1 @@
-[assembly:InternalsVisibleTo("Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100638A43140E8A1271C1453DF1379E64B40B67A1F333864C1AEF5AC318A0FA2008545C3D35A82EF005EDF0DE1AD1E1EA155722FE289DF0E462F78C40A668CBC96D7BE1D487FAEF5714A54BB4E57909C86B3924C2DB6D55CCF59939B99EB0CAB6E8A91429BA0CE630C08A319B323BDDCBBD509F1AFE4AE77A6CBB8B447F588FEBC3")]
+[assembly:InternalsVisibleTo("Tests")]

src/SetStartupProjects/Resource.cs

@@ -2,6 +2,11 @@
 {
     static Assembly assembly = typeof(Resource).Assembly;
 
-    public static Stream AsStream(string name) =>
-        assembly.GetManifestResourceStream($"SetStartupProjects.{name}")!;
+    public static MemoryStream AsStream(string name)
+    {
+        using var stream = assembly.GetManifestResourceStream($"SetStartupProjects.{name}")!;
+        var memoryStream = new MemoryStream();
+        stream.CopyTo(memoryStream);
+        return memoryStream;
+    }
 }

src/SetStartupProjects/StartProjectSuoCreator.cs

@@ -48,12 +48,16 @@ static void Write(List<string> startupProjectGuids, string solutionDirectory, st
         using var stream = Resource.AsStream($"Solution{resourceKey}.suotemplate");
         try
         {
-            using var compoundFile = new CompoundFile(stream, CFSUpdateMode.ReadOnly, CFSConfiguration.SectorRecycle | CFSConfiguration.EraseFreeSectors);
-            compoundFile.RootStorage.Delete("SolutionConfiguration");
-            var solutionConfiguration = compoundFile.RootStorage.AddStream("SolutionConfiguration");
+            using var root = RootStorage.Open(stream);
+            root.Delete("SolutionConfiguration");
+            var solutionConfiguration = root.CreateStream("SolutionConfiguration");
 
             SetSolutionConfigValue(solutionConfiguration, startupProjectGuids);
-            compoundFile.SaveAs(suoFilePath);
+
+            using var fileStream = new FileStream(suoFilePath, FileMode.CreateNew);
+            stream.Position = 0;
+            stream.CopyTo(fileStream);
+            fileStream.Flush();
         }
         catch (Exception exception)
         {
@@ -63,7 +67,7 @@ static void Write(List<string> startupProjectGuids, string solutionDirectory, st
         }
     }
 
-    static void SetSolutionConfigValue(CFStream cfStream, IEnumerable<string> startupProjectGuids)
+    static void SetSolutionConfigValue(CfbStream cfStream, IEnumerable<string> startupProjectGuids)
     {
         var single = Encoding.GetEncodings()
             .Single(_ => string.Equals(_.Name, "utf-16", StringComparison.OrdinalIgnoreCase));
@@ -97,6 +101,7 @@ static void SetSolutionConfigValue(CFStream cfStream, IEnumerable<string> startu
         }
 
         var newBytes = encoding.GetBytes(builder.ToString());
-        cfStream.SetData(newBytes);
+        cfStream.Write(newBytes);
+        cfStream.Flush();
     }
 }