Merge branch 'master' of https://github.com/nissl-lab/npoi

README.md

@@ -15,11 +15,9 @@ This project is the .NET version of Apache POI project. With NPOI, you can read/
 
 About Donation 关于捐款
 ============
-Since Github sponsorship is not supported in China so far, it's hard to get donation from Github channel. I'm strictly limiting my contribution time on NPOI these 2 years although it looks to be still maintained well. 
+If you profits/benefits from NPOI and you believe it's useful, please [sponsor me via Github Sponsor](https://github.com/sponsors/tonyqus) or [donate this project](https://github.com/nissl-lab/npoi/discussions/923). Thank you!
 
-If you profits/benefits from NPOI and you believe it's useful, please [donate this project](https://github.com/nissl-lab/npoi/discussions/923). Thank you!
-
-如果您从NPOI受益或实现盈利，请[给该项目捐款](https://github.com/nissl-lab/npoi/discussions/923)，谢谢！
+如果您从NPOI受益或实现盈利，请通过[Github Sponsor赞助我](https://github.com/sponsors/tonyqus)或[给该项目捐款](https://github.com/nissl-lab/npoi/discussions/923)，谢谢！
 
 
 Telegram User Group
@@ -54,7 +52,7 @@ e. Support not only export but also import
 
 f. Real successful cases all over the world
 
-g. [huge amount of basic examples](https://github.com/nissl-lab/npoi-examples)
+g. [huge amount of code examples for you to learn how to use NPOI](https://github.com/nissl-lab/npoi-examples)
 
 h. Works on both Windows and Linux 
 

build.ps1

@@ -20,9 +20,8 @@ $DotNetGlobalFile = "$PSScriptRoot\\global.json"
 $DotNetInstallUrl = "https://dot.net/v1/dotnet-install.ps1"
 $DotNetChannel = "STS"
 
-$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
 $env:DOTNET_CLI_TELEMETRY_OPTOUT = 1
-$env:DOTNET_MULTILEVEL_LOOKUP = 0
+$env:DOTNET_NOLOGO = 1
 
 ###########################################################################
 # EXECUTION
@@ -61,6 +60,7 @@ else {
         ExecSafe { & powershell $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath }
     }
     $env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe"
+    $env:PATH = "$DotNetDirectory;$env:PATH"
 }
 
 Write-Output "Microsoft (R) .NET SDK version $(& $env:DOTNET_EXE --version)"

build.sh

@@ -17,8 +17,7 @@ DOTNET_INSTALL_URL="https://dot.net/v1/dotnet-install.sh"
 DOTNET_CHANNEL="STS"
 
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
-export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-export DOTNET_MULTILEVEL_LOOKUP=0
+export DOTNET_NOLOGO=1
 
 ###########################################################################
 # EXECUTION
@@ -54,11 +53,12 @@ else
         "$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "$DOTNET_VERSION" --no-path
     fi
     export DOTNET_EXE="$DOTNET_DIRECTORY/dotnet"
+    export PATH="$DOTNET_DIRECTORY:$PATH"
 fi
 
 echo "Microsoft (R) .NET SDK version $("$DOTNET_EXE" --version)"
 
-if [[ ! -z ${NUKE_ENTERPRISE_TOKEN+x} && "NUKE_ENTERPRISE_TOKEN" != "" ]]; then
+if [[ ! -z ${NUKE_ENTERPRISE_TOKEN+x} && "$NUKE_ENTERPRISE_TOKEN" != "" ]]; then
     "$DOTNET_EXE" nuget remove source "nuke-enterprise" &>/dev/null || true
     "$DOTNET_EXE" nuget add source "https://f.feedz.io/nuke/enterprise/nuget" --name "nuke-enterprise" --username "PAT" --password "$NUKE_ENTERPRISE_TOKEN" --store-password-in-clear-text &>/dev/null || true
 fi

build/Build.cs

@@ -28,8 +28,6 @@ partial class Build : NukeBuild
     [Solution] Solution Solution;
     [GitRepository] readonly GitRepository GitRepository;
 
-    static AbsolutePath SourceDirectory => RootDirectory / "src";
-
     static AbsolutePath ArtifactsDirectory => RootDirectory / "publish";
 
     string TagVersion => GitRepository.Tags.SingleOrDefault(x => x.StartsWith("v"))?[1..];
@@ -45,8 +43,6 @@ partial class Build : NukeBuild
 
     string VersionSuffix;
 
-    static bool IsRunningOnWindows => RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
-
     [Secret]
     [Parameter("GitHub API token")]
     readonly string GitHubToken;
@@ -101,11 +97,11 @@ static void DeleteCompilationArtifacts()
         .Executes(() =>
         {
             DotNetBuild(_ =>_
-                .EnableNoRestore()
+                .SetNoRestore(SucceededTargets.Contains(Restore))
                 .SetConfiguration(Configuration)
                 .SetDeterministic(IsServerBuild)
                 .SetContinuousIntegrationBuild(IsServerBuild)
-                .SetVerbosity(DotNetVerbosity.Minimal)
+                .SetVerbosity(DotNetVerbosity.minimal)
                 // obsolete missing XML documentation comment, XML comment on not valid language element, XML comment has badly formed XML, no matching tag in XML comment
                 // need to use escaped separator in order for this to work
                 .AddProperty("NoWarn", string.Join("%3B", new [] { 169, 612, 618, 1591, 1587, 1570, 1572, 1573, 1574 }))

build/_build.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace></RootNamespace>
         <NoWarn>CS0649;CS0169</NoWarn>
         <NukeRootDirectory>..</NukeRootDirectory>
@@ -11,7 +11,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Nuke.Common" Version="7.0.2" />
+        <PackageReference Include="Nuke.Common" Version="8.0.0" />
     </ItemGroup>
 
 </Project>

main/NPOI.Core.csproj

@@ -18,10 +18,10 @@
     <PackageReference Include="ExtendedNumerics.BigDecimal" Version="2023.1000.0.230" />
     <PackageReference Include="MathNet.Numerics.Signed" Version="5.0.0" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
-    <PackageReference Include="BouncyCastle.Cryptography" Version="2.2.1" />
+    <PackageReference Include="BouncyCastle.Cryptography" Version="2.3.0" />
     <PackageReference Include="SharpZipLib" Version="1.3.3" />
-    <PackageReference Include="SixLabors.Fonts" Version="1.0.0" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.4" />
+    <PackageReference Include="SixLabors.Fonts" Version="1.0.1" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.7" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' != 'net472' ">

main/SS/UserModel/IndexedColors.cs

@@ -191,7 +191,7 @@ static IndexedColors()
             mappingName.Add("darkteal", IndexedColors.DarkTeal);
             mappingName.Add("seagreen", IndexedColors.SeaGreen);
             mappingName.Add("darkgreen", IndexedColors.DarkGreen);
-            mappingName.Add("olivergreen", IndexedColors.OliveGreen);
+            mappingName.Add("olivegreen", IndexedColors.OliveGreen);
             mappingName.Add("brown", IndexedColors.Brown);
             mappingName.Add("plum", IndexedColors.Plum);
             mappingName.Add("indigo", IndexedColors.Indigo);