Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

~Upgraded CSLA library to v3.0.5

Browse Source
This commit is contained in:
Chris Glavan 2024-03-18 11:42:04 -04:00
parent 8e433cc28e
commit b01a9edc1e
8 changed files with 74 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PROMS/VEPROMS User Interface/VEPROMS_UI.csproj
View File

@ -105,8 +105,9 @@
<Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL"> <Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
</Reference> </Reference>
<Reference Include="Csla"> <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
<HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>C:\Users\Chris.VLN\Downloads\csla-3-0-5\cslacs\Csla\bin\Debug\Csla.dll</HintPath>
</Reference> </Reference>
<Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL"> <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>

2
PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj
View File

@ -85,7 +85,7 @@
<ItemGroup> <ItemGroup>
<Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL"> <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <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>
<Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL"> <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>

23
PROMS/VEPROMS.CSLA.Library/app.config Normal file
View File

@ -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>

26
PROMS/VEPROMS.CSLA.Library/packages.config Normal file
View File

@ -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>

2
PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj
View File

@ -95,7 +95,7 @@
</Reference> </Reference>
<Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL"> <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <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>
<Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL"> <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>

2
PROMS/Volian.Print.Library/Volian.Print.Library.csproj
View File

@ -70,7 +70,7 @@
</Reference> </Reference>
<Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL"> <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <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>
<Reference Include="FlexableMessageBox"> <Reference Include="FlexableMessageBox">
<HintPath>..\FlexableMessageBox\bin\Debug\FlexableMessageBox.dll</HintPath> <HintPath>..\FlexableMessageBox\bin\Debug\FlexableMessageBox.dll</HintPath>

15
PROMS/Volian.Print.Library/app.config Normal file
View File

@ -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>

6
PROMS/Volian.Print.Library/vlnParagraph.cs
View File

@ -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) if (sc != null && sc.Step_ImageWidth != 0)
{ {
Width = sc.Step_ImageWidth; Width = sc.Step_ImageWidth;
@ -4184,7 +4185,8 @@ namespace Volian.Print.Library
{ {
Width *= (h2 / h1); 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) if (sc != null && sc.Step_ImageWidth != 0)
{ {
Width = sc.Step_ImageWidth; Width = sc.Step_ImageWidth;