From 10c8377a2ef781045429d08bc1e9090081faaa14 Mon Sep 17 00:00:00 2001 From: yingtingxu Date: Tue, 10 Jan 2017 11:41:51 +0800 Subject: [PATCH 1/2] hotfix: fixed the file check logic error --- src/NpoiExtension.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NpoiExtension.cs b/src/NpoiExtension.cs index 7d4acdd..5e0a29b 100644 --- a/src/NpoiExtension.cs +++ b/src/NpoiExtension.cs @@ -291,7 +291,7 @@ private static IWorkbook InitializeWorkbook(string excelFile) var setting = Excel.Setting; if (setting.UserXlsx) { - if (!string.IsNullOrEmpty(excelFile) || File.Exists(excelFile)) + if (!string.IsNullOrEmpty(excelFile) && File.Exists(excelFile)) { using (var file = new FileStream(excelFile, FileMode.Open, FileAccess.Read)) { @@ -305,7 +305,7 @@ private static IWorkbook InitializeWorkbook(string excelFile) } else { - if (!string.IsNullOrEmpty(excelFile) || File.Exists(excelFile)) + if (!string.IsNullOrEmpty(excelFile) && File.Exists(excelFile)) { using (var file = new FileStream(excelFile, FileMode.Open, FileAccess.Read)) { From 6ba1ae13e4a2c7a6c8f7cab9f90a0db86f0ba3e2 Mon Sep 17 00:00:00 2001 From: yingtingxu Date: Tue, 10 Jan 2017 11:42:32 +0800 Subject: [PATCH 2/2] feat: hotfix version --- src/Properties/AssemblyInfo.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs index a967ed5..86975a3 100644 --- a/src/Properties/AssemblyInfo.cs +++ b/src/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.4.0.0")] -[assembly: AssemblyFileVersion("1.4.0.0")] +[assembly: AssemblyVersion("1.4.1.0")] +[assembly: AssemblyFileVersion("1.4.1.0")]