Fix Excelnumberformat 1.1.0 valid date expired (Valid from: 2018-04-10 08:00:00 to 2021-04-14 20:00:00) [link](https://github.com/andersnm/ExcelNumberFormat/issues/34)

2024-11-29 18:38:08 +08:00 · 2021-12-31 10:00:41 +08:00 · 2021-12-31 10:00:41 +08:00 · 9e7abf893e
commit 9e7abf893e
parent daf5fa5b78
24 changed files with 37 additions and 46 deletions
--- a/MiniExcel.sln
+++ b/MiniExcel.sln
@ -34,8 +34,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MiniExcel.Benchmarks", "ben
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{77A8A169-168B-457F-AB5F-48F30D6BB33C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExcelNumberFormat", "src\ExcelNumberFormat\ExcelNumberFormat.csproj", "{7ECB1CFF-955F-4285-8486-756F1CDE2177}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -54,10 +52,6 @@ Global
 		{1888285A-B130-48D5-A628-DC85B623FAB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1888285A-B130-48D5-A628-DC85B623FAB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1888285A-B130-48D5-A628-DC85B623FAB8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7ECB1CFF-955F-4285-8486-756F1CDE2177}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7ECB1CFF-955F-4285-8486-756F1CDE2177}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7ECB1CFF-955F-4285-8486-756F1CDE2177}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7ECB1CFF-955F-4285-8486-756F1CDE2177}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@ -66,7 +60,6 @@ Global
 		{097903C9-1F81-4427-B4C8-530CB59687B8} = {CC1E0601-AEC9-42D7-8F6A-3FB3939EED16}
 		{77F2C86B-0F17-4370-AB38-A089F9DF4ED5} = {359A7094-3353-48F2-B3E1-FE9E59698318}
 		{1888285A-B130-48D5-A628-DC85B623FAB8} = {77A8A169-168B-457F-AB5F-48F30D6BB33C}
-		{7ECB1CFF-955F-4285-8486-756F1CDE2177} = {CC1E0601-AEC9-42D7-8F6A-3FB3939EED16}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {51DF25DA-2DCB-4883-90FE-399DA950D4F2}
--- a/docs/README.md
+++ b/docs/README.md
@ -16,6 +16,9 @@

 ---

