Merge pull request #70 from PandaTechAM/development

dotnet 10 upgrade

Author: HaikAsatryan

.github/workflows/main.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           global-json-file: global.json
 

.gitignore

@@ -1,7 +1,10 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 ##
-## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
+## Get latest from `dotnet new gitignore`
+
+# dotenv files
+.env
 
 # User-specific files
 *.rsuser
@@ -12,8 +15,7 @@
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
-.idea/
-/.idea/
+
 # Mono auto generated files
 mono_crash.*
 
@@ -58,11 +60,14 @@ dlldata.c
 # Benchmark Results
 BenchmarkDotNet.Artifacts/
 
-# .NET Core
+# .NET
 project.lock.json
 project.fragment.lock.json
 artifacts/
 
+# Tye
+.tye/
+
 # ASP.NET Scaffolding
 ScaffoldingReadMe.txt
 
@@ -397,5 +402,88 @@ FodyWeavers.xsd
 
 # JetBrains Rider
 *.sln.iml
-/PandaFileExporter/MimeTypesFull.cs
-/MimeTypesFull.cs
+.idea/
+
+##
+## Visual studio for Mac
+##
+
+
+# globs
+Makefile.in
+*.userprefs
+*.usertasks
+config.make
+config.status
+aclocal.m4
+install-sh
+autom4te.cache/
+*.tar.gz
+tarballs/
+test-results/
+
+# Mac bundle stuff
+*.dmg
+*.app
+
+# content below from: https://github.com/github/gitignore/blob/main/Global/macOS.gitignore
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# content below from: https://github.com/github/gitignore/blob/main/Global/Windows.gitignore
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# Vim temporary swap files
+*.swp
+
+# Added by me
+logs
+LocalFileStorage
+*.db*

FileExporter.sln

@@ -0,0 +1,15 @@
+<Solution>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+    <File Path=".github/workflows/main.yml" />
+    <File Path=".gitignore" />
+    <File Path="global.json" />
+    <File Path="README.md" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="src/FileExporter/FileExporter.csproj" />
+  </Folder>
+  <Folder Name="/test/">
+    <Project Path="test/FileExporter.Demo/FileExporter.Demo.csproj" />
+  </Folder>
+</Solution>

FileExporter.slnx

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.200",
+    "version": "10.0.101",
     "rollForward": "latestMinor"
   }
 }

global.json

@@ -3,6 +3,7 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Text;
 using CsvHelper;
 using CsvHelper.Configuration;
 using FileExporter.Dtos;
@@ -24,7 +25,7 @@ public static ExportFile Export<T>(IEnumerable<T> data, ExportRule<T> rule)
       var fileName = NamingHelper.EnsureExtension(baseName, MimeTypes.Csv.Extension);
 
       using var ms = new MemoryStream();
