From b01a9edc1e6e97815cb9b2129dae769dc9d30ac3 Mon Sep 17 00:00:00 2001
From: Chris Glavan <cglavan@volian.com>
Date: Mon, 18 Mar 2024 11:42:04 -0400
Subject: [PATCH] ~Upgraded CSLA library to v3.0.5

---
 .../VEPROMS User Interface/VEPROMS_UI.csproj  |  5 ++--
 .../VEPROMS.CSLA.Library.csproj               |  2 +-
 PROMS/VEPROMS.CSLA.Library/app.config         | 23 ++++++++++++++++
 PROMS/VEPROMS.CSLA.Library/packages.config    | 26 +++++++++++++++++++
 .../Volian.Controls.Library.csproj            |  2 +-
 .../Volian.Print.Library.csproj               |  2 +-
 PROMS/Volian.Print.Library/app.config         | 15 +++++++++++
 PROMS/Volian.Print.Library/vlnParagraph.cs    |  6 +++--
 8 files changed, 74 insertions(+), 7 deletions(-)
 create mode 100644 PROMS/VEPROMS.CSLA.Library/app.config
 create mode 100644 PROMS/VEPROMS.CSLA.Library/packages.config
 create mode 100644 PROMS/Volian.Print.Library/app.config

diff --git a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj
index d511f0be..01f603eb 100644
--- a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj	
+++ b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj	
@@ -105,8 +105,9 @@
     <Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="Csla">
-      <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
+    <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>C:\Users\Chris.VLN\Downloads\csla-3-0-5\cslacs\Csla\bin\Debug\Csla.dll</HintPath>
     </Reference>
     <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj
index 14ae24e0..15071caf 100644
--- a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj
+++ b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj
@@ -85,7 +85,7 @@
   <ItemGroup>
     <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
+      <HintPath>C:\Users\Chris.VLN\Downloads\csla-3-0-5\cslacs\Csla\bin\Debug\Csla.dll</HintPath>
     </Reference>
     <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/PROMS/VEPROMS.CSLA.Library/app.config b/PROMS/VEPROMS.CSLA.Library/app.config
new file mode 100644
index 00000000..4b2e0f1f
--- /dev/null
+++ b/PROMS/VEPROMS.CSLA.Library/app.config
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/PROMS/VEPROMS.CSLA.Library/packages.config b/PROMS/VEPROMS.CSLA.Library/packages.config
new file mode 100644
index 00000000..345cd9c8
--- /dev/null
+++ b/PROMS/VEPROMS.CSLA.Library/packages.config
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Configuration" version="5.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Configuration.Abstractions" version="5.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Configuration.Binder" version="5.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="5.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="5.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Primitives" version="5.0.0" targetFramework="net462" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net462" />
+  <package id="System.ComponentModel" version="4.3.0" targetFramework="net462" />
+  <package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net462" />
+  <package id="System.ComponentModel.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Data.Common" version="4.3.0" targetFramework="net462" />
+  <package id="System.Memory" version="4.5.4" targetFramework="net462" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net462" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net462" />
+  <package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime.Serialization.Xml" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Principal" version="4.3.0" targetFramework="net462" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
+  <package id="System.Threading.ThreadPool" version="4.3.0" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
+</packages>
\ No newline at end of file
diff --git a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj
index 9c76fbf7..708f2197 100644
--- a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj
+++ b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj
@@ -95,7 +95,7 @@
     </Reference>
     <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
+      <HintPath>C:\Users\Chris.VLN\Downloads\csla-3-0-5\cslacs\Csla\bin\Debug\Csla.dll</HintPath>
     </Reference>
     <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj
index 12ed5491..dddee375 100644
--- a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj
+++ b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj
@@ -70,7 +70,7 @@
     </Reference>
     <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
+      <HintPath>C:\Users\Chris.VLN\Downloads\csla-3-0-5\cslacs\Csla\bin\Debug\Csla.dll</HintPath>
     </Reference>
     <Reference Include="FlexableMessageBox">
       <HintPath>..\FlexableMessageBox\bin\Debug\FlexableMessageBox.dll</HintPath>
diff --git a/PROMS/Volian.Print.Library/app.config b/PROMS/Volian.Print.Library/app.config
new file mode 100644
index 00000000..7be68eba
--- /dev/null
+++ b/PROMS/Volian.Print.Library/app.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index f00363f0..d056d8e7 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -1407,7 +1407,8 @@ namespace Volian.Print.Library
 								}
 							}
 						}
-						StepConfig sc = new StepConfig(MyItemInfo as StepInfo);
+						StepInfo si = (StepInfo)MyItemInfo;						
+						StepConfig sc = new StepConfig(si.MyContent.Config);
 						if (sc != null && sc.Step_ImageWidth != 0)
 						{
 							Width = sc.Step_ImageWidth;
@@ -4184,7 +4185,8 @@ namespace Volian.Print.Library
 							{
 								Width *= (h2 / h1);
 							}
-							StepConfig sc = new StepConfig(MyItemInfo as StepInfo);
+							StepInfo si = (StepInfo)MyItemInfo;
+							StepConfig sc = new StepConfig(si.MyContent.Config);
 							if (sc != null && sc.Step_ImageWidth != 0)
 							{
 								Width = sc.Step_ImageWidth;