+### 0.19.3-beta
+- [Fix]  Excelnumberformat 1.1.0 valid date expired (Valid from: 2018-04-10 08:00:00 to 2021-04-14 20:00:00) [link](https://github.com/andersnm/ExcelNumberFormat/issues/34)
+
 ### 0.19.2
 - [New] SaveAsByTemplate support datareader [#I4HL54](https://gitee.com/dotnetchina/MiniExcel/issues/I4HL54)

--- a/docs/README.zh-CN.md
+++ b/docs/README.zh-CN.md
@ -23,10 +23,12 @@

 ---

+### 0.19.3-beta
+- [Fix]  Excelnumberformat 1.1.0 凭证过期 (Valid from: 2018-04-10 08:00:00 to 2021-04-14 20:00:00) [link](https://github.com/andersnm/ExcelNumberFormat/issues/34)
+
 ### 0.19.2
 - [New] SaveAsByTemplate 支持 datareader [#I4HL54](https://gitee.com/dotnetchina/MiniExcel/issues/I4HL54)

-
 ### 0.19.1
 - [New] QueryAsDataTable 删除空白 Column keys. #298
 - [Bug] Error NU3037: ExcelNumberFormat 1.1.0 #302
--- a/docs/README.zh-Hant.md
+++ b/docs/README.zh-Hant.md
@ -17,7 +17,11 @@

 ---

-### 0.20.0
+
+### 0.19.3-beta
+- [Fix]  Excelnumberformat 1.1.0 憑證過期 (Valid from: 2018-04-10 08:00:00 to 2021-04-14 20:00:00) [link](https://github.com/andersnm/ExcelNumberFormat/issues/34)
+
+### 0.19.2
 - [New] SaveAsByTemplate 支持 datareader [#I4HL54](https://gitee.com/dotnetchina/MiniExcel/issues/I4HL54)

 ### 0.19.1
--- a/src/ExcelNumberFormat/AssemblyInfo.cs
+++ b/src/ExcelNumberFormat/AssemblyInfo.cs
@ -1,3 +0,0 @@
-using System;
-
-[assembly:CLSCompliant(true)]
--- a/src/ExcelNumberFormat/ExcelNumberFormat.csproj
+++ b/src/ExcelNumberFormat/ExcelNumberFormat.csproj
@ -1,10 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0;net5.0</TargetFrameworks>
-    <VersionPrefix>1.1.1</VersionPrefix>
-    <Authors>ExcelNumberFormat developers</Authors>
-    <PackageProjectUrl>https://github.com/andersnm/ExcelNumberFormat</PackageProjectUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-  </PropertyGroup>
-</Project>
--- a/src/ExcelNumberFormat/icon.png
+++ b/src/ExcelNumberFormat/icon.png
--- a/src/MiniExcel/ExcelNumberFormat/Color.cs
+++ b/src/MiniExcel/ExcelNumberFormat/Color.cs
@ -1,4 +1,4 @@
-namespace ExcelNumberFormat
+namespace MiniExcelNumberFormat
 {
    internal class Color
    {
--- a/src/MiniExcel/ExcelNumberFormat/CompatibleConvert.cs
+++ b/src/MiniExcel/ExcelNumberFormat/CompatibleConvert.cs
@ -1,6 +1,6 @@
 using System;

-namespace ExcelNumberFormat
+namespace MiniExcelNumberFormat
 {
    internal static class CompatibleConvert
    {
--- a/src/MiniExcel/ExcelNumberFormat/Condition.cs
+++ b/src/MiniExcel/ExcelNumberFormat/Condition.cs
@ -1,4 +1,4 @@
-namespace ExcelNumberFormat
+namespace MiniExcelNumberFormat
 {
    internal class Condition
    {
--- a/src/MiniExcel/ExcelNumberFormat/DecimalSection.cs
+++ b/src/MiniExcel/ExcelNumberFormat/DecimalSection.cs
@ -1,6 +1,6 @@
 using System.Collections.Generic;

-namespace ExcelNumberFormat
+namespace MiniExcelNumberFormat
 {
    internal class DecimalSection
    {
--- a/src/MiniExcel/ExcelNumberFormat/Evaluator.cs
+++ b/src/MiniExcel/ExcelNumberFormat/Evaluator.cs
@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;

-namespace ExcelNumberFormat
+namespace MiniExcelNumberFormat
 {
    internal static class Evaluator
    {
--- a/src/MiniExcel/ExcelNumberFormat/ExcelDateTime.cs
+++ b/src/MiniExcel/ExcelNumberFormat/ExcelDateTime.cs
@ -1,7 +1,7 @@
 using System;
 using System.Globalization;

-namespace ExcelNumberFormat
+namespace MiniExcelNumberFormat
 {
    /// <summary>
    /// Similar to regular .NET DateTime, but also supports 0/1 1900 and 29/2 1900.
--- a/src/MiniExcel/ExcelNumberFormat/ExponentialSection.cs
+++ b/src/MiniExcel/ExcelNumberFormat/ExponentialSection.cs
@ -1,6 +1,6 @@
 using System.Collections.Generic;

-namespace ExcelNumberFormat
+namespace MiniExcelNumberFormat
 {
    internal class ExponentialSection
    {
--- a/src/MiniExcel/ExcelNumberFormat/Formatter.cs
+++ b/src/MiniExcel/ExcelNumberFormat/Formatter.cs
@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Text;

-namespace ExcelNumberFormat
+namespace MiniExcelNumberFormat
 {
    static internal class Formatter
    {
--- a/src/MiniExcel/ExcelNumberFormat/FractionSection.cs
+++ b/src/MiniExcel/ExcelNumberFormat/FractionSection.cs
@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text;

-namespace ExcelNumberFormat
+namespace MiniExcelNumberFormat
 {
    internal class FractionSection
    {
--- a/src/MiniExcel/ExcelNumberFormat/NumberFormat.cs
+++ b/src/MiniExcel/ExcelNumberFormat/NumberFormat.cs
@ -1,13 +1,18 @@
-using System;
+/**
+ * Edit from ExcelNumberFormat https://www.nuget.org/packages/ExcelNumberFormat/
+ * MIT license @andersnm
+ * Because this issue : https://github.com/andersnm/ExcelNumberFormat/issues/34 miniexcel needs to include source code
+ */
+using System;
 using System.Collections.Generic;
 using System.Globalization;

-namespace ExcelNumberFormat
+namespace MiniExcelNumberFormat
 {
    /// <summary>
    /// Parse ECMA-376 number format strings and format values like Excel and other spreadsheet softwares.
    /// </summary>
-    public class NumberFormat
+    internal class NumberFormat
    {
        /// <summary>
        /// Initializes a new instance of the <see cref="NumberFormat"/> class.
--- a/src/MiniExcel/ExcelNumberFormat/Parser.cs
+++ b/src/MiniExcel/ExcelNumberFormat/Parser.cs
@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;

-namespace ExcelNumberFormat
+namespace MiniExcelNumberFormat
 {
    internal static class Parser
    {
--- a/src/MiniExcel/ExcelNumberFormat/Section.cs
+++ b/src/MiniExcel/ExcelNumberFormat/Section.cs
@ -1,6 +1,6 @@
 using System.Collections.Generic;

-namespace ExcelNumberFormat
+namespace MiniExcelNumberFormat
 {
    internal class Section
    {
--- a/src/MiniExcel/ExcelNumberFormat/SectionType.cs
+++ b/src/MiniExcel/ExcelNumberFormat/SectionType.cs
@ -1,4 +1,4 @@
-namespace ExcelNumberFormat
+namespace MiniExcelNumberFormat
 {
    internal enum SectionType
    {
--- a/src/MiniExcel/ExcelNumberFormat/Token.cs
+++ b/src/MiniExcel/ExcelNumberFormat/Token.cs
@ -1,6 +1,6 @@
 using System;

-namespace ExcelNumberFormat
+namespace MiniExcelNumberFormat
 {
    internal static class Token
    {
--- a/src/MiniExcel/ExcelNumberFormat/Tokenizer.cs
+++ b/src/MiniExcel/ExcelNumberFormat/Tokenizer.cs
@ -1,6 +1,6 @@
 using System;

-namespace ExcelNumberFormat
+namespace MiniExcelNumberFormat
 {
    internal class Tokenizer
    {
--- a/src/MiniExcel/MiniExcelLibs.csproj
+++ b/src/MiniExcel/MiniExcelLibs.csproj
@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFrameworks>net45;netstandard2.0;net5.0</TargetFrameworks>
-		<Version>0.19.2</Version>
+		<Version>0.19.3-beta</Version>
 	</PropertyGroup>
 	<PropertyGroup>
 		<AssemblyName>MiniExcel</AssemblyName>
@ -34,15 +34,12 @@ Todo : https://github.com/shps951023/MiniExcel/projects/1?fullscreen=true
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net45'">
 		<Reference Include="System.IO.Compression" />
 	</ItemGroup>
-	<ItemGroup>
-	  <ProjectReference Include="..\ExcelNumberFormat\ExcelNumberFormat.csproj" />
-	</ItemGroup>
 	<ItemGroup>
 	  <None Update="icon.png">
 	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 	  </None>
 	</ItemGroup>
  <ItemGroup>
-    <None Include="icon.png" Pack="true" PackagePath="\"/>
+    <None Include="icon.png" Pack="true" PackagePath="\" />
  </ItemGroup>	
 </Project>
--- a/src/MiniExcel/Utils/DateTimeHelper.cs
+++ b/src/MiniExcel/Utils/DateTimeHelper.cs
@ -1,6 +1,6 @@
 namespace MiniExcelLibs.Utils
 {
-    using ExcelNumberFormat;
+    using MiniExcelNumberFormat;
    using System;
    using System.Globalization;