-      using (var writer = new StreamWriter(ms, new System.Text.UTF8Encoding(true), leaveOpen: true))
+      using (var writer = new StreamWriter(ms, new UTF8Encoding(true), leaveOpen: true))
       {
          var config = new CsvConfiguration(CultureInfo.InvariantCulture)
          {

src/FileExporter/Exporters/CsvExporter.cs

@@ -20,7 +20,7 @@ internal static class XlsxExporter
 {
    internal static async Task<ExportFile> ExportAsync<T>(IEnumerable<T> data,
       ExportRule<T> rule,
-      CancellationToken cancellationToken = default)
+      CancellationToken ct = default)
       where T : class
    {
       ArgumentNullException.ThrowIfNull(data);
@@ -41,12 +41,12 @@ internal static async Task<ExportFile> ExportAsync<T>(IEnumerable<T> data,
       if (totalRows <= rowsPerSheet)
       {
          // Single sheet
-         bytes = await CreateXlsxFileAsync(list, columns, rule, cancellationToken);
+         bytes = await CreateXlsxFileAsync(list, columns, rule, ct);
       }
       else
       {
          // Multi-sheet single workbook
-         bytes = await CreateMultiSheetXlsxFileAsync(list, columns, rule, rowsPerSheet, cancellationToken);
+         bytes = await CreateMultiSheetXlsxFileAsync(list, columns, rule, rowsPerSheet, ct);
       }
 
       if (bytes.Length < ExportLimits.ZipThresholdBytes)
@@ -65,12 +65,12 @@ internal static async Task<ExportFile> ExportAsync<T>(IEnumerable<T> data,
    private static async Task<byte[]> CreateXlsxFileAsync<T>(IEnumerable<T> dataSlice,
       List<ExportColumn> columns,
       ExportRule<T> rule,
-      CancellationToken cancellationToken)
+      CancellationToken ct)
       where T : class
    {
       await using var ms = new MemoryStream();
 
-      await using (var spreadsheet = await Spreadsheet.CreateNewAsync(ms, cancellationToken: cancellationToken))
+      await using (var spreadsheet = await Spreadsheet.CreateNewAsync(ms, cancellationToken: ct))
       {
          var sheetName = rule.FileName.ToValidName(30);
 
@@ -79,13 +79,13 @@ private static async Task<byte[]> CreateXlsxFileAsync<T>(IEnumerable<T> dataSlic
 
          options.FrozenRows = 1;
 
-         await spreadsheet.StartWorksheetAsync(sheetName, options, token: cancellationToken);
+         await spreadsheet.StartWorksheetAsync(sheetName, options, ct);
 
          var table = new Table(TableStyle.None);
          spreadsheet.StartTable(table);
 
          var headerStyleId = AddHeaderStyle(spreadsheet);
-         await AddHeaderRowAsync(spreadsheet, columns, headerStyleId, cancellationToken);
+         await AddHeaderRowAsync(spreadsheet, columns, headerStyleId, ct);
 
          foreach (var item in dataSlice)
          {
@@ -99,10 +99,10 @@ private static async Task<byte[]> CreateXlsxFileAsync<T>(IEnumerable<T> dataSlic
                row.Add(formatted == null ? new Cell(string.Empty) : CreateCell(formatted));
             }
 
-            await spreadsheet.AddRowAsync(row, cancellationToken);
+            await spreadsheet.AddRowAsync(row, ct);
          }
 
-         await spreadsheet.FinishAsync(cancellationToken);
+         await spreadsheet.FinishAsync(ct);
       }
 
       return ms.ToArray();
@@ -152,7 +152,7 @@ private static StyleId AddHeaderStyle(Spreadsheet spreadsheet)
    private static async Task AddHeaderRowAsync(Spreadsheet spreadsheet,
       IReadOnlyList<ExportColumn> columns,
       StyleId headerStyleId,
-      CancellationToken cancellationToken)
+      CancellationToken ct)
    {
       var headers = new string[columns.Count];
 
@@ -161,7 +161,7 @@ private static async Task AddHeaderRowAsync(Spreadsheet spreadsheet,
          headers[i] = columns[i].Rule.ColumnName;
       }
 
-      await spreadsheet.AddHeaderRowAsync(headers, headerStyleId, cancellationToken);
+      await spreadsheet.AddHeaderRowAsync(headers, headerStyleId, ct);
    }
 
    private static void ApplyColumnWidths(WorksheetOptions options, IReadOnlyList<ExportColumn> columns)
@@ -355,12 +355,12 @@ private static async Task<byte[]> CreateMultiSheetXlsxFileAsync<T>(IList<T> list
       List<ExportColumn> columns,
       ExportRule<T> rule,
       int rowsPerSheet,
-      CancellationToken cancellationToken)
+      CancellationToken ct)
       where T : class
    {
       await using var ms = new MemoryStream();
 
-      await using (var spreadsheet = await Spreadsheet.CreateNewAsync(ms, cancellationToken: cancellationToken))
+      await using (var spreadsheet = await Spreadsheet.CreateNewAsync(ms, cancellationToken: ct))
       {
          var sanitizedBaseName = rule.FileName.ToValidName(ExportLimits.MaxSheetNameLength);
          var headerStyleId = AddHeaderStyle(spreadsheet);
@@ -378,12 +378,12 @@ private static async Task<byte[]> CreateMultiSheetXlsxFileAsync<T>(IList<T> list
 
             options.FrozenRows = 1;
 
-            await spreadsheet.StartWorksheetAsync(sheetName, options, token: cancellationToken);
+            await spreadsheet.StartWorksheetAsync(sheetName, options, ct);
 
             var table = new Table(TableStyle.None);
             spreadsheet.StartTable(table);
 
-            await AddHeaderRowAsync(spreadsheet, columns, headerStyleId, cancellationToken);
+            await AddHeaderRowAsync(spreadsheet, columns, headerStyleId, ct);
 
             for (var i = 0; i < take; i++)
             {
@@ -398,11 +398,11 @@ private static async Task<byte[]> CreateMultiSheetXlsxFileAsync<T>(IList<T> list
                   row.Add(formatted == null ? new Cell(string.Empty) : CreateCell(formatted));
                }
 
-               await spreadsheet.AddRowAsync(row, cancellationToken);
+               await spreadsheet.AddRowAsync(row, ct);
             }
          }
 
-         await spreadsheet.FinishAsync(cancellationToken);
+         await spreadsheet.FinishAsync(ct);
       }
 
       return ms.ToArray();