Merge branch 'dev'

Author: rabanti-github

Changelog.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## v3.0.1
+
+---
+
+Release Date: **(24.04.2026)** <sup>(DMY)</sup>
+
+- Package: **NanoXLSX.Reader**
+  * Fixed internal async handling of the workbook reader, to avoid deadlocks in WinForms/WPF projects, when async is not used (regression).
+  * Fixed order of worksheets when manually changed
+  * Added filename to workbook when reading from file
+
+
 ## v3.0.0
 
 ---
@@ -246,7 +258,7 @@ Release Date: **12.01.2025** <sup>(DMY)</sup>
 Release Date: **24.11.2024** <sup>(DMY)</sup>
 
 - Fixed a bug of the column address (letter) resolution. Column letters above 'Z' were resolved incorrectly
-- Changed async handing of the workbook reader, to avoid deadlocks. Change provided by Jarren Long
+- Changed async handling of the workbook reader, to avoid deadlocks. Change provided by Jarren Long
 - Simplified project structure (unified .Net 4.x and Standard). Change provided by Jarren Long
 - Added tests for column address resolution
 

Docs.IndexGenerator/Config/meta-package-config.json

@@ -1,5 +1,5 @@
 {
 "packageName": "NanoXLSX",
-"version": "3.0.0",
+"version": "3.0.1",
 "description": "NanoXLSX is a library to generate and read Microsoft Excel files (XLSX) in an easy and native way. This package is the meta package of NanoXLSX and should be used in most cases as dependency in your project."
 }

Documentation/icons/NanoXLSX.png

