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

Merge pull request 'CSLA_version_upgrade' (#272) from CSLA_version_upgrade into Development

Browse Source 
Merging into Development.

**NOTE**
Developers will need to update their 3rd Party Library repository to ensure that they have the latest CSLA version.  Review the Git documentation in Confluence for instructions on cloning the repository.
This commit was merged in pull request #272.
This commit is contained in:
Chris Glavan committed 2024-03-19 12:01:54 -04:00
2 parents ac1041fa10 31301c4717
commit 51ef1d127d
8 files changed
+77 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

PROMS/VEPROMS User Interface/VEPROMS_UI.csproj
+3 -2
View File
@@ -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=3.5.2.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\Git\Production\3rdPartyLibraries\CSLA\v3.8.4\Csla.dll</HintPath>
</Reference>
<Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj
+2 -2
View File
@@ -83,9 +83,9 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
<Reference Include="Csla, Version=3.5.2.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
<HintPath>C:\Git\Production\3rdPartyLibraries\CSLA\v3.8.4\Csla.dll</HintPath>
</Reference>
<Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
PROMS/VEPROMS.CSLA.Library/app.config
+23
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>
PROMS/VEPROMS.CSLA.Library/packages.config
+26
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>
PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj
+2 -3
View File
@@ -93,9 +93,8 @@
<Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
<Reference Include="Csla">
<HintPath>C:\Git\Production\3rdPartyLibraries\CSLA\v3.8.4\Csla.dll</HintPath>
</Reference>
<Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
PROMS/Volian.Print.Library/Volian.Print.Library.csproj
+2 -3
View File
@@ -68,9 +68,8 @@
<Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
<Reference Include="Csla">
<HintPath>C:\Git\Production\3rdPartyLibraries\CSLA\v3.8.4\Csla.dll</HintPath>
</Reference>
<Reference Include="FlexableMessageBox">
<HintPath>..\FlexableMessageBox\bin\Debug\FlexableMessageBox.dll</HintPath>
PROMS/Volian.Print.Library/app.config
+15
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>
PROMS/Volian.Print.Library/vlnParagraph.cs
+4 -2
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)
{
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;