Skip to content

Commit 4099e77

Browse files
committed
update version
1 parent 38334d7 commit 4099e77

4 files changed

Lines changed: 10 additions & 13 deletions

File tree

ExcelMerge.sln

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
32
# Visual Studio Version 17
43
VisualStudioVersion = 17.8.34227.203
54
MinimumVisualStudioVersion = 10.0.40219.1
65
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExcelMerge", "ExcelMerge\ExcelMerge.csproj", "{09AA7F86-7EF6-44D4-98D9-916D4E2FC258}"
7-
ProjectSection(ProjectDependencies) = postProject
8-
{B666D83B-68A5-482E-A2AD-91D0E3038784} = {B666D83B-68A5-482E-A2AD-91D0E3038784}
9-
EndProjectSection
106
EndProject
11-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnityYamlParser", "UnityYamlParser\UnityYamlParser.csproj", "{B666D83B-68A5-482E-A2AD-91D0E3038784}"
7+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnityYamlParser", "UnityYamlParser\UnityYamlParser.csproj", "{3EB4337C-A0A9-4CD6-98E2-547ADE0EC58B}"
128
EndProject
139
Global
1410
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -20,10 +16,10 @@ Global
2016
{09AA7F86-7EF6-44D4-98D9-916D4E2FC258}.Debug|Any CPU.Build.0 = Debug|Any CPU
2117
{09AA7F86-7EF6-44D4-98D9-916D4E2FC258}.Release|Any CPU.ActiveCfg = Release|Any CPU
2218
{09AA7F86-7EF6-44D4-98D9-916D4E2FC258}.Release|Any CPU.Build.0 = Release|Any CPU
23-
{B666D83B-68A5-482E-A2AD-91D0E3038784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
24-
{B666D83B-68A5-482E-A2AD-91D0E3038784}.Debug|Any CPU.Build.0 = Debug|Any CPU
25-
{B666D83B-68A5-482E-A2AD-91D0E3038784}.Release|Any CPU.ActiveCfg = Release|Any CPU
26-
{B666D83B-68A5-482E-A2AD-91D0E3038784}.Release|Any CPU.Build.0 = Release|Any CPU
19+
{3EB4337C-A0A9-4CD6-98E2-547ADE0EC58B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
20+
{3EB4337C-A0A9-4CD6-98E2-547ADE0EC58B}.Debug|Any CPU.Build.0 = Debug|Any CPU
21+
{3EB4337C-A0A9-4CD6-98E2-547ADE0EC58B}.Release|Any CPU.ActiveCfg = Release|Any CPU
22+
{3EB4337C-A0A9-4CD6-98E2-547ADE0EC58B}.Release|Any CPU.Build.0 = Release|Any CPU
2723
EndGlobalSection
2824
GlobalSection(SolutionProperties) = preSolution
2925
HideSolutionNode = FALSE

ExcelMerge/ExcelMerge.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
</ItemGroup>
7676
<ItemGroup>
7777
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
78-
<PackageReference Include="NPOI" Version="2.5.6" />
78+
<PackageReference Include="NPOI" Version="2.7.0" />
7979
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
8080
<PackageReference Include="SharpSvn.1.9-x86" Version="1.9007.3987.251" />
8181
<PackageReference Include="SharpZipLib" Version="1.4.1" />

ExcelMerge/Util.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,20 +92,22 @@ public static SolidColorBrush GetColorByDiffStatus(DiffStatus status) {
9292

9393
public static IWorkbook GetWorkBook(string file) {
9494
IWorkbook book = null;
95+
/*
9596
try
9697
{
9798
using (var s = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
9899
{
99-
book = WorkbookFactory.Create(s);
100+
book = WorkbookFactory.Create(s, true);
100101
}
101102
}
102103
finally
104+
*/
103105
{
104106
if (book == null)
105107
{
106108
using (var s = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read))
107109
{
108-
book = WorkbookFactory.Create(s);
110+
book = WorkbookFactory.Create(s, true);
109111
}
110112
}
111113
}

ExcelMerge/YAMLDifferWindow.xaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
using System.Windows.Media.Imaging;
1616
using System.Windows.Shapes;
1717
using UnityYamlParser;
18-
using static Org.BouncyCastle.Math.EC.ECCurve;
1918
using static System.Reflection.Metadata.BlobBuilder;
2019

2120
namespace ExcelMerge

0 commit comments

Comments
 (0)