Update

wieslawsoltes · Mar 9, 2024 · 2a2c065 · 2a2c065
1 parent 92a7e5e
commit 2a2c065
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 43 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -15,10 +15,10 @@
     <MicrosoftNETFrameworkReferenceAssembliesVersion>1.0.3</MicrosoftNETFrameworkReferenceAssembliesVersion>
     <SystemDrawingCommonVersion>7.0.0</SystemDrawingCommonVersion>
     <SystemTextJsonVersion>7.0.3</SystemTextJsonVersion>
-    <AutofacVersion>7.1.0</AutofacVersion>
+    <AutofacVersion>8.0.0</AutofacVersion>
     <CommunityToolkitMvvmVersion>8.2.2</CommunityToolkitMvvmVersion>
-    <CsvHelperVersion>30.0.1</CsvHelperVersion>
-    <DocumentFormatOpenXmlVersion>2.20.0</DocumentFormatOpenXmlVersion>
+    <CsvHelperVersion>31.0.2</CsvHelperVersion>
+    <DocumentFormatOpenXmlVersion>3.0.1</DocumentFormatOpenXmlVersion>
     <MicrosoftCodeAnalysisCSharpScriptingVersion>4.7.0</MicrosoftCodeAnalysisCSharpScriptingVersion>
     <netDXFnetstandardVersion>2.4.0</netDXFnetstandardVersion>
     <NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
@@ -31,12 +31,12 @@
     <XUnitVersion>2.4.1</XUnitVersion>
     <XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
     <MicrosoftNETTestSdkVersion>16.2.0</MicrosoftNETTestSdkVersion>
-    <SkiaSharpVersion>2.88.6</SkiaSharpVersion>
-    <SvgSkiaVersion>1.0.0.3</SvgSkiaVersion>
-    <AvaloniaVersion>11.0.5</AvaloniaVersion>
-    <AvaloniaXamlBehaviorsVersion>11.0.2</AvaloniaXamlBehaviorsVersion>
-    <AvaloniaControlsPanAndZoomVersion>11.0.0</AvaloniaControlsPanAndZoomVersion>
-    <ThemeEditorControlsColorPickerVersion>11.0.0</ThemeEditorControlsColorPickerVersion>
-    <DockAvaloniaVersion>11.0.0.2</DockAvaloniaVersion>
+    <SkiaSharpVersion>2.88.7</SkiaSharpVersion>
+    <SvgSkiaVersion>1.0.0.14</SvgSkiaVersion>
+    <AvaloniaVersion>11.0.10</AvaloniaVersion>
+    <AvaloniaXamlBehaviorsVersion>11.0.10</AvaloniaXamlBehaviorsVersion>
+    <AvaloniaControlsPanAndZoomVersion>11.0.0.3</AvaloniaControlsPanAndZoomVersion>
+    <ThemeEditorControlsColorPickerVersion>11.0.0.1</ThemeEditorControlsColorPickerVersion>
+    <DockAvaloniaVersion>11.0.0.6</DockAvaloniaVersion>
   </PropertyGroup>
 </Project>
diff --git a/NuGet.Config b/NuGet.Config
@@ -3,7 +3,6 @@
   <packageSources>
     <clear />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="avalonia" value="https://pkgs.dev.azure.com/AvaloniaUI/AvaloniaUI/_packaging/avalonia-all/nuget/v3/index.json" protocolVersion="3" />
     <add key="avaloniathememanager-nightly" value="https://www.myget.org/F/avaloniathememanager-nightly/api/v3/index.json" />
     <add key="dock-nightly" value="https://www.myget.org/F/dock-nightly/api/v3/index.json" />
     <add key="panandzoom-nightly" value="https://www.myget.org/F/panandzoom-nightly/api/v3/index.json" />

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100",
+    "version": "8.0.100",
     "rollForward": "latestMinor",
     "allowPrerelease": true
   }

diff --git a/src/Core2D/Core2D.csproj b/src/Core2D/Core2D.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>WinExe</OutputType>
     <IsPackable>True</IsPackable>
     <Nullable>enable</Nullable>

diff --git a/src/Core2D/Modules/TextFieldReader/OpenXml/OpenXmlReader.cs b/src/Core2D/Modules/TextFieldReader/OpenXml/OpenXmlReader.cs
@@ -31,37 +31,31 @@ public OpenXmlReader(IServiceProvider? serviceProvider)
             return c.CellValue?.Text;
         }
 
-        switch (c.DataType.Value)
+        if (c.DataType.Value == CellValues.SharedString)
         {
-            case CellValues.SharedString:
+            if (stringTable is not null)
             {
-                if (stringTable is { })
-                {
-                    int index = int.Parse(c.InnerText);
-                    var value = stringTable.SharedStringTable.ElementAt(index).InnerText;
-                    return value;
-                }
+                int index = int.Parse(c.InnerText);
+                var value = stringTable.SharedStringTable.ElementAt(index).InnerText;
+                return value;
             }
-                break;
-            case CellValues.Boolean:
-            {
-                return c.InnerText switch
-                {
-                    "0" => "FALSE",
-                    _ => "TRUE",
-                };
-            }
-            case CellValues.Number:
-                return c.InnerText;
-            case CellValues.Error:
-                return c.InnerText;
-            case CellValues.String:
-                return c.InnerText;
-            case CellValues.InlineString:
-                return c.InnerText;
-            case CellValues.Date:
-                return c.InnerText;
         }
+        else if (c.DataType.Value == CellValues.Boolean)
+            return c.InnerText switch
+            {
+                "0" => "FALSE",
+                _ => "TRUE",
+            };
+        else if (c.DataType.Value == CellValues.Number)
+            return c.InnerText;
+        else if (c.DataType.Value == CellValues.Error)
+            return c.InnerText;
+        else if (c.DataType.Value == CellValues.String)
+            return c.InnerText;
+        else if (c.DataType.Value == CellValues.InlineString)
+            return c.InnerText;
+        else if (c.DataType.Value == CellValues.Date) 
+            return c.InnerText;
 
         return null;
     }
@@ -88,7 +82,7 @@ public OpenXmlReader(IServiceProvider? serviceProvider)
             yield return fields;
         }
 
-        spreadsheetDocument.Close();
+        spreadsheetDocument.Dispose();
     }
 
     public DatabaseViewModel? Read(Stream stream)
@@ -109,4 +103,4 @@ public OpenXmlReader(IServiceProvider? serviceProvider)
 
         return _serviceProvider.GetService<IViewModelFactory>()?.FromFields(name, fields);
     }
-}
+}
diff --git a/src/Core2D/Modules/TextFieldWriter/OpenXml/OpenXmlWriter.cs b/src/Core2D/Modules/TextFieldWriter/OpenXml/OpenXmlWriter.cs
@@ -182,7 +182,7 @@ public static void Write(Stream stream, object[,] values, uint nRows, uint nColu
         WriteTable(worksheetPart, 1U, values, nRows, nColumns);
 
         workbookPart.Workbook.Save();
-        spreadsheetDocument.Close();
+        spreadsheetDocument.Dispose();
     }
 
     public void Write(Stream stream, DatabaseViewModel? database)