Using Net 4.8.1 build of CSLA

Merge pull request 'B2025-014 PROMS – RO Update Admin Tool Error when updating RO containing carats/deltas' (#509 ) from B2025-014 into Development
good for testing phase
2025-02-06 15:57:41 -05:00 · 2025-02-05 14:03:18 -05:00 · 2025-02-05 13:34:18 -05:00 · 2025-02-05 10:01:13 -05:00 · 2025-02-05 08:38:18 -05:00 · 2025-02-04 13:47:24 -05:00
12 changed files with 88 additions and 38 deletions
--- a/Interface/VEPROMS_UI.csproj
+++ b/Interface/VEPROMS_UI.csproj
@@ -103,8 +103,9 @@
    <Reference Include="C1.Win.C1Command.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=e808566f358766d8" />
    <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
    <Reference Include="C1.Win.C1Input.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=7e7ff60f0c214f9a, processorArchitecture=MSIL" />
-    <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>..\..\..\..\3rdPartyLibraries\CSLA\CSLA20cs_DLL_Net_4.8.1_Build\Csla.dll</HintPath>
    </Reference>
    <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs
@@ -705,7 +705,7 @@ namespace VEPROMS.CSLA.Library
 								Match m = Regex.Match(newvalue, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
 								if (m == null)
 									newvalue = newvalue.Replace(@"\u916?", "^");
-								else if (m.Groups[1].Value == "" && !ContentItems[0].MyItem.MyItemInfo.MyDocVersion.MyFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta)
+								else if (m.Groups[1].Value == "" && !ContentItems[0].MyItem.MyItemInfo.MyDocVersion.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta)
 									newvalue = newvalue.Replace(@"\u916?", "^");
 								else if (m.Groups[1].Value == "")
                                {
@@ -1420,7 +1420,7 @@ namespace VEPROMS.CSLA.Library
 							if (newvalue.Contains(@"\u916?"))
 							{
 								Match m = Regex.Match(gg, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
-								if (m.Groups.Count < 3 && !ContentItems[0].MyDocVersion.MyFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta)
+								if (m.Groups.Count < 3 && !ContentItems[0].MyDocVersion.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta)
 									newvalue = newvalue.Replace(@"\u916?", "^");
 								else if (m.Groups.Count < 3)
 									newvalue = newvalue.Replace(@"\u916?", $"{(char)916}");
--- a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj
+++ b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj
@@ -83,8 +83,9 @@
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
-    <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>..\..\..\..\3rdPartyLibraries\CSLA\CSLA20cs_DLL_Net_4.8.1_Build\Csla.dll</HintPath>
    </Reference>
    <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
--- a/PROMS/Volian.Controls.Library/DisplaySearch.cs
+++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs
@@ -2712,6 +2712,17 @@ namespace Volian.Controls.Library
 					lstCheckedStepTypes.Remove((int)sd.Index);
 					lstCheckedStepTypesStr.Remove(advTreeStepTypes.SelectedNode.Text);
 				}
+
+				//B2025-012 Find Step Elements
+				//uncheck the parents if there are any
+				DevComponents.AdvTree.Node tmp_n = n;
+				while (tmp_n.Parent != null)
+				{
+					tmp_n = tmp_n.Parent;
+					tmp_n.Checked = false;
+				}
+				//uncheck All Types
+				advTreeStepTypes.Nodes[0].Checked = false;
 			}

 			//C2023-010: Check if the node has children and if we need to process those children as well
@@ -2724,6 +2735,37 @@ namespace Volian.Controls.Library
 					advTreeStepTypes_AfterCheck(sender, null);
 				}
 			}
+			else if (n.Text == "All Types")
+			{
+				//B2025-012 Find Step Elements
+				//if checking / un-checking All Types
+				//Add Types to type list appropriately
+				if (n.Checked)
+				{
+					foreach (Node child in advTreeStepTypes.Nodes)
+					{
+						if (child.Text != "All Types")
+                        {
+							child.Checked = true;
+							advTreeStepTypes.SelectedNode = child;
+							advTreeStepTypes_AfterCheck(sender, null);
+						}
+					}
+				}
+				else
+                {
+					foreach (Node child in advTreeStepTypes.Nodes)
+					{
+						if (child.Text != "All Types")
+						{
+							child.Checked = false;
+							advTreeStepTypes.SelectedNode = child;
+							advTreeStepTypes_AfterCheck(sender, null);
+						}
+					}
+				}
+
+			}

 			buildStepTypePannelTitle();

--- a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj
+++ b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj
@@ -89,8 +89,9 @@
    </Reference>
    <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
    <Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
-    <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>..\..\..\..\3rdPartyLibraries\CSLA\CSLA20cs_DLL_Net_4.8.1_Build\Csla.dll</HintPath>
    </Reference>
    <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
--- a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj
+++ b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj
@@ -66,8 +66,9 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
-    <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>..\..\..\..\3rdPartyLibraries\CSLA\CSLA20cs_DLL_Net_4.8.1_Build\Csla.dll</HintPath>
    </Reference>
    <Reference Include="FlexableMessageBox">
      <HintPath>..\FlexableMessageBox\bin\Debug\FlexableMessageBox.dll</HintPath>
--- a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Csla.csproj
+++ b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Csla.csproj
@@ -12,12 +12,13 @@
    <AssemblyName>Csla</AssemblyName>
    <SignAssembly>true</SignAssembly>
    <AssemblyOriginatorKeyFile>CslaKey.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -29,6 +30,7 @@
    <WarningLevel>4</WarningLevel>
    <RunCodeAnalysis>false</RunCodeAnalysis>
    <DocumentationFile>bin\Debug\Csla.XML</DocumentationFile>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@@ -37,6 +39,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
@@ -173,12 +176,8 @@
    <Compile Include="Web\InsertObjectArgs.cs" />
    <Compile Include="Web\SelectObjectArgs.cs" />
    <Compile Include="Web\UpdateObjectArgs.cs" />
-    <Compile Include="Windows\BindingSourceRefresh.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Windows\ReadWriteAuthorization.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="Windows\BindingSourceRefresh.cs" />
+    <Compile Include="Windows\ReadWriteAuthorization.cs" />
  </ItemGroup>
  <ItemGroup>
    <None Include="CslaKey.snk" />
--- a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Properties/Resources.Designer.cs
+++ b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18408
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -19,7 +19,7 @@ namespace Csla.Properties {
    // class via a tool like ResGen or Visual Studio.
    // To add or remove a member, edit your .ResX file then rerun ResGen
    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
--- a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Properties/Settings.Designer.cs
+++ b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18408
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -12,7 +12,7 @@ namespace Csla.Properties {
    
    
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
        
        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
--- a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Web
+++ b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Web
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18408
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -9,7 +9,7 @@
 //------------------------------------------------------------------------------

 // 
-// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.18408.
+// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.42000.
 // 
 #pragma warning disable 1591

@@ -23,7 +23,7 @@ namespace Csla.WebServiceHost {
    
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
    [System.Web.Services.WebServiceBindingAttribute(Name="WebServicePortalSoap", Namespace="http://ws.lhotka.net/Csla")]
@@ -227,11 +227,11 @@ namespace Csla.WebServiceHost {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
    public delegate void CreateCompletedEventHandler(object sender, CreateCompletedEventArgs e);
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
    public partial class CreateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -253,11 +253,11 @@ namespace Csla.WebServiceHost {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
    public delegate void FetchCompletedEventHandler(object sender, FetchCompletedEventArgs e);
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
    public partial class FetchCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -279,11 +279,11 @@ namespace Csla.WebServiceHost {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
    public delegate void UpdateCompletedEventHandler(object sender, UpdateCompletedEventArgs e);
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
    public partial class UpdateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -305,11 +305,11 @@ namespace Csla.WebServiceHost {
    }
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
    public delegate void DeleteCompletedEventHandler(object sender, DeleteCompletedEventArgs e);
    
    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.ComponentModel.DesignerCategoryAttribute("code")]
    public partial class DeleteCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
--- a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/app.config
+++ b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/app.config
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
    <configSections>
-        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="Csla.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="Csla.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
        </sectionGroup>
    </configSections>
    <applicationSettings>
@@ -12,4 +12,4 @@
            </setting>
        </Csla.Properties.Settings>
    </applicationSettings>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
--- a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/cslacs.sln
+++ b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/cslacs.sln
@@ -1,6 +1,8 @@

-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.35706.149
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Csla", "Csla\Csla.csproj", "{9DA591ED-C570-47AC-8E5D-35B039E07973}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F19F70D9-566D-4303-B0CD-69327F32FCFF}"
@@ -23,6 +25,9 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {3DB3F350-552A-4162-8E47-3117D986B11F}
+	EndGlobalSection
 	GlobalSection(TestCaseManagementSettings) = postSolution
 		CategoryFile = cslacs.vsmdi
 	EndGlobalSection
Author	SHA1	Message	Date
John Jenko	bb24d1207d	Using Net 4.8.1 build of CSLA	2025-02-06 15:57:41 -05:00
John Jenko	8fc477ec04	Merge pull request 'B2025-014 PROMS – RO Update Admin Tool Error when updating RO containing carats/deltas' (#509 ) from B2025-014 into Development good for testing phase	2025-02-05 14:03:18 -05:00
mschill	bf06c9e14f	B2025-014 PROMS – RO Update Admin Tool Error when updating RO containing carats/deltas While testing an update for C2025-0011, using BNPP data and ROs, the update ro values crashes at the next to the last procedure set which is folder called "PROMS Tests." It crashes with a null reference as it is not able to detect the format. This is to change this to use the “ActiveFormat” of the Working Folder instead of utilizing “MyFormat”.	2025-02-05 13:34:18 -05:00
John Jenko	5a263107da	Merge pull request 'B2025-012 PROMS – Searching Step Elements – All Step Types' (#507 ) from B2025-012 into Development good for testing phase	2025-02-05 10:01:13 -05:00
mschill	d30bb2e329	B2025-012 PROMS – Searching Step Elements – All Step Types When searching for step elements (the Find Selected Step Elements option is selected) and "All Types." Is selected for step types, you incorrectly get the "No Types Selected" message box when clicking on search.	2025-02-05 08:38:18 -05:00
John Jenko	8248bd8e47	Merge pull request 'C2025-011 PROMS – RO Update Admin Tool Memory Enhancements' (#506 ) from C2025-011 into Development good for the testing phase	2025-02-04 13:47:24 -05:00