@@ -1,4 +1,4 @@
-![NanoXLSX](https://raw.githubusercontent.com/rabanti-github/NanoXLSX/refs/heads/master/Documentation/icons/NanoXLSX.png)
+![NanoXLSX](https://raw.githubusercontent.com/rabanti-github/NanoXLSX/refs/heads/master/NanoXLSX/NanoXLSX.png)
 
 # NanoXLSX.Core
 

NanoXLSX.Core/README.md

@@ -1,5 +1,15 @@
 # Change Log - NanoXLSX.Reader
 
+## v3.0.1
+
+---
+Release Date: **(24.04.2026)** <sup>(DMY)</sup>
+
+- Fixed internal async handling of the workbook reader, to avoid deadlocks in WinForms/WPF projects, when async is not used (regression).
+- Fixed order of worksheets when manually changed
+- Added filename to workbook when reading from file
+
+
 ## v3.0.0
 
 ---

NanoXLSX.Reader/Changelog.md

@@ -1 +1 @@
-PROJECT_NUMBER = 3.0.0 
+PROJECT_NUMBER = 3.0.1 

NanoXLSX.Reader/Documentation/projectNumber.doxygen

@@ -34,6 +34,7 @@ public static Workbook Load(string filename, ReaderOptions options = null)
             using (XlsxReader reader = new XlsxReader(filename, options))
             {
                 reader.Read();
+                reader.Workbook.Filename = filename;
                 return reader.Workbook;
             }
         }
@@ -66,6 +67,7 @@ public static async Task<Workbook> LoadAsync(string filename, ReaderOptions opti
             using (XlsxReader reader = new XlsxReader(filename, options))
             {
                 await reader.ReadAsync();
+                reader.Workbook.Filename = filename;
                 return reader.Workbook;
             }
         }

NanoXLSX.Reader/Extensions/WorkbookReader.cs

@@ -175,6 +175,7 @@ private void GetViewInformation(XmlNodeList nodes)
         /// <param name="nodes">Sheet nodes to check</param>
         private void GetWorksheetInformation(XmlNodeList nodes)
         {
+            int visibleWorksheetOrder = 0;
             foreach (XmlNode node in nodes)
             {
                 if (node.LocalName.Equals("sheet", StringComparison.OrdinalIgnoreCase))
@@ -194,7 +195,8 @@ private void GetWorksheetInformation(XmlNodeList nodes)
                         {
                             Hidden = hidden
                         };
-                        Workbook.AuxiliaryData.SetData(PlugInUUID.WorkbookReader, PlugInUUID.WorksheetDefinitionEntity, id, definition);
+                        Workbook.AuxiliaryData.SetData(PlugInUUID.WorkbookReader, PlugInUUID.WorksheetDefinitionEntity, visibleWorksheetOrder, definition);
+                        visibleWorksheetOrder++;
                     }
                     catch (Exception e)
                     {

NanoXLSX.Reader/Internal/Readers/WorkbookReader.cs

@@ -105,7 +105,7 @@ public void Execute()
             try
             {
                 WorksheetDefinition worksheetDefinition = Workbook.AuxiliaryData.GetData<WorksheetDefinition>(PlugInUUID.WorkbookReader, PlugInUUID.WorksheetDefinitionEntity, CurrentWorksheetID);
-                Worksheet worksheet = new Worksheet(worksheetDefinition.WorksheetName, CurrentWorksheetID, Workbook)
+                Worksheet worksheet = new Worksheet(worksheetDefinition.WorksheetName, worksheetDefinition.SheetID, Workbook)
                 {
                     Hidden = worksheetDefinition.Hidden
                 };
@@ -146,7 +146,7 @@ private void SetWorkbookRelation(Worksheet worksheet)
         {
             Workbook.AddWorksheet(worksheet);
             int selectedWorksheetId = Workbook.AuxiliaryData.GetData<int>(PlugInUUID.WorkbookReader, PlugInUUID.SelectedWorksheetEntity);
-            if (selectedWorksheetId + 1 == CurrentWorksheetID) // selectedWorksheetId is 0-based
+            if (selectedWorksheetId == CurrentWorksheetID)
             {
                 Workbook.SetSelectedWorksheet(worksheet);
             }

NanoXLSX.Reader/Internal/Readers/WorksheetReader.cs

@@ -77,7 +77,7 @@ public void Read()
             {
                 using (memoryStream = new MemoryStream())
                 {
-                    ReadInternal().GetAwaiter().GetResult();
+                    Task.Run(() => ReadInternal()).GetAwaiter().GetResult();
                 }
             }
             catch (NotSupportedContentException)
@@ -224,9 +224,10 @@ private void ReadZip(ZipArchive zf)
 
             IWorksheetReader worksheetReader = PlugInLoader.GetPlugIn<IWorksheetReader>(PlugInUUID.WorksheetReader, new WorksheetReader());
             worksheetReader.SharedStrings = sharedStringsReader.SharedStrings;
-            List<WorksheetDefinition> workshetDefinitions = wb.AuxiliaryData.GetDataList<WorksheetDefinition>(PlugInUUID.WorkbookReader, PlugInUUID.WorksheetDefinitionEntity);
             List<Relationship> relationshipDefinitions = wb.AuxiliaryData.GetDataList<Relationship>(PlugInUUID.RelationshipReader, PlugInUUID.RelationshipEntity);
-            foreach (WorksheetDefinition definition in workshetDefinitions)
+            int worksheetVisualIndex = 0;
+            WorksheetDefinition definition;
+            while ((definition = wb.AuxiliaryData.GetData<WorksheetDefinition>(PlugInUUID.WorkbookReader, PlugInUUID.WorksheetDefinitionEntity, worksheetVisualIndex)) != null)
             {
                 Relationship relationship = relationshipDefinitions.SingleOrDefault(r => r.RID == definition.RelId);
                 if (relationship == null)
@@ -235,8 +236,9 @@ private void ReadZip(ZipArchive zf)
                 }
                 ms = GetEntryStream(relationship.Target, zf);
                 worksheetReader.Init(ms, wb, readerOptions, ReaderPlugInHandler.HandleInlineQueuePlugins);
-                worksheetReader.CurrentWorksheetID = definition.SheetID;
+                worksheetReader.CurrentWorksheetID = worksheetVisualIndex;
                 worksheetReader.Execute();
+                worksheetVisualIndex++;
             }
             if (wb.Worksheets.Count == 0)
             {