Merge pull request #64 from PandaTechAM/development

name ffix

Author: HaikAsatryan

src/FileExporter/Extensions/EnumerableExtensions.cs

@@ -155,15 +155,20 @@ private static ExportFile CreateZip(string baseName, MimeTypes innerType, IReadO
             var entryName = parts.Count == 1
                ? $"{baseName}{innerType.Extension}"
                : $"{baseName}_{i + 1}{innerType.Extension}";
+
             var entry = zip.CreateEntry(entryName, CompressionLevel.Optimal);
             using var es = entry.Open();
             es.Write(parts[i]);
          }
       }
 
-      return new ExportFile(baseName, MimeTypes.Zip, ms.GetBuffer()[..(int)ms.Length]);
-   }
+      // Ensure exactly one ".zip" on the outer file
+      var outerName = baseName.EndsWith(".zip", StringComparison.OrdinalIgnoreCase)
+         ? baseName
+         : $"{baseName}.zip";
 
+      return new ExportFile(outerName, MimeTypes.Zip, ms.ToArray());
+   }
 
    private static ExportFile ReturnFileOrZippedVersion<T>(DataTable<T> dataTable, List<byte[]> files, MimeTypes type)
    {

src/FileExporter/FileExporter.csproj

@@ -8,7 +8,7 @@
         <Copyright>MIT</Copyright>
         <PackageIcon>Logo.jpg</PackageIcon>
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
-        <Version>4.1.0</Version>
+        <Version>4.1.1</Version>
         <Company>PandaTech</Company>
         <Title>Model to File</Title>
         <PackageTags>Pandatech, lib, export, xlsx, csv, pdf</PackageTags>