PROMS/AdjustBuildRevision/AdjustBuildRevision.csproj

@@ -27,7 +27,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

PROMS/AdjustBuildRevision/Program.cs

@@ -32,9 +32,9 @@ namespace AdjustBuildRevision
 						{
 							// Allow for setting build revision on either proms or the roeditor:
 							if (Directory.GetCurrentDirectory().ToUpper().Contains("REFOBJ"))
-								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")");
-							else
 								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.2.yyMM.dHH") + "\")");
+							else
+								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.1.yyMM.dHH") + "\")");
 					//		if (outline != line)
 					//		{
 					//			Console.WriteLine("Before: '{0}'", line);

PROMS/AdjustBuildRevision/app.config

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>

PROMS/Baseline/App.config

@@ -6,7 +6,7 @@
         </sectionGroup>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
     </startup>
     <userSettings>
         <Baseline.Properties.Settings>

PROMS/Baseline/Baseline.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Baseline</RootNamespace>
     <AssemblyName>Baseline</AssemblyName>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>
     </SccProjectName>

PROMS/DropDownPanel/DropDownPanel.csproj

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

PROMS/FlexableMessageBox/FlexableMessageBox.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FlexableMessageBox</RootNamespace>
     <AssemblyName>FlexableMessageBox</AssemblyName>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <SccProjectName>

PROMS/Formats/Formats.csproj

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

PROMS/Formats/app.config

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>

PROMS/LBWordLibrary/LBWordLibrary.csproj

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.csproj

@@ -33,7 +33,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/app.config

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <configuration>
 	<startup>
-	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup><runtime>
+	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup><runtime>
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
 		</assemblyBinding></runtime></configuration>

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs

@@ -23,8 +23,8 @@ using System.Runtime.CompilerServices;
 //      Build YYMM (two digit year, two digit month)
 //      Revision DHH (day - no leading zero, two digit hour - military time
 //
-[assembly: AssemblyVersion("2.3.2404.1611")]
+[assembly: AssemblyVersion("2.2.2306.2212")]
-[assembly: AssemblyFileVersion("2.3.2404.1611")]
+[assembly: AssemblyFileVersion("2.2.2306.2212")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -89,8 +89,6 @@ using System.Runtime.CompilerServices;
 
 
 
-
-
 
 
 

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.csproj

@@ -44,7 +44,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/app.config

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <configuration>
 	<startup>
-	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup><runtime>
+	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup><runtime>
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
 		</assemblyBinding></runtime>
 	<appSettings>

PROMS/ReferencedObjects/LibSource/DBEncapsulation/DBEncapsulation.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/Org.Mentalis.Files/Org.Mentalis.Files.csproj

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/ROFST/ROFST.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/ROField/ROFields.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/Utils/Utils.csproj

@@ -51,7 +51,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

PROMS/ReferencedObjects/LibSource/VlnProfiler/VlnProfiler.csproj

@@ -46,7 +46,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatus.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEditLib.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/RoAccessToSql/App.config

@@ -60,6 +60,6 @@
 			</logger>
 		</log4net>
 		<startup>
-			<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
+			<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
 		</startup>
 	</configuration>

PROMS/RoAccessToSql/RoAccessToSql.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RoAccessToSql</RootNamespace>
     <AssemblyName>RoAccessToSql</AssemblyName>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <SccProjectName>

PROMS/TablePicker/TablePicker.csproj

@@ -33,7 +33,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/VEPROMS User Interface/App.config

@@ -181,12 +181,8 @@
     </UISampleNetBar1.Properties.Settings>
   </userSettings>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
   </startup>
-  <runtime>
-    <AppContextSwitchOverrides
-      value="Switch.System.Windows.Forms.DoNotLoadLatestRichEditControl=true" />
-  </runtime>
   <system.web>
     <membership defaultProvider="ClientAuthenticationMembershipProvider">
       <providers>

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -22148,84 +22148,8 @@ AS
 		[Folders].[FormatID]=@FormatID
 
 	RETURN
-	GO
 
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_ListUnlinkedItems]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [vesp_ListUnlinkedItems];
-GO
 
