C2024-041-Disable-UCF-(User-Control-of-Format)-options

PROMS/VEPROMS User Interface/VEPROMS_UI.csproj

@@ -103,7 +103,7 @@
     <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, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+    <Reference Include="Csla, Version=3.8.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>

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -2121,16 +2121,17 @@ namespace VEPROMS
 			btnSecurity = new ButtonItem("btnSecurity", "Security");    // C2019-002: move security & format items into submenus
 			btnFormats = new ButtonItem("btnFormats", "Formats");
 			btnAdmin.SubItems.Add(btnSecurity);
-			btnAdmin.SubItems.Add(btnFormats);
+			// btnAdmin.SubItems.Add(btnFormats); // C2024 - 041 remove from Admin(V button) menu
+			btnAdmin.SubItems.Add(btnUpdateFormats); // C2024 - 041 remove from Admin(V button) menu
 			btnUserControlOfFormats = new ButtonItem("btnUserControlOfFormats", "User Control of Formats");
-			btnFormats.SubItems.Add(btnUpdateFormats);
-			btnFormats.SubItems.Add(btnUserControlOfFormats);
+			//btnFormats.SubItems.Add(btnUpdateFormats);
+			//btnFormats.SubItems.Add(btnUserControlOfFormats);  // C2024-041 remove from Admin (V button) menu
 			btnUserControlOfFormats.Click += new EventHandler(btnUserControlOfFormats_Click);
 			btnUserControlOfFormatsExport = new ButtonItem("btnUserControlOfFormatsExport", "Export User Control of Formats");
-			btnFormats.SubItems.Add(btnUserControlOfFormatsExport);
+			//btnFormats.SubItems.Add(btnUserControlOfFormatsExport); // C2024-041 remove from Admin (V button) menu
 			btnUserControlOfFormatsExport.Click += new EventHandler(btnUserControlOfFormatsExport_Click);
 			btnUserControlOfFormatsImport = new ButtonItem("btnUserControlOfFormatsImport", "Import User Control of Formats");
-			btnFormats.SubItems.Add(btnUserControlOfFormatsImport);
+			//btnFormats.SubItems.Add(btnUserControlOfFormatsImport); // C2024-041 remove from Admin (V button) menu
 			btnUserControlOfFormatsImport.Click += new EventHandler(btnUserControlOfFormatsImport_Click);
 			btnManageSecurity = new ButtonItem("btnManageSecurity", "Manage Security");
 			btnSecurity.SubItems.Add(btnManageSecurity);

PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj

@@ -83,7 +83,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+    <Reference Include="Csla, Version=3.8.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>
@@ -167,9 +167,7 @@
     <Compile Include="Format\PageStyles.cs" />
     <Compile Include="Format\PlantFormat.cs" />
     <Compile Include="Format\vlnFormat.cs" />
-    <Compile Include="frmRofstLoadStatus.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="frmRofstLoadStatus.cs" />
     <Compile Include="frmRofstLoadStatus.designer.cs">
       <DependentUpon>frmRofstLoadStatus.cs</DependentUpon>
     </Compile>

PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj

@@ -89,7 +89,7 @@
     </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, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+    <Reference Include="Csla, Version=3.8.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>
@@ -125,164 +125,110 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AlphabeticalNumbering.cs" />
-    <Compile Include="AnnotationDetails.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="AnnotationDetails.cs" />
     <Compile Include="AnnotationDetails.designer.cs">
       <DependentUpon>AnnotationDetails.cs</DependentUpon>
     </Compile>
-    <Compile Include="AnnotationSearch.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="AnnotationSearch.cs" />
     <Compile Include="AnnotationSearch.designer.cs">
       <DependentUpon>AnnotationSearch.cs</DependentUpon>
     </Compile>
-    <Compile Include="BorderListBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="BorderListBox.cs" />
     <Compile Include="BorderListBox.designer.cs">
       <DependentUpon>BorderListBox.cs</DependentUpon>
     </Compile>
-    <Compile Include="BorderSelectionPanel.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="BorderSelectionPanel.cs" />
     <Compile Include="BorderSelectionPanel.Designer.cs">
       <DependentUpon>BorderSelectionPanel.cs</DependentUpon>
     </Compile>
-    <Compile Include="ConvertTable.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="DisplayApplicability.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="ConvertTable.cs" />
+    <Compile Include="DisplayApplicability.cs" />
     <Compile Include="DisplayApplicability.designer.cs">
       <DependentUpon>DisplayApplicability.cs</DependentUpon>
     </Compile>
-    <Compile Include="DisplayBookMarks.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="DisplayBookMarks.cs" />
     <Compile Include="DisplayBookMarks.Designer.cs">
       <DependentUpon>DisplayBookMarks.cs</DependentUpon>
     </Compile>
