From ad157a94ebe37d165d312db7c819041d731179cf Mon Sep 17 00:00:00 2001
From: travispotterBH <travis.potter@burohappold.com>
Date: Wed, 17 Jan 2024 11:20:40 -0500
Subject: [PATCH 1/2] Update Nuget pacakages

---
 Excel_Adapter/Excel_Adapter.csproj | 18 +++++++++++++-----
 Excel_Adapter/packages.config      | 11 ++++++-----
 Excel_oM/packages.config           |  6 +++---
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/Excel_Adapter/Excel_Adapter.csproj b/Excel_Adapter/Excel_Adapter.csproj
index 7793263..f63920e 100644
--- a/Excel_Adapter/Excel_Adapter.csproj
+++ b/Excel_Adapter/Excel_Adapter.csproj
@@ -23,7 +23,7 @@
   </PropertyGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(Configuration)'=='Debug' Or '$(Configuration)'=='Release'">
-    <Exec Command="xcopy &quot;$(TargetPath)&quot;  &quot;$(ProgramData)\BHoM\Assemblies&quot; /C /Y&#xD;&#xA;xcopy &quot;$(TargetDir)ClosedXML.dll&quot;  &quot;$(ProgramData)\BHoM\Assemblies&quot; /Y&#xD;&#xA;xcopy &quot;$(TargetDir)DocumentFormat.OpenXml.dll&quot; &quot;$(ProgramData)\BHoM\Assemblies&quot; /Y" />
+    <Exec Command="xcopy &quot;$(TargetPath)&quot;  &quot;$(ProgramData)\BHoM\Assemblies&quot; /C /Y&#xD;&#xA;xcopy &quot;$(TargetDir)ClosedXML.dll&quot;  &quot;$(ProgramData)\BHoM\Assemblies&quot; /Y&#xD;&#xA;xcopy &quot;$(TargetDir)ExcelNumberFormat.dll&quot;  &quot;$(ProgramData)\BHoM\Assemblies&quot; /Y&#xD;&#xA;xcopy &quot;$(TargetDir)DocumentFormat.OpenXml.dll&quot;  &quot;$(ProgramData)\BHoM\Assemblies&quot; /Y&#xD;&#xA;xcopy &quot;$(TargetDir)SixLabors.Fonts.dll&quot;  &quot;$(ProgramData)\BHoM\Assemblies&quot; /Y" />
   </Target>
 
   <ItemGroup>
@@ -82,14 +82,22 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClosedXML" Version="0.95.0" />
-    <PackageReference Include="DocumentFormat.OpenXml" Version="2.19.0" />
+    <PackageReference Include="ClosedXML" Version="0.102.2" />
+    <PackageReference Include="DocumentFormat.OpenXml" Version="2.16.0" />
+    <PackageReference Include="ExcelNumberFormat" Version="1.1.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="System.Security.Permissions" Version="8.0.0-rc.2.23479.6" />
+    <PackageReference Include="SixLabors.Fonts" Version="1.0.0" />
+    <PackageReference Include="System.IO.Packaging" Version="8.0.0" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
+    <PackageReference Include="System.Security.Permissions" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)'=='Debug' Or '$(Configuration)'=='Release'">
-    <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.0.1" />
+    <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(Configuration)'=='ZeroCodeTool'">
+    <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Excel_Adapter/packages.config b/Excel_Adapter/packages.config
index a4c20c7..36d47dd 100644
--- a/Excel_Adapter/packages.config
+++ b/Excel_Adapter/packages.config
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ClosedXML" version="0.95.0" targetFramework="net461" />
-  <package id="DocumentFormat.OpenXml" version="2.7.2" targetFramework="net461" />
-  <package id="ExcelNumberFormat" version="1.0.10" targetFramework="net461" />
+  <package id="ClosedXML" version="0.102.2" targetFramework="net461" />
+  <package id="DocumentFormat.OpenXml" version="2.16.0" targetFramework="net461" />
+  <package id="ExcelNumberFormat" version="1.1.0" targetFramework="net461" />
   <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net461" />
-  <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net461" />
-  <package id="System.IO.Packaging" version="4.0.0" targetFramework="net461" />
+  <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net461" />
+  <package id="System.IO.Packaging" version="8.0.0" targetFramework="net461" />
+  <package id="SixLabors.Fonts" version="1.0.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Excel_oM/packages.config b/Excel_oM/packages.config
index 0d0618f..b15aea1 100644
--- a/Excel_oM/packages.config
+++ b/Excel_oM/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ClosedXML" version="0.95.3" targetFramework="net452" />
-  <package id="DocumentFormat.OpenXml" version="2.7.2" targetFramework="net452" />
-  <package id="ExcelNumberFormat" version="1.0.10" targetFramework="net452" />
+  <package id="ClosedXML" version="0.102.2" targetFramework="net452" />
+  <package id="DocumentFormat.OpenXml" version="2.16.0" targetFramework="net452" />
+  <package id="ExcelNumberFormat" version="1.1.0" targetFramework="net452" />
 </packages>
\ No newline at end of file

From 502a7529ffd524684e5da5576508e881da300f20 Mon Sep 17 00:00:00 2001
From: travispotterBH <travis.potter@burohappold.com>
Date: Wed, 17 Jan 2024 11:20:47 -0500
Subject: [PATCH 2/2] Fix compile Errors

---
 Excel_Adapter/Convert/FromExcel/CellContents.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Excel_Adapter/Convert/FromExcel/CellContents.cs b/Excel_Adapter/Convert/FromExcel/CellContents.cs
index 4684e52..d955ebb 100644
--- a/Excel_Adapter/Convert/FromExcel/CellContents.cs
+++ b/Excel_Adapter/Convert/FromExcel/CellContents.cs
@@ -44,14 +44,14 @@ public static CellContents FromExcel(this IXLCell xLCell)
 
             return new CellContents()
             {
-                Comment = xLCell.HasComment ? xLCell.Comment.Text : "",
+                Comment = xLCell.HasComment ? xLCell.GetComment().Text : "",
                 Value = xLCell.CellValueOrCachedValue(),
                 Address = BH.Engine.Excel.Create.CellAddress(xLCell.Address.ToString()),
                 DataType = xLCell.DataType.SystemType(),
                 FormulaA1 = xLCell.FormulaA1,
                 FormulaR1C1 = xLCell.FormulaR1C1,
-                HyperLink = xLCell.HasHyperlink ? xLCell.Hyperlink.ExternalAddress.ToString() : "",
-                RichText = xLCell.HasRichText ? xLCell.RichText.Text : ""
+                HyperLink = xLCell.HasHyperlink ? xLCell.GetHyperlink().ExternalAddress.ToString() : "",
+                RichText = xLCell.HasRichText ? xLCell.GetRichText().Text : ""
             };
 
 
@@ -62,10 +62,10 @@ public static CellContents FromExcel(this IXLCell xLCell)
         [Description("Gets the value of the cell, or cached value if the TryGetValue method fails. Raises a warning if the cached value is used, and ClosedXML beleives the cell needs to be recalculated.")]
         [Input("xLCell", "IXLCell to get the (cached) value from.")]
         [Input("value", "Value or cached value of the cell.")]
-        public static object CellValueOrCachedValue(this IXLCell xLCell) 
+        public static object CellValueOrCachedValue(this IXLCell xLCell)
         {
             object value;
-            if (!xLCell.TryGetValue(out value)) 
+            if (!xLCell.TryGetValue(out value))
             {
                 //If not able to just get the value, then get the cached value
                 //If cell is flagged as needing recalculation, raise warning.