-	/*****************************************************************************
-	   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
-		   Copyright 2024 - Volian Enterprises, Inc. All rights reserved.
-	*****************************************************************************/
-	/*
-	==========================================================================================================
-	 Author:		Kathy Ruffing
-	 Create Date:	03/27/2024
-	 Description:	B2024-018: Gets list of procedures/sections/steps for possible enhanced linking
-	==========================================================================================================
-	 */
-Create Procedure[dbo].[vesp_ListUnlinkedItems]
-(
-	@ItemID int,
-	@EnhType int
-)
-WITH EXECUTE AS OWNER
-AS
-BEGIN 
-DECLARE @ParItemID int
-	DECLARE @EItemID int
-	set @EItemID = (select top 1 VIS.EItemID from vefn_AllSiblingItems(@ItemID)--Find All Siblings 
-	outer apply vefn_GetNewEnhancedData(ItemID,@EnhType) VIS -- That are Linked
-	where EitemID is not null)
-
-	if @EItemID is null
-	BEGIN
-		select @EItemID = epp.ItemID  
-			from (select * from Parts where ItemID in(select itemID from vefn_AllSiblingItems(@ItemID)))SPP -- FindParent
-			JOIN  ITEMS SII ON sPP.ContentID = sII.ContentID -- Get Parent Content ID
-			outer apply vefn_GetNewEnhancedData(SII.ItemID,@EnhType) VIS -- Get Enhanced ID for Parent
-			JOIN ITEMS EII ON VIS.EItemID = EII.ItemID -- Get Enhanced Parent Content ID 
-			JOIN PARTS EPP ON EPP.ContentID = EII.ContentID and SPP.FromType = epp.FromType -- Get first Child
-	END
-	if @EItemID is null	-- B2024-018: If not found at the current level, check at the parent level
-	BEGIN
-	
-		select @ParItemID = dbo.ve_getparentitem(@ItemID)
-		select @EItemID = epp.ItemID  
-			from (select * from Parts where ItemID in(select itemID from vefn_AllSiblingItems(@ParItemID)))SPP -- FindParent
-			JOIN  ITEMS SII ON sPP.ContentID = sII.ContentID -- Get Parent Content ID
-			outer apply vefn_GetNewEnhancedData(SII.ItemID,@EnhType) VIS -- Get Enhanced ID for Parent
-			JOIN ITEMS EII ON VIS.EItemID = EII.ItemID -- Get Enhanced Parent Content ID 
-			JOIN PARTS EPP ON EPP.ContentID = EII.ContentID --and SPP.FromType = epp.FromType (had to remove types may be proc/sect) 
-	
-	END
-	if @EItemID is null
-	BEGIN
-		select @EItemID = DV2.ItemID from (select *,cast(config as xml) xconfig from DocVersions 
-		where ItemID in(select itemID from vefn_AllSiblingItems(@ItemID))) SDV -- Source DocVersion
-		cross apply (select * from vefn_GetEnhancedDocVersions(SDV.VersionID) where @EnhType = Type) EDV -- Enhanced DocVersion
-		Join DocVersions DV2 ON DV2.VersionID = EDV.VersionID -- First Procedure
-	END
-	Select ItemID,PreviousID,II.ContentID,II.[DTS],II.[UserID],II.[LastChanged],
-		(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[ItemID]=[II].[ItemID]) [AnnotationCount],
-		(SELECT COUNT(*) FROM [DocVersions] WHERE [DocVersions].[ItemID]=[II].[ItemID]) [DocVersionCount],
-		(SELECT COUNT(*) FROM [Items] [Children] WHERE [Children].[PreviousID]=[II].[ItemID]) [NextCount],
-		(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ItemID]=[II].[ItemID]) [PartCount],
-		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[RangeID]=[II].[ItemID]) [Transition_RangeIDCount],
-		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[ToID]=[II].[ItemID]) [Transition_ToIDCount]
-		from Items II 
-		Left Join Entries EE ON II.ContentID = EE.ContentID	
-		where ItemID In (select SIB.ItemID from vefn_AllSiblingItems(@EItemID) SIB 
-		outer apply vefn_GetNewEnhancedData(ItemID,0) VIE
-		Where VIE.EItemID is null)
-		and EE.ContentID is null
-END
-Go
-
-	IF (@@Error = 0) PRINT 'Procedure Creation: [vesp_ListUnlinkedItems] Succeeded'
-	ELSE PRINT 'Procedure Creation: [vesp_ListUnlinkedItems] Error on Creation'
-	GO
 -----------------------------------------------------------------------------
 /*
   ---------------------------------------------------------------------------
@@ -22260,8 +22184,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '03/27/2024 11:00 AM'
+	set @RevDate = '10/03/2023 11:00 AM'
-	set @RevDescription = 'B2024-018: Enhanced link issue with sub-sections in source but not in enhanced'
+	set @RevDescription = 'C2023-017: Added logic to filter the format list when selecting a format to be applied to a section'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs.bak

@@ -0,0 +1,92 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("PROMS")]
+[assembly: AssemblyDescription("Create, Edit, and Maintain Procedures Sets.")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Volian Enterprises, Inc.")]
+[assembly: AssemblyProduct("PROMS")]
+[assembly: AssemblyCopyright("Copyright © 2012. All Rights Reserved.")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("2ffeb031-bf85-4153-baa2-2d4da2fd5556")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build YYMM (two digit year, two digit month)
+//      Revision DHH (day - no leading zero, two digit hour - military time
+//
+[assembly: AssemblyVersion("11.6.1205.316")]
+[assembly: AssemblyFileVersion("11.6.1205.316")]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

PROMS/VEPROMS User Interface/Properties/licenses.licx

@@ -0,0 +1,2 @@
+C1.Win.C1FlexGrid.C1FlexGrid, C1.Win.C1FlexGrid.2
+C1.Win.C1SpellChecker.C1SpellChecker, C1.Win.C1SpellChecker.2

PROMS/VEPROMS User Interface/VEPROMS_UI.csproj

@@ -19,7 +19,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -99,11 +99,11 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="C1.Win.4.8">
+    <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
-      <HintPath>..\VEPROMS\packages\C1.Win.8.0.20233.631\lib\net48\C1.Win.4.8.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="C1.Win.C1FlexGrid.4.8">
+    <Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
-      <HintPath>..\VEPROMS\packages\C1.Win.C1FlexGrid.4.8.20233.631\lib\net48\C1.Win.C1FlexGrid.4.8.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Csla">
       <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>

PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs

@@ -68,7 +68,6 @@ namespace VEPROMS
 			this.cbScrunch = new System.Windows.Forms.CheckBox();
 			this.btnNext = new System.Windows.Forms.Button();
 			this.cmbFont = new System.Windows.Forms.ComboBox();
-			this.lblDummy = new System.Windows.Forms.Label();
 			this.labelItem10 = new DevComponents.DotNetBar.LabelItem();
 			this.bottomProgBar = new DevComponents.DotNetBar.ProgressBarItem();
 			this.labelItem9 = new DevComponents.DotNetBar.LabelItem();
@@ -515,7 +514,6 @@ namespace VEPROMS
 			this.bottomBar.Controls.Add(this.cbScrunch);
 			this.bottomBar.Controls.Add(this.btnNext);
 			this.bottomBar.Controls.Add(this.cmbFont);
-			this.bottomBar.Controls.Add(this.lblDummy);
 			this.bottomBar.Dock = System.Windows.Forms.DockStyle.Bottom;
 			this.bottomBar.Font = new System.Drawing.Font("Segoe UI", 9F);
 			this.bottomBar.IsMaximized = false;
@@ -603,15 +601,6 @@ namespace VEPROMS
 			this.cmbFont.TabIndex = 0;
 			this.cmbFont.SelectedIndexChanged += new System.EventHandler(this.cmbFont_SelectedIndexChanged);
 			// 
-			// lblDummy
-			// 
-			this.lblDummy.Dock = System.Windows.Forms.DockStyle.Right;
-			this.lblDummy.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
-			this.lblDummy.Location = new System.Drawing.Point(1013, 0);
-			this.lblDummy.Name = "lblDummy";
-			this.lblDummy.Size = new System.Drawing.Size(10, 25);
-			this.lblDummy.Visible = false;
-			// 
 			// labelItem10
 			// 
 			this.labelItem10.BorderSide = DevComponents.DotNetBar.eBorderSide.Left;
@@ -1743,7 +1732,6 @@ namespace VEPROMS
 		private DevComponents.DotNetBar.ButtonItem btnShortCuts;
 		private DevComponents.DotNetBar.LabelItem lblItemID;
 		private System.Windows.Forms.ComboBox cmbFont;
-		private System.Windows.Forms.Label lblDummy;
 		private DevComponents.DotNetBar.LabelItem lblResolution;
 		private DevComponents.DotNetBar.LabelItem lblUser;
 		private DevComponents.DotNetBar.LabelItem lblLastChange;

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -3202,14 +3202,6 @@ namespace VEPROMS
 				txtSearch.Visible = false;
 				lblLastChange.Visible = false;
 				btnStepRTF.Visible = false;
-				lblDummy.Visible = false;
-			}
-			else
-			{
-				// C2024-007: On Proms main form, allow for control of whether the FontMenu
-				//	combo box is displayed.  Only done when running in debugmode
-				cmbFont.Visible = Volian.Base.Library.VlnSettings.GetCommandFlag("FontMenu");
-				lblDummy.Visible = !Volian.Base.Library.VlnSettings.GetCommandFlag("FontMenu");
 			}
 		}
 

PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs

@@ -285,16 +285,18 @@ namespace VEPROMS.CSLA.Library
 		#region ROTextConvertMethods
 		// B2023-037: Handle <=, >=, +-, -> and <- symbols. Convert to unicode for output, i.e. print and edit/view (when editing
 		//   step, will show as 2 characters, not unicode, unless ro inserted when code replaced link text with unicode.
-		public static string ROConvertSymbols(string retval, bool arr1, bool arr2)
+		public static string ROConvertSymbols(string retval, ItemInfo MyItemInfo = null)
 		{
-			if (arr1)
+			// _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
+			// _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue
+			if (MyItemInfo == null || MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue)
 			{ 
 				retval = retval.Replace("\\u8209?>", @"\u8594?"); // Right Arrow
 				retval = retval.Replace("<\\u8209?", @"\u8592?"); // Left Arrow
 				retval = retval.Replace("->", @"\u8594?"); // Right Arrow
 				retval = retval.Replace("<-", @"\u8592?"); // Left Arrow
 			}
-			if (arr2)
+			if (MyItemInfo == null || MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue)
 			{
 				retval = retval.Replace("<=", @"\u8804?"); // Less than or Equal
 				retval = retval.Replace(">=", @"\u8805?"); // Greater than or Equal
@@ -490,7 +492,7 @@ namespace VEPROMS.CSLA.Library
 			return rc;
 		}
 
-		public string GetTranslatedRoValue(string roid, bool DoCaret, bool DoDOSSuperSubScript, bool convertRoSymbols, ItemInfo myiteminfo)
+		public string GetTranslatedRoValue(string roid, bool DoCaret, bool DoDOSSuperSubScript, bool convertRoSymbols)
 		{
 			roid = FormatRoidKey(roid, true);
 
@@ -502,13 +504,7 @@ namespace VEPROMS.CSLA.Library
 			retval = ReplaceUnicode(retval, DoCaret);
 			// B2023-037: Handle <=, >=, +-, -> and <- symbols. Convert to unicode for output, i.e. print and edit/view (when editing
 			//   step, will show as 2 characters, not unicode, unless ro inserted when code replaced link text with unicode.
-
+			if (convertRoSymbols) retval = ROFSTLookup.ROConvertSymbols(retval);
-			//(_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
-			//			_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue))
-			bool arrows1 = myiteminfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
-			bool arrows2 = myiteminfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
-
-			if (convertRoSymbols) retval = ROFSTLookup.ROConvertSymbols(retval, arrows1, arrows2);
 
 			retval = ConvertFortranFormatToScienctificNotation(retval);
 

PROMS/VEPROMS.CSLA.Library/Extension/AuditExt.cs

@@ -1616,7 +1616,7 @@ namespace VEPROMS.CSLA.Library
 						foreach (ContentRoUsage ro in cont.ContentRoUsages)
 						{
 							RoUsageInfo rou = RoUsageInfo.Get(ro.ROUsageID);
-							string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, tmp);
+							string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
 							
 							ROFSTLookup.rochild rocc = mylookup.GetRoChild(rou.ROID);
 							
@@ -1844,7 +1844,7 @@ namespace VEPROMS.CSLA.Library
 						ROFSTLookup mylookup = myRoFst.GetROFSTLookup(tmp.ContentItems[0].MyProcedure.MyDocVersion);
 						foreach (RoUsageInfo rou in tmp.ContentRoUsages)
 						{
-							string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, tmp.ContentItems[0]);
+							string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
 							ROFSTLookup.rochild rocc = mylookup.GetRoChild(rou.ROID);
 							int mytype = rocc.type;
 							ctmp.FixContentText(rou, myvalue, mytype, myRoFst);

PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs

@@ -694,12 +694,10 @@ namespace VEPROMS.CSLA.Library
 					// B2017-147: backquotes should be translated to degrees for edit/print:
 					newvalue = newvalue.Replace("`", @"\'b0");
 					// B2023-037: Handle <=, >=, +-, -> and <- symbols. If the format has flags to convert these RO symbols, it
-					bool arrows1 = _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
-					bool arrows2 = _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
 					//	is done here so that output (print & edit/view) has symbol, not 2 characters.
 					if (!_MyItemInfo.IsTable && (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
 						_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue))
-						newvalue = ROFSTLookup.ROConvertSymbols(newvalue, arrows1, arrows2);
+						newvalue = ROFSTLookup.ROConvertSymbols(newvalue, _MyItemInfo);
 
 					if (gg != newvalue)
 						text = text.Substring(0, myIndex) + newvalue + text.Substring(myIndex + myLength);

PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs

@@ -908,7 +908,7 @@ namespace VEPROMS.CSLA.Library
 					{
 						string oldText = this.MyContent.Text;
 
-						string roval = lookup.GetTranslatedRoValue(rousage.ROID, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, this);
+						string roval = lookup.GetTranslatedRoValue(rousage.ROID, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
 						ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
 						
 						this.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, this);
@@ -964,7 +964,7 @@ namespace VEPROMS.CSLA.Library
 						ROCheckCount++;
 						string oldText = itemInfo.MyContent.Text;
 
-						string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, sectionInfo);
+						string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
 						ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
 
 						itemInfo.MyContent.FixContentText(rousage, roval, roch.type, origROFst, itemInfo);
@@ -1184,10 +1184,9 @@ namespace VEPROMS.CSLA.Library
 						if (sectionInfo != null)
 						{
 							// B2023-037: loading print text, resolve the RO symbols 
-
+							bool GTLT = sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
-							bool GTLT = !itemInfo.IsTable && sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
+							bool GLTArrows = sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
-							bool GLTArrows = !itemInfo.IsTable &&  sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
+							string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta,    sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, itemInfo.IsTable && GTLT || GLTArrows);
-							string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta,    sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, GTLT || GLTArrows, itemInfo);
 							ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
 							itemInfo.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, itemInfo);
 						}
@@ -4452,10 +4451,9 @@ namespace VEPROMS.CSLA.Library
 					}
 				}
 				// F2024-037 reset the seq sub-step numbering if the parent is an un-numbered high level step
-				// F2024-049 changed to specify the level via the format file (Generic EOP and Vogtle 3&4)
+				else if (sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS && IsSequential && MyParent != null && MyParent.IsHigh && MyParent.MyTab.Text.Length == 0)
-				else if (sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS != null && IsSequential && MyParent != null && MyParent.IsHigh && MyParent.MyTab.Text.Length == 0)
 				{
-					localPrintLevel = (int)sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS;
+					localPrintLevel--; // since parent is a high level step we only need to go back one level
 					itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex;
 				}
 				if (!tbformat.Contains(@"{!C"))

PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs

@@ -722,7 +722,7 @@ namespace VEPROMS.CSLA.Library
 								{
 									foreach (ItemInfo ii in roUsg.MyContent.ContentItems)
 									{
-										string val = newLookup.GetTranslatedRoValue(padroid, ii.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, ii.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, ii);
+										string val = newLookup.GetTranslatedRoValue(padroid, ii.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, ii.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
 										content.FixContentText(roUsg, val, roch.type, origROFstInfo, true);
 
 										if (content.IsDirty)

PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs

@@ -1227,9 +1227,7 @@ namespace VEPROMS.CSLA.Library
 					case 0:
 						break;
 					default:
-						//F2024-048 use a hard space (\\u160;) instead of a space in the page number text
+						tb.Append(string.Format(" (Page {0})", tb._ToItem.PageNumber + 1));
-						//          to keep that text together on the page
-						tb.Append(string.Format(" (Page{0}{1})", "\\u160;", tb._ToItem.PageNumber + 1));
 						break;
 				}
 			}

PROMS/VEPROMS.CSLA.Library/Format/ENums.cs

@@ -58,8 +58,7 @@ namespace VEPROMS.CSLA.Library
 		SectMenuStep = 0x0020,
 		StepAllowNone = 0x0040,
 		StepFirst = 0x0080,
-		StepLast = 0x0100,
+		StepLast = 0x0100
-		StepAllChildren = 0x0200
 	}
 	public enum E_EMode : uint
 	{

PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs

@@ -4508,9 +4508,8 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _AllowNoteCautionAdd, "@AllowNoteCautionAdd");
 			}
 		}
-		// F2024-049 changed to specify the sub-step level via the format file (Generic EOP and Vogtle 3&4)
+		private LazyLoad<bool> _ResetSeqNumberingAfterUnnumberedHLS;
-		private LazyLoad<int?> _ResetSeqNumberingAfterUnnumberedHLS;
+		public bool ResetSeqNumberingAfterUnnumberedHLS
-		public int? ResetSeqNumberingAfterUnnumberedHLS
 		{
 			get
 			{

PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs

@@ -199,12 +199,9 @@ namespace VEPROMS.CSLA.Library
 			LoadChildren(true);
 		}
 		private bool _allParts = true;
-		private bool _excludeTablesFigsEqu = false; // used for inserting Step Text transitions (BNPP)
+		public virtual void LoadChildren(bool allParts)
-		public virtual void LoadChildren(bool allParts, bool excldTablesFigEq = false)
 		{
 			_allParts = allParts;
-			// B2024-019 don't show Tables, Figures, or Equations in step tree when inserting Text Transitions
-			_excludeTablesFigsEqu = excldTablesFigEq;
 			if (!_ChildrenLoaded)
 			{
 				this.Nodes.Clear();
@@ -265,10 +262,6 @@ namespace VEPROMS.CSLA.Library
 					if (!skipIt)
 					{
 						VETreeNode tmp = new VETreeNode(o, _allParts);
-						// B2024-019 don't show Tables, Figures, or Equations in step tree when inserting Text Transitions
-						bool isTableFigEqu = tmp.Text.Equals("Table") ||
-									tmp.Text.Equals("Figure") ||
-									tmp.Text.Equals("Equation");
 						if (o.HasChildren)
 						{
 							if (o is PartInfo)
@@ -286,8 +279,7 @@ namespace VEPROMS.CSLA.Library
 							tmp._ChildrenLoaded = true;// Reset the children loaded flag
 						if (lastWasSection)
 							this.Nodes.Insert(0, tmp);
-						// B2024-019 don't show Tables, Figures, or Equations in step tree when inserting Text Transitions
+						else
-						else if (!_excludeTablesFigsEqu || !isTableFigEqu)
 							this.Nodes.Add(tmp);
 						// if last thing was section & this is step, do insert - i.e. so that steps go before sections.
 						lastWasSection = (o is PartInfo && (o as PartInfo).PartType == E_FromType.Section);

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

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

PROMS/VG/VG.csproj

@@ -35,7 +35,7 @@
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/Volian.Base.Library/Volian.Base.Library.csproj

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

PROMS/Volian.Controls.Library/DisplayRO.cs

@@ -905,7 +905,7 @@ namespace Volian.Controls.Library
 						string linktxt = string.Format(@"#Link:ReferencedObject:<NewID> {0} {1}", padroid, MyROFST.RODbID);
 
 						// Resolve symbols and scientific notation in the RO return value
-						string valtxt = MyROFSTLookup.GetTranslatedRoValue(padroid, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, MyRTB.MyItemInfo);
+						string valtxt = MyROFSTLookup.GetTranslatedRoValue(padroid, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
 
 						MyRTB.OnRoInsert(this, new StepRTBRoEventArgs(valtxt, selectedChld.value, linktxt, padroid, MyROFST.RODbID));
 					}

PROMS/Volian.Controls.Library/DisplayTransition.cs

@@ -898,11 +898,7 @@ namespace Volian.Controls.Library
 			// allow this (12/2/09).  Note that this was changed to not allow transitions
 			// to RNOs (10/2010), this 'feature' will be added at some later date.
 			tn.ChildrenLoaded = false;
-			// F2024-047 BNPP standard Text transition - pass True to LoadChildren to load all children.
+			tn.LoadChildren(false); 
-			E_TransUI etm = (E_TransUI) _CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[_TranFmtIndx].TransUI;
-			bool loadAllChildren = ((etm & E_TransUI.StepAllChildren) == E_TransUI.StepAllChildren);
-			bool excludeTableFigEqu = loadAllChildren; // don't show Tables, Figures, or Equations in step list
-			tn.LoadChildren(loadAllChildren, excludeTableFigEqu); 
 		}
 		private void cbTranSects_SelectedIndexChanged(object sender, EventArgs e)
 		{
@@ -944,9 +940,7 @@ namespace Volian.Controls.Library
 		private void HideStepTreeIfNeeded()
 		{
 			string trnFmt = _CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[_TranFmtIndx].TransFormat;
-			// F2024-047 Added check for {Step Text} so that the step tree is displayed
+			bool showStepList = trnFmt.Contains("{First Step}");
-			//           Needed for BNPP transition to step text only for standard text
-			bool showStepList = trnFmt.Contains("{First Step}") || trnFmt.Contains("{Step Text}");
 			if (!showStepList)
 				tvTran.Nodes.Clear(); // clear the tree view of steps if not needed for selected transition
 			tvTran.Enabled = showStepList; // show the tree view of steps?
@@ -1342,13 +1336,7 @@ namespace Volian.Controls.Library
 				return;
 			}
 			// B2015-170 - don't allow a transition to step that is not sequential
-			// B2024-019  - but allow if TranFmt only contains {Step Text}
+			if ((toItem != null &&!toItem.IsNumbered) || (rangeItem != null && !rangeItem.IsNumbered))
-			//            - Calvert uses {Step Text} but also includes step number
-			//            - Barakah (BNPP) uses just {Step Text} to link to standard text
-			bool onlyStepText = false;
-			if (listBoxTranFmt.Text.Contains("{Step Text}") && !listBoxTranFmt.Text.Contains("{First Step}"))
-				onlyStepText = true;
-			if (!onlyStepText && (toItem != null &&!toItem.IsNumbered) || (rangeItem != null && !rangeItem.IsNumbered))
 			{
 				FlexibleMessageBox.Show("For transitions containing step references, the transition must be to a numbered or lettered step.",
 					"Cannot add transition to a non-sequential step", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);

PROMS/Volian.Controls.Library/EditItem.cs

@@ -2185,9 +2185,6 @@ namespace Volian.Controls.Library
 			// B2017-043 account for Horizontal Scroll
 			int colT = MyStepPanel.DisplayRectangle.X + MyStepPanel.ToDisplay((int)myStepSectionLayoutData.ColT);
 			if (x < colT) x = colT;
-			// B2023-025: if x is <= 0, add 20 to it so that left column of table isn't cut-off. 20 was used because lesser numbers
-			//	still cut-off the left column (by trial and error).
-			if (x <= 0) x = 20;
 			int y = FindTop(myParentEditItem.Bottom);
 			return new Point(x, y);
 		}

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -563,7 +563,7 @@ namespace Volian.Controls.Library
 			string linktxt = string.Format(@"#Link:ReferencedObject:<NewID> {0} {1}", padroid, MyLookup.MyDocVersionInfo.DocVersionAssociations[0].MyROFst.MyRODb.RODbID);
 			// Resolve symbols and scientific notation in the RO return value
 			string valtxt = MyLookup.GetTranslatedRoValue(padroid, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues,
-			 false, MyStepRTB.MyItemInfo); //ConvertSymbolsAndStuff(selectedChld.value);
+			 false); //ConvertSymbolsAndStuff(selectedChld.value);
 			MyStepRTB.OnRoInsert(this, new StepRTBRoEventArgs(valtxt, myvalue, linktxt, padroid, MyLookup.MyDocVersionInfo.DocVersionAssociations[0].MyROFst.MyRODb.RODbID));
 		}
 		private void SaveROWithAnnotation_Click(object sender, EventArgs e)
@@ -580,7 +580,7 @@ namespace Volian.Controls.Library
 			string padroid = (myroid.Length <= 12) ? myroid + "0000" : myroid;
 			string linktxt = string.Format(@"#Link:ReferencedObject:<NewID> {0} {1}", padroid, MyLookup.MyDocVersionInfo.DocVersionAssociations[0].MyROFst.MyRODb.RODbID);
 			// Resolve symbols and scientific notation in the RO return value
-			string valtxt = MyLookup.GetTranslatedRoValue(padroid, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, MyStepRTB.MyItemInfo); //ConvertSymbolsAndStuff(selectedChld.value);
+			string valtxt = MyLookup.GetTranslatedRoValue(padroid, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false); //ConvertSymbolsAndStuff(selectedChld.value);
 			MyStepRTB.OnRoInsert(this, new StepRTBRoEventArgs(valtxt, myvalue, linktxt, padroid, MyLookup.MyDocVersionInfo.DocVersionAssociations[0].MyROFst.MyRODb.RODbID));
 		}
 		private void NoROFound_Click(object sender, EventArgs e)

PROMS/Volian.Controls.Library/VlnFlexGrid.cs

@@ -3716,17 +3716,17 @@ namespace Volian.Controls.Library
 		/// Grid will be saved to an Excel file.
 		/// </summary>
 		/// <param name="initDir"></param>
-		//public void ExportToExcel(string initDir)
+		public void ExportToExcel(string initDir)
-		//{
+		{
-		//	SaveFileDialog sfd = new SaveFileDialog();
+			SaveFileDialog sfd = new SaveFileDialog();
-		//	sfd.DefaultExt = ".xls";
+			sfd.DefaultExt = ".xls";
-		//	sfd.Filter = "Excel files (*.xls)|*.xls|All files (*.*)|*.* ";
+			sfd.Filter = "Excel files (*.xls)|*.xls|All files (*.*)|*.* ";
-		//	//sfd.InitialDirectory = @"C:\Development\SampleTableData";
+			//sfd.InitialDirectory = @"C:\Development\SampleTableData";
-		//	sfd.InitialDirectory = initDir;
+			sfd.InitialDirectory = initDir;
-		//	sfd.Title = "Save Excel File";
+			sfd.Title = "Save Excel File";
-		//	sfd.ShowDialog();
+			sfd.ShowDialog();
-		//	this.SaveExcel(sfd.FileName);
+			this.SaveExcel(sfd.FileName);
-		//}
+		}
 
 		/// <summary>
 		/// Prompts user with Open File dialog.
@@ -3761,25 +3761,25 @@ namespace Volian.Controls.Library
 		/// </summary>
 		/// <param name="initDir"></param>
 		/// <returns></returns>
-		//public string ImportExcel(string initDir)
+		public string ImportExcel(string initDir)
-		//{
+		{
-		//	string rtn = "";
+			string rtn = "";
-		//	//VlnFlexGrid grd = rbtDefaultTable.Checked ? vlnFlexGrid2 : vlnFlexGrid3; //GetActiveGrid();
+			//VlnFlexGrid grd = rbtDefaultTable.Checked ? vlnFlexGrid2 : vlnFlexGrid3; //GetActiveGrid();
-		//	OpenFileDialog ofd = new OpenFileDialog();
+			OpenFileDialog ofd = new OpenFileDialog();
-		//	ofd.DefaultExt = ".xls";
+			ofd.DefaultExt = ".xls";
-		//	ofd.Filter = "Excel files (*.xls)|*.xls|All files (*.*)|*.*";
+			ofd.Filter = "Excel files (*.xls)|*.xls|All files (*.*)|*.*";
-		//	//ofd.InitialDirectory = @"C:\Development\SampleTableData";
+			//ofd.InitialDirectory = @"C:\Development\SampleTableData";
-		//	ofd.InitialDirectory = initDir;
+			ofd.InitialDirectory = initDir;
-		//	ofd.Multiselect = false;
+			ofd.Multiselect = false;
-		//	ofd.Title = "Select Excel File";
+			ofd.Title = "Select Excel File";
-		//	ofd.ShowDialog();
+			ofd.ShowDialog();
-		//	this.Clear();
+			this.Clear();
-		//	this.MergedRanges.Clear();
+			this.MergedRanges.Clear();
-		//	this.LoadExcel(ofd.FileName);
+			this.LoadExcel(ofd.FileName);
-		//	this.AdjustGridControlSize();
+			this.AdjustGridControlSize();
-		//	rtn = ofd.SafeFileName;
+			rtn = ofd.SafeFileName;
-		//	return rtn;
+			return rtn;
-		//}
+		}
 		public static List<string> ROTableUpdate(object sender, ROFstInfoROTableUpdateEventArgs args)
 		{
 			string xml = null;

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

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -87,14 +87,11 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\3rdPartyLibraries\Edraw\AxInterop.EDWordLib.dll</HintPath>
     </Reference>
-    <Reference Include="C1.Win.4.8">
+    <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
-      <HintPath>..\VEPROMS\packages\C1.Win.8.0.20233.631\lib\net48\C1.Win.4.8.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="C1.Win.C1FlexGrid.4.8, Version=4.8.20233.631, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
+    <Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
-      <HintPath>..\VEPROMS\packages\C1.Win.C1FlexGrid.4.8.20233.631\lib\net48\C1.Win.C1FlexGrid.4.8.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="C1.Win.C1SpellChecker.4.8, Version=4.8.20233.631, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
-      <HintPath>..\VEPROMS\packages\C1.Win.C1SpellChecker.4.8.20233.631\lib\net48\C1.Win.C1SpellChecker.4.8.dll</HintPath>
     </Reference>
     <Reference Include="Csla">
       <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
@@ -488,7 +485,6 @@
       <DependentUpon>PreviewROImage.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="RTBItem.resx">
       <DependentUpon>RTBItem.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -586,12 +582,10 @@
   <ItemGroup>
     <None Include="app.config" />
     <None Include="ClassDiagram1.cd" />
-    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <EmbeddedResource Include="Volian.Controls.Library.gclicx" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="DisplayApplicability.resx">

PROMS/Volian.Controls.Library/Volian.Controls.Library.gclicx

@@ -1 +0,0 @@
-da3d5d14-691f-4908-aa3c-fd3239734232;-8584914772854775808;Vm9saWFuLkNvbnRyb2xzLkxpYnJhcnkuZGxs;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,MDEwODE5MjdYWFhYWFhYWDA1Mg,Sk9ITi1XSU4xMA,RmFsc2U,ODQzNA,RmFsc2U,MA,MA,djIwMjIuMw,,;c7VmK7aSALscK1Nd/lI1cS3mms+p4j4Fsa2LgKQ1JmeSkNKq5X8LWx2NLOHITkvv+3IbbTQcVPnGa7hKiEDHlfH3thfwEvtzoqprZSXMOYfNPiXTPIIYPNb6L31Qq7AGiogvw+dMD9o/AiUWt4Q7a5SRmYU+PbrlNAXVISIzndw

PROMS/Volian.Controls.Library/app.config

@@ -12,4 +12,4 @@
             </setting>
         </Volian.Controls.Library.Properties.Settings>
     </userSettings>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>

PROMS/Volian.Controls.Library/packages.config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="C1.Win" version="8.0.20233.631" targetFramework="net481" />
-  <package id="C1.Win.C1FlexGrid" version="4.8.20233.631" targetFramework="net481" />
-  <package id="C1.Win.C1SpellChecker" version="4.8.20233.631" targetFramework="net481" />
-</packages>

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -3185,7 +3185,7 @@ namespace Volian.Controls.Library
 		{
 			// If parent step is open in editor, use the OnInsertItemInfo to insert step & add RTBItems to step editor panel
 			ItemInfo ii = tn.VEObject as ItemInfo;
-			if (OnInsertItemInfo(this, new vlnTreeItemInfoInsertEventArgs(ii, (newtype == MenuSelections.StepAfter) ? E_InsertType.After : E_InsertType.Before, "")))
+			if (OnInsertItemInfo(this, new vlnTreeItemInfoInsertEventArgs(ii, (newtype == MenuSelections.StepAfter) ? E_InsertType.After : E_InsertType.Before, "New Step")))
 			{
 				tn = (VETreeNode)((newtype == MenuSelections.StepAfter) ? tn.NextNode : tn.PrevNode);
 			}

PROMS/Volian.Pipe.Library/Volian.Pipe.Library.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Volian.Pipe.Library</RootNamespace>
     <AssemblyName>Volian.Pipe.Library</AssemblyName>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <SccProjectName>"%24/PROMS/Volian.Pipe.Library", RQGAAAAA</SccProjectName>

PROMS/Volian.Print.Library/Grid2Pdf.cs

@@ -1,4 +1,5 @@
 using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 using C1.Win.C1FlexGrid;

PROMS/Volian.Print.Library/PromsPrinter.cs

@@ -700,8 +700,6 @@ namespace Volian.Print.Library
 				try
 				{
 					if (File.Exists(outputFileName))
-					{
-						if (!BaselineTesting)
 					{
 						String tmpExt = System.IO.Path.GetExtension(outputFileName);
 						String tmpPTH = System.IO.Path.GetDirectoryName(outputFileName);
@@ -718,7 +716,7 @@ namespace Volian.Print.Library
 						} while (files.Contains(filename));
 
 						outputFileName = filename;
-						}
+
 					}
 
 					writer = PdfWriter.GetInstance(document, new FileStream(outputFileName, FileMode.Create));

PROMS/Volian.Print.Library/Properties/licenses.licx

@@ -0,0 +1 @@
+C1.Win.C1FlexGrid.C1FlexGrid, C1.Win.C1FlexGrid.2

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

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -65,11 +65,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="C1.Win.4.8">
+    <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
-      <HintPath>..\VEPROMS\packages\C1.Win.8.0.20233.631\lib\net48\C1.Win.4.8.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="C1.Win.C1FlexGrid.4.8">
-      <HintPath>..\VEPROMS\packages\C1.Win.C1FlexGrid.4.8.20233.631\lib\net48\C1.Win.C1FlexGrid.4.8.dll</HintPath>
     </Reference>
     <Reference Include="Csla">
       <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
@@ -156,9 +153,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <EmbeddedResource Include="Properties\licenses.licx" />
-    <EmbeddedResource Include="Volian.Print.Library.gclicx" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

PROMS/Volian.Print.Library/Volian.Print.Library.gclicx

@@ -1 +0,0 @@
-da3d5d14-691f-4908-aa3c-fd3239734232;-8584914772854775808;Vm9saWFuLlByaW50LkxpYnJhcnkuZGxs;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,MDEwODE5MjdYWFhYWFhYWDA1Mg,Sk9ITi1XSU4xMA,RmFsc2U,ODQzNA,RmFsc2U,MA,MA,djIwMjIuMw,,;c7VmK7aSALscK1Nd/lI1cS3mms+p4j4Fsa2LgKQ1JmeSkNKq5X8LWx2NLOHITkvv+3IbbTQcVPnGa7hKiEDHlfH3thfwEvtzoqprZSXMOYfNPiXTPIIYPNb6L31Qq7AGiogvw+dMD9o/AiUWt4Q7a5SRmYU+PbrlNAXVISIzndw

PROMS/Volian.Print.Library/packages.config

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="BouncyCastle" version="1.8.9" targetFramework="net481" />
-  <package id="iTextSharp" version="5.5.13.3" targetFramework="net481" />
-</packages>

PROMS/Volian.Svg.Library/Volian.Svg.Library.csproj

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -71,8 +71,7 @@
     <Reference Include="Itenso.Rtf.Parser">
       <HintPath>..\..\..\..\3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Parser.dll</HintPath>
     </Reference>
-    <Reference Include="itextsharp, Version=4.1.2.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca">
+    <Reference Include="itextsharp">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\3rdPartyLibraries\iTechSharp\itextsharp.dll</HintPath>
     </Reference>
     <Reference Include="log4net">

PROMS/Volian.Utils.Library/Volian.Utils.Library.csproj

@@ -16,7 +16,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

PROMS/XYPlots/XYPlots.csproj

@@ -35,7 +35,7 @@
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>