update version

luxuia · Jun 22, 2024 · 4099e77 · 4099e77
1 parent 38334d7
commit 4099e77
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/ExcelMerge.sln b/ExcelMerge.sln
@@ -1,14 +1,10 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.8.34227.203
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExcelMerge", "ExcelMerge\ExcelMerge.csproj", "{09AA7F86-7EF6-44D4-98D9-916D4E2FC258}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B666D83B-68A5-482E-A2AD-91D0E3038784} = {B666D83B-68A5-482E-A2AD-91D0E3038784}
-	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnityYamlParser", "UnityYamlParser\UnityYamlParser.csproj", "{B666D83B-68A5-482E-A2AD-91D0E3038784}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnityYamlParser", "UnityYamlParser\UnityYamlParser.csproj", "{3EB4337C-A0A9-4CD6-98E2-547ADE0EC58B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -20,10 +16,10 @@ Global
 		{09AA7F86-7EF6-44D4-98D9-916D4E2FC258}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{09AA7F86-7EF6-44D4-98D9-916D4E2FC258}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{09AA7F86-7EF6-44D4-98D9-916D4E2FC258}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B666D83B-68A5-482E-A2AD-91D0E3038784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B666D83B-68A5-482E-A2AD-91D0E3038784}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B666D83B-68A5-482E-A2AD-91D0E3038784}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B666D83B-68A5-482E-A2AD-91D0E3038784}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3EB4337C-A0A9-4CD6-98E2-547ADE0EC58B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3EB4337C-A0A9-4CD6-98E2-547ADE0EC58B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3EB4337C-A0A9-4CD6-98E2-547ADE0EC58B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3EB4337C-A0A9-4CD6-98E2-547ADE0EC58B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/ExcelMerge/ExcelMerge.csproj b/ExcelMerge/ExcelMerge.csproj
@@ -75,7 +75,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="NPOI" Version="2.5.6" />
+    <PackageReference Include="NPOI" Version="2.7.0" />
     <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
     <PackageReference Include="SharpSvn.1.9-x86" Version="1.9007.3987.251" />
     <PackageReference Include="SharpZipLib" Version="1.4.1" />

diff --git a/ExcelMerge/Util.cs b/ExcelMerge/Util.cs
@@ -92,20 +92,22 @@ public static SolidColorBrush GetColorByDiffStatus(DiffStatus status) {
 
         public static IWorkbook GetWorkBook(string file) {
             IWorkbook book = null;
+            /*
             try
             {
                 using (var s = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
                 {
-                    book = WorkbookFactory.Create(s);
+                    book = WorkbookFactory.Create(s, true);
                 }
             }
             finally
+            */
             {
                 if (book == null)
                 {
                     using (var s = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read))
                     {
-                        book = WorkbookFactory.Create(s);
+                        book = WorkbookFactory.Create(s, true);
                     }
                 }
             }

diff --git a/ExcelMerge/YAMLDifferWindow.xaml.cs b/ExcelMerge/YAMLDifferWindow.xaml.cs
@@ -15,7 +15,6 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 using UnityYamlParser;
-using static Org.BouncyCastle.Math.EC.ECCurve;
 using static System.Reflection.Metadata.BlobBuilder;
 
 namespace ExcelMerge