-    <Compile Include="DisplayFoldoutMaint.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="DisplayFoldoutMaint.cs" />
     <Compile Include="DisplayFoldoutMaint.Designer.cs">
       <DependentUpon>DisplayFoldoutMaint.cs</DependentUpon>
     </Compile>
-    <Compile Include="DisplayHistory.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="DisplayHistory.cs" />
     <Compile Include="DisplayHistory.designer.cs">
       <DependentUpon>DisplayHistory.cs</DependentUpon>
     </Compile>
-    <Compile Include="DisplayLibDocs.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="DisplayLibDocs.cs" />
     <Compile Include="DisplayLibDocs.Designer.cs">
       <DependentUpon>DisplayLibDocs.cs</DependentUpon>
     </Compile>
-    <Compile Include="DisplayReports.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="DisplayReports.cs" />
     <Compile Include="DisplayReports.designer.cs">
       <DependentUpon>DisplayReports.cs</DependentUpon>
     </Compile>
-    <Compile Include="DisplaySearch.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="DisplaySearch.cs" />
     <Compile Include="DisplaySearch.Designer.cs">
       <DependentUpon>DisplaySearch.cs</DependentUpon>
     </Compile>
-    <Compile Include="DisplayTags.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="DisplayTags.cs" />
     <Compile Include="DisplayTags.Designer.cs">
       <DependentUpon>DisplayTags.cs</DependentUpon>
     </Compile>
-    <Compile Include="dlgChgId.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="dlgChgId.cs" />
     <Compile Include="dlgChgId.designer.cs">
       <DependentUpon>dlgChgId.cs</DependentUpon>
     </Compile>
-    <Compile Include="dlgDelProcReason.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="dlgDelProcReason.cs" />
     <Compile Include="dlgDelProcReason.designer.cs">
       <DependentUpon>dlgDelProcReason.cs</DependentUpon>
     </Compile>
-    <Compile Include="dlgEnhMissingItem.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="dlgEnhMissingItem.cs" />
     <Compile Include="dlgEnhMissingItem.Designer.cs">
       <DependentUpon>dlgEnhMissingItem.cs</DependentUpon>
     </Compile>
-    <Compile Include="dlgUCFImportOptions.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="dlgUCFImportOptions.cs" />
     <Compile Include="dlgUCFImportOptions.Designer.cs">
       <DependentUpon>dlgUCFImportOptions.cs</DependentUpon>
     </Compile>
-    <Compile Include="EditItem.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="EditItem.cs" />
     <Compile Include="EditItem.Designer.cs">
       <DependentUpon>EditItem.cs</DependentUpon>
     </Compile>
-    <Compile Include="FindReplace.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="FindReplace.cs" />
     <Compile Include="FindReplace.designer.cs">
       <DependentUpon>FindReplace.cs</DependentUpon>
     </Compile>
     <Compile Include="FormatUtility.cs" />
-    <Compile Include="frmEnhanced.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="frmEnhanced.cs" />
     <Compile Include="frmEnhanced.Designer.cs">
       <DependentUpon>frmEnhanced.cs</DependentUpon>
     </Compile>
-    <Compile Include="frmImportWordContents.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="frmImportWordContents.cs" />
     <Compile Include="frmImportWordContents.Designer.cs">
       <DependentUpon>frmImportWordContents.cs</DependentUpon>
     </Compile>
-    <Compile Include="frmSendErrorLog.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="frmSendErrorLog.cs" />
     <Compile Include="frmSendErrorLog.designer.cs">
       <DependentUpon>frmSendErrorLog.cs</DependentUpon>
     </Compile>
-    <Compile Include="frmViewTextFile.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="frmViewTextFile.cs" />
     <Compile Include="frmViewTextFile.designer.cs">
       <DependentUpon>frmViewTextFile.cs</DependentUpon>
     </Compile>
-    <Compile Include="GridItem.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="GridItem.cs" />
     <Compile Include="GridItem.Designer.cs">
       <DependentUpon>GridItem.cs</DependentUpon>
     </Compile>
-    <Compile Include="ImageItem.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="ImageItem.cs" />
     <Compile Include="ImageItem.designer.cs">
       <DependentUpon>ImageItem.cs</DependentUpon>
     </Compile>
     <Compile Include="LinkText.cs" />
-    <Compile Include="PreviewMultiLineRO.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="PreviewMultiLineRO.cs" />
     <Compile Include="PreviewMultiLineRO.designer.cs">
       <DependentUpon>PreviewMultiLineRO.cs</DependentUpon>
     </Compile>
-    <Compile Include="PreviewROImage.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="PreviewROImage.cs" />
     <Compile Include="PreviewROImage.designer.cs">
       <DependentUpon>PreviewROImage.cs</DependentUpon>
     </Compile>
@@ -291,28 +237,20 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
-    <Compile Include="RTBItem.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="RTBItem.cs" />
     <Compile Include="RTBItem.designer.cs">
       <DependentUpon>RTBItem.cs</DependentUpon>
     </Compile>
-    <Compile Include="RtfRawItem.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="RtfRawItem.cs" />
     <Compile Include="RtfRawItem.designer.cs">
       <DependentUpon>RtfRawItem.cs</DependentUpon>
     </Compile>
     <Compile Include="Settings.cs" />
-    <Compile Include="StepPanel.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="StepPanel.cs" />
     <Compile Include="StepPanel.designer.cs">
       <DependentUpon>StepPanel.cs</DependentUpon>
     </Compile>
-    <Compile Include="DisplayRO.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="DisplayRO.cs" />
     <Compile Include="DisplayRO.Designer.cs">
       <DependentUpon>DisplayRO.cs</DependentUpon>
     </Compile>
@@ -322,43 +260,29 @@
     <Compile Include="DisplayTabControl.designer.cs">
       <DependentUpon>DisplayTabControl.cs</DependentUpon>
     </Compile>
-    <Compile Include="DisplayTabItem.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="DisplayTabItem.cs" />
     <Compile Include="DisplayTabItem.designer.cs">
       <DependentUpon>DisplayTabItem.cs</DependentUpon>
     </Compile>
-    <Compile Include="StepTabPanel.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="StepTabPanel.cs" />
     <Compile Include="StepTabPanel.designer.cs">
       <DependentUpon>StepTabPanel.cs</DependentUpon>
     </Compile>
-    <Compile Include="StepTabRibbon.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="StepTabRibbon.cs" />
     <Compile Include="StepTabRibbon.designer.cs">
       <DependentUpon>StepTabRibbon.cs</DependentUpon>
     </Compile>
-    <Compile Include="DisplayTransition.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="DisplayTransition.cs" />
     <Compile Include="DisplayTransition.Designer.cs">
       <DependentUpon>DisplayTransition.cs</DependentUpon>
     </Compile>
     <Compile Include="DropDownNode.cs" />
-    <Compile Include="DropDownTree.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="DSOTabPanel.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="DropDownTree.cs" />
+    <Compile Include="DSOTabPanel.cs" />
     <Compile Include="DSOTabPanel.designer.cs">
       <DependentUpon>DSOTabPanel.cs</DependentUpon>
     </Compile>
-    <Compile Include="FlagEnumEditor.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="FlagEnumEditor.cs" />
     <Compile Include="MostRecentItem.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
@@ -366,65 +290,47 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="RichTextBox41.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="RichTextBox41.cs" />
     <Compile Include="RichTextBox41.Designer.cs">
       <DependentUpon>RichTextBox41.cs</DependentUpon>
     </Compile>
     <Compile Include="RomanNumeral.cs" />
     <Compile Include="RTBAPI.cs" />
-    <Compile Include="TransPanel.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="TransPanel.cs" />
     <Compile Include="TransPanel.designer.cs">
       <DependentUpon>TransPanel.cs</DependentUpon>
     </Compile>
     <Compile Include="VlnBorders.cs" />
-    <Compile Include="vlnExpander.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="vlnExpander.cs" />
     <Compile Include="vlnExpander.designer.cs">
       <DependentUpon>vlnExpander.cs</DependentUpon>
     </Compile>
-    <Compile Include="StepRTB.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="StepRTB.cs" />
     <Compile Include="StepRTB.designer.cs">
       <DependentUpon>StepRTB.cs</DependentUpon>
     </Compile>
-    <Compile Include="VlnFlexGrid.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="VlnFlexGrid.cs" />
     <Compile Include="VlnFlexGrid.Designer.cs">
       <DependentUpon>VlnFlexGrid.cs</DependentUpon>
     </Compile>
     <Compile Include="VlnGridCellShading.cs" />
     <Compile Include="VlnSpellCheck.cs" />
-    <Compile Include="VlnSpellCheckDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="VlnSpellCheckDlg.cs" />
     <Compile Include="VlnSpellCheckDlg.designer.cs">
       <DependentUpon>VlnSpellCheckDlg.cs</DependentUpon>
     </Compile>
-    <Compile Include="vlnTreeCombo.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="vlnTreeCombo.cs" />
     <Compile Include="vlnTreeView.cs">
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="vlnTreeView.Designer.cs">
       <DependentUpon>vlnTreeView.cs</DependentUpon>
     </Compile>
-    <Compile Include="vlnTreeView3.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="vlnTreeView3.cs" />
     <Compile Include="vlnTreeView3.Designer.cs">
       <DependentUpon>vlnTreeView3.cs</DependentUpon>
     </Compile>
-    <Compile Include="WebBrowser.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="WebBrowser.cs" />
     <Compile Include="WebBrowser.designer.cs">
       <DependentUpon>WebBrowser.cs</DependentUpon>
     </Compile>

PROMS/Volian.Print.Library/Volian.Print.Library.csproj

@@ -66,7 +66,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
-    <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+    <Reference Include="Csla, Version=3.8.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>