Bring branch up to date

format only change - good for testing

.gitignore

@@ -402,3 +402,4 @@ FodyWeavers.xsd
 /fmtall
 /genmacall
 *AssemblyInfo.cs
+/PROMS/Baseline/Baseline.sln

PROMS/AdjustBuildRevision/Program.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
@@ -35,31 +33,7 @@ namespace AdjustBuildRevision
 								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.4.yyMM.dHH") + "\")");
 							else
 								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")");
-					//		if (outline != line)
+							
-					//		{
-					//			Console.WriteLine("Before: '{0}'", line);
-					//			Console.WriteLine("After:  '{0}'", outline);
-					//			lines[i] = outline;
-					//			changed = true;
-					//		}
-					//		else
-					//		{
-					//			Console.WriteLine("No change: '{0}'", line);
-					//		}
-					//	}
-					//}
-					//if (changed)
-					//{
-					//	if (!fi.IsReadOnly) fi.IsReadOnly = false;
-					//	StreamWriter sw = fi.CreateText();
-					//	foreach (string line in lines)
-					//		sw.WriteLine(line);
-					//	sw.Close();
-					//	string line = lines[i];
-					//	string outline = line;
-					//	if (line.Contains("AssemblyVersion") || line.Contains("AssemblyFileVersion"))
-					//	{
-							//outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("1.1.yyMM.dHH") + "\")");
 							if (outline != line)
 							{
 								Console.WriteLine("Before: '{0}'", line);
@@ -84,7 +58,7 @@ namespace AdjustBuildRevision
 				}
 				else
 				{
-					MessageBox.Show("File " + fi.FullName + " does not exist");
+					MessageBox.Show($"File {fi.FullName} does not exist");
 				}
 			}
 			catch (Exception ex)
@@ -93,10 +67,6 @@ namespace AdjustBuildRevision
 			}
 		}
 
-		//private static DateTime GetLatestDateTime(string path)
-		//{
-		//	return GetLatestDateTime(new DirectoryInfo(path));
-		//}
 		private static DateTime GetLatestDateTime(DirectoryInfo di, DateTime dtCheck)
 		{
 			DateTime dtMax = dtCheck;
@@ -104,24 +74,14 @@ namespace AdjustBuildRevision
 			foreach(FileInfo myFile in myFiles)
 			{
 				DateTime dt = myFile.LastWriteTime;
-				//if (dt > dtCheck)
-				//{
-					//Console.WriteLine("\"File\"\t\"{0}\"\t\"{1}\"\t{2}\t{3}",myFile.FullName,dt.ToString("1.1.yyMM.dHH"),dt,dtCheck);
 				if(dtMax < dt) dtMax = dt;
-				//}
 			}
 			DirectoryInfo[] myFolders = di.GetDirectories();
 			foreach (DirectoryInfo diChild in myFolders)
 			{
 				DateTime dtChild = GetLatestDateTime(diChild,dtCheck);
-				//if (dtChild > dtCheck)
-				//{
-					//Console.WriteLine("\"SubFolder\"\t\"{0}\"\t\"{1}\"\t{2}\t{3}", diChild.FullName, dtChild.ToString("1.1.yyMM.dHH"),dtChild,dtCheck);
 				if(dtChild > dtMax) dtMax = dtChild;
-				//}
 			}
-			//if(dtMax > dtCheck)
-			//	Console.WriteLine("\"Folder\"\t\"{0}\"\t\"{1}\"", di.FullName, dtMax.ToString("1.1.yyMM.dHH"));
 			return dtMax;
 		}
 	}

PROMS/Baseline/Baseline.csproj

@@ -67,6 +67,7 @@
     <Compile Include="frmSettings.Designer.cs">
       <DependentUpon>frmSettings.cs</DependentUpon>
     </Compile>
+    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="frmBaseline.resx">

PROMS/Baseline/GlobalSuppressions.cs

@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Not modifying Naming Styles")]

PROMS/Baseline/Program.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Baseline

PROMS/Baseline/frmBaseline.cs

@@ -43,12 +43,9 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
-using System.Drawing;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
-using System.Collections.Specialized;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Xml.Serialization;
@@ -73,12 +70,7 @@ namespace Baseline
 	}
 	public partial class frmBaseline : Form
 	{
-		private IgnoreLines _MyIgnore = new IgnoreLines();
+        public IgnoreLines MyIgnore { get; set; } = new IgnoreLines();
-		public IgnoreLines MyIgnore
-		{
-			get { return _MyIgnore; }
-			set { _MyIgnore = value; }
-		}
         private LastWas myLast = LastWas.Search;
 		private Settings MySettings;
 		public string MyStatus
@@ -151,8 +143,10 @@ namespace Baseline
 			this.WindowState = Properties.Settings.Default.WidnowState;
 			if(Properties.Settings.Default.Ignore != null && Properties.Settings.Default.Ignore != "")
 				MyIgnore = IgnoreLines.Get(Properties.Settings.Default.Ignore);
-			MySettings= new Settings();
+            MySettings = new Settings
-			MySettings.IgnoreLines = new BindingList<string>();
+            {
+                IgnoreLines = new BindingList<string>()
+            };
             splitContainer1.SplitterDistance = Properties.Settings.Default.Split1;
 			splitContainer2.SplitterDistance = Properties.Settings.Default.Split2;
 			splitContainer3.SplitterDistance = Properties.Settings.Default.Split3;
@@ -240,8 +234,7 @@ namespace Baseline
 			lbProcedures.Items.Clear();
 			lbResults1.Items.Clear();
 			lbResults2.Items.Clear();
-			FindFile ff = lbDifferent.SelectedItem as FindFile;
+            if (lbDifferent.SelectedItem is FindFile ff)
-			if (ff != null)
             {
                 // Fill Procedure or Result ListBoxes
                 switch (myLast)
@@ -361,13 +354,6 @@ namespace Baseline
 			lines1 = list1.AsEnumerable<string>();// Convert back to Enumerable to work with LINQ
 			return lines1;
 		}
-		private string GetProcNum(string line)
-		{
-			string retval =  line.Substring(3, line.IndexOf(" | ") - 3);
-			if (retval.Contains("_"))
-				retval = retval.Substring(0, retval.IndexOf("_") - 1);
-			return retval;
-		}
 		/// <summary>
 		/// Include lines for Procedure or Page or Search is true
 		/// Account for Case Insensitive CheckBox
@@ -450,13 +436,13 @@ namespace Baseline
 		private void lbResults1_SelectedIndexChanged(object sender, EventArgs e)
 		{
 			string line=null;
-			if (lbResults1.SelectedItem is string)
+			if (lbResults1.SelectedItem is string v)
-				line = (string)lbResults1.SelectedItem;
+				line = v;
 			Line myLine = lbResults1.SelectedItem as Line;
 				switch (myLast)
 				{
 					case LastWas.Pagination:
-						line = OpenPDF(line);
+						OpenPDF(line);
 						break;
 					case LastWas.Baseline: // TODO: Need to add code here to open matching file
 						OpenOnePDF(myLine,1);
@@ -472,14 +458,14 @@ namespace Baseline
 		{
 
 			string line=null;
-			if(lbResults2.SelectedItem is string)
+			if(lbResults2.SelectedItem is string v)
-				line = (string)lbResults2.SelectedItem;
+				line = v;
 			Line myLine = lbResults2.SelectedItem as Line;
 
 			switch (myLast)
 			{
 				case LastWas.Pagination:
-					line = OpenPDF(line);
+					OpenPDF(line);
 					break;
 				case LastWas.Baseline: // TODO: Need to add code here to open matching file
 					OpenOnePDF(myLine,2);
@@ -491,34 +477,97 @@ namespace Baseline
 					break;
 			}
 		}
-		string exePath;
+
-		private string OpenPDF(string line)
+		/// <summary>
+		/// This will return the full path to the PDF file
+		/// </summary>
+		/// <param name="fi"></param>
+		/// <param name="patern"></param>
+		/// <returns></returns>
+		private string GetPFDFileAndPath(FileInfo fi, string patern)
 		{
-			int page = int.Parse(line.Substring(0, 6));
+			string[] fileList = Directory.GetFiles(fi.DirectoryName, patern);
+			// sort the list of file list
+			Array.Sort((string[])fileList);
+			return fileList.FirstOrDefault(); // the PDF file that we what should be top of the list then.
+		}
+
+		/// <summary>
+		/// This will parse out the procedure number for the PROMS ShortPath representation of a procedure section or step part
+		/// In the PROMS ShortPath, ".S" is used to delimit the procedure number, section then uses "..S" for the step parts
+		/// This method was written to handle cases where ".S" is used as part of the procedure number
+		/// </summary>
+		/// <param name="txt"></param>
+		/// <returns></returns>
+		private string ParseOutProcedureNumberFromLine(string txt)
+		{
+            // if the item is to a high levels step or sub-step the short path as "..S" for each part of the step
+            // so look for the last occurence of ".." which will be the end of the section information
+            int lidx = txt.LastIndexOf("..");
+            if (lidx > 0)
+			{
+				lidx = txt.LastIndexOf(".S", lidx); // this will position us to the end of the procedure number
+			}
+			else
+			{
+				lidx = txt.LastIndexOf(".S"); // this will position us to the end of the procedure number if there was no step information
+			}
+            // old logic was looking for the first occurence of ".S" in the txt string as the ending point of the procedure nuumber
+            // Beaver Valley has a procedure number "1.SBGEN" in which the old logic would not work
+            // 1.SBGEN.SC. ==> short path of attachment section "C"
+            // 1.SBGEN.SC..S1. ==> short path of Step 1 in attachment section "C"
             // B2018-113 - Replace slashes and backslashes with underscores just as PROMS does when creating a PDF file.
-			line = line.Substring(8, line.IndexOf(".S") - 8).Replace("/", "_").Replace("\\", "_");
+            string rtnstr = txt.Substring(8, lidx - 8).Replace("/", "_").Replace("\\", "_");
+            return rtnstr;
+		}
+
+		string exePath;
+		private void OpenPDF(string line)
+		{
+			int pageNum = int.Parse(line.Substring(0, 6));
+			// B2018-113 - Replace slashes and backslashes with underscores just as PROMS does when creating a PDF file.
+			string ProcNum = ParseOutProcedureNumberFromLine(line);
+			string procPatern = string.Format("*{0}*.pdf", string.IsNullOrEmpty(line) ? "noProcNumber" : ProcNum);
+
 			FindFile ff = lbDifferent.SelectedItem as FindFile;
 			FileInfo fi1 = new FileInfo(ff.File1);
 			FileInfo fi2 = new FileInfo(ff.File2);
+			string PDFfileName1 = GetPFDFileAndPath(fi1,procPatern);
+			string PDFfileName2 = GetPFDFileAndPath(fi2,procPatern);
+			if (string.IsNullOrEmpty(PDFfileName1) || string.IsNullOrEmpty(PDFfileName2)) return;
+
 			// If you don't know where the Reader executable is for PDFs Open a PDF and Check to see where the path points
 			if (exePath == null)
 			{
-				System.Diagnostics.Process p = System.Diagnostics.Process.Start(fi1.DirectoryName + "\\" + line + ".pdf");
+				try
+				{
+					System.Diagnostics.Process p = System.Diagnostics.Process.Start(PDFfileName1);
 					exePath = TryToGetPath(p);
 					p.Kill(); // No need to keep it open
 				}
+				catch (Exception ex)
+				{
+					Application.DoEvents();
+					string msg = string.Format("{0} - {1}", ex.GetType().Name, ex.Message);
+					Console.WriteLine(msg);
+					MessageBox.Show(msg, "Error opening default PDF Viewer");
+					return;
+				}
+			}
+
 			// Open the first PDF on a Specific Page
-			System.Diagnostics.ProcessStartInfo psi1 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A page={0} ", page) + fi1.DirectoryName + "\\" + line + ".pdf ");
+			System.Diagnostics.ProcessStartInfo psi1 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format(" /A \"page={0}\" \"{1}\" ", pageNum,PDFfileName1));
 			System.Diagnostics.Process p1 = System.Diagnostics.Process.Start(psi1);
 			// Move the PDF Reader window to 0,0
 			MoveProcess(p1, 0, 0);
-			// Open the first PDF on a Specific Page
+
-			System.Diagnostics.ProcessStartInfo psi2 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A page={0} ", page) + fi2.DirectoryName + "\\" + line + ".pdf ");
+			// Open the second PDF on a Specific Page
+			System.Diagnostics.ProcessStartInfo psi2 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format(" /A \"page={0}\" \"{1}\" ", pageNum, PDFfileName2));
 			System.Diagnostics.Process p2 = System.Diagnostics.Process.Start(psi2);
 			// Move the PDF Reader window to 960,0
 			// TODO: This Offset could be a Setting
 			MoveProcess(p2, 960, 0);
-			return line;
+			return;
 		}
 		/// <summary>
 		/// Try to get the location of the PDF Reader executable
@@ -530,7 +579,7 @@ namespace Baseline
 			p.WaitForInputIdle();
 			while (p.MainModule == null)
 			{
-				Console.WriteLine("{0} -  {1}", p.MainWindowTitle,p.ProcessName);
+				Console.WriteLine("{0} -  {1}", p.MainWindowTitle, p.ProcessName);
 				p.WaitForInputIdle();
 				Application.DoEvents();
 			}
@@ -551,10 +600,10 @@ namespace Baseline
 				progname = @"C:\Program Files (x86)\IDM Computer Solutions\UltraCompare\UC.exe";
 			System.Diagnostics.ProcessStartInfo psi =
 				new System.Diagnostics.ProcessStartInfo(progname, string.Format(@" -t ""{0}"" ""{1}""", compareFile, baseFile));
-			System.Diagnostics.Process prc = System.Diagnostics.Process.Start(psi);
+            _ = System.Diagnostics.Process.Start(psi);
         }
 
-		private ProcessLocationQueue myQueue= new ProcessLocationQueue();
+		private readonly ProcessLocationQueue myQueue= new ProcessLocationQueue();
 		private Timer queueTimer = null;
 		/// <summary>
 		/// Move a Process to a specific screen location - This is done with a timer so 
@@ -567,8 +616,10 @@ namespace Baseline
 		{
 			if (queueTimer == null)
 			{
-				queueTimer = new Timer();
+                queueTimer = new Timer
-				queueTimer.Enabled = false;
+                {
+                    Enabled = false
+                };
                 queueTimer.Tick += queueTimer_Tick;
 				queueTimer.Interval = 1000;
 			}
@@ -594,40 +645,54 @@ namespace Baseline
 		/// <param name="list"></param>
 		private void OpenOnePDF(Line myLine, int list)
 		{
+			if (myLine == null) return; // no PDF to open
 			// B2018-113 - Replace slashes and backslashes with underscores just as PROMS does when creating a PDF file.
 			string proc = myLine.MyProc.Number.Replace("/","_").Replace("\\","_");
+
+			// if no procedure number, PROMS creates pdf filename "NoProcNumber.pdf"
+			// create pattern to use to get the PDF from the directory
+			// add wildcards (*) to file the file if any prefix or suffix was added to the filename
+			string procPatern = string.Format("*{0}*.pdf", proc == string.Empty ? "noProcNumber" : proc);
 			int pagenum = myLine.MyPage.Number;
 			FindFile ff = lbDifferent.SelectedItem as FindFile;
-			FileInfo fi1 = new FileInfo(ff.File1);
+            string PDFfileName;
-			FileInfo fi2 = new FileInfo(ff.File2);
+            if (list == 1)
-			if (exePath == null)
 			{
-				System.Diagnostics.Process p = System.Diagnostics.Process.Start(fi1.DirectoryName + "\\" + proc + ".pdf");
+				FileInfo fi1 = new FileInfo(ff.File1);
-				while (exePath == null)
+				PDFfileName = GetPFDFileAndPath(fi1, procPatern);
+			}
+			else // list == 2
+			{
+				FileInfo fi2 = new FileInfo(ff.File2);
+				PDFfileName = GetPFDFileAndPath(fi2, procPatern);
+			}
+			if (string.IsNullOrEmpty(PDFfileName)) return; // no PDF to open
+
+			// if exePath is null, then open the found PDF with the default PDF viewer and
+			// capture/save the entire name and path of the default PDF viewer
+			if (exePath == null)
 			{
 				try
 				{
-
+					System.Diagnostics.Process tp = System.Diagnostics.Process.Start(PDFfileName);
-						exePath = p.MainModule.FileName;
+					exePath = TryToGetPath(tp);
+					tp.Kill();
 				}
 				catch (Exception ex)
 				{
 					Application.DoEvents();
-						Console.WriteLine("{0} - {1}", ex.GetType().Name, ex.Message);
+					string msg = string.Format("{0} - {1}", ex.GetType().Name, ex.Message);
+					Console.WriteLine(msg);
+					MessageBox.Show(msg, "Error opening default PDF Viewer");
+					return;
 				}
 			}
-				p.Kill();
+            // open the PDF and jump to the page number
-			}
+            System.Diagnostics.ProcessStartInfo psi1 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A \"page={0}\" \"{1}\" ", pagenum, PDFfileName))
-			if (list == 1)
             {
-				System.Diagnostics.ProcessStartInfo psi1 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A page={0} ", pagenum) + fi1.DirectoryName + "\\" + proc + ".pdf ");
+                UseShellExecute = false
-				System.Diagnostics.Process p1 = System.Diagnostics.Process.Start(psi1);
+            };
-			}
+            _ = System.Diagnostics.Process.Start(psi1);
-			else
-			{
-				System.Diagnostics.ProcessStartInfo psi2 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A page={0} ", pagenum) + fi2.DirectoryName + "\\" + proc + ".pdf ");
-				System.Diagnostics.Process p1 = System.Diagnostics.Process.Start(psi2);
-			}
         }
 		/// <summary>
 		/// Perform Debug Meta file comparison for all of the folders within the automated testing folders 
@@ -709,11 +774,11 @@ namespace Baseline
 		private void lbProcedures_SelectedIndexChanged(object sender, EventArgs e)
 		{
             //Initialize Results List Box
-			lbResults1.Items.Clear();
+            if (!(lbProcedures.SelectedItem is Procedure myProc)) return; // clicked on the white space (blank line) in the list of different procedures
-			Procedure myProc = lbProcedures.SelectedItem as Procedure;
                                                                           //TODO: May need to consider if there are duplicate procedure numers and titles
             Procedure myProc1 = MyProcs1.Find(x => x.Number == myProc.Number && x.Title == myProc.Title);
 			// Build the results ListBox for the left window
+			lbResults1.Items.Clear();
 			if (myProc1 != null)
 			{
 				foreach (Page myPage in myProc1.MyPages)
@@ -758,27 +823,12 @@ namespace Baseline
 		};
 	public class Settings
 	{
-		private BindingList<string> _IgnoreLines;
+        public BindingList<string> IgnoreLines { get; set; }
-		public BindingList<string> IgnoreLines
-		{
-			get { return _IgnoreLines; }
-			set { _IgnoreLines = value; }
-		}
     }
 	public partial class FindFile
 	{
-		private string _File1;
+        public string File1 { get; set; }
-		public string File1
+        public string File2 { get; set; }
-		{
-			get { return _File1; }
-			set { _File1 = value; }
-		}
-		private string _File2;
-		public string File2
-		{
-			get { return _File2; }
-			set { _File2 = value; }
-		}
         public FindFile(string file1, string file2)
 		{
 			File1 = file1;
@@ -787,11 +837,8 @@ namespace Baseline
 	}
 	public partial class FindFiles : List<FindFile>
 	{
-		private string _FileName;
+		private readonly string _FileName;
-		public string FileName
+        public string FileName => _FileName;
-		{
-			get { return _FileName; }
-		}
         /// <summary>
         /// Build list of DocVersion Folders with differences
         /// </summary>
@@ -1025,33 +1072,15 @@ namespace Baseline
 	// Text - the line of text
 	public partial class Procedure
 	{
-		private string _Number;
+        public string Number { get; set; }
-		public string Number
+        public string Title { get; set; }
-		{
+        public Pages MyPages { get; set; } = new Pages();
-			get { return _Number; }
-			set { _Number = value; }
-		}
-		private string _Title;
-		public string Title
-		{
-			get { return _Title; }
-			set { _Title = value; }
-		}
-		private Pages _MyPages = new Pages();
-		public Pages MyPages
-		{
-			get { return _MyPages; }
-			set { _MyPages = value; }
-		}
         public Procedure(string number, string title)
 		{
-			_Number = number;
+			Number = number;
-			_Title = title;
+			Title = title;
-		}
-		public override string ToString()
-		{
-			return string.Format("{0} - {1}", Number, Title);
 		}
+        public override string ToString() => string.Format("{0} - {1}", Number, Title);
     }
 	public partial class Procedures : List<Procedure>
 	{
@@ -1083,76 +1112,33 @@ namespace Baseline
 	}
 	public partial class Page
 	{
-		private int _Number;
+        public int Number { get; set; }
-		public int Number
-		{
-			get { return _Number; }
-			set { _Number = value; }
-		}
-		private Lines _MyLines = new Lines();
 
-		public Lines MyLines
+        public Lines MyLines { get; set; } = new Lines();
-		{
+        public Page(int number) => Number = number;
-			get { return _MyLines; }
+        public override string ToString() => string.Format("Page {0}", Number);
-			set { _MyLines = value; }
-		}
-		public Page(int number)
-		{
-			_Number = number;
-		}
-		public override string ToString()
-		{
-			return string.Format("Page {0}", Number);
-		}
     }
 	public partial class Pages : List<Page>
 	{
-		public void Add(int number)
+        public void Add(int number) => Add(new Page(number));
-		{
-			Add(new Page(number));
-		}
     }
 	public partial class Line
 	{
-		private Procedure _MyProc;
+        public Procedure MyProc { get; set; }
-		public Procedure MyProc
+        public Page MyPage { get; set; }
-		{
+        public string Text { get; set; }
-			get { return _MyProc; }
+        public Line(string text) => Text = text;
-			set { _MyProc = value; }
-		}
-		private Page _MyPage;
-		public Page MyPage
-		{
-			get { return _MyPage; }
-			set { _MyPage = value; }
-		}
-		private string _Text;
-		public string Text
-		{
-			get { return _Text; }
-			set { _Text = value; }
-		}
-		public Line(string text)
-		{
-			_Text = text;
-		}
         public Line(string text, Procedure myProc, Page myPage)
 		{
-			_Text = text;
+			Text = text;
-			_MyProc = myProc;
+			MyProc = myProc;
-			_MyPage = myPage;
+			MyPage = myPage;
-		}
-		public override string ToString()
-		{
-			return Text;
 		}
+        public override string ToString() => Text;
     }
 	public partial class Lines : List<Line>
 	{
-		public void Add(string text)
+        public void Add(string text) => Add(new Line(text));
-		{
-			Add(new Line(text));
-		}
     }
 	[Serializable]
 	public partial class IgnoreLine
@@ -1191,20 +1177,11 @@ namespace Baseline
 		public IgnoreLines()
 		{
 		}
-		public void Add(string text, Relation searchType, bool active)
+        public void Add(string text, Relation searchType, bool active) => Add(new IgnoreLine(text, searchType, active));
-		{
-			Add(new IgnoreLine(text, searchType, active));
-		}
         // Convert IgnoreLines to string (XML)
-		public override string ToString()
+        public override string ToString() => GenericSerializer<IgnoreLines>.StringSerialize(this);
-		{
-			return GenericSerializer<IgnoreLines>.StringSerialize(this);
-		}
         // Convert string to IgnoreLines
-		public static IgnoreLines Get(string xml)
+        public static IgnoreLines Get(string xml) => GenericSerializer<IgnoreLines>.StringDeserialize(xml);
-		{
-			return GenericSerializer<IgnoreLines>.StringDeserialize(xml);
-		}
     }
 	/// <summary>
 	/// This is a simple serializer that takes a class and converts it to and from string (XML)
@@ -1233,7 +1210,7 @@ namespace Baseline
 			string ss = s.Replace("encoding=\"utf-16\"", "");
 			XmlSerializer xs = new XmlSerializer(typeof(T));
 			UTF8Encoding enc = new UTF8Encoding();
-			Byte[] arrBytData = enc.GetBytes(ss);
+            byte[] arrBytData = enc.GetBytes(ss);
 			using (MemoryStream ms = new MemoryStream(arrBytData))
 			{
 				t = (T)xs.Deserialize(ms);
@@ -1248,10 +1225,7 @@ namespace Baseline
 	{
 		public NonXsiTextWriter(TextWriter w) : base(w) { }
         public NonXsiTextWriter(Stream w, Encoding encoding)
-			: base(w, encoding)
+            : base(w, encoding) => Formatting = Formatting.Indented;
-		{
-			this.Formatting = Formatting.Indented;
-		}
         public NonXsiTextWriter(string filename, Encoding encoding) : base(filename, encoding) { }
 		bool _skip = false;
 		public override void WriteStartAttribute(string prefix, string localName, string ns)
@@ -1294,32 +1268,16 @@ namespace Baseline
 		public const short SWP_NOZORDER = 0X4;
 		public const int SWP_SHOWWINDOW = 0x0040;
 
-		private System.Diagnostics.Process _Process;
+        public System.Diagnostics.Process Process { get; set; }
-
+        public int X { get; set; }
-		public System.Diagnostics.Process Process
+        public int Y { get; set; }
-		{
-			get { return _Process; }
-			set { _Process = value; }
-		}
-		private int _X;
-		public int X
-		{
-			get { return _X; }
-			set { _X = value; }
-		}
-		private int _Y;
-		public int Y
-		{
-			get { return _Y; }
-			set { _Y = value; }
-		}
         public ProcessLocation(System.Diagnostics.Process process, int x, int y)
 		{
 			Process = process;
 			X = x;
 			Y = y;
 		}
-		private static Boolean FoxitSettingInfo = true;
+		private static bool FoxitSettingInfo = true;
 
 		/// <summary>
 		/// MoveIt() moves the window containing the PDF viewer to the right so the two pdf viewer windows will not overlap.
@@ -1340,10 +1298,7 @@ namespace Baseline
 	}
 	public class ProcessLocationQueue: Queue<ProcessLocation>
 	{
-		public void Add(System.Diagnostics.Process process, int x, int y)
+        public void Add(System.Diagnostics.Process process, int x, int y) => Enqueue(new ProcessLocation(process, x, y));
-		{
-			Enqueue(new ProcessLocation(process,x,y));
-		}
         public void ProcessNext()
 		{
 			ProcessLocation pl = Dequeue();

PROMS/Baseline/frmSettings.cs

@@ -1,11 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Baseline
@@ -19,17 +12,7 @@ namespace Baseline
 			set {
 				_MyIgnore = value; 
 				dgv.DataSource=null;
-				//dgvcSearchType.ValueType = typeof(Relation);
-				//dgvcSearchType.ValueMember = "Value";
-				//dgvcSearchType.DisplayMember = "Display";
-				//dgvcSearchType.DataSource = new Relation[] { Relation.Contains, Relation.StartsWith, Relation.EndsWith, Relation.Regex }
-				//.Select(x => new { Display = x.ToString(), Value = x })
-				//.ToList();
 				dgv.DataSource=value;
-				//dgvcSearchType.DataSource =
-				//new List<Relation>((Relation[]) Enum.GetValues(typeof(Relation)))
-				//.Select(x => new { Display=x.ToString(), Value=(int)x })
-				//.ToList();;
 			}
 		}
 		public frmSettings(IgnoreLines myIgnore)
@@ -46,19 +29,16 @@ namespace Baseline
 			col.ValueType = typeof(Relation);
 		}
 
-		private void dgv_DataError(object sender, DataGridViewDataErrorEventArgs e)
+        private void dgv_DataError(object sender, DataGridViewDataErrorEventArgs e) => Console.WriteLine("Here");
-		{
-			Console.WriteLine("Here");
-		}
         private void btnOK_Click(object sender, EventArgs e)
 		{
-			this.DialogResult = System.Windows.Forms.DialogResult.OK;
+			DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.Close();
+			Close();
 		}
 		private void btnCancel_Click(object sender, EventArgs e)
 		{
-			this.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.Close();
+			Close();
 		}
 	}
 }

PROMS/DropDownPanel/Controls/DropDownPanel.cs

@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Drawing;
 using System.Windows.Forms;
 
@@ -15,7 +14,7 @@ namespace AT.STO.UI.Win
 	{
 	#region Private Variable Declarations
 		private IDropDownAware			_dropDownControl	= null;
-		private DropDownWindowHelper	_dropDownHelper		= null;
+		private readonly DropDownWindowHelper	_dropDownHelper		= null;
 		private Form					_owner				= null;
 	#endregion
 	#region Constructor / Destructor
@@ -47,7 +46,7 @@ namespace AT.STO.UI.Win
 		/// <param name="e"></param>
 		protected override void OnHandleCreated(EventArgs e)
 		{	
-			_owner = this.FindForm();
+			_owner = FindForm();
 			_dropDownHelper.ReleaseHandle();
 			
 			if (_owner != null)
@@ -66,8 +65,8 @@ namespace AT.STO.UI.Win
 		{
 			base.OnResize(e);
 			combo.Location = new Point(0, 0);
-			combo.Width = this.ClientRectangle.Width;
+			combo.Width = ClientRectangle.Width;
-			this.Height = combo.Height;
+			Height = combo.Height;
 		}
 	#endregion
 	#region Event Handler
@@ -96,7 +95,7 @@ namespace AT.STO.UI.Win
 			else
 			{
 				_dropDownHelper.CloseDropDown();
-				this.Focus();
+				Focus();
 			}
 		}
 		
@@ -115,7 +114,7 @@ namespace AT.STO.UI.Win
 
 		private void DropDownHelper_DropDownCancel(object sender, DropDownCancelEventArgs e)
 		{
-			if (this.Bounds.Contains(Parent.PointToClient(e.CursorLocation)))
+			if (Bounds.Contains(Parent.PointToClient(e.CursorLocation)))
 			{
 				e.Cancel = true;
 			}
@@ -138,23 +137,14 @@ namespace AT.STO.UI.Win
 				SetValue<long>(e.Value as ILookupItem<long>);
 			}
 
-			if (this.FinishEditing != null)
+            FinishEditing?.Invoke(this, e);
-			{
-				this.FinishEditing(this, e);
-			}
 
             _dropDownControl.FinishEditing -= new DropDownValueChangedEventHandler(DropDown_FinishEditing);
 			_dropDownControl.ValueChanged -= new DropDownValueChangedEventHandler(DropDown_ValueChanged);
 			_dropDownHelper.CloseDropDown();
 		}
 
-		private void DropDown_ValueChanged(object sender, DropDownValueChangedEventArgs e)
+        private void DropDown_ValueChanged(object sender, DropDownValueChangedEventArgs e) => ValueChanged?.Invoke(this, e);
-		{
-			if (this.ValueChanged != null)
-			{
-				this.ValueChanged(this, e);
-			}
-		}
         #endregion
         #region Public Properties
         /// <summary>
@@ -169,15 +159,12 @@ namespace AT.STO.UI.Win
 			{ 
 				_dropDownControl = value; 
 				
-				this.Controls.Add(_dropDownControl as Control);
+				Controls.Add(_dropDownControl as Control);
 			}
 		}
         #endregion
         #region Public Methods
-		public override string ToString()
+        public override string ToString() => Name;
-		{
-			return this.Name;
-		}
         #endregion
         #region Private Methods
         /// <summary>

PROMS/DropDownPanel/Events/Events.cs

@@ -36,9 +36,8 @@ namespace AT.STO.UI.Win
 	public class DropDownCancelEventArgs : EventArgs
 	{
         #region Private Variable Declarations
-		private bool	_cancel				= false;
         private Point	_cursorLocation;
-		private Form	_dropDown			= null;
+		private readonly Form	_dropDown			= null;
 	#endregion
 	#region Constructor / Destructor
 		/// <summary>
@@ -51,34 +50,24 @@ namespace AT.STO.UI.Win
 		{
 			_dropDown		= DropDown;
 			_cursorLocation = CursorLocation;
-			_cancel			= false;
+			Cancel			= false;
 		}
         #endregion
         #region Public Properties	
         /// <summary>
         /// 
         /// </summary>
-		public bool Cancel
+        public bool Cancel { get; set; } = false;
-		{
-			get { return _cancel; }
-			set { _cancel = value; }
-		}
 
         /// <summary>
         /// 
         /// </summary>
-		public Point CursorLocation
+        public Point CursorLocation => _cursorLocation;
-		{
-			get { return _cursorLocation; }
-		}
 
         /// <summary>
         /// 
         /// </summary>
-		public Form DropDown
+        public Form DropDown => _dropDown;
-		{
-			get { return _dropDown; }
-		}
         #endregion
     }
 
@@ -91,7 +80,7 @@ namespace AT.STO.UI.Win
 	public class DropDownClosedEventArgs : EventArgs
 	{
 	#region Private Variable Declarations
-		private Form _dropDown = null;
+		private readonly Form _dropDown = null;
         #endregion
         #region Constructor / Destructor
         /// <summary>
@@ -99,19 +88,13 @@ namespace AT.STO.UI.Win
         /// popup form.
         /// </summary>
         /// <param name="DropDown">DropDown Form which is being closed.</param>
-		public DropDownClosedEventArgs(Form DropDown)
+        public DropDownClosedEventArgs(Form DropDown) => _dropDown = DropDown;
-		{
-			_dropDown = DropDown;
-		}
         #endregion
         #region Public Properties
         /// <summary>
         /// Gets the dropdown form which is being closed.
         /// </summary>
-		public Form DropDown
+        public Form DropDown => _dropDown;
-		{
-			get { return _dropDown; }
-		}
         #endregion
     }
 	
@@ -121,7 +104,6 @@ namespace AT.STO.UI.Win
 	public class DropDownValueChangedEventArgs : EventArgs
 	{
         #region Private Variable Declarations
-		private object _value = null;
         #endregion
         #region Constructor / Destructor
         /// <summary>
@@ -135,20 +117,13 @@ namespace AT.STO.UI.Win
         /// Initialization with the control's value.
         /// </summary>
         /// <param name="Value"></param>
-		public DropDownValueChangedEventArgs(object Value)
+        public DropDownValueChangedEventArgs(object Value) => this.Value = Value;
-		{
-			_value = Value;
-		}
         #endregion
         #region Public Properties
         /// <summary>
         /// Gets or sets the control's value.
         /// </summary>
-		public object Value
+        public object Value { get; set; } = null;
-		{
-			get { return _value; }
-			set { _value = value; }
-		}
         #endregion
     }
 }

PROMS/DropDownPanel/Forms/DropDownForm.cs

@@ -13,16 +13,13 @@ namespace AT.STO.UI.Win
 	internal partial class DropDownForm : Form, IDropDownAware
 	{
 	#region Private Variable Declaration
-		private IDropDownAware _control = null;
+		private readonly IDropDownAware _control = null;
         #endregion
         #region Constructor / Destructor
         /// <summary>
         /// Default Constructor
         /// </summary>
-		public DropDownForm()
+        public DropDownForm() => InitializeComponent();
-		{
-			InitializeComponent();
-		}
 
         /// <summary>
         /// Constructor to initialize the for with the control to display.
@@ -41,7 +38,7 @@ namespace AT.STO.UI.Win
 	#region Form Events
 		protected override void OnClosing(CancelEventArgs e)
 		{
-			this.Controls.Remove(_control as Control);
+			Controls.Remove(_control as Control);
 			base.OnClosing(e);
 		}
 
@@ -58,22 +55,13 @@ namespace AT.STO.UI.Win
 	#region Event Handler
 	    private void Ctrl_FinishEditing(object sender, DropDownValueChangedEventArgs e)
 	    {
-			if (this.FinishEditing != null)
+            FinishEditing?.Invoke(this, e);
-			{
-				this.FinishEditing(this, e);
-			}
 
             _control.FinishEditing -= new DropDownValueChangedEventHandler(Ctrl_FinishEditing);
 			_control.ValueChanged -= new DropDownValueChangedEventHandler(Ctrl_ValueChanged);
 	    }
 
-	    private void Ctrl_ValueChanged(object sender, DropDownValueChangedEventArgs e)
+        private void Ctrl_ValueChanged(object sender, DropDownValueChangedEventArgs e) => ValueChanged?.Invoke(this, e);
-	    {
-			if (this.ValueChanged != null)
-			{
-				this.ValueChanged(this, e);
-			}
-	    }
         #endregion
         #region IDropDownAware Implementation
         /// <summary>
@@ -100,15 +88,15 @@ namespace AT.STO.UI.Win
 		private void InitializeControl(Control Ctrl)
 		{
 			Size	size	= Ctrl.Size;
-			Size	inner	= this.ClientRectangle.Size;
+			Size	inner	= ClientRectangle.Size;
-			Size	outer	= this.Size;
+			Size	outer	= Size;
 			int		gap		= outer.Width - inner.Width;
 			
 			size.Width += gap;
 			size.Height += gap;
 			
-			this.Size = size;
+			Size = size;
-			this.Controls.Add(Ctrl);
+			Controls.Add(Ctrl);
 			Ctrl.Location = new Point(0, 0);
 			Ctrl.Visible = true;
 			Ctrl.Invalidate();

PROMS/DropDownPanel/Helper/DropDownMessageFilter.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Drawing;
 using System.Windows.Forms;
 
@@ -23,8 +22,7 @@ namespace AT.STO.UI.Win
 		private const int WM_NCMBUTTONDOWN	= 0x0A7;
         #endregion
         #region Private Variable Declarations
-		private Form					_dropDown	= null;
+        private readonly DropDownWindowHelper	_owner		= null;
-		private DropDownWindowHelper	_owner		= null;
 	#endregion
 	#region Event Declarations
 		public event DropDownCancelEventHandler DropDownCancel;
@@ -36,44 +34,34 @@ namespace AT.STO.UI.Win
         /// </summary>
         /// <param name="Owner">The <see cref="DropDownWindowHelper"/> object
         /// which owns this class.</param>
-		public DropDownMessageFilter(DropDownWindowHelper Owner)
+        public DropDownMessageFilter(DropDownWindowHelper Owner) => _owner = Owner;
-		{
-			_owner = Owner;
-		}
         #endregion
         #region Public Properties
         /// <summary>
         /// Gets/sets the dropdown form which is being displayed.
         /// </summary>
-		public Form DropDown
+        public Form DropDown { get; set; } = null;
-		{
-			get { return _dropDown; }
-			set { _dropDown = value; }
-		}
         #endregion
         #region Private Methods
         private void OnMouseDown()
 		{
 			Point cursorPos = Cursor.Position;											// Get the cursor location
 
-			if (!_dropDown.Bounds.Contains(cursorPos))									// Check if it is within the popup form
+			if (!DropDown.Bounds.Contains(cursorPos))									// Check if it is within the popup form
 			{
-				OnDropDownCancel(new DropDownCancelEventArgs(_dropDown, cursorPos));	// If not, then call to see if it should be closed
+				OnDropDownCancel(new DropDownCancelEventArgs(DropDown, cursorPos));	// If not, then call to see if it should be closed
 			}
 		}
 	#endregion
 	#region DropDownCancelEvent Implementation
 		protected virtual void OnDropDownCancel(DropDownCancelEventArgs e)
 		{
-			if (this.DropDownCancel != null)
+            DropDownCancel?.Invoke(this, e);
-			{
-				this.DropDownCancel(this, e);
-			}
 
             if (!e.Cancel)
 			{
 				_owner.CloseDropDown();
-				_dropDown = null;					// Clear reference for GC
+				DropDown = null;					// Clear reference for GC
 			}
 		}
 	#endregion
@@ -90,7 +78,7 @@ namespace AT.STO.UI.Win
 		/// This implementation always returns <c>false</c>.</returns>
 		public bool PreFilterMessage(ref Message m)
 		{
-			if (_dropDown != null)
+			if (DropDown != null)
 			{
 				switch (m.Msg)
 				{

PROMS/DropDownPanel/Helper/DropDownWindowHelper.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Drawing;
-using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
 namespace AT.STO.UI.Win
@@ -22,7 +21,7 @@ namespace AT.STO.UI.Win
 		
 		private Form					_dropDown			= null;
 		private bool					_dropDownShowing	= false;
-		private DropDownMessageFilter	_filter				= null;
+		private readonly DropDownMessageFilter	_filter				= null;
 		private Form					_owner				= null;
 		private bool					_skipClose			= false;
 	#endregion
@@ -44,10 +43,7 @@ namespace AT.STO.UI.Win
 		}
         #endregion
         #region Event Handler
-		private void Popup_Cancel(object sender, DropDownCancelEventArgs e)
+        private void Popup_Cancel(object sender, DropDownCancelEventArgs e) => OnDropDownCancel(e);
-		{
-			OnDropDownCancel(e);
-		}
 
         /// <summary>
         /// Responds to the <see cref="System.Windows.Forms.Form.Closed"/>
@@ -55,10 +51,7 @@ namespace AT.STO.UI.Win
         /// </summary>
         /// <param name="sender">Popup form that has been closed.</param>
         /// <param name="e">Not used.</param>
-		private void Popup_Closed(object sender, EventArgs e)
+        private void Popup_Closed(object sender, EventArgs e) => CloseDropDown();
-		{
-			CloseDropDown();
-		}
 
         /// <summary>
         /// Subclasses the owning form's existing Window Procedure to enables the 
@@ -76,7 +69,7 @@ namespace AT.STO.UI.Win
 				{
 					if (((int)m.WParam) == 0)																// Check if the title bar will made inactive:
 					{	// Note it's no good to try and consume this message; if you try to do that you'll end up with windows
-						UIApiCalls.SendMessage(this.Handle, UIApiCalls.WM_NCACTIVATE, 1, IntPtr.Zero);		// If so reactivate it.
+						UIApiCalls.SendMessage(Handle, UIApiCalls.WM_NCACTIVATE, 1, IntPtr.Zero);		// If so reactivate it.
 					}
 				}
 				else if (m.Msg == UIApiCalls.WM_ACTIVATEAPP)
@@ -84,7 +77,7 @@ namespace AT.STO.UI.Win
 					if ((int)m.WParam == 0)																	// Check if the application is being deactivated.
 					{
 						CloseDropDown();																		// It is so cancel the popup:
-						UIApiCalls.PostMessage(this.Handle, UIApiCalls.WM_NCACTIVATE, 0, IntPtr.Zero);		// And put the title bar into the inactive state:
+						UIApiCalls.PostMessage(Handle, UIApiCalls.WM_NCACTIVATE, 0, IntPtr.Zero);		// And put the title bar into the inactive state:
 					}
 				}
 			}
@@ -173,17 +166,14 @@ namespace AT.STO.UI.Win
         /// <summary>
         /// Indicator weither the DropDown is showing.
         /// </summary>
-		public bool DropDownShowing
+        public bool DropDownShowing => _dropDownShowing;
-		{
-			get { return _dropDownShowing; }
-		}
         #endregion
         #region Event Implementation
         protected virtual void OnDropDownCancel(DropDownCancelEventArgs e)
 		{
-			if (this.DropDownCancel != null)
+			if (DropDownCancel != null)
 			{
-				this.DropDownCancel(this, e);
+				DropDownCancel(this, e);
 
 				if (!e.Cancel)
 				{
@@ -192,13 +182,7 @@ namespace AT.STO.UI.Win
 			}
 		}
 
-		protected virtual void OnPDropDownClosed(DropDownClosedEventArgs e)
+        protected virtual void OnPDropDownClosed(DropDownClosedEventArgs e) => DropDownClosed?.Invoke(this, e);
-		{
-		    if (this.DropDownClosed != null)
-		    {
-		        this.DropDownClosed(this, e);
-		    }
-		}
         #endregion
     }
 }

PROMS/DropDownPanel/Interfaces/IDropDownAware.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace AT.STO.UI.Win
 {
 	/// <summary>

PROMS/DropDownPanel/Interfaces/ILookupItem.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace AT.STO.UI.Win
 {
 	public interface ILookupItem<T> where T: struct

PROMS/FlexableMessageBox/FlexibleMessageBox.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Diagnostics;
 using System.Drawing;
-using System.Globalization;
-//using System.Linq;
 using System.Windows.Forms;
 
 
@@ -121,10 +119,7 @@ namespace JR.Utils.GUI.Forms
         /// </summary>
         /// <param name="text">The text.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(string text)
+        public static DialogResult Show(string text) => FlexibleMessageBoxForm.Show(null, text, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-        {
-            return FlexibleMessageBoxForm.Show(null, text, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-        }
 
         /// <summary>
         /// Shows the specified message box.
@@ -132,10 +127,7 @@ namespace JR.Utils.GUI.Forms
         /// <param name="owner">The owner.</param>
         /// <param name="text">The text.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(IWin32Window owner, string text)
+        public static DialogResult Show(IWin32Window owner, string text) => FlexibleMessageBoxForm.Show(owner, text, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-        {
-            return FlexibleMessageBoxForm.Show(owner, text, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-        }
 
         /// <summary>
         /// Shows the specified message box.
@@ -143,10 +135,7 @@ namespace JR.Utils.GUI.Forms
         /// <param name="text">The text.</param>
         /// <param name="caption">The caption.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(string text, string caption)
+        public static DialogResult Show(string text, string caption) => FlexibleMessageBoxForm.Show(null, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-        {
-            return FlexibleMessageBoxForm.Show(null, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-        }
 
         /// <summary>
         /// Shows the specified message box.
@@ -155,10 +144,7 @@ namespace JR.Utils.GUI.Forms
         /// <param name="text">The text.</param>
         /// <param name="caption">The caption.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(IWin32Window owner, string text, string caption)
+        public static DialogResult Show(IWin32Window owner, string text, string caption) => FlexibleMessageBoxForm.Show(owner, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-        {
-            return FlexibleMessageBoxForm.Show(owner, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-        }
 
         /// <summary>
         /// Shows the specified message box.
@@ -167,10 +153,7 @@ namespace JR.Utils.GUI.Forms
         /// <param name="caption">The caption.</param>
         /// <param name="buttons">The buttons.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(string text, string caption, MessageBoxButtons buttons)
+        public static DialogResult Show(string text, string caption, MessageBoxButtons buttons) => FlexibleMessageBoxForm.Show(null, text, caption, buttons, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-        {
-            return FlexibleMessageBoxForm.Show(null, text, caption, buttons, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-        }
 
         /// <summary>
         /// Shows the specified message box.
@@ -180,10 +163,7 @@ namespace JR.Utils.GUI.Forms
         /// <param name="caption">The caption.</param>
         /// <param name="buttons">The buttons.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons)
+        public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons) => FlexibleMessageBoxForm.Show(owner, text, caption, buttons, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-        {
-            return FlexibleMessageBoxForm.Show(owner, text, caption, buttons, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-        }
 
         /// <summary>
         /// Shows the specified message box.
@@ -193,10 +173,7 @@ namespace JR.Utils.GUI.Forms
         /// <param name="buttons">The buttons.</param>
         /// <param name="icon">The icon.</param>
         /// <returns></returns>
-        public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
+        public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon) => FlexibleMessageBoxForm.Show(null, text, caption, buttons, icon, MessageBoxDefaultButton.Button1);
-        {
-            return FlexibleMessageBoxForm.Show(null, text, caption, buttons, icon, MessageBoxDefaultButton.Button1);
-        }
 
         /// <summary>
         /// Shows the specified message box.
@@ -207,10 +184,7 @@ namespace JR.Utils.GUI.Forms
         /// <param name="buttons">The buttons.</param>
         /// <param name="icon">The icon.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
+        public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon) => FlexibleMessageBoxForm.Show(owner, text, caption, buttons, icon, MessageBoxDefaultButton.Button1);
-        {
-            return FlexibleMessageBoxForm.Show(owner, text, caption, buttons, icon, MessageBoxDefaultButton.Button1);
-        }
 
         /// <summary>
         /// Shows the specified message box.
@@ -221,10 +195,7 @@ namespace JR.Utils.GUI.Forms
         /// <param name="icon">The icon.</param>
         /// <param name="defaultButton">The default button.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton)
+        public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton) => FlexibleMessageBoxForm.Show(null, text, caption, buttons, icon, defaultButton);
-        {
-            return FlexibleMessageBoxForm.Show(null, text, caption, buttons, icon, defaultButton);
-        }
 
         /// <summary>
         /// Shows the specified message box.
@@ -236,10 +207,7 @@ namespace JR.Utils.GUI.Forms
         /// <param name="icon">The icon.</param>
         /// <param name="defaultButton">The default button.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton)
+        public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton) => FlexibleMessageBoxForm.Show(owner, text, caption, buttons, icon, defaultButton);
-        {
-            return FlexibleMessageBoxForm.Show(owner, text, caption, buttons, icon, defaultButton);
-        }
 
         /// <summary>
         /// Shows the specified message box.
@@ -251,10 +219,8 @@ namespace JR.Utils.GUI.Forms
         /// <param name="icon">The icon.</param>
         /// <param name="defaultButton">The default button.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Keeping owner for legacy reasons")]
-        {
+        public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon) => FlexibleMessageBoxForm.ShowCustom(null, text, caption, buttons, icon);
-            return FlexibleMessageBoxForm.ShowCustom(null, text, caption, buttons, icon);
-        }
 
         #endregion
 
@@ -341,7 +307,7 @@ namespace JR.Utils.GUI.Forms
                 this.richTextBoxMessage.TabIndex = 0;
                 this.richTextBoxMessage.TabStop = false;
                 this.richTextBoxMessage.Text = "<Message>";
-                this.richTextBoxMessage.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.richTextBoxMessage_LinkClicked);
+                this.richTextBoxMessage.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.RichTextBoxMessage_LinkClicked);
                 // 
                 // panel1
                 // 
@@ -431,8 +397,8 @@ namespace JR.Utils.GUI.Forms
             #region Private constants
 
             //These separators are used for the "copy to clipboard" standard operation, triggered by Ctrl + C (behavior and clipboard format is like in a standard MessageBox)
-            private static readonly String STANDARD_MESSAGEBOX_SEPARATOR_LINES = "---------------------------\n";
+            private static readonly string STANDARD_MESSAGEBOX_SEPARATOR_LINES = "---------------------------\n";
-            private static readonly String STANDARD_MESSAGEBOX_SEPARATOR_SPACES = "   ";
+            private static readonly string STANDARD_MESSAGEBOX_SEPARATOR_SPACES = "   ";
 
             //These are the possible buttons (in a standard MessageBox)
             private enum ButtonID { OK = 0, CANCEL, YES, NO, ABORT, RETRY, IGNORE, OVERWRITE, RENAME };
@@ -440,10 +406,10 @@ namespace JR.Utils.GUI.Forms
             //These are the buttons texts for different languages. 
             //If you want to add a new language, add it here and in the GetButtonText-Function
             private enum TwoLetterISOLanguageID { en, de, es, it };
-            private static readonly String[] BUTTON_TEXTS_ENGLISH_EN = { "OK", "Cancel", "&Yes", "&No", "&Abort", "&Retry", "&Ignore", "&Overwrite", "&Rename" }; //Note: This is also the fallback language
+            private static readonly string[] BUTTON_TEXTS_ENGLISH_EN = { "OK", "Cancel", "&Yes", "&No", "&Abort", "&Retry", "&Ignore", "&Overwrite", "&Rename" }; //Note: This is also the fallback language
-            private static readonly String[] BUTTON_TEXTS_GERMAN_DE = { "OK", "Abbrechen", "&Ja", "&Nein", "&Abbrechen", "&Wiederholen", "&Ignorieren", "&Overwrite", "&Rename" };
+            private static readonly string[] BUTTON_TEXTS_GERMAN_DE = { "OK", "Abbrechen", "&Ja", "&Nein", "&Abbrechen", "&Wiederholen", "&Ignorieren", "&Overwrite", "&Rename" };
-            private static readonly String[] BUTTON_TEXTS_SPANISH_ES = { "Aceptar", "Cancelar", "&Sí", "&No", "&Abortar", "&Reintentar", "&Ignorar", "&Overwrite", "&Rename" };
+            private static readonly string[] BUTTON_TEXTS_SPANISH_ES = { "Aceptar", "Cancelar", "&Sí", "&No", "&Abortar", "&Reintentar", "&Ignorar", "&Overwrite", "&Rename" };
-            private static readonly String[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora", "&Overwrite", "&Rename" };
+            private static readonly string[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora", "&Overwrite", "&Rename" };
 
             #endregion
 
@@ -451,7 +417,7 @@ namespace JR.Utils.GUI.Forms
 
             private MessageBoxDefaultButton defaultButton;
             private int visibleButtonsCount;
-            private TwoLetterISOLanguageID languageID = TwoLetterISOLanguageID.en;
+            private readonly TwoLetterISOLanguageID languageID = TwoLetterISOLanguageID.en;
 
             #endregion
 
@@ -758,9 +724,9 @@ namespace JR.Utils.GUI.Forms
                 /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
                 private void FlexibleMessageBoxForm_Shown(object sender, EventArgs e)
             {
-                int buttonIndexToFocus = 1;
                 Button buttonToFocus;
 
+                int buttonIndexToFocus;
                 //Set the default button...
                 switch (this.defaultButton)
                 {
@@ -799,7 +765,7 @@ namespace JR.Utils.GUI.Forms
             /// </summary>
             /// <param name="sender">The source of the event.</param>
             /// <param name="e">The <see cref="System.Windows.Forms.LinkClickedEventArgs"/> instance containing the event data.</param>
-            private void richTextBoxMessage_LinkClicked(object sender, LinkClickedEventArgs e)
+            private void RichTextBoxMessage_LinkClicked(object sender, LinkClickedEventArgs e)
             {
                 try
                 {
@@ -877,12 +843,14 @@ namespace JR.Utils.GUI.Forms
             public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton)
             {
                 //Create a new instance of the FlexibleMessageBox form
-                var flexibleMessageBoxForm = new FlexibleMessageBoxForm();
+                var flexibleMessageBoxForm = new FlexibleMessageBoxForm
-                flexibleMessageBoxForm.ShowInTaskbar = false;
+                {
+                    ShowInTaskbar = false,
 
                     //Bind the caption and the message text
-                flexibleMessageBoxForm.CaptionText = caption;
+                    CaptionText = caption,
-                flexibleMessageBoxForm.MessageText = text;
+                    MessageText = text
+                };
                 flexibleMessageBoxForm.FlexibleMessageBoxFormBindingSource.DataSource = flexibleMessageBoxForm;
 
                 //Set the buttons visibilities and texts. Also set a default button.
@@ -914,15 +882,18 @@ namespace JR.Utils.GUI.Forms
             /// <param name="icon">The icon.</param>
             /// <param name="defaultButton">The default button.</param>
             /// <returns>The dialog result.</returns>
+            [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Keeping buttons for legacy reasons")]
             public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
             {
                 //Create a new instance of the FlexibleMessageBox form
-                var flexibleMessageBoxForm = new FlexibleMessageBoxForm();
+                var flexibleMessageBoxForm = new FlexibleMessageBoxForm
-                flexibleMessageBoxForm.ShowInTaskbar = false;
+                {
+                    ShowInTaskbar = false,
 
                     //Bind the caption and the message text
-                flexibleMessageBoxForm.CaptionText = caption;
+                    CaptionText = caption,
-                flexibleMessageBoxForm.MessageText = text;
+                    MessageText = text
+                };
                 flexibleMessageBoxForm.FlexibleMessageBoxFormBindingSource.DataSource = flexibleMessageBoxForm;
 
                 //Set the buttons visibilities and texts. Also set a default button.

PROMS/Formats/Formats.csproj

@@ -66,6 +66,7 @@
     <Compile Include="frmFormatCopy.Designer.cs">
       <DependentUpon>frmFormatCopy.cs</DependentUpon>
     </Compile>
+    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="frmFormatCopy.resx">
@@ -179,6 +180,7 @@
     <Content Include="fmtall\CPL_00all.xml" />
     <Content Include="fmtall\CPL_01all.xml" />
     <Content Include="fmtall\CPL_02all.xml" />
+    <Content Include="fmtall\CPL_04all.xml" />
     <Content Include="fmtall\CPL_03all.xml" />
     <Content Include="fmtall\CPSAMGDataall.xml" />
     <Content Include="fmtall\CPSAMGDEVall.xml" />

PROMS/Formats/GlobalSuppressions.cs

@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Not modifying Naming Styles")]

PROMS/Formats/Program.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Windows.Forms;
 
 namespace Formats

PROMS/Formats/frmFormatCopy.cs

@@ -1,9 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.IO;
 using System.Windows.Forms;
 
@@ -28,7 +23,7 @@ namespace Formats
 				txbxPROMSFormatsPath.Text = savedFormatPath;
 			else
 			{
-				string curFolder = Environment.CurrentDirectory; // C:\development/PROMS/Formats/bin/debug
+				string curFolder = Environment.CurrentDirectory; // .../PROMS/Formats/bin/debug
 				int idx = curFolder.ToUpper().IndexOf(@"\PROMS\");
 				txbxPROMSFormatsPath.Text = curFolder.Substring(0, idx);
 			}
@@ -40,8 +35,7 @@ namespace Formats
 			DirectoryInfo di = new DirectoryInfo(path);
 			if (di.Exists == false) //return;
 			{
-				DialogResult dlgrslt = DialogResult.No;
+                DialogResult dlgrslt = MessageBox.Show(string.Format("{0} does not exist. Create it?", path), "Create Folder?", MessageBoxButtons.YesNo);
-				dlgrslt = MessageBox.Show(string.Format("{0} does not exist. Create it?", path), "Create Folder?", MessageBoxButtons.YesNo);
                 if (dlgrslt == DialogResult.Yes)
 				{
 					di.Create();
@@ -86,9 +80,10 @@ namespace Formats
 
 		private void btnBrowse_Click(object sender, EventArgs e)
 		{
-			FolderBrowserDialog fbd = new FolderBrowserDialog();
+            FolderBrowserDialog fbd = new FolderBrowserDialog
-
+            {
-			fbd.SelectedPath = txbxPROMSFormatsPath.Text;
+                SelectedPath = txbxPROMSFormatsPath.Text
+            };
             if (fbd.ShowDialog() == DialogResult.OK)
 			{
 				if (Directory.Exists(fbd.SelectedPath)) txbxPROMSFormatsPath.Text = fbd.SelectedPath + @"\";
@@ -116,9 +111,9 @@ namespace Formats
 			if (!txbxPROMSFormatsPath.Text.EndsWith(@"\")) txbxPROMSFormatsPath.Text += @"\";
 
 			// There should be a "fmtall" and "genmacall" folder in the delelopment project folder
-			// ex: C:\development\PROMS\Formats\fmtall and C:\development\PROMS\Formats\genmacall
+			// ex: ...\PROMS\Formats\fmtall and ...\PROMS\Formats\genmacall
-			string destFmtallPath = txbxPROMSFormatsPath.Text + @"fmtall\";
+			string destFmtallPath = $@"{txbxPROMSFormatsPath.Text}fmtall\";
-			string destGenmacallPath = txbxPROMSFormatsPath.Text + @"genmacall\";
+			string destGenmacallPath = $@"{txbxPROMSFormatsPath.Text}genmacall\";
 			string srcFmtallPath = @"..\..\"; // up to levels from startup path
 
 			// clear the destination fmtall and genmacall folders
@@ -156,14 +151,10 @@ namespace Formats
 			}
 			Properties.Settings.Default.FormatPath = txbxPROMSFormatsPath.Text.Substring(0,txbxPROMSFormatsPath.Text.Length-1); // save the copy format path minus the ending backslash
 			Properties.Settings.Default.Save();
-			//if(MessageBox.Show("Do you want to end the Format Copier?","Formats Copied.", MessageBoxButtons.YesNo, MessageBoxIcon.Question)== DialogResult.Yes)
 			Application.Exit();
 		}
 
-		private void buttonX2_Click(object sender, EventArgs e)
+        private void buttonX2_Click(object sender, EventArgs e) => Application.Exit();
-		{
-			Application.Exit();
-		}
 
     }
 }

PROMS/LBWordLibrary/GlobalSuppressions.cs

@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Not modifying Naming Styles")]

PROMS/LBWordLibrary/LBObjectExtension.cs

@@ -1,11 +1,11 @@
+using Microsoft.Win32;
+using Read64bitRegistryFrom32bitApp;
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Reflection;
-using Microsoft.Win32;
+using System.Text;
-using System.Windows.Forms;
 using System.Text.RegularExpressions;
-using Read64bitRegistryFrom32bitApp;
+using System.Windows.Forms;
 
 namespace LBWordLibrary
 {
@@ -18,14 +18,8 @@ namespace LBWordLibrary
         /// <param name="Background">boolean BackGround
         /// If true  - document will be printed in the background
         /// If false - document will be printed in the foreground</param>
-		public void PrintOut(Boolean Background)
+        public void PrintOut(bool Background) => InvokeMethod("PrintOut", Background, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value);
-		{
+        public void Quit(bool save) => InvokeMethod("Quit", save, Missing.Value, Missing.Value);
-			InvokeMethod("PrintOut", Background, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value, Missing.Value);
-		}
-		public void Quit(bool save)
-		{
-			InvokeMethod("Quit", save, Missing.Value, Missing.Value);
-		}
         public bool VolianPDFInstalled
         {
             get
@@ -51,63 +45,23 @@ namespace LBWordLibrary
                         string keyPath = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components\0E5C161912A2A6C4C93C76678926C56C";
                         bool validKey = RegistryWOW6432.CheckRegKey64Valid(RegHive.HKEY_LOCAL_MACHINE, keyPath);
                         _WordPDFExporterInstalled = validKey;
-						if(!validKey)
+                        if (!validKey)
                             _MyLog.WarnFormat("MSWord2007 PDF Export Registry Key Missing");
-						//RegistryKey key = Registry.LocalMachine.OpenSubKey(keyPath, RegistryKeyPermissionCheck.ReadSubTree);
+ 
-						//if (key == null)
+                        return (bool)_WordPDFExporterInstalled;
-						//{
-						//  RegistryKey localMachine64 = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry64);
-						//  key = localMachine64.OpenSubKey(keystring, RegistryKeyPermissionCheck.ReadSubTree);
-						//}
-						//if (key != null)
-						//{
-						//  key.Close();
-						//  _WordPDFExporterInstalled = true;
-						//  return (bool) _WordPDFExporterInstalled;
-						//}
-						//_WordPDFExporterInstalled = FindEXP_PDF();
-						return (bool) _WordPDFExporterInstalled;
                     }
                     catch (Exception ex)
                     {
                         _MyLog.WarnFormat("MSWord2007 PDF Export Registry Key Failure {0} - {1}", ex.GetType().Name, ex.Message);
                         _WordPDFExporterInstalled = false;
-						return (bool) _WordPDFExporterInstalled;
+                        return (bool)_WordPDFExporterInstalled;
                     }
 
                 }
-				return (bool) _WordPDFExporterInstalled;
+                return (bool)_WordPDFExporterInstalled;
             }
         }
-		private static bool FindEXP_PDF()
+
-		{
-			bool retval = false;
-			DateTime dtStart = DateTime.Now;
-			try
-			{
-				//string keystr = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components\0E5C161912A2A6C4C93C76678926C56C";
-				RegistryKey key = null;
-				string keystr = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Components";
-				while (key == null && keystr != "")
-				{
-					key = Registry.LocalMachine.OpenSubKey(keystr, RegistryKeyPermissionCheck.ReadSubTree);
-					keystr = keystr.Substring(0, keystr.LastIndexOf("\\"));
-				}
-				if (FindKeys(key, "EXP_PDF.DLL"))
-					retval = true;
-			}
-			catch (Exception ex)
-			{
-				AddKeyFound(string.Format("{0} - {1}", ex.GetType().Name, ex.Message));
-			}
-			finally
-			{
-				DateTime dtEnd = DateTime.Now;
-				TimeSpan ts = TimeSpan.FromTicks(dtEnd.Ticks - dtStart.Ticks);
-				AddKeyFound(string.Format("{0} Seconds", ts.TotalSeconds));
-			}
-			return retval;
-		}
         private static bool FindKeys(RegistryKey key, string find)
         {
             string[] keyNames = key.GetSubKeyNames();
@@ -144,10 +98,7 @@ namespace LBWordLibrary
             }
             return false;
         }
-		private static void AddKeyFound(string str)
+        private static void AddKeyFound(string str) => _MyLog.WarnFormat("RegistryKeySearch: {0}", str);
-		{
-			_MyLog.WarnFormat("RegistryKeySearch: {0}",str);
-		}
         private bool CanCreatePDFFile(string pdfFileName)
         {
             System.IO.FileInfo file = new System.IO.FileInfo(pdfFileName);
@@ -178,20 +129,18 @@ namespace LBWordLibrary
             }
             throw new Exception("Cannot find a name to use");
         }
-		public string CreatePDF(string pdfFileName, bool openPDF,int DebugStatus)
+        public string CreatePDF(string pdfFileName, bool openPDF, int DebugStatus)
         {
             pdfFileName = CreatePDF(pdfFileName, DebugStatus);
             if (openPDF) OpenPDF(pdfFileName);
             return pdfFileName;
         }
-		static List<System.Diagnostics.Process> _AcrobatProcesses=new List<System.Diagnostics.Process>(); 
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "Keeping Collections Not ReadOnly")]
-		private static void OpenPDF(string pdfFileName)
+        static List<System.Diagnostics.Process> _AcrobatProcesses = new List<System.Diagnostics.Process>();
-		{
+        private static void OpenPDF(string pdfFileName) => _AcrobatProcesses.Add(System.Diagnostics.Process.Start(pdfFileName));
-			_AcrobatProcesses.Add(System.Diagnostics.Process.Start(pdfFileName));
-		}
         public static void ClosePDFs()
         {
-			foreach(System.Diagnostics.Process proc in _AcrobatProcesses)
+            foreach (System.Diagnostics.Process proc in _AcrobatProcesses)
                 if (!proc.HasExited)
                     KillAndWait(proc);
         }
@@ -206,7 +155,7 @@ namespace LBWordLibrary
                 Application.DoEvents();
             }
             Console.WriteLine("{0:yyyy-MM-dd HH:mm:ss.ffff} {1:yyyy-MM-dd HH:mm:ss.ffff} {2}", DateTime.Now, proc.ExitTime
-				,TimeSpan.FromTicks(proc.ExitTime.Ticks - tStart.Ticks).TotalMilliseconds);
+                , TimeSpan.FromTicks(proc.ExitTime.Ticks - tStart.Ticks).TotalMilliseconds);
         }
         public string CreatePDF(string pdfFileName, int DebugStatus)
         {
@@ -223,12 +172,7 @@ namespace LBWordLibrary
                 _MyLog.WarnFormat("Using VolianPDFWriter - MSWord Version = '{0}'", Version);
                 return CreatePDF2003BG(pdfFileName);
             }
-			//else // Force PDF Export
-			//{
-			//  _MyLog.WarnFormat("Force PDF Export for Michelle - MSWord Version = '{0}'", Version);
-			//  return CreatePDF2007(pdfFileName, DebugStatus);
             throw new Exception("No PDF Writer support installed for MS Word sections");
-			//}
         }
         public string CreatePDF2003FG(string pdfFileName, bool openPDF)
         {
@@ -299,12 +243,9 @@ namespace LBWordLibrary
             if (openPDF) OpenPDF(pdfFileName);
             return pdfFileName;
         }
-		public string CreatePDF2007(string pdfFileName,int DebugStatus)
+        public string CreatePDF2007(string pdfFileName, int DebugStatus)
         {
             pdfFileName = AvailableFileName(pdfFileName);
-			// Removed to support MSWord 2010 and beyond.
-			//if (!WordPDFExporterInstalled)
-			//  throw new Exception("MS Word PDF Exporter is not installed");
             try
             {
                 ActiveDocument.ExportAsFixedFormat(pdfFileName, LBWdExportFormat.wdExportFormatPDF, DebugStatus);
@@ -318,14 +259,8 @@ namespace LBWordLibrary
     }
     public partial class LBDocuments
     {
-		public LBDocumentClass Open(string fileName, Boolean addToRecentFiles)
+        public LBDocumentClass Open(string fileName, bool addToRecentFiles) => Open(fileName, Missing.Value, Missing.Value, addToRecentFiles);
-		{
+        private LBDocumentClass Open(params object[] myParams) => new LBDocumentClass(InvokeMethod("Open", myParams));
-			return Open(fileName, Missing.Value, Missing.Value, addToRecentFiles);
-		}
-		private LBDocumentClass Open(params object[] myParams)
-		{
-			return new LBDocumentClass(InvokeMethod("Open", myParams));
-		}
     }
     public partial class LBDocumentClass : LBComObject
     {
@@ -345,10 +280,7 @@ namespace LBWordLibrary
             else
                 SaveAs2000(fileName);
         }
-		public void SaveAs2000(params object[] myParams)
+        public void SaveAs2000(params object[] myParams) => InvokeMethod("SaveAs2000", myParams);
-		{
-			InvokeMethod("SaveAs2000", myParams);
-		}
         public void SaveAs(string fileName)
         {
             if (fileName.ToUpper().EndsWith("DOC"))
@@ -362,18 +294,9 @@ namespace LBWordLibrary
             else
                 SaveAs2(fileName, Missing.Value, Missing.Value, Missing.Value, false);
         }
-		public void SaveAs2(params object[] myParams)
+        public void SaveAs2(params object[] myParams) => InvokeMethod("SaveAs", myParams);
-		{
+        public void SaveAs(string fileName, LBWdSaveFormat format) => SaveAs2(fileName, format, Missing.Value, Missing.Value, false);
-			InvokeMethod("SaveAs", myParams);
+        public LBRange Range(int Start, int End) => new LBRange(InvokeMethod("Range", Start, End));
-		}
-		public void SaveAs(string fileName, LBWdSaveFormat format)
-		{
-			SaveAs2(fileName, format, Missing.Value, Missing.Value, false);
-		}
-		public LBRange Range(int Start, int End)
-		{
-			return new LBRange(InvokeMethod("Range", Start, End));
-		}
         /// <summary>
         /// Length is Pages and Partial Pages
         /// The integral part is the number of full pages
@@ -393,11 +316,6 @@ namespace LBWordLibrary
                 myRange = myRange.GoTo(LBWdGoToItem.wdGoToPercent, LBWdGoToDirection.wdGoToAbsolute, 0);
                 float mytop = myRange.PageSetup.TopMargin;
                 myRange = myRange.GoTo(LBWdGoToItem.wdGoToPercent, LBWdGoToDirection.wdGoToLast, 100);
-         //float partial = (float) myRange.get_Information(LBWdInformation.wdVerticalPositionRelativeToTextBoundary);
-        // B2018-028  Word 2016  has a different value for the Vertical  Position Relative to the Text Boundary than older version of Word.
-        //            We now need to calculated the last row of text in the PROMS attachment differently.
-        //            We now subtract the TopMargin the Page Setup from the Vertical Position Relative to the Page
-        //            this works with older versions of MS Word as well.
                 float partial = (float)myRange.get_Information(LBWdInformation.wdVerticalPositionRelativeToPage) - mytop;
                 partial += myRange.Font.Size;
                 retval += partial / 7200;
@@ -414,7 +332,7 @@ namespace LBWordLibrary
                 return ReplaceSymbolCharacters(GetRangeText(myRange));
             }
         }
-		private static string[] SymbolFontName = { "VolianDraw", "WingDings", "VESymb", "VESymbFix", "Symbol" };
+        private static readonly string[] SymbolFontName = { "VolianDraw", "WingDings", "VESymb", "VESymbFix", "Symbol" };
         private static bool IsSymbolFont(string fontName)
         {
             foreach (string symbolFont in SymbolFontName)
@@ -422,150 +340,6 @@ namespace LBWordLibrary
                     return true;
             return false;
         }
-		/// <summary>
-		/// If document contains symbol characters, returns problem font.
-		/// </summary>
-		public string FontHasSymbolCharacters
-		{
-			get
-			{
-				LBRange myRange = Range();
-				myRange = myRange.GoTo(LBWdGoToItem.wdGoToPercent, LBWdGoToDirection.wdGoToLast, 100);
-				myRange.Start = 0;
-				int end = myRange.End;
-				string myText = GetRangeText(myRange);
-				//return _RegFindSymbol.IsMatch(myText);
-				MatchCollection problems = _RegFindSymbol.Matches(myText);
-				int offset = 0;
-				List<string> alreadyProcessed = new List<string>();
-				List<string> fontHasSymbols = new List<string>();
-				foreach (Match problem in problems)
-				{
-					if (!alreadyProcessed.Contains(problem.Value))
-						{
-						myRange.Start = problem.Index + offset;
-						myRange.End = problem.Index + problem.Length + offset;
-						int newOffset = FindRangeOffset(myRange, problem, offset, end);
-						string fontName = myRange.Font.Name;
-						if (IsSymbolFont(fontName))
-						{
-							if( !fontHasSymbols.Contains(fontName))
-							{
-								fontHasSymbols.Add(fontName);
-								// Found symbol font
-								_MyLog.InfoFormat("Font '{0}' has Symbols", fontName);
-							}
-							//Console.WriteLine("Font '{0}' has Symbols", myRange.Font.Name);
-							//return true;
-						}
-						else
-							return myRange.Font.Name;
-						offset = newOffset;
-						alreadyProcessed.Add(problem.Value);
-					}
-				}
-				return null;
-			}
-		}
-		/// <summary>
-		/// Debug Tool - Return a string containing a list of the fonts that have symbol characters.
-		/// </summary>
-		public string FontsHaveSymbolCharacters
-		{
-			get
-			{
-				string sep = "";
-				StringBuilder sb = new StringBuilder();
-				List<string> fonts=new List<string>();
-				LBRange myRange = Range();
-				myRange = myRange.GoTo(LBWdGoToItem.wdGoToPercent, LBWdGoToDirection.wdGoToLast, 100);
-				myRange.Start = 0;
-				int end = myRange.End;
-				string myText = GetRangeText(myRange);
-				//return _RegFindSymbol.IsMatch(myText);
-				MatchCollection problems = _RegFindSymbol.Matches(myText);
-				int offset = 0;
-				foreach (Match problem in problems)
-				{
-					myRange.Start = problem.Index + offset;
-					myRange.End = problem.Index + problem.Length + offset;
-					int newOffset = FindRangeOffset(myRange, problem, offset, end);
-					if (!fonts.Contains(myRange.Font.Name))
-					{
-						fonts.Add(myRange.Font.Name);
-						sb.Append(sep + "'" + myRange.Font.Name + "'");
-						sep = ",";
-					}
-					offset = newOffset;
-				}
-				if (sb.Length > 0) return sb.ToString();
-				return null;
-			}
-		}
-		/// <summary>
-		/// Debug Tool - Return a list of symbol characters using VESYMB font.
-		/// </summary>
-		public string FontsHaveSymbolCharacters2
-		{
-			get
-			{
-				try
-				{
-					Dictionary<string, List<int>> fonts = new Dictionary<string, List<int>>();
-					LBRange myRange = Range();
-					myRange = myRange.GoTo(LBWdGoToItem.wdGoToPercent, LBWdGoToDirection.wdGoToLast, 100);
-					myRange.Start = 0;
-					int end = myRange.End;
-					string myText = GetRangeText(myRange);
-					//return _RegFindSymbol.IsMatch(myText);
-					MatchCollection problems = _RegFindSymbol.Matches(myText);
-					int offset = 0;
-					foreach (Match problem in problems)
-					{
-						myRange.Start = problem.Index + offset;
-						myRange.End = problem.Index + problem.Length + offset;
-						int newOffset = FindRangeOffset(myRange, problem, offset, end);
-						string sFont = myRange.Font.Name;
-						if (sFont.ToUpper().StartsWith("VESYM"))
-						{
-							if (!fonts.ContainsKey(sFont))
-							{
-								fonts.Add(sFont, new List<int>());
-							}
-							List<int> symbols = fonts[sFont];
-							string myTextSymb = GetRangeText(myRange);
-							foreach (char c in myTextSymb)
-							{
-								if (!symbols.Contains((int)c))
-									symbols.Add((int)c);
-							}
-						}
-						offset = newOffset;
-					}
-					if (fonts.Count > 0)
-					{
-						string sep = "";
-						StringBuilder sb = new StringBuilder();
-						foreach (string font in fonts.Keys)
-						{
-							sb.Append(sep + "'" + font + "'");
-							sep = ",";
-							foreach (int i in fonts[font])
-							{
-								sb.Append(sep);
-								sb.Append(i);
-							}
-						}
-						return sb.ToString();
-					}
-				}
-				catch (Exception ex)
-				{
-					Console.WriteLine("{0},{1},{2}", ex.GetType().Name, ex.Message, ex.StackTrace);
-				}
-				return null;
-			}
-		}
 
         /// <summary>
         /// Checks to see if the document contains symbol characters
@@ -580,7 +354,6 @@ namespace LBWordLibrary
                 myRange.Start = 0;
                 int end = myRange.End;
                 string myText = GetRangeText(myRange);
-				//return _RegFindSymbol.IsMatch(myText);
                 MatchCollection problems = _RegFindSymbol.Matches(myText);
                 int offset = 0;
                 foreach (Match problem in problems)
@@ -591,7 +364,6 @@ namespace LBWordLibrary
                     if (IsSymbolFont(myRange.Font.Name))
                     {
                         Console.WriteLine("Font '{0}' has Symbols", myRange.Font.Name);
-						//return true;
                     }
                     else
                         return true;
@@ -600,87 +372,8 @@ namespace LBWordLibrary
                 return false;
             }
         }
-		Regex _RegFindSymbol = new Regex("[\\uF020-\\uF07F]+");
+        readonly Regex _RegFindSymbol = new Regex("[\\uF020-\\uF07F]+");
-		/// <summary>
-		/// FixSymbolCharacters - Fix any symbol characters in the document
-		/// </summary>
-		public void FixSymbolCharacters()
-		{
-			// Set up range object to be used to process text
-			LBRange myRange = Range();
-			myRange = myRange.GoTo(LBWdGoToItem.wdGoToPercent, LBWdGoToDirection.wdGoToLast, 100);
-			int end = myRange.End;
-			myRange.Start = 0;
-			string myText = GetRangeText(myRange);
-			MatchCollection problems = _RegFindSymbol.Matches(myText);
-			int offset = 0;
-			foreach (Match problem in problems)
-			{
-				myRange.Start = problem.Index + offset;
-				myRange.End = problem.Index + problem.Length + offset;
-				int newOffset = FindRangeOffset(myRange, problem, offset, end);
-				if (myRange.Font.Name == "")
-				{
-					int wrdStart = myRange.Start;
-					int wrdEnd = myRange.End;
-					int wrdMiddle = wrdStart;
-					while (myRange.Font.Name == "")
-					{
-						do
-						{
-							myRange.End = ++wrdMiddle;
-						} while(myRange.Font.Name != "");
-						myRange.End = wrdMiddle - 1;
-						ReplaceSymbolCharacters(myRange);
-						myRange.Start = wrdMiddle -1;
-						myRange.End = wrdEnd;
-					}
-					ReplaceSymbolCharacters(myRange);
-				}
-				else
-				{
-					ReplaceSymbolCharacters(myRange);
-				}
-				offset = newOffset;
-			}
-		}
-		/// <summary>
-		/// Try to fix the first character in the symbol range F000 to F0FF.  If it cannot be
-		/// fixed, it is an indicator that the font is not installed properly.  Regardless of
-		/// whether there is success, the change is undone so that the document will not be
-		/// considered dirty, i.e. will not prompt user for save.
-		/// </summary>
-		/// <returns></returns>
-		public bool AttemptToFixASymbolCharacter()
-		{
-			// Set up range object to be used to process text
-			LBRange myRange = Range();
-			myRange = myRange.GoTo(LBWdGoToItem.wdGoToPercent, LBWdGoToDirection.wdGoToLast, 100);
 
-			int end = myRange.End;
-			myRange.Start = 0;
-			string myText = GetRangeText(myRange);
-			MatchCollection problems = _RegFindSymbol.Matches(myText);
-			if (problems.Count>0)
-			{
-				Match problem = problems[0];
-				myRange.Start = problem.Index;
-				myRange.End = myRange.Start + 1;
-				if (IsSymbolFont(myRange.Font.Name)) return true;   // if it's a symbol font already, no issue.
-				string before = GetRangeText(myRange);
-				string updated = ReplaceSymbolCharacters(before);
-				myRange.Text = updated;
-				string after = GetRangeText(myRange);
-				Undo(1);
-				//Console.WriteLine("Undo1 results = {0}", tst);
-				//tst = Undo(1);
-				//Console.WriteLine("Undo2 results = {0}", tst);
-				//tst = Undo(1);
-				//Console.WriteLine("Undo3 results = {0}", tst);
-				return (updated == after);
-			}
-			return true;
-		}
         /// <summary>
         /// Get the Range Text with error handling.  myRange.Text sometimes will get a null reference exception.
         /// </summary>
@@ -688,7 +381,7 @@ namespace LBWordLibrary
         /// <returns></returns>
         internal static string GetRangeText(LBRange myRange)
         {
-			string text="";
+            string text = "";
             try
             {
                 if (myRange.Start == myRange.End)// If Start and End equal return an empty string.
@@ -737,35 +430,6 @@ namespace LBWordLibrary
             return myRange.Start - problem.Index;
         }
         /// <summary>
-		/// ReplaceSymbolCharacters Replaces any symbol characters in the specified range
-		/// </summary>
-		/// <param name="myRange"></param>
-		private static void ReplaceSymbolCharacters(LBRange myRange)
-		{
-			try
-			{
-				if (IsSymbolFont(myRange.Font.Name)) 
-					return;
-				string before = GetRangeText(myRange);
-				string updated = ReplaceSymbolCharacters(before);
-				myRange.Text = updated;
-				string after = GetRangeText(myRange);
-				if (after != updated)  // If the Word text doesn't match try including a character before and after and do it again.
-				{
-					Console.WriteLine("'TryEntireRange Failed',{0},{1},'{2}','{3}','{4}'", myRange.Start, myRange.End, before, updated, after);
-					int end = myRange.End;
-					myRange.Start = myRange.Start - 1;
-					myRange.End = end + 1;
-					myRange.Text = ReplaceSymbolCharacters(GetRangeText(myRange));
-					Console.WriteLine("'TryEntireRange Failed',{0},{1},'{2}'", myRange.Start, myRange.End, GetRangeText(myRange));
-				}
-			}
-			catch (Exception ex)
-			{
-				Console.WriteLine("'TryEntireRange Exception',{0},{1},'{2}'", myRange.Start, myRange.End, ex.Message);
-			}
-		}
-		/// <summary>
         /// ReplaceSymbolCharacters processes the string returned and changes any symbols (0xF0??) to normal characters
         /// </summary>
         /// <param name="str"></param>
@@ -786,10 +450,7 @@ namespace LBWordLibrary
         /// Close the document
         /// </summary>
         /// <param name="SaveChanges">Save Changes</param>
-		public void Close(bool SaveChanges)
+        public void Close(bool SaveChanges) => InvokeMethod("Close", SaveChanges, Missing.Value, Missing.Value);
-		{
-			InvokeMethod("Close", SaveChanges, Missing.Value, Missing.Value);
-		}
     }
     public partial class LBFind
     {
@@ -810,33 +471,15 @@ namespace LBWordLibrary
     }
     public partial class LBRange : LBComObject
     {
-		public Object get_Information(LBWdInformation info)
+        public object get_Information(LBWdInformation info) => GetProperty("Information", info);
-		{
+        public LBRange GoTo(LBWdGoToItem What, LBWdGoToDirection Which, int Count) => new LBRange(InvokeMethod("GoTo", What, Which, Count, Missing.Value));
-			return GetProperty("Information", info);
-		}
-		public LBRange GoTo(LBWdGoToItem What, LBWdGoToDirection Which, int Count)
-		{
-			return new LBRange(InvokeMethod("GoTo", What, Which, Count, Missing.Value));
-		}
     }
     public partial class LBSelection : LBComObject
     {
-		public Object get_Information(LBWdInformation info)
+        public object get_Information(LBWdInformation info) => GetProperty("Information", info);
-		{
+        public int MoveStart(LBWdUnits Unit, int Count) => InvokeMethod("MoveStart", Unit, Count) as int? ?? 0;
-			return GetProperty("Information", info);
+        public int MoveEnd(LBWdUnits Unit, int Count) => InvokeMethod("MoveEnd", Unit, Count) as int? ?? 0;
-		}
+        public int EndKey(LBWdUnits Unit, bool Extend) => InvokeMethod("EndKey", Unit, Extend) as int? ?? 0;
-		public int MoveStart(LBWdUnits Unit, int Count)
-		{
-			return InvokeMethod("MoveStart", Unit, Count) as int? ?? 0;
-		}
-		public int MoveEnd(LBWdUnits Unit, int Count)
-		{
-			return InvokeMethod("MoveEnd", Unit, Count) as int? ?? 0;
-		}
-		public int EndKey(LBWdUnits Unit, bool Extend)
-		{
-			return InvokeMethod("EndKey", Unit, Extend) as int? ?? 0;
-		}
         public bool LastWasUpper
         {
             get
@@ -850,7 +493,7 @@ namespace LBWordLibrary
                     string previous = LBDocumentClass.GetRangeText(myRange);
                     if (Regex.IsMatch(previous, "[A-Z]")) return true;
                     if (Regex.IsMatch(previous, "[a-z]")) return false;
-					start = start - 1;
+                    start--;
                 }
                 return false;
             }
@@ -858,21 +501,12 @@ namespace LBWordLibrary
     }
     public partial class LBInlineShapes : LBComObjectList<LBInlineShapes, LBInlineShape> /* Collection */
     {
-		public LBInlineShape AddPicture(string FileName, LBRange Range)
+        public LBInlineShape AddPicture(string FileName, LBRange Range) => new LBInlineShape(InvokeMethod("AddPicture", FileName, false, true, Range));
-		{
-			return new LBInlineShape(InvokeMethod("AddPicture", FileName, false, true, Range));
-		}
     }
     public partial class LBShapes : LBComObjectList<LBShapes, LBShape> /* Collection */
     {
-		public LBShape AddPicture(string FileName, float Left, float Top, LBRange Anchor)
+        public LBShape AddPicture(string FileName, float Left, float Top, LBRange Anchor) => new LBShape(InvokeMethod("AddPicture", FileName, false, true, Left, Top, Missing.Value, Missing.Value, Anchor));
-		{
+        public LBShape AddPicture(string FileName, float Left, float Top) => new LBShape(InvokeMethod("AddPicture", FileName, false, true, Left, Top, Missing.Value, Missing.Value, Missing.Value));
-			return new LBShape(InvokeMethod("AddPicture", FileName, false, true, Left, Top, Missing.Value, Missing.Value, Anchor));
-		}
-		public LBShape AddPicture(string FileName, float Left, float Top)
-		{
-			return new LBShape(InvokeMethod("AddPicture", FileName, false, true, Left, Top, Missing.Value, Missing.Value, Missing.Value));
-		}
     }
     public enum LBMsoTriState
     {
@@ -882,25 +516,4 @@ namespace LBWordLibrary
         msoTriStateToggle = -3,
         msoTrue = -1
     }
-	//public partial class ProcessKiller
-	//{
-	//  System.Diagnostics.Process _MyProcess;
-	//  private bool _Exited = false;
-	//  public ProcessKiller(System.Diagnostics.Process myProcess)
-	//  {
-	//    _MyProcess = myProcess;
-	//    _MyProcess.Exited += new EventHandler(_MyProcess_Exited);
-	//    _MyProcess.Kill();
-	//    DateTime next = DateTime.Now.AddMilliseconds(200);
-	//    while (DateTime.Now < next)
-	//      Application.DoEvents();
-	//    while (!_Exited)
-	//      Application.DoEvents();
-	//  }
-	//  void _MyProcess_Exited(object sender, EventArgs e)
-	//  {
-	//    Console.WriteLine("Exited");
-	//    _Exited = true;
-	//  }
-	//}
 }

PROMS/LBWordLibrary/LBWordLibrary.csproj

@@ -79,6 +79,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="LBComObject.cs" />
     <Compile Include="LBObjectExtension.cs" />
     <Compile Include="OutlookLBComObject.cs" />

PROMS/LBWordLibrary/OutlookLBComObject.cs

@@ -1,28 +1,22 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Reflection;
 
 namespace LBOutlookLibrary
 {
 	public abstract partial class LBComObject
 	{
-		private Object _Item;
+		private object _Item;
-		internal Object Item
+		internal object Item
 		{
 			get { return _Item; }
 			set
 			{
 				_Item = value;
-				if (value != null) _MyType = _Item.GetType();
+				if (value != null) MyType = _Item.GetType();
 			}
 		}
-		private Type _MyType;
+
-		public Type MyType
+        public Type MyType { get; set; }
-		{
-			get { return _MyType; }
-			set { _MyType = value; }
-		}
         protected LBComObject() { }
 		protected LBComObject(string ProgID)
 		{
@@ -30,35 +24,22 @@ namespace LBOutlookLibrary
 			objClassType = Type.GetTypeFromProgID(ProgID);
 			Item = Activator.CreateInstance(objClassType);
 		}
-		protected LBComObject(Object item)
+        protected LBComObject(object item) => Item = item;
-		{
+        private object DoInvokeMember(string name, object[] parameters, BindingFlags bf, Binder b)
-			Item = item;
-		}
-		private Object DoInvokeMember(string name, Object[] parameters, BindingFlags bf, Binder b)
 		{
 			try
 			{
-				return _MyType.InvokeMember(name, bf, b, _Item, parameters);
+				return MyType.InvokeMember(name, bf, b, _Item, parameters);
 			}
 			catch (Exception ex)
 			{
-				throw new Exception(string.Format("LBComObject.DoInvokeMember {0}.{1}", _MyType.Name, name), ex);
+				throw new Exception(string.Format("LBComObject.DoInvokeMember {0}.{1}", MyType.Name, name), ex);
 			}
-			return null;
 		}
-		protected void SetProperty(string propertyName, params Object[] parameters)
+        protected void SetProperty(string propertyName, params object[] parameters) => DoInvokeMember(propertyName, parameters, BindingFlags.SetProperty, null);
-		{
+        protected object GetProperty(string propertyName) => DoInvokeMember(propertyName, null, BindingFlags.GetProperty, null);
-			DoInvokeMember(propertyName, parameters, BindingFlags.SetProperty, null);
+        protected object GetProperty(string propertyName, params object[] parameters) => DoInvokeMember(propertyName, parameters, BindingFlags.GetProperty, null);
-		}
+        protected object InvokeMethod(string methodName, params object[] parameters)
-		protected Object GetProperty(string propertyName)
-		{
-			return DoInvokeMember(propertyName, null, BindingFlags.GetProperty, null);
-		}
-		protected Object GetProperty(string propertyName, params Object[] parameters)
-		{
-			return DoInvokeMember(propertyName, parameters, BindingFlags.GetProperty, null);
-		}
-		protected Object InvokeMethod(string methodName, params Object[] parameters)
 		{
 			if (parameters != null)
 				FixParameters(parameters);
@@ -71,44 +52,14 @@ namespace LBOutlookLibrary
 				if (parameters[i] is LBComObject)
 					parameters[i] = (parameters[i] as LBComObject).Item;
 		}
-		protected Object InvokeMethod(string methodName)
+        protected object InvokeMethod(string methodName) => InvokeMethod(methodName, null);
-		{
-			return InvokeMethod(methodName, null);
-		}
-	}
-	public class LBComObjectList<TList, TItem> : LBComObject
-		where TList : LBComObjectList<TList, TItem>
-		where TItem : LBComObject, new()
-	{
-		//public new(Object item):base(item){}
-		public TItem Add()
-		{
-			TItem tmp = new TItem();
-			tmp.Item = InvokeMethod("Add");
-			return tmp;
-		}
-		//public TItem this[int item]
-		//{
-		//	get
-		//	{
-		//		TItem tmp = new TItem();
-		//		tmp.Item = GetProperty("Item", item);
-		//		return tmp;
-		//	}
-		//}
     }
 	public partial class LBApplicationClass : LBComObject
 	{
 		public LBApplicationClass() : base("Outlook.Application") { }
-		public LBApplicationClass(Object item) : base(item) { }
+		public LBApplicationClass(object item) : base(item) { }
-		public System.Object CreateItem(LBOlItemType ItemType)
+        public object CreateItem(LBOlItemType ItemType) => InvokeMethod("CreateItem", ItemType);
-		{
+        public void Quit() => InvokeMethod("Quit");
-			return InvokeMethod("CreateItem", ItemType);
-		}
-		public void Quit()
-		{
-			InvokeMethod("Quit");
-		}
     }
 	public enum LBOlItemType
 	{
@@ -124,13 +75,13 @@ namespace LBOutlookLibrary
 	public partial class LBMailItem : LBComObject
 	{
 		public LBMailItem() { }
-		public LBMailItem(Object item) : base(item) { }
+		public LBMailItem(object item) : base(item) { }
 	}
 	public partial class LBMailItemClass : LBComObject
 	{
 		public LBMailItemClass() { }
-		public LBMailItemClass(Object item) : base(item) { }
+		public LBMailItemClass(object item) : base(item) { }
-		public String Body
+		public string Body
 		{
 			get { return (GetProperty("Body").ToString()); }
 			set { SetProperty("Body", value); }
@@ -140,28 +91,19 @@ namespace LBOutlookLibrary
 			get { return (LBOlBodyFormat)GetProperty("BodyFormat"); }
 			set { SetProperty("BodyFormat", value); }
 		}
-		public LBAttachments Attachments
+        public LBAttachments Attachments => new LBAttachments(GetProperty("Attachments"));
-		{
+        public string Subject
-			get { return new LBAttachments(GetProperty("Attachments")); }
-		}
-		public String Subject
 		{
 			get { return (GetProperty("Subject").ToString()); }
 			set { SetProperty("Subject", value); }
 		}
-		public LBRecipients Recipients
+        public LBRecipients Recipients => new LBRecipients(GetProperty("Recipients"));
-		{
+        public string To
-			get { return new LBRecipients(GetProperty("Recipients")); }
-		}
-		public String To
 		{
 			get { return (GetProperty("To").ToString()); }
 			set { SetProperty("To", value); }
 		}
-		public void Send()
+        public void Send() => InvokeMethod("Send");
-		{
-			InvokeMethod("Send");
-		}
     }
 	public enum LBOlBodyFormat
 	{
@@ -173,78 +115,39 @@ namespace LBOutlookLibrary
 	public partial class LBAttachments : LBComObject
 	{
 		public LBAttachments() { }
-		public LBAttachments(Object item) : base(item) { }
+		public LBAttachments(object item) : base(item) { }
-		public int Count
+        public int Count => (GetProperty("Count") as int? ?? 0);
-		{
+        public new LBAttachment Item => new LBAttachment(GetProperty("Item"));
-			get { return (GetProperty("Count") as int? ?? 0); }
+        public LBAttachment Add(object Source) => new LBAttachment(InvokeMethod("Add", Source, Missing.Value, Missing.Value, Missing.Value));
-		}
-		public LBAttachment Item
-		{
-			get { return new LBAttachment(GetProperty("Item")); }
-		}
-		public LBAttachment Add(object Source)
-		{
-			return new LBAttachment(InvokeMethod("Add", Source, Missing.Value, Missing.Value, Missing.Value));
-		}
         public LBAttachment Add(object Source, object Type, object Position, object DisplayName)
 		{
 			return new LBAttachment(InvokeMethod("Add", Source, Type, Position, DisplayName));
 		}
-		public void Remove(int Index)
+        public void Remove(int Index) => InvokeMethod("Remove", Index);
-		{
-			InvokeMethod("Remove", Index);
-		}
     }
 	public partial class LBRecipients : LBComObject
 	{
 		public LBRecipients() { }
-		public LBRecipients(Object item) : base(item) { }
+		public LBRecipients(object item) : base(item) { }
-		public int Count
+        public int Count => (GetProperty("Count") as int? ?? 0);
-		{
+        public new LBRecipient Item => new LBRecipient(GetProperty("Item"));
-			get { return (GetProperty("Count") as int? ?? 0); }
+        public LBRecipient Add(string Name) => new LBRecipient(InvokeMethod("Add", Name));
-		}
+        public void Remove(int Index) => InvokeMethod("Remove", Index);
-		public LBRecipient Item
+        public bool ResolveAll() => InvokeMethod("ResolveAll") as bool? ?? false;
-		{
-			get { return new LBRecipient(GetProperty("Item")); }
-		}
-		public LBRecipient Add(string Name)
-		{
-			return new LBRecipient(InvokeMethod("Add", Name));
-		}
-		public void Remove(int Index)
-		{
-			InvokeMethod("Remove", Index);
-		}
-		public Boolean ResolveAll()
-		{
-			return InvokeMethod("ResolveAll") as Boolean? ?? false;
-		}
     }
 	public partial class LBAttachment : LBComObject
 	{
 		public LBAttachment() { }
-		public LBAttachment(Object item) : base(item) { }
+		public LBAttachment(object item) : base(item) { }
-		public LBOlAttachmentType Type
+        public LBOlAttachmentType Type => (LBOlAttachmentType)GetProperty("Type");
-		{
-			get { return (LBOlAttachmentType)GetProperty("Type"); }
-		}
     }
 	public partial class LBRecipient : LBComObject
 	{
 		public LBRecipient() { }
-		public LBRecipient(Object item) : base(item) { }
+		public LBRecipient(object item) : base(item) { }
-		public String Address
+        public string Address => (GetProperty("Address").ToString());
-		{
+        public string Name => (GetProperty("Name").ToString());
-			get { return (GetProperty("Address").ToString()); }
+        public bool Resolve() => InvokeMethod("Resolve") as bool? ?? false;
-		}
-		public String Name
-		{
-			get { return (GetProperty("Name").ToString()); }
-		}
-		public Boolean Resolve()
-		{
-			return InvokeMethod("Resolve") as Boolean? ?? false;
-		}
     }
 	public enum LBOlAttachmentType
 	{

PROMS/LBWordLibrary/OutlookLBComObjectExt.cs

@@ -1,21 +1,13 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace LBOutlookLibrary
 {
 	public partial class LBApplicationClass
 	{
-		public LBMailItemClass CreateMailItem()
+        public LBMailItemClass CreateMailItem() => new LBMailItemClass(CreateItem(LBOlItemType.olMailItem));
-		{
-			return new LBMailItemClass(CreateItem(LBOlItemType.olMailItem));
-		}
     }
 	public partial class LBMailItemClass
 	{
-		public void AddAttachment(string filename)
+        public void AddAttachment(string filename) => Attachments.Add(filename, LBOlAttachmentType.olByValue, Type.Missing, Type.Missing);
-		{
-			Attachments.Add(filename, LBOlAttachmentType.olByValue, Type.Missing, Type.Missing);
-		}
     }
 }

PROMS/LBWordLibrary/RegHive.cs

@@ -53,15 +53,9 @@ namespace Read64bitRegistryFrom32bitApp
         #endregion
 
         #region Functions
-		static public string GetRegKey64Value(UIntPtr inHive, String inKeyName, String inPropertyName)
+        static public string GetRegKey64Value(UIntPtr inHive, string inKeyName, string inPropertyName) => GetRegKey64Value(inHive, inKeyName, RegSAM.WOW64_64Key, inPropertyName);
-		{
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "inHive kept to match dll signature")]
-			return GetRegKey64Value(inHive, inKeyName, RegSAM.WOW64_64Key, inPropertyName);
+        static public string GetRegKey64Value(UIntPtr inHive, string inKeyName, RegSAM in32or64key, string inPropertyName)
-		}
-		static public string GetRegKey32Value(UIntPtr inHive, String inKeyName, String inPropertyName)
-		{
-			return GetRegKey64Value(inHive, inKeyName, RegSAM.WOW64_32Key, inPropertyName);
-		}
-		static public string GetRegKey64Value(UIntPtr inHive, String inKeyName, RegSAM in32or64key, String inPropertyName)
 		{
 			int hkey = 0;
 			try
@@ -80,15 +74,10 @@ namespace Read64bitRegistryFrom32bitApp
 				if (0 != hkey) RegCloseKey(hkey);
 			}
 		}
-		static public bool CheckRegKey64Valid(UIntPtr inHive, String inKeyName)
+        static public bool CheckRegKey64Valid(UIntPtr inHive, string inKeyName) => CheckRegKey64Valid(inHive, inKeyName, RegSAM.WOW64_64Key);
-		{
+        static public bool GetRegKey32Valid(UIntPtr inHive, string inKeyName) => CheckRegKey64Valid(inHive, inKeyName, RegSAM.WOW64_32Key);
-			return CheckRegKey64Valid(inHive, inKeyName, RegSAM.WOW64_64Key);
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "inHive kept to match dll signature")]
-		}
+        static public bool CheckRegKey64Valid(UIntPtr inHive, string inKeyName, RegSAM in32or64key)
-		static public bool GetRegKey32Valid(UIntPtr inHive, String inKeyName)
-		{
-			return CheckRegKey64Valid(inHive, inKeyName, RegSAM.WOW64_32Key);
-		}
-		static public bool CheckRegKey64Valid(UIntPtr inHive, String inKeyName, RegSAM in32or64key)
 		{
 			int hkey = 0;
 			try
@@ -103,8 +92,5 @@ namespace Read64bitRegistryFrom32bitApp
 			}
 		}
 		#endregion
-
-		#region Enums
-		#endregion
 	}
 }

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

@@ -844,8 +844,12 @@ namespace ROEditor
 				AccPageID = " ";
 			WriteString(AccPageID);
 
+            //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+            string moddt = ROdatabase.RODB_GetModDateTime(elem.GetAttribute("RecID"), elem.GetAttribute("Table"));
+            if (!string.IsNullOrEmpty(moddt)) WriteString(moddt);
+
             // Save the ID and offset entry for the current ID
-			IdsAndOffsets.Add(RORecID,startFST);
+            IdsAndOffsets.Add(RORecID, startFST);
 
 			// Save the RecID and Accessory Page id
 			IdsAndAccPgIds[AccPageID] = RORecID;

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs

@@ -355,6 +355,7 @@ namespace RODBInterface
 		public abstract string RODB_GetDBServerForAbout();
 		public abstract string RODB_HasBeenConverted();
 		public abstract bool RODB_WriteSqlConnectToAccess(string newConectStr);
+		public abstract string RODB_GetModDateTime(string Recid, string table);
         #endregion
 
         public RODB()
@@ -3082,6 +3083,27 @@ namespace RODBInterface
 			return GrpCnt;
 		}
 
+        //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+        //Get the Modification Date / Time for the RO
+        public override string RODB_GetModDateTime(string Recid, string table)
+        {
+            using (System.Data.OleDb.OleDbConnection connection = new System.Data.OleDb.OleDbConnection(strDatabaseConnectionCommand))
+            {
+				connection.Open();
+                using (System.Data.OleDb.OleDbCommand command = connection.CreateCommand())
+                {
+					//Unfortunately Access wont let you paramaterize the table name
+                    command.CommandText = $"SELECT ModDateTime FROM {Regex.Replace(table, "[^a-zA-Z0-9]", "")} WHERE RecID = @Value";
+                    command.Parameters.Add(new System.Data.OleDb.OleDbParameter
+                    {
+                        OleDbType = System.Data.OleDb.OleDbType.VarChar,
+                        ParameterName = "@Value",
+                        Value = Recid
+                    });
+                    return command.ExecuteScalar().ToString();
+                }
+            }
+        }
     }
 }
 

PROMS/ReferencedObjects/LibSource/RODBInterface/SqlRODB.cs

@@ -2653,6 +2653,34 @@ namespace RODBInterface
 			}
 			return GrpCnt;
 		}
+
+        //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+        //Get the Modification Date / Time for the RO
+        public override string RODB_GetModDateTime(string Recid, string table)
+        {
+            using (SqlConnection connection = new SqlConnection(strDatabaseConnectionCommand))
+            {
+				connection.Open();
+                using (SqlCommand command = connection.CreateCommand())
+                {
+                    command.CommandText = $"SELECT ModDateTime FROM ROALL WHERE RecID = @Value AND ROTable = @table";
+                    command.Parameters.Add(new SqlParameter
+                    {
+                        SqlDbType = SqlDbType.VarChar,
+                        ParameterName = "@Value",
+                        Value = Recid
+                    });
+                    command.Parameters.Add(new SqlParameter
+                    {
+                        SqlDbType = SqlDbType.VarChar,
+                        ParameterName = "@table",
+                        Value = table
+                    });
+
+                    return command.ExecuteScalar().ToString();
+                }
+            }
+        }
         #endregion
         public static bool TestConnect(string constring)
 		{

PROMS/ReferencedObjects/LibSource/VlnStatus/StatusBarFrm.cs

@@ -19,11 +19,6 @@
  *********************************************************************************************/
 
 using System;
-using System.Drawing;
-using System.Collections;
-using System.ComponentModel;
-using System.Windows.Forms;
-//using ROProfiler; //don't forget to add VlnProfiler to the reference list
 
 namespace VlnStatus
 {
@@ -35,11 +30,6 @@ namespace VlnStatus
 		private System.Windows.Forms.ProgressBar progressBar1;
 		private System.Windows.Forms.Label lblBar;
 		private System.Windows.Forms.Label StatMsg;
-//		private string strLblLast="";
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.Container components = null;
 
 		public StatusBarFrm()
 		{
@@ -61,21 +51,6 @@ namespace VlnStatus
 			Text = StatusBoxTitle;
 		}
 
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		protected override void Dispose( bool disposing )
-		{
-			if( disposing )
-			{
-				if(components != null)
-				{
-					components.Dispose();
-				}
-			}
-			base.Dispose( disposing );
-		}
-
 		#region Windows Form Designer generated code
 		/// <summary>
 		/// Required method for Designer support - do not modify
@@ -190,14 +165,6 @@ namespace VlnStatus
 		{
 			lblBar.Text = (Math.Round((decimal)(progressBar1.Value * 100) / progressBar1.Maximum)).ToString();
 			lblBar.Text += "% Complete";
-//			if( lblBar.Text != strLblLast)
-//			{
-//				Profiler.Start("UpdateLabel");
-				lblBar.Refresh();
-//				lblBar.Update();
-//				Profiler.End("UpdateLabel");
-//			}
-//			strLblLast = lblBar.Text;
 		}
 
 		public string StatusMessage
@@ -209,10 +176,7 @@ namespace VlnStatus
 			set
 			{
 				StatMsg.Text = value;
-//				Profiler.Start("StatusMessage");
 				StatMsg.Refresh();
-//				StatMsg.Update();
-//				Profiler.End("StatusMessage");
 			}
 		}
 

PROMS/ReferencedObjects/LibSource/VlnStatus/StatusMessageFrm.cs

@@ -17,12 +17,6 @@
  * Added overbounds check
  *********************************************************************************************/
 
-using System;
-using System.Drawing;
-using System.Collections;
-using System.ComponentModel;
-using System.Windows.Forms;
-
 namespace VlnStatus
 {
 	/// <summary>
@@ -31,10 +25,6 @@ namespace VlnStatus
 	public class StatusMessageFrm : System.Windows.Forms.Form
 	{
 		private System.Windows.Forms.Label lblStatMsg;
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.Container components = null;
 
 		public StatusMessageFrm()
 		{
@@ -54,21 +44,6 @@ namespace VlnStatus
 			Text = StatTitle;
 		}
 
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		protected override void Dispose( bool disposing )
-		{
-			if( disposing )
-			{
-				if(components != null)
-				{
-					components.Dispose();
-				}
-			}
-			base.Dispose( disposing );
-		}
-
 		#region Windows Form Designer generated code
 		/// <summary>
 		/// Required method for Designer support - do not modify

PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatusBar.cs

@@ -33,7 +33,7 @@ namespace VlnStatus
 	/// </summary>
 	public class VlnStatusBar
 	{
-		StatusBarFrm StatBar;
+        readonly StatusBarFrm StatBar;
 		private int Cnt;
 
 		// Create a status window with the default title of "Status"
@@ -53,8 +53,6 @@ namespace VlnStatus
 		// Increament the the status bar by the passed in value.
 		public void PerformStep(int val)
 		{
-//			StatBar.Value = val;
-//			Cnt = val;
 			BarValue = val;
 			StatBar.PerformStep();
 		}
@@ -62,7 +60,6 @@ namespace VlnStatus
 		// Increament the the status bar by one
 		public void PerformStep()
 		{
-//			StatBar.Value = StatBar.Value + 1;
 			Cnt++;
 			BarValue = Cnt;
 			StatBar.PerformStep();

PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatusMessage.cs

@@ -13,8 +13,6 @@
  * Added overbounds check
  *********************************************************************************************/
 
-using System;
-
 namespace VlnStatus
 {
 	/// <summary>
@@ -28,7 +26,7 @@ namespace VlnStatus
 	/// </summary>
 	public class VlnStatusMessage
 	{
-		StatusMessageFrm StatusMessageBox;
+        readonly StatusMessageFrm StatusMessageBox;
 
 		// Create a status window with the default title of "Status"
 		public VlnStatusMessage()

PROMS/RoAccessToSql/GlobalSuppressions.cs

@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Not modifying Naming Styles")]

PROMS/RoAccessToSql/Program.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace RoAccessToSql

PROMS/RoAccessToSql/RoAccessToSql.cs

@@ -1,16 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Data;
 using System.IO;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using System.Data.SqlClient;
 using System.Data.OleDb;
-using Volian.Base.Library;
 
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]
 
@@ -33,25 +27,11 @@ namespace RoAccessToSql
 	public partial class RoAccessToSql : Form
 	{
 		private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-		private string _MSAccessPath = null;
+
-		public string MSAccessPath
+        public string MSAccessPath { get; set; } = null;
-		{
+        public string SqlServerName { get; set; } = null;
-			get { return _MSAccessPath; }
+        public string SqlDatabaseName { get; set; } = null;
-			set { _MSAccessPath = value; }
+        readonly bool _Initializing = false;
-		}
-		private string _SqlServerName = null;
-		public string SqlServerName
-		{
-			get { return _SqlServerName; }
-			set { _SqlServerName = value; }
-		}
-		private string _SqlDatabaseName = null;
-		public string SqlDatabaseName
-		{
-			get { return _SqlDatabaseName; }
-			set { _SqlDatabaseName = value; }
-		}
-		bool _Initializing = false;
 
 		public RoAccessToSql(string[] args)
 		{
@@ -66,7 +46,7 @@ namespace RoAccessToSql
 				}
 				else if (parm.StartsWith("/sqldb="))
 				{
-					SqlDatabaseName = parm.Substring(7) + "_RO";
+					SqlDatabaseName = $"{parm.Substring(7)}_RO";
 				}
 				else if (parm.StartsWith("/server="))
 				{
@@ -92,7 +72,7 @@ namespace RoAccessToSql
 			if (UserInRoEditor()) this.Close();
 			tbSqlDbName.Text = SqlDatabaseName;
 			_TmpFileForConnectStr = Path.GetTempPath();
-			_TmpFileForConnectStr = _TmpFileForConnectStr + @"\PromsConnect.txt";
+			_TmpFileForConnectStr += @"\PromsConnect.txt";
 			File.Delete(_TmpFileForConnectStr);
 			_Initializing = false;
 		}
@@ -100,7 +80,7 @@ namespace RoAccessToSql
 		private bool UserInRoEditor()
 		{
 			FileInfo fiown = null;
-			FileStream fsown = null;
+            FileStream fsown;
             // The following code was taken from the roeditor. It uses the 'RoEditor.own' file to assure that
             // no one is in the roeditor. This file is located in the microsoft access database directory.
             try
@@ -119,7 +99,7 @@ namespace RoAccessToSql
 					fsown = fiown.Open(FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
 					TextReader tr1 = new StreamReader(fsown);
 					string who1 = tr1.ReadToEnd();
-					MessageBox.Show(ex.Message + "\r\n\r\n" + who1, "RO Editor In Use", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+					MessageBox.Show($"{ex.Message}\r\n\r\n{who1}", "RO Editor In Use", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
 				}
 				fsown = fiown.Open(FileMode.OpenOrCreate, FileAccess.Read, FileShare.ReadWrite);
 				TextReader tr = new StreamReader(fsown);
@@ -142,7 +122,7 @@ namespace RoAccessToSql
 				tw.WriteLine("Current User:  {0}, Date and Time Started:  {1}", Environment.UserName.ToUpper(), DateTime.Now.ToString("MM/dd/yyyy @ hh:mm"));
 				tw.Flush();
 			}
-			catch (IOException ex)
+			catch (IOException)
             {
 				fsown = fiown.Open(FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
 				TextReader tr = new StreamReader(fsown);
@@ -154,12 +134,8 @@ namespace RoAccessToSql
 			}
 			return false;
 		}
-		static string _ErrorLogFileName;
+
-		public static string ErrorLogFileName
+        public static string ErrorLogFileName { get; set; }
-		{
-			get { return _ErrorLogFileName; }
-			set { _ErrorLogFileName = value; }
-		}
         // make error log file name (uses same logic as proms error log)
         static bool ChangeLogFileName(string AppenderName, string NewFilename)
 		{
@@ -168,11 +144,10 @@ namespace RoAccessToSql
 			foreach (log4net.Appender.IAppender iApp in RootRep.GetAppenders())
 			{
 				if (iApp.Name.CompareTo(AppenderName) == 0
-				&& iApp is log4net.Appender.FileAppender)
+				&& iApp is log4net.Appender.FileAppender fApp)
                 {
-					log4net.Appender.FileAppender fApp = (log4net.Appender.FileAppender)iApp;
 					string folderPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
-					fApp.File = folderPath + @"\VEPROMS\" + (Volian.Base.Library.VlnSettings.GetCommand("prefix", "") + "_").TrimStart("_".ToCharArray()) + NewFilename;
+					fApp.File = $@"{folderPath}\VEPROMS\{($"{Volian.Base.Library.VlnSettings.GetCommand("prefix", "")}_").TrimStart("_".ToCharArray())}{NewFilename}";
 					ErrorLogFileName = fApp.File;
 					fApp.ActivateOptions();
 					return true;
@@ -189,7 +164,7 @@ namespace RoAccessToSql
 				if (Directory.Exists(fbd.SelectedPath))
 					tbAccessPath.Text = fbd.SelectedPath;
 				else
-					MessageBox.Show("Path doesn't exist " + tbAccessPath.Text);
+					MessageBox.Show($"Path doesn't exist {tbAccessPath.Text}");
 			}
 		}
 		// Convert the data
@@ -212,7 +187,7 @@ namespace RoAccessToSql
 		{
 			DateTime dtSunday = DateTime.Now.AddDays(-((int)DateTime.Now.DayOfWeek));
 
-			ChangeLogFileName("LogFileAppender", SqlDatabaseName + " " + dtSunday.ToString("yyyyMMdd") + " ErrorLog.txt");
+			ChangeLogFileName("LogFileAppender", $"{SqlDatabaseName} {dtSunday:yyyyMMdd} ErrorLog.txt");
 			_MyLog.InfoFormat("\r\nSession Beginning\r\n<===={0}[SQL:{1:yyMM.ddHH}]====== User: {2}/{3} Started {4} ===============>{5}"
 				, Application.ProductVersion, RevDate, DateTime.Now, Environment.UserDomainName, Environment.UserName, DateTime.Now.ToString("dddd MMMM d, yyyy h:mm:ss tt"), "");
 		}
@@ -229,7 +204,7 @@ namespace RoAccessToSql
 					if (sqlConnection.State == ConnectionState.Open)
 					{
 						// now try to open access db:
-						string strDatabaseConnectionCommand = "Provider=Microsoft.ACE.OLEDB.12.0;Password=\"\";User ID=Admin;Data Source=" + MSAccessPath + "\\ROMaster.mdb;Mode=Share Deny None;Extended Properties=\"\";Jet OLEDB:System database=\"\";Jet OLEDB:Registry Path=\"\";Jet OLEDB:Database Password=\"\";Jet OLEDB:Engine Type=5;Jet OLEDB:Database Locking Mode=1;Jet OLEDB:Global Partial Bulk Ops=2;Jet OLEDB:Global Bulk Transactions=1;Jet OLEDB:New Database Password=\"\";Jet OLEDB:Create System Database=False;Jet OLEDB:Encrypt Database=False;Jet OLEDB:Don't Copy Locale on Compact=False;Jet OLEDB:Compact Without Replica Repair=False;Jet OLEDB:SFP=False";
+						string strDatabaseConnectionCommand = $"Provider=Microsoft.ACE.OLEDB.12.0;Password=\"\";User ID=Admin;Data Source={MSAccessPath}\\ROMaster.mdb;Mode=Share Deny None;Extended Properties=\"\";Jet OLEDB:System database=\"\";Jet OLEDB:Registry Path=\"\";Jet OLEDB:Database Password=\"\";Jet OLEDB:Engine Type=5;Jet OLEDB:Database Locking Mode=1;Jet OLEDB:Global Partial Bulk Ops=2;Jet OLEDB:Global Bulk Transactions=1;Jet OLEDB:New Database Password=\"\";Jet OLEDB:Create System Database=False;Jet OLEDB:Encrypt Database=False;Jet OLEDB:Don't Copy Locale on Compact=False;Jet OLEDB:Compact Without Replica Repair=False;Jet OLEDB:SFP=False";
 						using (OleDbConnection accessConnection = new OleDbConnection(strDatabaseConnectionCommand))
 						{
 							try
@@ -251,13 +226,13 @@ namespace RoAccessToSql
 					}
 					else
 					{
-						_MyLog.Error("SQL Connection is not open. Check connection string: " + tbSqlDbName.Text);
+						_MyLog.Error($"SQL Connection is not open. Check connection string: {tbSqlDbName.Text}");
-						MessageBox.Show("Check connection string: " + tbSqlDbName.Text, "SQL Connection is not open.");
+						MessageBox.Show($"Check connection string: {tbSqlDbName.Text}", "SQL Connection is not open.");
 					}
 				}
 				catch (SqlException ex) 
 				{
-					_MyLog.Error("SQL Connection is not open. Check connection string: " + tbSqlDbName.Text);
+					_MyLog.Error($"SQL Connection is not open. Check connection string: {tbSqlDbName.Text}");
 					MessageBox.Show(ex.Message, "Unknown error when migrating RO data from MS Access to SQL");
 				}
 			}
@@ -274,9 +249,8 @@ namespace RoAccessToSql
 			lastTimeDbs = ProgressBarUpdate(pBarDbs, null, 0, 1, 0, 0, lastTimeDbs, false);
 			lastTimeRos = ProgressBarUpdate(pBarROs, null, 0, maxCntRo, 0, 0, lastTimeRos, false);
 			lastTimeDbs = ProgressBarUpdate(pBarDbs, "ROMaster Table", 0, 5, 0, 1, lastTimeDbs, false);
-			OleDbDataReader reader = null;
             OleDbCommand command = new OleDbCommand("select * from ROMaster", accessConnection);
-			reader = command.ExecuteReader();
+            OleDbDataReader reader = command.ExecuteReader();
             // Do access's romaster table first so that the list of other tables to process is found.  While doing this, migrate this table's data.
             int cntRo = 0;
 			int cntDb = 0;
@@ -303,10 +277,9 @@ namespace RoAccessToSql
 					maxCntDb++;
 				}
 			}
-			lastTimeRos = ProgressBarUpdate(pBarROs, "ROMaster", 0, maxCntRo, maxCntRo, 1, lastTimeRos, true);
+			ProgressBarUpdate(pBarROs, "ROMaster", 0, maxCntRo, maxCntRo, 1, lastTimeRos, true);
 			lastTimeDbs = ProgressBarUpdate(pBarDbs, null, 0, maxCntDb, 0, 0, lastTimeDbs, false);
 			reader.Close();
-			reader = null;
 
             // now migrate all the tables that were found
             foreach (string tableName in allTables)
@@ -318,7 +291,7 @@ namespace RoAccessToSql
 				lastTimeRos = ProgressBarUpdate(pBarROs, null, 0, maxCntRo, 0, 0, lastTimeRos, true);
 				lastTimeDbs = ProgressBarUpdate(pBarDbs, allTablesText[cntDb], 0, maxCntDb, cntDb, 1, lastTimeDbs, false);
 				command = null;
-				command = new OleDbCommand("select * from " + tableName, accessConnection);
+				command = new OleDbCommand($"select * from {tableName}", accessConnection);
 				reader = command.ExecuteReader();
 				while (reader.Read())			// read all of the records from the current access table
 				{
@@ -338,7 +311,7 @@ namespace RoAccessToSql
 				reader = null;
 				lastTimeRos = ProgressBarUpdate(pBarROs, tableName, 0, maxCntRo, maxCntRo, 1, lastTimeRos, false);
 			}
-			lastTimeDbs = ProgressBarUpdate(pBarDbs, allTablesText[maxCntDb - 1], 0, maxCntDb, maxCntDb, 1, lastTimeDbs, false);
+			ProgressBarUpdate(pBarDbs, allTablesText[maxCntDb - 1], 0, maxCntDb, maxCntDb, 1, lastTimeDbs, false);
 			pBarDbs.Text = "Referenced Object Tables Migration Completed";
 			pBarROs.Text = "Referenced Objects Migration Completed";
 			btnConvert.Enabled = false;
@@ -357,7 +330,7 @@ namespace RoAccessToSql
 				string dt = string.Format("{0:yyyyMMddHHmmss}", System.DateTime.Now);
 				string strInsert = "INSERT INTO ROMaster (RecID, RecType, ModDateTime, Info) ";
 				// note that '8' for rectype flags database converted:
-				strInsert = strInsert + " VALUES ('09999999', 8, '" + dt + "', '" + _SqlConnectStr + "');";
+				strInsert = $"{strInsert} VALUES ('09999999', 8, '{dt}', '{_SqlConnectStr}');";
 				OleDbCommand command = new OleDbCommand(strInsert, accessConnection);
 				reader = command.ExecuteReader();
 				if (reader.Read()) return;
@@ -367,7 +340,7 @@ namespace RoAccessToSql
 				MessageBox.Show(e.Message, "Error on insert to flag migration completed");
 			}
 		}
-		private string _TmpFileForConnectStr = null;
+		private readonly string _TmpFileForConnectStr = null;
 		private void WriteSqlPathToTempFile()
 		{
 			System.IO.File.WriteAllText(_TmpFileForConnectStr, _SqlConnectStr);
@@ -375,12 +348,11 @@ namespace RoAccessToSql
 		// the following is used to update the progress bars, it finds how many records are in a table.
 		private int GetRecordCountForTable(string tableName, OleDbConnection accessConnection)
 		{
-			OleDbDataReader reader = null;
             int retcnt = 100;
 			try
 			{
-				OleDbCommand command = new OleDbCommand("SELECT COUNT (RecID) as cnt FROM " + tableName, accessConnection);
+				OleDbCommand command = new OleDbCommand($"SELECT COUNT (RecID) as cnt FROM {tableName}", accessConnection);
-				reader = command.ExecuteReader();
+                OleDbDataReader reader = command.ExecuteReader();
                 if (reader.Read())
 				{
 					retcnt = reader.GetInt32(0);
@@ -393,6 +365,7 @@ namespace RoAccessToSql
 			}
 			return retcnt;
 		}
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Keeping min for Debugging")]
         DateTime ProgressBarUpdate(DevComponents.DotNetBar.Controls.ProgressBarX pbi, string msg, int min, int max, int progress, int flag, DateTime lastUpdateDisplay, bool doTimeCheck)
 		{
 			if (flag == 0)		// setup
@@ -412,10 +385,12 @@ namespace RoAccessToSql
 		{
 			try
 			{
-				SqlCommand command = new SqlCommand();
+                SqlCommand command = new SqlCommand
-				command.Connection = sqlConnection;
+                {
-				command.CommandType = CommandType.StoredProcedure;
+                    Connection = sqlConnection,
-				command.CommandText = "insertAllRectypes";
+                    CommandType = CommandType.StoredProcedure,
+                    CommandText = "insertAllRectypes"
+                };
                 command.Parameters.AddWithValue("@RecType", RecType);
 				if (AccPageID == null || AccPageID == "")
 					command.Parameters.AddWithValue("@AccPageID", string.Empty);
@@ -428,7 +403,6 @@ namespace RoAccessToSql
 				command.Parameters.AddWithValue("@ModDateTime", ModDateTime);
 				using (SqlDataReader reader = command.ExecuteReader())
 				{
-					bool success = true;
                 }
                 command = null;
 			}
@@ -438,29 +412,12 @@ namespace RoAccessToSql
 				_MyLog.Error(msg, ex);
 			}
 		}
-		private void btnExit_Click(object sender, EventArgs e)
+        private void btnExit_Click(object sender, EventArgs e) => this.Close();
-		{
-			this.Close();
-		}
         // the user selected the button to test the sql connection string
-		private void btnTestConnect_Click(object sender, EventArgs e)
+        private void btnTestConnect_Click(object sender, EventArgs e) => TestConnection(true);
-		{
+
-			TestConnection(true);
+        public static DateTime RevDate { get; set; } = DateTime.MinValue;
-		}
+        public static string RevDescription { get; set; } = "Unknown";
-		// the RevDate & RevDescription are found in a stored procedure, vesp_GetSQLCodeRevision, in the sql database.  These get updated each
-		// time a revision is made to the sql database using ROFixes.sql script.
-		private static DateTime _RevDate = DateTime.MinValue;
-		public static DateTime RevDate
-		{
-			get { return _RevDate; }
-			set { _RevDate = value; }
-		}
-		private static string _RevDescription = "Unknown";
-		public static string RevDescription
-		{
-			get { return _RevDescription; }
-			set { _RevDescription = value; }
-		}
         // This is called to test the sql connection, either from the button when pressed by user, or from the convert button, before
         // the conversion is done. See below for what is checked
         private bool TestConnection(bool notifyUser)
@@ -486,10 +443,12 @@ namespace RoAccessToSql
 						if (connection.State == ConnectionState.Open)
 						{
                             // now see if there is an roall table
-							SqlCommand command = new SqlCommand();
+                            SqlCommand command = new SqlCommand
-							command.Connection = connection;
+                            {
-							command.CommandType = CommandType.Text;
+                                Connection = connection,
-							command.CommandText = "(SELECT count(*) FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[ROALL]') AND type in (N'U'))";
+                                CommandType = CommandType.Text,
+                                CommandText = "(SELECT count(*) FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[ROALL]') AND type in (N'U'))"
+                            };
                             using (SqlDataReader reader = command.ExecuteReader())
 							{
 								if (reader.Read())
@@ -509,10 +468,12 @@ namespace RoAccessToSql
 							{
 								// now see if there are stored procedures:
 								command = null;   // reset command
-								command = new SqlCommand();
+                                command = new SqlCommand
-								command.Connection = connection;
+                                {
-								command.CommandType = CommandType.Text;
+                                    Connection = connection,
-								command.CommandText = "(SELECT count(*) FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[deleteByROTable]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)";
+                                    CommandType = CommandType.Text,
+                                    CommandText = "(SELECT count(*) FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[deleteByROTable]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)"
+                                };
                                 using (SqlDataReader reader = command.ExecuteReader())
 								{
 									if (reader.Read())
@@ -533,10 +494,12 @@ namespace RoAccessToSql
 							{
 								// now test that the roall table is empty:
 								command = null;   // reset command
-								command = new SqlCommand();
+                                command = new SqlCommand
-								command.Connection = connection;
+                                {
-								command.CommandType = CommandType.Text;
+                                    Connection = connection,
-								command.CommandText = "SELECT count(*) FROM roall";
+                                    CommandType = CommandType.Text,
+                                    CommandText = "SELECT count(*) FROM roall"
+                                };
                                 using (SqlDataReader reader = command.ExecuteReader())
 								{
 									if (reader.Read())
@@ -557,16 +520,18 @@ namespace RoAccessToSql
 							{
 								// now test that the database version is ok
 								command = null;   // reset command
-								command = new SqlCommand();
+                                command = new SqlCommand
-								command.Connection = connection;
+                                {
-								command.CommandType = CommandType.StoredProcedure;
+                                    Connection = connection,
-								command.CommandText = "vesp_GetSQLCodeRevision";
+                                    CommandType = CommandType.StoredProcedure,
+                                    CommandText = "vesp_GetSQLCodeRevision"
+                                };
                                 using (SqlDataReader reader = command.ExecuteReader())
 								{
 									if (reader.Read())
 									{
-										_RevDate = reader.GetDateTime(0);
+										RevDate = reader.GetDateTime(0);
-										_RevDescription = reader.GetString(1);
+										RevDescription = reader.GetString(1);
 										dbsuc = true;
 									}
 									else
@@ -582,13 +547,13 @@ namespace RoAccessToSql
 					}
 					catch (SqlException ex)
 					{
-						if (notifyUser) MessageBox.Show("Connection failed: " + ex, "Connection Failed");
+						if (notifyUser) MessageBox.Show($"Connection failed: {ex}", "Connection Failed");
 					}
 				}
 			}
 			catch (Exception ex)
 			{
-				if (notifyUser) MessageBox.Show("Connection failed: " + ex, "Connection Failed");
+				if (notifyUser) MessageBox.Show($"Connection failed: {ex}", "Connection Failed");
 			}
 
 			if (notifyUser && success) MessageBox.Show("You have been successfully connected to the database!", "Connection Succeeded");

PROMS/RoAccessToSql/RoAccessToSql.csproj

@@ -66,6 +66,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="RoAccessToSql.cs">
       <SubType>Form</SubType>
     </Compile>

PROMS/SQL/PROMStoCM.sql

@@ -1817,7 +1817,7 @@ ALTER trigger [dbo].[tr_Contents_Delete] on [dbo].[Contents] instead of delete a
 		select ii.ContentID,ii.Number,ii.Text,ii.Type,ii.FormatID,ii.Config,ii.DTS,ii.UserID,ii.DeleteStatus,ii.ActionDTS
 		from tblContents ii inner join deleted dd on dd.ContentID = ii.ContentID
 		where ii.DeleteStatus > 0
-		update ga set ga.contentauditid = (select max(auditid) from contentaudits where contentid = ga.contentid and deletestatus = ga.deletestatus)
+		update ga set ga.contentauditid = (select ISNULL(max(auditid),0) from contentaudits where contentid = ga.contentid and deletestatus = ga.deletestatus)
 		from gridaudits ga join deleted dd on ga.contentid = dd.contentid where ga.contentauditid = 0
 	end
 go

PROMS/TablePicker/TablePicker.cs

@@ -1,7 +1,4 @@
-using System;
 using System.Drawing;
-using System.Collections;
-using System.ComponentModel;
 using System.Windows.Forms;
 
 namespace Accentra.Controls
@@ -11,11 +8,6 @@ namespace Accentra.Controls
 	/// </summary>
 	public class TablePicker : System.Windows.Forms.Form
 	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.Container components = null;
-
 		public TablePicker()
 		{
 			// Activates double buffering
@@ -29,21 +21,6 @@ namespace Accentra.Controls
 			InitializeComponent();
 		}
 
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		protected override void Dispose( bool disposing )
-		{
-			if( disposing )
-			{
-				if(components != null)
-				{
-					components.Dispose();
-				}
-			}
-			base.Dispose( disposing );
-		}
-
 		#region Windows Form Designer generated code
 		/// <summary>
 		/// Required method for Designer support - do not modify
@@ -75,80 +52,39 @@ namespace Accentra.Controls
 		}
 		#endregion
 
-		private Pen BeigePen = new Pen(Color.Beige, 1);
+		private readonly Brush BlackBrush = System.Drawing.Brushes.Black;
-		private Brush BeigeBrush = System.Drawing.Brushes.Beige;
+		private readonly Brush WhiteBrush = System.Drawing.Brushes.White;
-		private Brush GrayBrush = System.Drawing.Brushes.Gray;
-		private Brush BlackBrush = System.Drawing.Brushes.Black;
-		private Brush WhiteBrush = System.Drawing.Brushes.White;
 
-		private Brush Jbrush = System.Drawing.Brushes.LightBlue; 
+		private readonly Brush Jbrush = System.Drawing.Brushes.LightBlue; 
-		//private Brush Jbrush = System.Drawing.Brushes.LightSteelBlue; 
-		//private Brush Jbrush = System.Drawing.Brushes.SteelBlue; 
-		//private Brush Jbrush = System.Drawing.Brushes.PowderBlue;
 
-		private Pen BorderPen = new Pen(SystemColors.ControlDark);
+		private readonly Pen BorderPen = new Pen(SystemColors.ControlDark);
-		private Pen BluePen = new Pen(Color.SlateGray, 1);
+		private readonly Pen BluePen = new Pen(Color.SlateGray, 1);
 
 		private string DispText = "Esc to Cancel";	// Display text
-		private int DispHeight = 40;//20;		// Display ("Table 1x1", "Cancel")
+		private readonly int DispHeight = 40;		// Display ("Table 1x1", "Cancel")
-		private Font DispFont = new Font("Tahoma", 8.25F);
+		private readonly Font DispFont = new Font("Tahoma", 8.25F);
-		private int SquareX = 20;			// Width of squares 
+		private readonly int SquareX = 20;			// Width of squares 
-		private int SquareY = 20;			// Height of squares
+		private readonly int SquareY = 20;			// Height of squares
 		private int SquareQX = 3;			// Number of visible squares (X)
 		private int SquareQY = 3;			// Number of visible squares (Y)
 		private int SelQX = 1;				// Number of selected squares (x)
 		private int SelQY = 1;				// Number of selected squares (y)
 
-		private bool bHiding = false;
+        public int MaxRows { get; set; } = -1;
-		private bool bCancel = true;	// Determines whether to Cancel
 
-		// Added my Volian 4/27/11
+        public int MaxCols { get; set; } = -1;
-		private int _MaxRows = -1;
-
-		public int MaxRows
-		{
-			get { return _MaxRows; }
-			set { _MaxRows = value; }
-		}
-		private int _MaxCols = -1;
-
-		public int MaxCols
-		{
-			get { return _MaxCols; }
-			set { _MaxCols = value; }
-		}
-
-		/// <summary>
-		/// Similar to <code><see cref="DialogResult"/> 
-		/// == <see cref="DialogResult.Cancel"/></code>,
-		/// but is used as a state value before the form
-		/// is hidden and cancellation is finalized.
-		/// </summary>
-		public bool Cancel {
-			get {
-				return bCancel;
-			}
-		}
 
         /// <summary>
         /// Returns the number of columns, or the horizontal / X count,
         /// of the selection.
         /// </summary>
-		public int SelectedColumns {
+        public int SelectedColumns => SelQX;
-			get {
-				return SelQX;
-			}
-		}
 
         /// <summary>
         /// Returns the number of rows, or the vertical / Y count, 
         /// of the selection.
         /// </summary>
-		public int SelectedRows {
+        public int SelectedRows => SelQY;
-			get {
-				return SelQY;
-			}
-		}
 
         private void TablePicker_Paint(object sender, System.Windows.Forms.PaintEventArgs e) {
 			Graphics g = e.Graphics;
@@ -162,8 +98,8 @@ namespace Accentra.Controls
 			if (SquareQX < 7) SquareQX = 7;
 			if (SquareQY < 5) SquareQY = 5;
 
-			if (_MaxRows > 0 && SquareQY > _MaxRows) SquareQY = _MaxRows;
+			if (MaxRows > 0 && SquareQY > MaxRows) SquareQY = MaxRows;
-			if (_MaxCols > 0 && SquareQX > _MaxCols) SquareQX = _MaxCols;
+			if (MaxCols > 0 && SquareQX > MaxCols) SquareQX = MaxCols;
 
 			// Second, expand the dimensions of this form according to the 
 			// number of visible squares.
@@ -177,14 +113,7 @@ namespace Accentra.Controls
 			// the text is left-justified, only the Y (vertical) position
 			// is calculated.
 			int dispY = ((SquareY - 1) * SquareQY) + SquareQY + 4;
-			//if (this.Cancel) {
+			DispText = $"{SelQY} Row{((SelQY > 1) ? "s" : "")}  {SelQX} Column{((SelQX > 1) ? "s" : "")}\nEsc to Cancel";
-			//    DispText = "Esc Key to Cancel";
-			//} else {
-			//    DispText = SelQX.ToString() + " by " + SelQY.ToString() + " Table";
-			//}
-			//DispText = SelQX.ToString() + " by " + SelQY.ToString() + " Table\nEsc Key to Cancel";
-			//DispText = SelQY.ToString() + " Row"+((SelQY>1)?"s by ":" by ") + SelQX.ToString() + " Column"+((SelQX>1)?"s\nEsc Key to Cancel":"\nEsc Key to Cancel");
-			DispText = SelQY.ToString() + " Row" + ((SelQY > 1) ? "s" : "") + "  " + SelQX.ToString() + " Column" + ((SelQX > 1) ? "s" : "")+ "\nEsc to Cancel";
 			g.DrawString(DispText, DispFont, BlackBrush, 3, dispY + 2); 
 
 			// Draw each of the squares and fill with the default color.
@@ -198,7 +127,6 @@ namespace Accentra.Controls
 			// Go back and paint the squares with selection colors.
 			for (int x=0; x<SelQX; x++) {
 				for (int y=0; y<SelQY; y++) {
-					//g.FillRectangle(BeigeBrush, (x*SquareX) + 3, (y*SquareY) + 3, SquareX - 2, SquareY - 2);
 					g.FillRectangle(Jbrush, (x * SquareX) + 3, (y * SquareY) + 3, SquareX - 2, SquareY - 2);
 					g.DrawRectangle(BluePen, (x * SquareX) + 3, (y * SquareY) + 3, SquareX - 2, SquareY - 2);
 				}
@@ -210,11 +138,6 @@ namespace Accentra.Controls
 		/// </summary>
 		private void TablePicker_Deactivate(object sender, System.EventArgs e) {
 
-			// bCancel = true 
-			// and DialogResult = DialogResult.Cancel 
-			// were previously already set in MouseLeave.
-
-			//this.Hide();
 		}
 
 		/// <summary>
@@ -242,9 +165,6 @@ namespace Accentra.Controls
 		/// escaped (canceling) state.
 		/// </summary>
 		private void TablePicker_MouseLeave(object sender, System.EventArgs e) {
-			//if (!bHiding) bCancel = true;
-			//this.DialogResult = DialogResult.Cancel;
-			//this.Invalidate();
 			if (this.DialogResult == DialogResult.None)
 				this.DialogResult = DialogResult.Cancel;
 		}
@@ -252,32 +172,17 @@ namespace Accentra.Controls
         /// <summary>
         /// Cancels the prior cancellation caused by MouseLeave.
         /// </summary>
-		private void TablePicker_MouseEnter(object sender, System.EventArgs e) {
+        private void TablePicker_MouseEnter(object sender, System.EventArgs e) => this.Invalidate();
-			//bHiding = false;
-			//bCancel = false;
-			//this.DialogResult = DialogResult.OK;
-			this.Invalidate();
-		}
 
         /// <summary>
         /// Detects that the user made a selection by clicking.
         /// </summary>
-		private void TablePicker_Click(object sender, System.EventArgs e) {
+        private void TablePicker_Click(object sender, System.EventArgs e) => this.DialogResult = DialogResult.OK;
-			//bHiding = true; // Not the same as Visible == false
-			//                // because bHiding suggests that the control
-			//                // is still "active" (not canceled).
-			//this.Hide();
-			this.DialogResult = DialogResult.OK;
-		}
 
         private void TablePicker_KeyPress(object sender, KeyPressEventArgs e)
 		{
 			if (e.KeyChar == (char)Keys.Escape)
 			{
-				//bHiding = true; // Not the same as Visible == false
-				//// because bHiding suggests that the control
-				//// is still "active" (not canceled).
-				//this.Hide();
 				this.DialogResult = DialogResult.Cancel;
 			}
 		}

PROMS/VEPROMS User Interface/DlgPrintProcedure.cs

@@ -1395,7 +1395,7 @@ namespace VEPROMS
 			DoCreatePDF();		// create indivitual pdfs
 			if (_MergedPdfPath != null && _MergedPdfPath != PDFPath) PDFPath = _MergedPfd.Folder = _MergedPdfPath;
 			// C2021-063 pass in whether to generate Alarm Point List text when a merge is done
-			if (!_MergedPfd.DoTheMerge(PromsPrinter.MergedLandscapePages,cbxAlmPtTxt.Checked)) return;		// merge them together.
+			if (!_MergedPfd.DoTheMerge(cbxAlmPtTxt.Checked)) return;		// merge them together.
 			// if the property to show the file after printing is set (on the version dialog), display it.  Otherwise do a dialog to let user know it's done
 			if (_DocVersionConfig.Print_MergedPdfsViewAfter)
 			{

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -5227,7 +5227,7 @@ CREATE PROCEDURE [dbo].[getRevisionByItemIDandRevisionNumberAndUnitID]
 WITH EXECUTE AS OWNER
 AS
 declare @RevisionID int
-set @RevisionID = (select revisionid from revisions rr cross apply rr.config.nodes('//Applicability') t1(r1) where itemid = @itemid and revisionnumber = @RevisionNumber and r1.value('@Index','int') = @UnitID)
+set @RevisionID = (select top 1 revisionid from revisions rr cross apply rr.config.nodes('//Applicability') t1(r1) where itemid = @itemid and revisionnumber = @RevisionNumber and r1.value('@Index','int') = @UnitID order by revisionid desc)
 	SELECT
 		[RevisionID],
 		[ItemID],
@@ -5547,6 +5547,12 @@ ELSE PRINT 'Function: ve_GetItemDerivedApplicability Error on Creation'
 GO
 
 -------
+
+-- =============================================
+-- Author:		Matthew Schill
+-- Modify date: 07/14/2026
+-- Description:	Reworked ve_GetParentItem for Performance improvement
+-- =============================================
 /****** Object:  UserDefinedFunction [dbo].[vefn_GetParentItem]    Script Date: 03/28/2012 17:58:48 ******/
 IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[ve_GetParentItem]') AND OBJECTPROPERTY(id,N'IsScalarFunction') = 1)
     DROP FUNCTION [ve_GetParentItem];
@@ -5555,35 +5561,46 @@ GO
    Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
        Copyright 2012 - Volian Enterprises, Inc. All rights reserved.
 *****************************************************************************/
-CREATE FUNCTION [dbo].[ve_GetParentItem] (@ItemID int) RETURNS int
+CREATE OR ALTER FUNCTION [dbo].[ve_GetParentItem] (@ItemID int) RETURNS int
 WITH EXECUTE AS OWNER
 AS
 BEGIN
 DECLARE @ParentID int;
-WITH Itemz([ItemID],[IsFound]) as
+WITH Itemz([ItemID]) as
 (
-select ii.itemid,0 from items ii where ii.itemid = @ItemID
+select ii.itemid from items ii WITH (NOLOCK) where ii.itemid = @ItemID
 union all
-select ii.previousid,0 from items ii
+select ii.previousid from items ii WITH (NOLOCK)
 join itemz zz on ii.itemid = zz.itemid
 where ii.previousid is not null
-and zz.isfound = 0
-union all
-select ii.itemid,1
-from parts pp
-join itemz zz on pp.itemid = zz.itemid
-join items ii on ii.contentid = pp.contentid
 )
-select top 1 @ParentID = itemid from itemz
+select top 1 @ParentID = ii.itemid 
-where isfound = 1 OPTION (MAXRECURSION 10000)
+from itemz
+inner join parts pp WITH (NOLOCK) on pp.itemid = itemz.itemid
+inner join items ii WITH (NOLOCK) on ii.contentid = pp.contentid
+OPTION (MAXRECURSION 10000)
+
 RETURN @ParentID
 END
+
 GO
 
 IF (@@Error = 0) PRINT 'ScalerFunction [vefn_GetParentItem] Succeeded'
 ELSE PRINT 'ScalerFunction [vefn_GetParentItem] Error on Creation'
 go
 
+IF EXISTS (SELECT * FROM dbo.sysIndexes WHERE name like 'IX_PartsItemID')
+	DROP INDEX [IX_PartsItemID] ON [dbo].[tblParts];
+GO
+
+CREATE NONCLUSTERED INDEX IX_PartsItemID
+ON [dbo].[tblParts] ([ItemID] ASC)
+INCLUDE([ContentID],[DeleteStatus],[FromType]) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+
+PRINT 'Added IX_PartsItemID Index.  Speeds up Getting Parent Items'
+GO
+
 /****** Object:  UserDefinedFunction [dbo].[vefn_CanTransitionBeCreated]    Script Date: 10/14/2012 02:03:30 ******/
 IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vefn_CanTransitionBeCreated]') AND OBJECTPROPERTY(id,N'IsScalarFunction') = 1)
 	DROP FUNCTION [vefn_CanTransitionBeCreated];
@@ -13541,34 +13558,6 @@ IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[deleteAllDocVers
     DROP PROCEDURE [deleteAllDocVersionPdfs];
 GO
 
-/*****************************************************************************
-   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
-       Copyright 2017 - Volian Enterprises, Inc. All rights reserved.
-*****************************************************************************/
-CREATE PROCEDURE [dbo].[deleteAllDocVersionPdfs]
-
-(
-	@VersionID int
-)
-WITH EXECUTE AS OWNER
-AS
-BEGIN TRY -- Try Block
-	BEGIN TRANSACTION
-	DELETE [Pdfs]
-		WHERE [DocID] IN(select EE.DocID from vefn_GetVersionItems(cast(@VersionID as varchar(20))) VI
-		Join Entries EE ON EE.ContentID= VI.ContentID)
-	IF( @@TRANCOUNT > 0 ) COMMIT
-END TRY
-BEGIN CATCH -- Catch Block
-	IF( @@TRANCOUNT = 1 ) ROLLBACK -- Only rollback if top level
- 	ELSE IF( @@TRANCOUNT > 1 ) COMMIT -- Otherwise commit.  Top level will rollback
-	EXEC vlnErrorHandler
-END CATCH
-GO
--- Display the status of Proc creation
-IF (@@Error = 0) PRINT 'Procedure Creation: deleteAllDocVersionPdfs Succeeded'
-ELSE PRINT 'Procedure Creation: deleteAllDocVersionPdfs Error on Creation'
-GO
 /****** Object:  StoredProcedure [addFiguresByROFstIDandImageIDs] ******/
 IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[addFiguresByROFstIDandImageIDs]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
     DROP PROCEDURE [addFiguresByROFstIDandImageIDs];
@@ -17169,6 +17158,7 @@ GO
 			[roid] [varchar](50) NOT NULL,
 			[appid] [varchar](max) NULL,
 			[value] [varchar](max) NULL,
+            [moddatetime] [datetime] NULL,
 		 CONSTRAINT [PK_RofstChild] PRIMARY KEY CLUSTERED 
 		(
 			[RofstChildID] ASC
@@ -17303,6 +17293,23 @@ GO
 	End -- Rofst Tables
 	Go
 
+	-- =============================================
+	-- Author:		Matthew Schill
+	-- Create date: 03/30/2026
+	-- Description:	Store RO Modification date/time
+	-- =============================================
+
+	--- Add Column to store RO  Modification date/time if it does not already exist
+	IF NOT EXISTS(SELECT *
+			  FROM   INFORMATION_SCHEMA.COLUMNS
+			  WHERE  TABLE_NAME = 'RofstChild'
+					 AND COLUMN_NAME = 'moddatetime') 
+	ALTER TABLE RofstChild ADD moddatetime datetime NULL;
+	go
+	-- Display the status
+	IF (@@Error = 0) PRINT 'Altered table [RofstChild] Succeeded for moddatetime'
+	ELSE PRINT 'Altered table [RofstChild] Error on Alter for moddatetime'
+	go
 
 	/*
 	----------------------------------------------------------------------------------
@@ -19705,6 +19712,7 @@ GO
 		@roid VarChar(50),
 		@appid VarChar(Max) = null,
 		@value VarChar(Max) = null,
+		@ModDateTime DateTime = null,
 		@missingDefaultValue VarChar(Max) = null
 	)
 	With Execute as Owner
@@ -19722,8 +19730,8 @@ GO
 			Set @missingDefaultValue = '[TBD]';
 
 		-- Create Rofst Child/Group Record --> [Roid = (12) Digits]
-		Insert Into RofstChild (RofstID, ID, ParentID, dbiID, [type], title, roid, appid, [value])
+		Insert Into RofstChild (RofstID, ID, ParentID, dbiID, [type], title, roid, appid, moddatetime, [value])
-		Values (@RofstID, @ID, @ParentID, @dbiID, @type, @title, @roid, @appid, REPLACE(REPLACE(@value, '&123;', '{'), '&125;', '}'));
+		Values (@RofstID, @ID, @ParentID, @dbiID, @type, @title, @roid, @appid, @ModDateTime, REPLACE(REPLACE(@value, '&123;', '{'), '&125;', '}'));
 
 
 		-- Check for appid, if exists, then insert the default value for each return type if multi-value
@@ -24777,6 +24785,256 @@ IF (@@Error = 0) PRINT 'Procedure Creation: [GetMissingDocsByUnit] Succeeded'
 ELSE PRINT 'Procedure Creation: [GetMissingDocsByUnit] Error on Creation'
 GO
 
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vefn_ROFST_changes]') AND OBJECTPROPERTY(id,N'IsTableFunction') = 1)
+    DROP FUNCTION [vefn_ROFST_changes];
+GO
+
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+	
+/*
+==========================================================================================================
+ Author:		Matthew Schill
+ Create Date:	03/31/2026
+ Description:	Function for ROs that updated in latest RO FST Load
+==========================================================================================================
+*/
+CREATE FUNCTION [dbo].[vefn_ROFST_changes](@OrigFSTID int, @NewFSTid int, @VersionID int)
+RETURNS @ROIDs TABLE
+(
+[roid] varchar(50)
+)
+WITH EXECUTE AS OWNER
+AS
+BEGIN
+
+    insert into @ROIDs
+	  SELECT DISTINCT ISNULL(RofstChild.roid,previous.roid)
+	    FROM 
+			(SELECT * FROM RofstChild where RofstChild.RofstID = @NewFSTid) RofstChild
+			FULL OUTER JOIN 
+			(SELECT * FROM RofstChild previous where previous.RofstID = @OrigFSTID) previous
+			ON previous.dbiID = RofstChild.dbiID AND previous.ID = RofstChild.ID 
+	    where	
+	    ISNULL(previous.RofstID,'') != ISNULL(RofstChild.RofstID,'')
+		AND
+	    (
+		 (RofstChild.RofstID = @NewFSTid OR RofstChild.RofstID IS NULL)
+		  AND
+		 (previous.RofstID = @OrigFSTID OR previous.RofstID IS NULL)
+		)
+		AND
+		(previous.moddatetime IS NULL 
+        OR RofstChild.moddatetime IS NULL 
+		OR RofstChild.moddatetime != previous.moddatetime
+		OR RofstChild.title != previous.title
+		OR RofstChild.value != previous.value
+		)
+
+	RETURN
+END
+go
+
+IF (@@Error = 0) PRINT 'TableFunction [vefn_ROFST_changes] Succeeded'
+ELSE PRINT 'TableFunction [vefn_ROFST_changes] Error on Creation'
+go
+
+/****** Object:  StoredProcedure [deleteDocVersionPdfsWithNewROs] ******/
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[deleteDocVersionPdfsWithNewROs]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+    DROP PROCEDURE [deleteDocVersionPdfsWithNewROs];
+GO
+	
+/*
+==========================================================================================================
+ Author:		Matthew Schill
+ Create Date:	03/31/2026
+ Description:	Delete all PDFs with ROs that will need re-resolved
+==========================================================================================================
+*/
+CREATE PROCEDURE [dbo].[deleteDocVersionPdfsWithNewROs]
+
+(
+	@VersionID int,
+    @OrigFSTid int,
+    @NewFSTid int
+)
+WITH EXECUTE AS OWNER
+AS
+ BEGIN
+	DELETE [Pdfs]
+		WHERE [DocID] IN 
+            (
+               select EE.DocID from vefn_GetVersionItems(cast(@VersionID as varchar(20))) VI
+		       Join Entries EE ON EE.ContentID= VI.ContentID
+			   Join DRoUsages ON DRoUsages.DocID = EE.DocID
+               Join dbo.vefn_ROFST_changes(@OrigFSTID, @NewFSTid, @VersionID) ROFST_changes on LEFT(DRoUsages.ROID,12) = ROFST_changes.roid
+            )
+
+	RETURN
+ END
+
+GO
+
+-- Display the status of Proc creation
+IF (@@Error = 0) PRINT 'Procedure Creation: deleteDocVersionPdfsWithNewROs Succeeded'
+ELSE PRINT 'Procedure Creation: deleteDocVersionPdfsWithNewROs Error on Creation'
+GO
+
+
+/****** Object:  StoredProcedure [getItemsWithNewROs] ******/
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getItemsWithNewROs]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+    DROP PROCEDURE [getItemsWithNewROs];
+GO
+
+/*
+==========================================================================================================
+ Author:		Matthew Schill
+ Create Date:	03/31/2026
+ Description:	Get Items with New ROs that will need resolved
+==========================================================================================================
+*/
+CREATE PROCEDURE [dbo].[getItemsWithNewROs]
+
+(
+	@VersionID int,
+    @OrigFSTid int,
+    @NewFSTid int
+)
+WITH EXECUTE AS OWNER
+AS
+ BEGIN
+	select DISTINCT tblItems.ItemID FROM
+	dbo.vefn_ROFST_changes(@OrigFSTID, @NewFSTid, @VersionID) ROFST_changes
+	INNER JOIN RoUsages ON LEFT(RoUsages.ROID,12) = ROFST_changes.roid
+	INNER JOIN tblItems ON RoUsages.ContentID = tblItems.ContentID
+	OUTER APPLY (Select VersionID =  dbo.vefn_GetVersionIDByItemID(tblItems.ItemID)) ver
+	INNER JOIN DocVersions DV ON DV.VersionID = ver.VersionID
+	INNER JOIN Associations ON Associations.VersionID = DV.VersionID
+	where ver.VersionID = @VersionID
+
+	RETURN
+ END
+
+GO
+
+-- Display the status of Proc creation
+IF (@@Error = 0) PRINT 'Procedure Creation: getItemsWithNewROs Succeeded'
+ELSE PRINT 'Procedure Creation: getItemsWithNewROs Error on Creation'
+GO
+
+/****** Object: StoredProcedure [dbo].[getRevisionByItemIDandRevisionNumber] ******/
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[getRevisionByItemIDandRevisionNumber]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+DROP PROCEDURE [dbo].[getRevisionByItemIDandRevisionNumber];
+GO
+
+/*****************************************************************************
+   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
+       Copyright 2012 - Volian Enterprises, Inc. All rights reserved.
+*****************************************************************************/
+CREATE PROCEDURE [dbo].[getRevisionByItemIDandRevisionNumber]
+
+(
+	@ItemID int,
+	@RevisionNumber nvarchar(50)
+)
+WITH EXECUTE AS OWNER
+AS
+declare @RevisionID int
+set @RevisionID = (select top 1 revisionid from revisions where itemid = @itemid and revisionnumber = @RevisionNumber order by revisionid desc)
+	SELECT
+		[RevisionID],
+		[ItemID],
+		[TypeID],
+		[RevisionNumber],
+		[RevisionDate],
+		[Notes],
+		[Config],
+		[DTS],
+		[UserID],
+		[LastChanged],
+		(SELECT COUNT(*) FROM [Checks] WHERE [Checks].[RevisionID]=[Revisions].[RevisionID]) [CheckCount],
+		(SELECT COUNT(*) FROM [Versions] WHERE [Versions].[RevisionID]=[Revisions].[RevisionID]) [VersionCount]
+	FROM [Revisions]
+	WHERE [RevisionID]=@RevisionID
+
+	SELECT
+		[Checks].[CheckID],
+		[Checks].[RevisionID],
+		[Checks].[StageID],
+		[Checks].[ConsistencyChecks],
+		[Checks].[DTS],
+		[Checks].[UserID],
+		[Checks].[LastChanged],
+		[Stages].[Name] [Stage_Name],
+		[Stages].[Description] [Stage_Description],
+		[Stages].[IsApproved] [Stage_IsApproved],
+		[Stages].[DTS] [Stage_DTS],
+		[Stages].[UserID] [Stage_UserID]
+	FROM [Checks]
+		JOIN [Stages]  ON
+			[Stages].[StageID]=[Checks].[StageID]
+	WHERE
+		[Checks].[RevisionID]=@RevisionID
+
+
+	SELECT
+		[Versions].[VersionID],
+		[Versions].[RevisionID],
+		[Versions].[StageID],
+		[Versions].[DTS],
+		[Versions].[UserID],
+		[Versions].[LastChanged],
+		[Versions].[PDF],
+		[Versions].[SummaryPDF],
+		[Stages].[Name] [Stage_Name],
+		[Stages].[Description] [Stage_Description],
+		[Stages].[IsApproved] [Stage_IsApproved],
+		[Stages].[DTS] [Stage_DTS],
+		[Stages].[UserID] [Stage_UserID]
+	FROM [Versions]
+		JOIN [Stages]  ON
+			[Stages].[StageID]=[Versions].[StageID]
+	WHERE
+		[Versions].[RevisionID]=@RevisionID
+
+	RETURN
+
+-- Display the status of Proc creation
+IF (@@Error = 0) PRINT 'Procedure Creation: getRevisionByItemIDandRevisionNumber Succeeded'
+ELSE PRINT 'Procedure Creation: getRevisionByItemIDandRevisionNumber Error on Creation'
+GO
+
+/*
+==========================================================================================================
+ Author:		Matthew Schill
+ Create Date:	06/29/2026
+ Description:	Added an ISNULL check when setting GridAudits.contentauditid.
+    Was Causing Deletion of some Grids to fail.
+==========================================================================================================
+*/
+/****** Object:  Trigger [tr_Contents_Delete] ******/
+ALTER trigger [dbo].[tr_Contents_Delete] on [dbo].[Contents] instead of delete as 
+	begin
+		update ii set DeleteStatus = (select max(DeleteID) from DeleteLog where SPID = @@spid), ActionDTS = getdate(),
+		UserID = (select top 1 UserID from DeleteLog where SPID = @@spid order by deleteid desc)
+		from tblContents ii inner join deleted dd on dd.ContentID = ii.ContentID
+		insert into ContentAudits(ContentID,Number,Text,Type,FormatID,Config,DTS,UserID,DeleteStatus,ActionDTS)
+		select ii.ContentID,ii.Number,ii.Text,ii.Type,ii.FormatID,ii.Config,ii.DTS,ii.UserID,ii.DeleteStatus,ii.ActionDTS
+		from tblContents ii inner join deleted dd on dd.ContentID = ii.ContentID
+		where ii.DeleteStatus > 0
+		update ga set ga.contentauditid = (select ISNULL(max(auditid),0) from contentaudits where contentid = ga.contentid and deletestatus = ga.deletestatus)
+		from gridaudits ga join deleted dd on ga.contentid = dd.contentid where ga.contentauditid = 0
+	end
+go
+
+-- Display the status of Trigger alter
+IF (@@Error = 0) PRINT 'Trigger Alteration: tr_Contents_Delete Succeeded'
+ELSE PRINT 'Trigger Alteration: tr_Contents_Delete Error on Creation'
+GO
+
 /*
   ---------------------------------------------------------------------------
   |                       ADD New Code Before this Block                    |
@@ -24810,8 +25068,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '03/13/2026 7:00 AM'
+	set @RevDate = '07/16/2026 8:30 AM'
-	set @RevDescription = 'Added Get Missing Docs by Unit for Generating Pdf table'
+	set @RevDescription = 'Reworked ve_GetParentItem for Performance improvement'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

PROMS/VEPROMS User Interface/dlgApproveProcedure.cs

@@ -67,6 +67,7 @@ namespace VEPROMS
             MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
             _MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing
             ApplicabilityIndex = myDocVersion.DocVersionConfig.SelectedSlave;
+            _MyApproval.SavedSlave = ApplicabilityIndex;
             this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
             this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
             _MyDocVersion = myDocVersion;
@@ -292,6 +293,7 @@ namespace VEPROMS
             expAddProcConChk.Expanded = true;
             _initializing = true;
             ApplicabilityIndex = myDocVersion.DocVersionConfig.SelectedSlave;
+            _MyApproval.SavedSlave = ApplicabilityIndex;
             InitializePanelApprove();
             InitializePanelSelect();
             _initializing = false;
@@ -306,6 +308,7 @@ namespace VEPROMS
             _MyDocVersion = myProcedure.MyDocVersion;
             _MyDocVersion.ResetProcedures();    // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list
             ApplicabilityIndex = _MyDocVersion.DocVersionConfig.SelectedSlave; // B2022-033 set the child being approved or workflow so other procedure list can populate
+            _MyApproval.SavedSlave = ApplicabilityIndex;
             InitializeComponent();
             FlexGridAddEvents();
             SetupComboBoxes();
@@ -914,6 +917,11 @@ namespace VEPROMS
             get { return _MyProcedures; }
             //set { _MyProcedures = value; }
         }
+
+        //B2026-058 - If approving multiple procedures at the same time with a multiunit set and one of the procedures is open, PROMS sometimes loses that it is set for an individual unit.
+        // this will save the SectedSlave in case a refresh causes it to get lost
+        public int SavedSlave { get; set; } = 0;
+
         public ApprovalInfo(frmVEPROMS myFrmVEPROMS)
         {
             MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
@@ -1173,9 +1181,14 @@ namespace VEPROMS
                 string pdfPath = string.Format(@"{0}\{1}", VlnSettings.TemporaryFolder, pdfTmp);
                 if (!TryToDelete(summaryPDF, "Change Summary")) break;
 				if (!TryToDelete(pdfPath,revisionStage)) break;
+                if (SavedSlave > 0 && ap.ProcInfo.MyDocVersion.DocVersionConfig.SelectedSlave < 1)
+                {
+                    //B2026-058 - If approving multiple procedures at the same time with a multiunit set and one of the procedures is open, PROMS sometimes loses that it is set for an individual unit.
+                    ap.ProcInfo.MyDocVersion.DocVersionConfig.SelectedSlave = SavedSlave;
+                }
                 procsApproved.Add(ap.ProcInfo.DisplayNumber + " " + ap.ProcInfo.DisplayText);
                 RevisionInfo ric = pi.MyDocVersion.DocVersionConfig.SelectedSlave > 0 ? RevisionInfo.GetCurrentByItemIDandUnitID(pi.ItemID, pi.MyDocVersion.DocVersionConfig.SelectedSlave) : RevisionInfo.GetCurrentByItemID(pi.ItemID);
-//				RevisionInfo rip = RevisionInfo.GetPreviousByItemID(pi.ItemID);
+                //				RevisionInfo rip = RevisionInfo.GetPreviousByItemID(pi.ItemID);
 				DateTime myDTS = pi.DTS;			// pi.DTS is date of last approval 
                 string cbDTS = (pi.MyConfig as ProcedureConfig).Print_ChangeBarDate;
                 // pi.DTS was the field that was used to store the approval date before master/slave code was added. Use ChangeBarDate if it is set - this is set either manually if no approval date (from treeview menu) or 
@@ -1343,6 +1356,8 @@ namespace VEPROMS
                     //// so change bars update
                     //// on any open StepPanel
 
+                    newproc = ItemInfo.ResetProcedure(pi.ItemID);
+
                     //B2026-019 Attempt to prevent an Access Error by utilizing a different Refresh if a Procedure is Open
                     DisplayTabItem dti = MyFrmVEPROMS.GetTabContainingProcedure(pi.ItemID);
                     if (dti != null)
@@ -1350,19 +1365,9 @@ namespace VEPROMS
                         if (!dti.MyStepTabPanel.MyStepPanel.ContainsFocus)
                             dti.MyStepTabPanel.MyStepPanel.Focus();
 
-						foreach (EditItem eitm in dti.MyStepTabPanel.MyStepPanel.Controls.OfType<EditItem>())
-                        {
-                            eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar;
-                        }
-
                         dti.MyStepTabPanel.MyStepTabRibbon.RefreshProcedure();
                         Application.DoEvents();
-                        newproc = ProcedureInfo.Get(pi.ItemID);
 
-                    }
-					else
-					{
-                        newproc = ItemInfo.ResetProcedure(pi.ItemID);
                     }
 
                     //since in a separate form, need to update the tree view
@@ -1478,19 +1483,34 @@ namespace VEPROMS
         {
             ProcedureConfig pc = procedureInfo.MyConfig as ProcedureConfig;
             if (pc == null) return;
+
             pc.SelectedSlave = selectedSlave;
             pc.Print_Rev = revNumber;
             //AppRevDate Change
             pc.Print_RevDate = revDate.ToString("MM/dd/yyyy");
-			pc.Print_ChangeBarDate = dts.ToString("MM/dd/yyyy HH:mm:ss");
+            pc.Print_ChangeBarDate = dts.ToString("MM/dd/yyyy HH:mm:ss");  //this is needed to set the changebar date for an indeividual unit also
             using (Item itm = Item.Get(procedureInfo.ItemID))
             {
                 itm.MyContent.Config = pc.ToString();
                 //itm.DTS = dts;
                 itm.UserID = Volian.Base.Library.VlnSettings.UserID;
                 itm.Save();
-			}
 
+                //C2026-015 set overall change bar date
+                if (selectedSlave > 0)
+                {
+                    pc.SelectedSlave = 0;
+                    pc.Print_Rev = revNumber;
+                    pc.Print_RevDate = revDate.ToString("MM/dd/yyyy");
+                    pc.Print_ChangeBarDate = dts.ToString("MM/dd/yyyy HH:mm:ss");  //this is needed to set the changebar date for an indeividual unit also
+                    using (Item itm2 = Item.Get(procedureInfo.ItemID))
+                    {
+                        itm2.MyContent.Config = pc.ToString();
+                        itm2.UserID = Volian.Base.Library.VlnSettings.UserID;
+                        itm2.Save();
+                    }
+                }
+            }
         }
     }
     public class RevType

PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.cs

@@ -68,8 +68,26 @@ namespace VEPROMS
 			MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss");// ("MM/dd/yyyy HH:mm:ss");
 
             //CSM - C2026-010 - Add Audit Record for Change Bar Audit History
-            ChangeBarAuditHistory.AddAudit(MyProcInfo.ItemID, $"Set ChangeBars set to ({ dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss")}) by ({ VlnSettings.UserID}) on ({DateTime.Now})", DateTime.Now, VlnSettings.UserID, 0);
+            ChangeBarAuditHistory.AddAudit(MyProcInfo.ItemID, $"Set ChangeBars set to ({dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss")}) by ({VlnSettings.UserID}) on ({DateTime.Now})", DateTime.Now, VlnSettings.UserID, 0);
 
+            //CSM C2026-014 if multi-unit, set for each unit
+            System.Data.DataTable dt = RevisionData.GetRevisionDataByUnit(MyProcInfo.ItemID);
+            if (RevisionData.HasUnits(dt))
+            {
+                //Change the ChangeBarDate for each unit
+                foreach (DataRow r in dt.Rows)
+                {
+                    if (!r.IsNull("UnitID"))
+                    {
+                        MyProcConfig.SelectedSlave = Convert.ToInt32(r["UnitID"]);
+                        MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss");
+
+                        //CSM - C2026-010 - Add Audit Record for Change Bar Audit History
+                        ChangeBarAuditHistory.AddAudit(MyProcInfo.ItemID, $"Set ChangeBars set to ({dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss")}) by ({VlnSettings.UserID}) on ({DateTime.Now}) for (Unit {r["UnitName"]})", DateTime.Now, VlnSettings.UserID, MyProcConfig.SelectedSlave);
+                    }
+                }
+                MyProcConfig.SelectedSlave = 0;
+            }
         }
 
 
@@ -107,9 +125,12 @@ namespace VEPROMS
 				StringBuilder sb = new StringBuilder();
 				sb.Append($"     The Procedure Viewer Change Bar Date will be set to ({maxDTS}).");
                 foreach (DataRow r in dt.Rows)
+                {
+                    if (!r.IsNull("UnitID"))
                     {
                         sb.Append($"\r\n     The Change Bar Date for Unit ({r["UnitName"]}) will be set to ({Convert.ToDateTime(r["DTS"]):MM/dd/yyyy HH:mm:ss}).");
                     }
+                }
 
                 sb.Append("\r\n     Any Change Bars for Units not listed above will use the Overall/Procedure Viewer Change Bar Date (as these Units have no approvals).");
 
@@ -121,12 +142,14 @@ namespace VEPROMS
                     //Change the ChangeBarDate for each unit
                     foreach (DataRow r in dt.Rows)
 					{
+                        if (!r.IsNull("UnitID"))
+                        {
                             MyProcConfig.SelectedSlave = Convert.ToInt32(r["UnitID"]);
                             MyProcConfig.Print_ChangeBarDate = Convert.ToDateTime(r["DTS"]).ToString("MM / dd / yyyy HH: mm: ss");
 
                             //CSM - C2026-010 - Add Audit Record for Change Bar Audit History
                             ChangeBarAuditHistory.AddAudit(MyProcInfo.ItemID, $"Reset ChangeBars performed by ({VlnSettings.UserID}) on ({DateTime.Now}). ChangeBars reset to show since last approval ({Convert.ToDateTime(r["DTS"]):MM/dd/yyyy HH:mm:ss}) for (Unit {r["UnitName"]})", DateTime.Now, VlnSettings.UserID, MyProcConfig.SelectedSlave);
-
+                        }
                     }
                     MyProcConfig.SelectedSlave = 0;
                     DialogResult = DialogResult.OK;

PROMS/VEPROMS User Interface/frmBatchRefresh.cs

@@ -1036,6 +1036,9 @@ namespace VEPROMS
 			ROFstInfo roFstInfo = dq.DocVersionAssociations[0].MyROFst;
 			string rofstPath = roFstInfo.MyRODb.FolderPath + @"\ro.fst";
 
+            //must get id before ROFST gets updated so know what to refresh later
+            int origfstid = roFstInfo.ROFstID;
+
             //if (!pathExists(rofstPath))
             if (!File.Exists(rofstPath))
 			{
@@ -1063,8 +1066,28 @@ namespace VEPROMS
 					ROFstInfo.UpdateRoFst(roFstInfo.MyRODb, dv, roFstInfo, DoProgressBarRefresh);
 					roFstInfo = dq.DocVersionAssociations[0].MyROFst;
 				}
+                else if (!dv.ROfstLastCompleted && origfstid == roFstInfo.ROFstID)
+                {
+                    //Handle issue where load failed without completing update
+                    //previous RO FST did not load, get last loaded ID
+					//if none, use -1 which will check all ROs in the Working Draft
+                    string cfg = dv.DocVersionAssociations[0].Config;
+                    AssociationConfig ac = new AssociationConfig((cfg == null || cfg.Length == 0) ? "<Config />" : cfg);
+                    if (dv.DocVersionAssociations[0]?.MyROFst != null)
+                    {
+                        if (!int.TryParse(ac.ROUpdate_PrevROFSTID, out origfstid))
+                        {
+                            origfstid = -1;
+                        }
+                    }
+                    else
+                    {
+                        origfstid = -1;
+                    }
+                }
+
                 roFstInfo.ROTableUpdate += new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
-				ROFst newrofst = ROFstInfo.RefreshROFst(dv, roFstInfo, DoProgressBarRefresh, txtProcess);
+                ROFstInfo.RefreshROFstAtItemLevel(DocVersionInfo.Get(dv.VersionID), DoProgressBarRefresh, txtProcess, roFstInfo, origfstid, roFstInfo.ROFstID);
                 roFstInfo.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
 			}
 
@@ -1316,9 +1339,9 @@ namespace VEPROMS
 			{
 				if (ProgressBar == null) return;
 
-				ProgressBar.Value = 100;
-				ProgressBar.Maximum = 100;
                 ProgressBar.Text = value;
+                ProgressBar.Maximum = 100;
+                ProgressBar.Value = 100;
                 txtProcess.AppendText(value);
 				txtProcess.AppendText(Environment.NewLine);
 				txtProcess.AppendText(Environment.NewLine);

PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs

@@ -83,7 +83,6 @@ namespace VEPROMS
 			this.lblUser = new DevComponents.DotNetBar.LabelItem();
 			this.lblLastChange = new DevComponents.DotNetBar.LabelItem();
 			this.btnStepRTF = new DevComponents.DotNetBar.ButtonItem();
-			this.btnFixMSWord = new DevComponents.DotNetBar.ButtonItem();
 			this.epAnnotations = new DevComponents.DotNetBar.ExpandablePanel();
 			this.ctrlAnnotationDetails = new Volian.Controls.Library.AnnotationDetails();
 			this.btnAnnoDetailsPushPin = new DevComponents.DotNetBar.ButtonX();
@@ -541,8 +540,7 @@ namespace VEPROMS
 			this.btnEditItem,
 			this.lblUser,
 			this.lblLastChange,
-			this.btnStepRTF,
+			this.btnStepRTF});
-			this.btnFixMSWord});
 			this.bottomBar.Location = new System.Drawing.Point(5, 573);
 			this.bottomBar.Name = "bottomBar";
 			this.bottomBar.Size = new System.Drawing.Size(1185, 25);
@@ -728,14 +726,6 @@ namespace VEPROMS
 			this.btnStepRTF.Text = "Step RTF";
 			this.btnStepRTF.Click += new System.EventHandler(this.btnStepRTF_Click);
 			// 
-			// btnFixMSWord
-			// 
-			this.btnFixMSWord.ForeColor = System.Drawing.Color.Black;
-			this.btnFixMSWord.Name = "btnFixMSWord";
-			this.btnFixMSWord.Text = "Fix Symbol Fonts";
-			this.btnFixMSWord.Visible = false;
-			this.btnFixMSWord.Click += new System.EventHandler(this.btnFixMSWord_Click);
-			// 
 			// epAnnotations
 			// 
 			this.epAnnotations.CanvasColor = System.Drawing.SystemColors.Control;
@@ -1775,7 +1765,6 @@ namespace VEPROMS
 		private DevComponents.DotNetBar.ButtonItem btnItemInfo;
 		private DevComponents.DotNetBar.ButtonItem btnFilter;
 		private DevComponents.DotNetBar.TextBoxItem txtFilter;
-		private DevComponents.DotNetBar.ButtonItem btnFixMSWord;
 		private Volian.Controls.Library.DisplayBookMarks displayBookMarks;
 		//private DevComponents.DotNetBar.LabelItem lblLocked;
 		private DevComponents.DotNetBar.ButtonItem btnShortCuts;

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -246,6 +246,10 @@ namespace VEPROMS
 
 			tc.MyCopyStep = myParent.tc.MyCopyStep; // copy the copystep info to the child window
             
+			//B2026 - 048 View Only Mode freezes PROMS if last tab closed
+            tc.EnableDisableStepProperties -= EnableDisableStepProperties;
+            tc.EnableDisableStepProperties += new StepTabRibbonEvent(EnableDisableStepProperties);
+
             (tv.Nodes[0] as VETreeNode).InChildWindow = true; // tells us this folder's tree nodes are in the child window
 		}
 
@@ -352,6 +356,7 @@ namespace VEPROMS
 
 			displayRO.TabControl = tc; // B2019-043 this was being passed in as a parameter for DisplayRO which caused issues with the Visual Studio designer
 			bottomProgBar.ValueChanged += new EventHandler(bottomProgBar_ValueChanged);
+			tc.EnableDisableStepProperties += new StepTabRibbonEvent(EnableDisableStepProperties);
 
             // When creating an XY Plot, a System.Drawing.Graphics is needed and it requires a form.  Use the main form.
             if (VlnSettings.DebugMode)
@@ -964,7 +969,18 @@ namespace VEPROMS
 			{
 				pnl.ApplDisplayMode = displayApplicability.ViewMode;
 				displayHistory.ApplDisplayMode = pnl.ApplDisplayMode;
+
+                //C2026-021 Expand Functionality of Viewing Mode
+                if (pnl.ApplDisplayMode > 0 && pnl.VwMode != E_ViewMode.View)
+                {
+                    pnl.VwMode = E_ViewMode.View;
+                    EnableDisableStepProperties(sender, new StepTabRibbonEventArgs(tc.SelectedDisplayTabItem.MyItemInfo, 0, pnl.VwMode));
+                    MessageBox.Show("Changing to View Only Mode. Applicability Viewing Mode must be Master to return to Edit Mode. View Mode can be toggled off via the Ribbon->View tab.", "Changing to View Mode", MessageBoxButtons.OK, MessageBoxIcon.Warning);
                 }
+
+                pnl.MyStepTabPanel.MyStepTabRibbon.RefreshProcedure();
+			}
+
 		}
 
 		void tv_ViewPDF(object sender, vlnTreeViewPdfArgs args)
@@ -985,7 +1001,7 @@ namespace VEPROMS
 				fs.Close();
 				System.Diagnostics.Process.Start(fileName);
 			}
-			catch (Exception ex)
+			catch (Exception)
 			{
 				StringBuilder sb = new StringBuilder();
 
@@ -1594,7 +1610,7 @@ namespace VEPROMS
 					displayRO.MyROFST = SelectedROFst;
                     // B2023-021: force Load of Step Prop/RO panel RO tree by passing in
                     //   true to LoadTree
-					displayRO.LoadTree(true);
+                    if (!_WeAreExitingPROMS) displayRO.LoadTree(true);
 				}
 			}
 
@@ -1751,7 +1767,7 @@ namespace VEPROMS
 			}
 			else if (args.TypesSelected == "Complete RO Report")
 			{
-				Volian.Print.Library.PDFReport myReport = new Volian.Print.Library.PDFReport(args.ReportTitle, args.RODataFile, Volian.Base.Library.VlnSettings.TemporaryFolder + @"\CompleteROReport.pdf", args.RofstLookup, args.CompleteROReport, args.ConvertCaretToDelta, args.IncludeEmptyROFields, args.PaperSize);
+				Volian.Print.Library.PDFReport myReport = new Volian.Print.Library.PDFReport(args.ReportTitle, args.RODataFile, Volian.Base.Library.VlnSettings.TemporaryFolder + @"\CompleteROReport.pdf", args.RofstLookup, args.ConvertCaretToDelta, args.IncludeEmptyROFields, args.PaperSize);
 				myReport.Build();
 			}
 			else if (args.TypesSelected == "RO Summary Report")
@@ -2132,7 +2148,7 @@ namespace VEPROMS
 						//C2019-036 View Only mode work with Checked Out Procedures
 						// View Only Mode is no longer checked out, so no longer has an OwnerID
 						// This will keep those tabs from auto-closing based on the timer
-						if (!myList.Contains(dti.OwnerID) && dti.MyStepTabPanel.MyStepPanel.VwMode != E_ViewMode.View)
+						if (!myList.Contains(dti.OwnerID) && dti?.MyStepTabPanel?.MyStepPanel?.VwMode != E_ViewMode.View)
 						{
 							MyCloseTabList.PushDTI(dti);
 						}
@@ -2395,6 +2411,7 @@ namespace VEPROMS
 			tv.MySessionInfo = MySessionInfo;
 			tv.MyUserInfo = MyUserInfo;
 			StepTabRibbon.MySessionInfo = MySessionInfo;
+            displayRO.MySessionInfo = MySessionInfo;
 
             // Initialize Caption with Server name and Database name.
             SetCaption(tv.TopNode as VETreeNode);
@@ -3561,6 +3578,7 @@ namespace VEPROMS
 			{
 				if (parameter.StartsWith("/P="))
 				{
+					BaseLnSettings.blBaseLine = true;
 					MSWordToPDF.Automatic = true;
 					PromsPrinter.BaselineTesting = true;// Set Baseline Testing property for PROMsPrinter
 					string[] dvstrs = parameter.Substring(3).Split(",".ToCharArray());
@@ -3606,7 +3624,7 @@ namespace VEPROMS
 						}
 						ranAuto = true;
 					}
-
+					BaseLnSettings.blBaseLine = false;
 					if (ranAuto)
 					{
 						this.Close();
@@ -4482,7 +4500,6 @@ namespace VEPROMS
 			{
 				infoPanel.Expanded = true;
 				infoTabs.SelectedTab = infotabTags;
-				displayTags.HighlightChangeStep();
 			}
 			else if (args.PanelTabName == "Change Image Size")
 			{
@@ -4553,6 +4570,15 @@ namespace VEPROMS
 			SetCaption(tv.SelectedNode as VETreeNode);
 			displayApplicability.MyDisplayTabItem = tc.SelectedDisplayTabItem;
 
+            //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+            // DisplayTab was changed
+            // need to clear the RTB selected
+            // without resetting the DVI or FST
+            // (those will be set manually / individually)
+            // this will prevent DVI and FST from changing to null then back again
+            // which will trigger reloads            
+            displayRO.ClearRTB();
+
             if (tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.DocVersionAssociationCount > 0)
 			{
 				displayRO.MyROFST = tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst;
@@ -4562,9 +4588,24 @@ namespace VEPROMS
 				displayRO.MyROFST = null;
 			}
 
+            //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+			// set the DocVersionInfo so that the FST and docversion are in sync
+            SelectedDVI = tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion;
+            if (displayRO.MyDvi != SelectedDVI)
+            {
+                displayRO.MyDvi = SelectedDVI;
+            }
+			Application.DoEvents();
+
             // B2022-026 RO Memory reduction coding (Jakes Merge)
             // B2022-123: RO Tab Treeview not showing correct RO values when switching between procedures. (Added True for the forceLoad parameter)
-			displayRO.LoadTree(true);
+            //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+            // if ROFST got updated,
+			// set the Selected FST so it is in sync
+            if (!_WeAreExitingPROMS && displayRO.LoadTree(true))
+			{
+				SelectedROFst = displayRO.MyROFST;
+            }
 
 			lblUser.Text = tc.SelectedDisplayTabItem.MyUserRole;
 
@@ -4579,7 +4620,7 @@ namespace VEPROMS
 					//           also change the text on the buttons to read either Find or Find/Replace
 					//           also toggle the Replace tab on the dialog based on the user's accessibility to the procedure
 					bool isReviewer = !MyUserInfo.IsAllowedToEdit(tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion);
-					pnl.MyStepTabPanel.MyStepTabRibbon.SetButtonAndMenuEnabling(true);
+					pnl.MyStepTabPanel.MyStepTabRibbon.SetButtonAndMenuEnabling();
 					this.dlgFindReplace.ToggleReplaceTab(isReviewer ? E_ViewMode.View : E_ViewMode.Edit);
 					pnl.MyStepTabPanel.MyStepTabRibbon.ToggleFindReplaceToolTip(isReviewer);
 				}
@@ -4628,8 +4669,6 @@ namespace VEPROMS
 			if (args != null && args.MyEditItem != null && !args.MyEditItem.MyStepPanel.ContainsFocus)
 				return;
 
-			btnFixMSWord.Visible = (args != null && (args.MyItemInfo != null && args.MyEditItem == null));
-
 			if (_LastStepRTB != null && !_LastStepRTB.Disposing && !_LastStepRTB.Closed)
 				_LastStepRTB.EditModeChanged -= new StepRTBEvent(_LastStepRTB_EditModeChanged);
 
@@ -4767,7 +4806,13 @@ namespace VEPROMS
 					// B2022-026 RO Memory reduction coding (Jakes Merge)
 					displayRO.ProgressBar = bottomProgBar;
 					displayRO.MyRTB = args.MyEditItem.MyStepRTB;
-					displayRO.LoadTree(); 
+                    //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+                    // if ROFST got updated,
+                    // set the Selected FST so it is in sync
+                    if (!_WeAreExitingPROMS && displayRO.LoadTree())
+                    {
+                        SelectedROFst = displayRO.MyROFST;
+                    }
 
                     displayBookMarks.MyEditItem = args.MyEditItem;
 					displayHistory.MyEditItem = args.MyEditItem;
@@ -4797,7 +4842,7 @@ namespace VEPROMS
 
 					// B2022-026 RO Memory reduction coding (Jakes Merge)
 					displayRO.SetFindDocROButton(false);
-					displayRO.LoadTree();
+					if (!_WeAreExitingPROMS) displayRO.LoadTree();
 
                     //C2019-036 View Only mode work with Checked Out Procedures
                     //In View Only Mode - Step Properties should be disabled
@@ -4838,15 +4883,31 @@ namespace VEPROMS
 		//In View Only Mode - Step Properties should be disabled
 		public void EnableDisableStepProperties(object sender, StepTabRibbonEventArgs args)
 		{
-            if (args.ViewMode == E_ViewMode.View && (infoTabs.Enabled || infoTabs.SelectedTab != infotabTags))
+            //C2026 - 021 Expand Functionality of Viewing Mode
+            //B2026 - 048 View Only Mode freezes PROMS if last tab closed
+            if (args.ViewMode == E_ViewMode.View && (infotabControlPanelTags.Enabled || (infoTabs.SelectedTab != infotabTags && infoTabs.SelectedTab != infotabApplicability)))
+            {
+				if (infoTabs.SelectedTab != infotabApplicability)
                 {
-				infoTabs.Enabled = true;
                     infoTabs.SelectedTab = infotabTags;
-                infoTabs.Enabled = false;
                 }
-			else if (args.ViewMode != E_ViewMode.View && !infoTabs.Enabled)
+
+                infotabControlPanelTags.Enabled = false;
+                infotabControlPanelRO.Enabled = false;
+                infotabControlPanelTransitions.Enabled = false;
+                tabControlPanel1.Enabled = false;
+				displayApplicability.SetEnableDisableItemSelection(false);
+                tcpFoldoutMaint.Enabled = false;
+
+            }
+			else if (args.ViewMode != E_ViewMode.View && !infotabControlPanelTags.Enabled)
 			{
-                infoTabs.Enabled = true;
+                infotabControlPanelTags.Enabled = true;
+                infotabControlPanelRO.Enabled = true;
+                infotabControlPanelTransitions.Enabled = true;
+                tabControlPanel1.Enabled = true;
+                displayApplicability.SetEnableDisableItemSelection(true);
+                tcpFoldoutMaint.Enabled = true;
             }
         }
 
@@ -4931,7 +4992,13 @@ namespace VEPROMS
 			displayRO.CurROLink = args.MyLinkText.MyRoUsageInfo;
 
             // B2022-026 RO Memory reduction coding (Jakes Merge)
-			displayRO.LoadTree();
+            //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+            // if ROFST got updated,
+            // set the Selected FST so it is in sync
+            if (displayRO.LoadTree())
+            {
+                SelectedROFst = displayRO.MyROFST;
+            }
         }
 
 		#endregion
@@ -5199,8 +5266,8 @@ namespace VEPROMS
 			{
 				if (SelectedDVI != null)
 					displayReports.Mydocversion = SelectedDVI;
-				displayReports.advTreeProcSetsFillIn(reportFocus);
+				displayReports.advTreeProcSetsFillIn();
-				displayReports.advTreeROFillIn(reportFocus);
+				displayReports.advTreeROFillIn();
 				displayReports.SelectReferencedObjectTab(); // to enable RO selection
 			}
 		}
@@ -5241,19 +5308,6 @@ namespace VEPROMS
 				Clipboard.SetDataObject(mydo);
 			}
 		}
-		private void btnFixMSWord_Click(object sender, EventArgs e)
-		{
-			if (tc.SelectedDisplayTabItem != null && tc.SelectedDisplayTabItem.MyDSOTabPanel != null)
-			{
-				string btnText = btnFixMSWord.Text;
-				btnFixMSWord.FixedSize = btnFixMSWord.Size;
-				btnFixMSWord.Text = "Processing  ...";
-				this.Cursor = Cursors.WaitCursor;
-				tc.SelectedDisplayTabItem.MyDSOTabPanel.FixSymbolCharacters();
-				btnFixMSWord.Text = btnText;
-				this.Cursor = Cursors.Default;
-			}
-		}
 
 		private void epAnnotations_Resize(object sender, EventArgs e)
 		{

PROMS/VEPROMS User Interface/frmVersionsProperties.cs

@@ -899,9 +899,9 @@ namespace VEPROMS
 			set
 			{
 				if (ProgressBar == null) return;
+                ProgressBar.Text = value;
                 ProgressBar.Maximum = 100;
                 ProgressBar.Value = 100;
-				ProgressBar.Text = value;
                 Application.DoEvents();
 			}
 		}
@@ -1527,6 +1527,9 @@ namespace VEPROMS
 
 				Cursor = Cursors.WaitCursor;
 
+                //must get id before ROFST gets updated so know what to refresh later
+                int origfstid = SelectedROFst.ROFstID;
+
                 // RO changes placed in file in the Documents\VEPROMS folder
                 swROUpdate = new System.IO.StreamWriter(ROFstInfo.ROUpdateResultsPath(_DocVersionConfig.MyDocVersion.MyDocVersionInfo));
 				DocVersion dv = _DocVersionConfig.MyDocVersion;
@@ -1536,11 +1539,30 @@ namespace VEPROMS
 					ROFstInfo.UpdateRoFst(SelectedROFst.MyRODb, dv, SelectedROFst, DoProgressBarRefresh);
 					SelectedROFst = null; // set to null to force getting the updated ROfst
 				}
+                else if (!dv.ROfstLastCompleted && origfstid == SelectedROFst.ROFstID)
+                {
+                    //Handle issue where load failed without completing update
+                    //previous RO FST did not load, get last loaded ID
+                    //if none, use -1 which will check all ROs in the Working Draft
+                    string cfg = dv.DocVersionAssociations[0].Config;
+                    AssociationConfig ac = new AssociationConfig((cfg == null || cfg.Length == 0) ? "<Config />" : cfg);
+                    if (dv.DocVersionAssociations[0]?.MyROFst != null)
+                    {
+                        if (!int.TryParse(ac.ROUpdate_PrevROFSTID, out origfstid))
+                        {
+                            origfstid = -1;
+                        }
+                    }
+                    else
+                    {
+                        origfstid = -1;
+                    }
+                }
 
                 ContentInfo.StaticContentInfoChange += ContentInfo_StaticContentInfoChange; // write changes to a text file
 				SelectedROFst.ROTableUpdate += new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
 
-				ROFst newrofst = ROFstInfo.RefreshROFst(_DocVersionConfig.MyDocVersion, SelectedROFst, DoProgressBarRefresh, null);
+				ROFstInfo.RefreshROFstAtItemLevel(DocVersionInfo.Get(dv.VersionID), DoProgressBarRefresh, null, SelectedROFst, origfstid, SelectedROFst.ROFstID);
 
                 ContentInfo.StaticContentInfoChange -= ContentInfo_StaticContentInfoChange;
 				SelectedROFst.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);

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

@@ -124,6 +124,23 @@ namespace VEPROMS.CSLA.Library
 				_Xp["ROUpdate", "LoadingFigures"] = value; // save selected value
 			}
 		}
+
+        [Category("RO Update")]
+        [DisplayName("Previous ROFSTID")]
+        [RefreshProperties(RefreshProperties.All)]
+        [Description("Previous ROFSTID")]
+        public string ROUpdate_PrevROFSTID
+        {
+            get
+            {
+                string s = _Xp["ROUpdate", "PrevROFSTID"];// get the saved value
+                return s;
+            }
+            set
+            {
+                _Xp["ROUpdate", "PrevROFSTID"] = value; // save selected value
+            }
+        }
         #endregion // ROUpdate
         #region ToString
         public override string ToString()

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

@@ -8,7 +8,6 @@ using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
-using static System.Net.Mime.MediaTypeNames;
 
 
 namespace VEPROMS.CSLA.Library
@@ -61,6 +60,7 @@ namespace VEPROMS.CSLA.Library
 		#region Structs / Internal Classes
 
 		[Serializable]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Keep Older Pre-existing naming conventions")]
         public struct roHdr
 		{
 			public int hSize;
@@ -78,6 +78,7 @@ namespace VEPROMS.CSLA.Library
 		};
 
 		[Serializable]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Keep Older Pre-existing naming conventions")]
         public struct rodbi
 		{
 			public int dbiID;
@@ -91,16 +92,19 @@ namespace VEPROMS.CSLA.Library
 		};
 
 		[Serializable]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Keep Older Pre-existing naming conventions")]
         public struct rogrp
 		{
 			public string value;
 			public string appid;
 			public int ID;
 			public int ParentID;
+			public DateTime? ModDateTime;  //C2026-008 Re-Architect RO.FST to include RO Modification date/time
             public rochild[] children;
 		};
 
 		[Serializable]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Keep Older Pre-existing naming conventions")]
         public struct rochild
 		{
 			public int ID;
@@ -110,6 +114,7 @@ namespace VEPROMS.CSLA.Library
 			public string roid;         // roid unique identifier
 			public string appid;        // accessory page id - user specified unique id
 			public string value;        // return value, can be multiple values
+            public DateTime? ModDateTime;  //C2026-008 Re-Architect RO.FST to include RO Modification date/time
             public rochild[] children;
 		};
 
@@ -131,7 +136,7 @@ namespace VEPROMS.CSLA.Library
 		private List<string> _baseAccPageKeys;
 
 		// RofstLookup/Conversion Variables
-		private int _rofstID;
+		private readonly int _rofstID;
 		private DocVersionInfo _myDocVersionInfo;
 		private int _selectedSlave;
 		private string _otherChild = string.Empty;
@@ -147,7 +152,7 @@ namespace VEPROMS.CSLA.Library
 		// B2022-107: Display Progress Bar Messages/Statuses when a new ROFST binary file is loaded into the database
 		private frmRofstLoadStatus _frmRofstLoadStatus = null;
 		private Dictionary<int, int> _dicRoCounts = null;
-		private bool _showLoadingStatus = true;
+		private readonly bool _showLoadingStatus = true;
 
 		private int _curRoCnt = 0;
 		private int _dbRoCnt = 0;
@@ -412,7 +417,6 @@ namespace VEPROMS.CSLA.Library
 
 			ROFSTLookup.rochild rc = RofstDataGetChildByAccPageID(_rofstID, accPageBase);
 
-			//if (rc.ID >=0 && rc.roid.Length < 16 && Regex.IsMatch(accPageKey, @".*\.[A-Z]") && rc.children != null && rc.children.Count() > 0)
 			if (rc.ID >= 0 && rc.roid.Length < 16 && !string.IsNullOrEmpty(accPageExt) && rc.children != null && rc.children.Count() > 0)
 			{
 				// Check if AccPageID/Key has a return value specific extension.  Try to find the RoChild record with the specific return value type, 
@@ -505,8 +509,6 @@ namespace VEPROMS.CSLA.Library
 			// 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.
 
-			//(_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;
 
@@ -679,13 +681,16 @@ namespace VEPROMS.CSLA.Library
 
 			if (minutes > 0) duration = string.Format("{0} min(s) ", minutes.ToString("n0"));
 			if (secs < 0) secs = 0.00;
-			duration = duration + string.Format("{0,10:#####0.00} sec(s)", secs).Trim();
+			duration += string.Format("{0,10:#####0.00} sec(s)", secs).Trim();
 
 			return duration;
 
-			//return string.Format("{0,10:#####0.00}", TimeSpan.FromTicks(DateTime.Now.Ticks - dtStart.Ticks).TotalSeconds);
 		}
 
+        //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+		//return new ROFstID if there is a newer ID that matches the same ROFSTDB
+        public int GetNewerFSTID() => RofstGetLatestID(RofstID);
+
         #endregion
 
         #endregion
@@ -888,7 +893,7 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 
-		private void RofstChildInsert(int rofstID, int id, int parentID, int dbiID, int type, string title, string roid, string appid, string value)
+		private void RofstChildInsert(int rofstID, int id, int parentID, int dbiID, int type, string title, string roid, string appid, string value, DateTime? dt = null)
 		{
 			try
 			{
@@ -917,6 +922,9 @@ namespace VEPROMS.CSLA.Library
 						if (!string.IsNullOrEmpty(this.RoMissingDefaultValue))
 							cmd.Parameters.Add(new SqlParameter("@missingDefaultValue", SqlDbType.VarChar)).Value = this.RoMissingDefaultValue;
 
+                        if (dt != null)
+                            cmd.Parameters.Add(new SqlParameter("@ModDateTime", SqlDbType.DateTime)).Value = dt;
+
                         cmd.ExecuteNonQuery();
 					}
 				}
@@ -1299,6 +1307,32 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 
+        //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+        //return new ROFstID if there is a newer ID that matches the same ROFSTDB
+        private int RofstGetLatestID(int rofstID)
+        {
+            try
+            {
+                using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+                {
+                    using (SqlCommand cmd = cn.CreateCommand())
+                    {
+                        cmd.CommandTimeout = 0;
+                        cmd.CommandType = CommandType.Text;
+                        cmd.CommandText = "SELECT ISNULL((SELECT TOP 1 ROFsts.ROFstID FROM ROFsts INNER JOIN ROFsts curFST ON curFST.RODbID = ROFsts.RODbID WHERE curFST.ROFstID = @FSTid order by ROFsts.DTS desc),-1)";
+
+                        cmd.Parameters.Add(new SqlParameter("@FSTid", SqlDbType.Int)).Value = rofstID;
+
+						return (int) cmd.ExecuteScalar();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new DbCslaException("RofstData.RofstGetLatestID", ex);
+            }
+        }
+
         #endregion
 
         #region (Core/Base logic for RO Values & UnitInfo RO Values) 
@@ -1440,19 +1474,20 @@ namespace VEPROMS.CSLA.Library
 
 		private ROFSTLookup.roHdr ConvertFst2Objects(byte[] ab)
 		{
-			ROFSTLookup.roHdr roh = new ROFSTLookup.roHdr();
+            ROFSTLookup.roHdr roh = new ROFSTLookup.roHdr
-
+            {
-			roh.hSize = BitConverter.ToInt32(ab, 0);
+                hSize = BitConverter.ToInt32(ab, 0),
-			roh.hYear = BitConverter.ToInt16(ab, 4);
+                hYear = BitConverter.ToInt16(ab, 4),
-			roh.hMonth = ab[6];
+                hMonth = ab[6],
-			roh.hDay = ab[7];
+                hDay = ab[7],
-			roh.hcYear = BitConverter.ToInt16(ab, 8);
+                hcYear = BitConverter.ToInt16(ab, 8),
-			roh.hcMonth = ab[10];
+                hcMonth = ab[10],
-			roh.hcDay = ab[11];
+                hcDay = ab[11],
-			roh.hcHour = ab[12];
+                hcHour = ab[12],
-			roh.hcMin = ab[13];
+                hcMin = ab[13],
-			roh.hcSec = ab[14];
+                hcSec = ab[14],
-			roh.hcHund = ab[15];
+                hcHund = ab[15]
+            };
 
             int hdrOffset = BitConverter.ToInt32(ab, 16);
 			int dbs = BitConverter.ToInt16(ab, hdrOffset + 4);
@@ -1490,10 +1525,11 @@ namespace VEPROMS.CSLA.Library
 
 		private ROFSTLookup.rogrp LoadGroup(byte[] ab, int offset, int tableID)
 		{
-			ROFSTLookup.rogrp myGrp = new ROFSTLookup.rogrp();
+            ROFSTLookup.rogrp myGrp = new ROFSTLookup.rogrp
-
+            {
-			myGrp.ID = BitConverter.ToInt32(ab, offset);
+                ID = BitConverter.ToInt32(ab, offset),
-			myGrp.ParentID = BitConverter.ToInt32(ab, offset + 4);
+                ParentID = BitConverter.ToInt32(ab, offset + 4)
+            };
 
             int numChildren = BitConverter.ToInt16(ab, offset + 8);
 
@@ -1523,6 +1559,10 @@ namespace VEPROMS.CSLA.Library
 					tmp.appid = tmpg.appid;
 					tmp.roid = tableID.ToString("X4") + tmp.ID.ToString("X8");
 					tmp.children = tmpg.children;
+                    if (tmpg.ModDateTime != null)
+                    {
+                        tmp.ModDateTime = tmpg.ModDateTime;
+                    }
 
                     int j;
 
@@ -1542,6 +1582,12 @@ namespace VEPROMS.CSLA.Library
 				int slen2 = StringLength(ab, offset + 13 + slen);
 				myGrp.appid = Encoding.Default.GetString(ab, offset + 13 + slen, slen2);
 
+                //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+                if (myGrp.value != "" && DateTime.TryParseExact(Encoding.Default.GetString(ab, offset + 14 + slen + slen2, 14), "yyyyMMddHHmmss", null, System.Globalization.DateTimeStyles.None, out DateTime dt))
+                {
+                    myGrp.ModDateTime = dt;
+                }
+
                 _dbRoCnt++;
 			}
 
@@ -1615,7 +1661,7 @@ namespace VEPROMS.CSLA.Library
 					}
 
 					// Update Progress Bar Accordingly
-					if (_totalRoCnt > 0) _pctComplete = _pctComplete + ((Convert.ToDouble(_dbRoCnt) / Convert.ToDouble(_totalRoCnt)) * 80.0);
+					if (_totalRoCnt > 0) _pctComplete += ((Convert.ToDouble(_dbRoCnt) / Convert.ToDouble(_totalRoCnt)) * 80.0);
 
 					OnProgressChanged(displayText, Convert.ToInt32(_pctComplete), 100);
 				}
@@ -1655,7 +1701,7 @@ namespace VEPROMS.CSLA.Library
 		private void LoadChild(int rofstID, int dbiID, ROFSTLookup.rochild child)
 		{
 			//Insert Rofst Child
-			RofstChildInsert(rofstID, child.ID, child.ParentID, dbiID, child.type, child.title, child.roid, child.appid, child.value);
+			RofstChildInsert(rofstID, child.ID, child.ParentID, dbiID, child.type, child.title, child.roid, child.appid, child.value, child.ModDateTime);
 
 			//Increment RO Count if RoChild has a return value
 			if (!string.IsNullOrEmpty(child.value)) _curRoCnt++;
@@ -1675,15 +1721,13 @@ namespace VEPROMS.CSLA.Library
 		protected virtual void OnProgressChanged(string title, string displayText, int curVal = 0, int maxVal = 100)
 		{
 			// If frmRofstLoadStatus is not null then call Update Progress Method
-			if (_frmRofstLoadStatus != null)
+			_frmRofstLoadStatus?.UpdateProgress(title, displayText, curVal, maxVal);
-				_frmRofstLoadStatus.UpdateProgress(title, displayText, curVal, maxVal);
 		}
 
 		protected virtual void OnProgressChanged(string displayText, int curVal = 0, int maxVal = 100)
 		{
 			// If frmRofstLoadStatus is not null then call Update Progress Method
-			if (_frmRofstLoadStatus != null)
+			_frmRofstLoadStatus?.UpdateProgress(_frmRofstLoadStatus.Title, displayText, curVal, maxVal);
-				_frmRofstLoadStatus.UpdateProgress(_frmRofstLoadStatus.Title, displayText, curVal, maxVal);
 		}
 
 		#endregion
@@ -1694,19 +1738,20 @@ namespace VEPROMS.CSLA.Library
 
 		private ROFSTLookup.roHdr ConvertToRoHdrObject(SafeDataReader dr, bool loadChildren)
 		{
-			ROFSTLookup.roHdr rh = new ROFSTLookup.roHdr();
+            ROFSTLookup.roHdr rh = new ROFSTLookup.roHdr
-
+            {
-			rh.hSize = (int)dr.GetValue("hSize");
+                hSize = (int)dr.GetValue("hSize"),
-			rh.hYear = (int)dr.GetValue("hYear");
+                hYear = (int)dr.GetValue("hYear"),
-			rh.hMonth = (byte)dr.GetValue("hMonth");
+                hMonth = (byte)dr.GetValue("hMonth"),
-			rh.hDay = (byte)dr.GetValue("hDay");
+                hDay = (byte)dr.GetValue("hDay"),
-			rh.hcYear = (int)dr.GetValue("hcYear");
+                hcYear = (int)dr.GetValue("hcYear"),
-			rh.hcMonth = (byte)dr.GetValue("hcMonth");
+                hcMonth = (byte)dr.GetValue("hcMonth"),
-			rh.hcDay = (byte)dr.GetValue("hcDay");
+                hcDay = (byte)dr.GetValue("hcDay"),
-			rh.hcHour = (byte)dr.GetValue("hcHour");
+                hcHour = (byte)dr.GetValue("hcHour"),
-			rh.hcMin = (byte)dr.GetValue("hcMin");
+                hcMin = (byte)dr.GetValue("hcMin"),
-			rh.hcSec = (byte)dr.GetValue("hcSec");
+                hcSec = (byte)dr.GetValue("hcSec"),
-			rh.hcHund = (byte)dr.GetValue("hcHund");
+                hcHund = (byte)dr.GetValue("hcHund")
+            };
 
             if (loadChildren)
 			{
@@ -1718,15 +1763,16 @@ namespace VEPROMS.CSLA.Library
 
 		private ROFSTLookup.rodbi ConvertToRodbiObject(SafeDataReader dr, bool loadChildren, bool loadAllChildren)
 		{
-			ROFSTLookup.rodbi rd = new ROFSTLookup.rodbi();
+            ROFSTLookup.rodbi rd = new ROFSTLookup.rodbi
-
+            {
-			rd.dbiID = (int)dr.GetValue("dbiID");
+                dbiID = (int)dr.GetValue("dbiID"),
-			rd.dbiType = (int)dr.GetValue("dbiType");
+                dbiType = (int)dr.GetValue("dbiType"),
-			rd.dbiAW = (int)dr.GetValue("dbiAW");
+                dbiAW = (int)dr.GetValue("dbiAW"),
-			rd.dbiAP = (string)dr.GetValue("dbiAP");
+                dbiAP = (string)dr.GetValue("dbiAP"),
-			rd.dbiTitle = (string)dr.GetValue("dbiTitle");
+                dbiTitle = (string)dr.GetValue("dbiTitle"),
-			rd.ID = (int)dr.GetValue("ID");
+                ID = (int)dr.GetValue("ID"),
-			rd.ParentID = (int)dr.GetValue("ParentID");
+                ParentID = (int)dr.GetValue("ParentID")
+            };
 
             if (loadChildren || loadAllChildren)
 			{
@@ -1738,13 +1784,14 @@ namespace VEPROMS.CSLA.Library
 
 		private ROFSTLookup.rochild ConvertToRochildObject(SafeDataReader dr, bool loadChildren, bool loadAllChildren)
 		{
-			ROFSTLookup.rochild rc = new ROFSTLookup.rochild();
+            ROFSTLookup.rochild rc = new ROFSTLookup.rochild
-
+            {
-			rc.ID = (int)dr.GetValue("ID");
+                ID = (int)dr.GetValue("ID"),
-			rc.ParentID = (int)dr.GetValue("ParentID");
+                ParentID = (int)dr.GetValue("ParentID"),
-			rc.type = (int)dr.GetValue("type");
+                type = (int)dr.GetValue("type"),
-			rc.title = (string)dr.GetValue("title");
+                title = (string)dr.GetValue("title"),
-			rc.roid = (string)dr.GetValue("roid");
+                roid = (string)dr.GetValue("roid")
+            };
 
             if (!string.IsNullOrEmpty((string)dr.GetValue("appid")))
 			{
@@ -1766,11 +1813,12 @@ namespace VEPROMS.CSLA.Library
 
 		private ROFSTLookup.RoExtension ConvertToRoExtensionObject(SafeDataReader dr)
 		{
-			ROFSTLookup.RoExtension re = new ROFSTLookup.RoExtension();
+            ROFSTLookup.RoExtension re = new ROFSTLookup.RoExtension
-
+            {
-			re.Offset = (int)dr.GetValue("Offset");
+                Offset = (int)dr.GetValue("Offset"),
-			re.RoidExt = (string)dr.GetValue("RoidExt");
+                RoidExt = (string)dr.GetValue("RoidExt"),
-			re.AccPageExt = (string)dr.GetValue("AccPageExt");
+                AccPageExt = (string)dr.GetValue("AccPageExt")
+            };
 
             return re;
 		}
@@ -1830,7 +1878,6 @@ namespace VEPROMS.CSLA.Library
 					// Instead of returning the RoChildBase object with a single RoReturnVal object attached, just return the single Ro ReturnValue object.
 					var roRetVal = child.children.First();
 
-					//child.title = roRetVal.title;
 					child.appid = roRetVal.appid;
 					child.roid = roRetVal.roid;
 					child.value = roRetVal.value;
@@ -2084,41 +2131,68 @@ namespace VEPROMS.CSLA.Library
 			return ProcessRO(match, multiRtnVal);
 		}
 
-		private string ProcessMacros(string str)
-		{
         // Takes the RO text value and sees if a macro has been used.  
         // If so it will perform the macro operation on the substring in the text value
         // Note** Right now the only macro is @HSP(), where every space between the "(" and ")" will be replaced with a hard space
+        private static string ProcessMacros(string str)
+        {
 
-			if (string.IsNullOrEmpty(str))
+            if (string.IsNullOrEmpty(str) || str.ToUpper().IndexOf("@HSP(") < 0)
                 return str;
 
-			string rtnstr = str;
-			int indx;
 
-			while ((indx = rtnstr.ToUpper().IndexOf("@HSP(")) > -1)
+            string processingstr = str;  //holds current string being processed
-			{
+            int indx;                    //current position of @HSP( in string
-				string resstr = rtnstr.Substring(0, indx);
+            int endpos = 0;              //end of last parens
-				int endHsp = rtnstr.IndexOf(")", indx);
 
-				//B2026 - 002 handle if parens inside a HSP
+            StringBuilder sb = new StringBuilder();
-				int startpos = indx + 5;
+            Stack<char> endparens = new Stack<char>();
-				while (rtnstr.Substring(startpos, endHsp - startpos).Contains("("))
+
+            while ((indx = processingstr.ToUpper().IndexOf("@HSP(")) > -1)
             {
-					startpos = rtnstr.IndexOf("(", startpos + 1, endHsp - startpos) + 1;
+                sb.Append(processingstr.Substring(0, indx));   // initial string before @HSP(
-					endHsp = rtnstr.IndexOf(")", endHsp + 1);
+
+                for (int i = indx + 5; i < processingstr.Length; i++)
+                {
+                    char ch = processingstr[i];
+
+                    if (ch == '(')
+                    {
+						//if opening paren inside HSP add it to the stack to look for a closing parens
+                        endparens.Push(ch);
+                    }
+                    else if (ch == ')' && endparens.Count > 0)
+                    {
+						//if cloing parens and it matches an opening parens inside of HSP, remove a level
+                        _ = endparens.Pop();
+                    }
+                    else if (ch == ')' && endparens.Count == 0)
+                    {
+						//if closing parens and at same level as HSP, break out since found correct closing parens
+                        endpos = i;
+                        break;
+                    }
+                    else if (i == processingstr.Length - 1)
+                    {
+						//if hit the end of the string and no matching closing parens found, take to the end of the string
+                        endpos = processingstr.Length;
+                    }
                 }
 
-				string tmpstr = rtnstr.Substring(indx + 5, endHsp - indx - 5);
+				//Add the text inside the @HSP(...)
-
+                string tmpstr = processingstr.Substring(indx + 5, endpos - indx - 5);
                 // B2017-012 Don't convert space to hard spaces for XY Plots.
                 if (!tmpstr.Contains("<<G")) tmpstr = tmpstr.Replace(" ", @"\u160?");
+                sb.Append(tmpstr);
 
-				resstr = resstr + tmpstr;
+                //Set the processing string to after the ending parens found in case multiple @HSP
-				rtnstr = resstr + rtnstr.Substring(endHsp + 1);
+                processingstr = endpos + 1 >= processingstr.Length ? "" : processingstr.Substring(endpos + 1);
             }
 
-			return rtnstr;
+            //add text after last end parens
+            sb.Append(processingstr);
+
+            return sb.ToString();
         }
 
         private int StringLength(byte[] ab, int offset)
@@ -2230,7 +2304,7 @@ namespace VEPROMS.CSLA.Library
 			{
 				rc.roid = FormatRoidKey(roid).Substring(0, 12);
 
-				DocVersionConfig dvc = (_myDocVersionInfo != null) ? _myDocVersionInfo.DocVersionConfig : null;
+				DocVersionConfig dvc = _myDocVersionInfo?.DocVersionConfig;
 				if (dvc != null) dvc.SelectedSlave = this.SelectedSlave;
 
 				switch (rc.roid)
@@ -2238,49 +2312,49 @@ namespace VEPROMS.CSLA.Library
 					case "FFFF00000001":
 						rc.title = "Number";
 						rc.appid = "U-NUMBER";
-						rc.value = (dvc != null) ? dvc.Unit_Number : null;
+						rc.value = dvc?.Unit_Number;
 						break;
 
 					case "FFFF00000002":
 						rc.title = "Other Number";
 						rc.appid = "U-OTHERNUMBER";
-						rc.value = (dvc != null) ? dvc.Other_Unit_Number : null;
+						rc.value = dvc?.Other_Unit_Number;
 						break;
 
 					case "FFFF00000003":
 						rc.title = "Text";
 						rc.appid = "U-TEXT";
-						rc.value = (dvc != null) ? dvc.Unit_Text : null;
+						rc.value = dvc?.Unit_Text;
 						break;
 
 					case "FFFF00000004":
 						rc.title = "Other Text";
 						rc.appid = "U-OTHERTEXT";
-						rc.value = (dvc != null) ? dvc.Other_Unit_Text : null;
+						rc.value = dvc?.Other_Unit_Text;
 						break;
 
 					case "FFFF00000005":
 						rc.title = "ID";
 						rc.appid = "U-ID";
-						rc.value = (dvc != null) ? dvc.Unit_ID : null;
+						rc.value = dvc?.Unit_ID;
 						break;
 
 					case "FFFF00000006":
 						rc.title = "Other ID";
 						rc.appid = "U-OTHERID";
-						rc.value = (dvc != null) ? dvc.Other_Unit_ID : null;
+						rc.value = dvc?.Other_Unit_ID;
 						break;
 
 					case "FFFF00000007":
 						rc.title = "Name";
 						rc.appid = "U-NAME";
-						rc.value = (dvc != null) ? dvc.Unit_Name : null;
+						rc.value = dvc?.Unit_Name;
 						break;
 
 					case "FFFF00000008":
 						rc.title = "Other Name";
 						rc.appid = "U-OTHERNAME";
-						rc.value = (dvc != null) ? dvc.Other_Unit_Name : null;
+						rc.value = dvc?.Other_Unit_Name;
 						break;
 				}
 

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

@@ -90,7 +90,7 @@ namespace VEPROMS.CSLA.Library
 		{
             string itemTitle = Regex.Replace(this.Path, "^..+?\\u0007", "");
 			itemTitle = itemTitle.Replace("\x11", itemTitle[0] == '\x11' ? "" : " - ").Replace("\\u8209?", "-").Replace(@"\u9586?",@"\");
-			return string.Format("{4} item {0} by {1} on {2} @ {3}", this.ActionWhat, this.UserID, this.ActionWhen == DateTime.MinValue ? this.DTS.ToShortDateString() : this.ActionWhen.ToShortDateString(), this.ActionWhen == DateTime.MinValue ? this.DTS.ToShortTimeString() : this.ActionWhen.ToShortTimeString(), itemTitle);
+			return string.Format("{4} item {0} by {1} on {2} @ {3}", this.ActionWhat, this.UserID, this.ActionWhen == DateTime.MinValue ? this.DTS.ToShortDateString() : this.ActionWhen.ToShortDateString(), this.ActionWhen == DateTime.MinValue ? this.DTS.ToString("HH:mm:ss") : this.ActionWhen.ToString("HH:mm:ss"), itemTitle);
 			//return string.Format("{0} by {1} on {2}", this.DeleteStatus == 0 ? "Changed" : "Deleted", this.UserID, this.DTS.ToString("MM/dd/yyyy @ HH:mm:ss"));
 			//return string.Format("{0} - {1} {2}", this.UserID, this.DTS, this.DeleteStatus == 0 ? "" : "Deleted");
 		}
@@ -177,7 +177,7 @@ namespace VEPROMS.CSLA.Library
 
 		public override string ToString()
       {
-				return string.Format("{0}{1} deleted by {2} on {3} @ {4}", this.Level == 0 ? "Previous " : this.Level == 1 ? "Next " : "", this.ItemType, this.UserID, this.DTS.ToShortDateString(), this.DTS.ToShortTimeString());
+				return string.Format("{0}{1} deleted by {2} on {3}", this.Level == 0 ? "Previous " : this.Level == 1 ? "Next " : "", this.ItemType, this.UserID, this.DTS.ToString("MM/dd/yyyy @ HH:mm:ss"));
 //				return string.Format("Deleted by {0} on {1} @ {2}", this.UserID, this.DTS.ToShortDateString(), this.DTS.ToShortTimeString());
 //				return string.Format("(ItemID: {4}, DeleteID: {5}, {0} by {1} on {2} Level: {3}", this.DeleteStatus == 0 ? "Changed" : "Deleted", this.UserID, this.DTS.ToString("MM/dd/yyyy @ HH:mm:ss"), Level.ToString(), this.ItemID.ToString(), this.DeleteStatus.ToString());
 //            return string.Format("Level: {3}, {0} - {1} {2}", this.UserID, this.DTS, this.DeleteStatus == 0 ? "" : "Deleted", this.Level.ToString());

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

@@ -2163,9 +2163,13 @@ namespace VEPROMS.CSLA.Library
                     //           move past that text and try the Word Find function again.
                     // B2022-088: [JPR] Find Doc Ro button not working in Word Sections
                     // B2022-098: [JPR] ROs not being resolved in Word Sections
+                    // B2026-070: When there is a  less-then sign (<) followed by a numeric value in a Word attachment (inside of a table), PROMS thinks the user put in an RO token will generate an RO not found error in the following table row who's text contains <U-Name>.
 					if (executeResult && !string.IsNullOrEmpty(sel.Text) && !sel.Text.StartsWith("<") && !sel.Text.EndsWith(">"))
                     {
-						sel.MoveStart(LBWdUnits.wdCharacter, sel.Text.Length - 1);
+                        int location = sel.Start + sel.Text.Length - 1; //do not do this inline - this needs captured before WholeStory
+
+                        sel.WholeStory();
+                        sel.MoveStart(LBWdUnits.wdCharacter, location);
                         tryagain = true;
 					}
 				} while (tryagain);

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

@@ -1093,6 +1093,15 @@ namespace VEPROMS.CSLA.Library
 				}
 			}
 		}
+
+        //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+		//Refresh at item level
+        public static void RefreshReferenceObjects(ItemInfo tmp, ROFstInfo origROFst)
+        {
+            if (tmp.MyDocVersion.DocVersionConfig.SelectedSlave <= 0)
+                MyRefreshReferenceObjects(tmp, null, tmp.GetSectionInfo(), tmp.MyDocVersion, origROFst);
+        }
+
         // B2022-026 RO Memory Reduction code - pass in ROFstInfo
         internal static void MyRefreshReferenceObjects(ItemInfo itemInfo, IVEDrillDownReadOnly itemParent, SectionInfo sectionInfo, DocVersionInfo docVersionInfo, ROFstInfo origROFst)
 		{
@@ -1219,6 +1228,22 @@ namespace VEPROMS.CSLA.Library
 			return true;
 		}
 
+        //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+        public static List<ItemInfo> GetItemInfoWithChangedROs(int docversionid, int origfstid, int newfstid) 
+		{
+            List<ItemInfo> lst = new List<ItemInfo>();
+
+            foreach (DataRow r in Data_GetItemsWithChangedROs(docversionid, origfstid, newfstid).Rows)
+            {
+                using (ItemInfo itm = Get((int)r["ItemID"]))
+				{
+                    lst.Add(itm);
+				}
+			}
+
+			return lst;
+        }
+
         #region Debug Code
 
         //private static void ShowDifference(string oldText, string newText)
@@ -1890,6 +1915,40 @@ namespace VEPROMS.CSLA.Library
 					foreach (ItemInfo itemInfo in partInfo.MyItems)
 						itemInfo.SpinThroughChildren();
 		}
+
+        //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+        private static DataTable Data_GetItemsWithChangedROs(int docversionid, int origfstid, int newfstid)
+        {
+            try
+            {
+                using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+                {
+                    using (SqlCommand cm = cn.CreateCommand())
+                    {
+                        cm.CommandType = CommandType.StoredProcedure;
+                        cm.CommandText = "getItemsWithNewROs";
+                        cm.Parameters.AddWithValue("@VersionID", docversionid);
+                        cm.Parameters.AddWithValue("@OrigFSTid", origfstid);
+                        cm.Parameters.AddWithValue("@NewFSTid", newfstid);
+                        cm.CommandTimeout = Database.DefaultTimeout;
+
+                        using (SqlDataAdapter da = new SqlDataAdapter(cm))
+                        {
+                            DataTable dt = new DataTable();
+                            da.Fill(dt);
+                            return dt;
+                        }
+                    }
+
+                }
+            }
+            catch (Exception ex)
+            {
+                Database.LogException("ItemInfoList.Data_GetItemsWithChangedROs", ex);
+                throw new DbCslaException("ItemInfoList.Data_GetItemsWithChangedROs", ex);
+            }
+        }
+
         #endregion
         #region LoadAtOnce
         // Method to Get Item and children
@@ -4054,6 +4113,9 @@ namespace VEPROMS.CSLA.Library
 				// date). Print_ViewableAfterChangeBarDate was created to get only that user specified date, if it exists.  If it does exist, we compare
 				// that with the Content datetime, otherwise we proceed as before.
 				DateTime? viewableStartingDateTime = (MyProcedure.MyConfig as ProcedureConfig).Print_ViewableStartingChangeBarDate;
+				// B2026-060 & B2026-061 removed the check of SelectedSlave (aka the selected child) from the IF statement,
+				// This was causing some step to print with change bars when there should not have been - because of the use of
+				// the Show Change Bars After date.  The logic we need is built into the get of ChangeBarDate and Print_ViewableStartingChangeBarDate.
 				if (viewableStartingDateTime != null && viewableStartingDateTime > MyProcedure.ChangeBarDate) 
 					return (MyContent.DTS > viewableStartingDateTime);
 				return (MyContent.DTS > MyProcedure.ChangeBarDate);
@@ -6215,6 +6277,11 @@ namespace VEPROMS.CSLA.Library
 			if (!SectionHasCheckOffs()) return null;
 			int stpCoIndx = CheckOffIndex();		// this step has a checkoff defined
 			if (stpCoIndx == -1) return null;
+            //B2026-040 - Signoff/Checkoffs not printing unless set to Section Default
+            if (stpCoIndx > 1)
+            {
+                return ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList[stpCoIndx];        // DO override of CheckOffList[]	
+            }
 
             int sectCoIndx = SectionDefaultCheckOffIndex();  // no checkoff on step, see if there is a section default.
 			if (sectCoIndx == -1) return null;
@@ -8059,6 +8126,10 @@ namespace VEPROMS.CSLA.Library
 			}
 			set { _ChangeBarDate = value; }
 		}
+
+        //C2026-021 Expand Functionality of Viewing Mode
+        public void ResetChangeBar() => _ChangeBarDate = null;
+
 		public Dictionary<int, ItemInfo> MyLookup = null;
 		public override void SetupTags()
 		{

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

@@ -61,35 +61,25 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("Pdf.DataPortal_Delete", ex);
 			}
 		}
+
+        //C2026-008 Re-Architect RO.FST to include RO Modification date/time
         // used to remove word section PDFs to force ROs to be updated when printed or saved
-		public static void DeleteAllDocVersion(int versionID)
+        public static void DeleteDocVersionPDFsWithNewROs(int versionID, int origfstid, int newfstid)
         {
             if (!CanDeleteObject())
                 throw new System.Security.SecurityException("User not authorized to remove a Pdf");
             try
             {
-				DataPortal.Delete(new VersionIDCriteria(versionID));
+                DeleteWithNewROs(versionID, origfstid, newfstid);
             }
             catch (Exception ex)
             {
                 throw new DbCslaException("Error on Pdf.DeleteAllDocVersion", ex);
             }
         }
-		[Serializable()]
+
-		protected class VersionIDCriteria
+        static private void DeleteWithNewROs(int docversionID, int origfstid, int newfstid)
         {
-			private int _VersionID;
-			public int VersionID
-			{ get { return _VersionID; } }
-			public VersionIDCriteria(int versionID)
-			{
-				_VersionID = versionID;
-			}
-		}
-		[Transactional(TransactionalTypes.TransactionScope)]
-		private void DataPortal_Delete(VersionIDCriteria criteria)
-		{
-			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] Pdf.DataPortal_Delete", GetHashCode());
             try
             {
                 using (SqlConnection cn = Database.VEPROMS_SqlConnection)
@@ -98,20 +88,20 @@ namespace VEPROMS.CSLA.Library
                     {
                         cm.CommandType = CommandType.StoredProcedure;
                         cm.CommandTimeout = Database.SQLTimeout;
-						cm.CommandText = "deleteAllDocVersionPdfs";
+                        cm.CommandText = "deleteDocVersionPdfsWithNewROs";
-						cm.Parameters.AddWithValue("@VersionID", criteria.VersionID);
+                        cm.Parameters.AddWithValue("@VersionID", docversionID);
+                        cm.Parameters.AddWithValue("@OrigFSTid", origfstid);
+                        cm.Parameters.AddWithValue("@NewFSTid", newfstid);
                         cm.ExecuteNonQuery();
                     }
                 }
             }
             catch (Exception ex)
             {
-				if (_MyLog.IsErrorEnabled) _MyLog.Error("Pdf.DataPortal_Delete", ex);
+                if (_MyLog.IsErrorEnabled) _MyLog.Error("Pdf.DeleteWithNewROs", ex);
-				_ErrorMessage = ex.Message;
+                throw new DbCslaException("Pdf.DeleteWithNewROs", ex);
-				throw new DbCslaException("Pdf.DataPortal_Delete", ex);
             }
         }
-
 	}
 	public partial class PdfInfo
 	{

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

@@ -225,38 +225,61 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 
-		// B2022-026 RO Memory Reduction code - pass in the ROFstInfo
+        //C2026-008 Re-Architect RO.FST to include RO Modification date/time
-		public static int RefreshROFst(DocVersionInfo dvi, ROFstInfoProgressBarRefresh myProgressBarRefresh, System.Windows.Forms.TextBox tbStatus, ROFstInfo origROFst)
+        // Refresh at item level
+        public static int RefreshROFstAtItemLevel(DocVersionInfo dvi, ROFstInfoProgressBarRefresh myProgressBarRefresh, System.Windows.Forms.TextBox tbStatus, ROFstInfo localROFst, int origfstid, int newfstid)
         {
             int fixedROs = 0;
 
             if (dvi.DocVersionConfig.SelectedSlave <= 0)
             {
-				myProgressBarRefresh(1, 100, "Update MS Word ROs");
+                // remove word section PDFs to force update of RO values when printed
+                myProgressBarRefresh(1, 100, "Updating MS Word ROs In Progress");
+                Pdf.DeleteDocVersionPDFsWithNewROs(dvi.VersionID, origfstid, newfstid);
 
-				Pdf.DeleteAllDocVersion(dvi.VersionID); // remove word section PDFs to force update of RO values when printed
+                //Loop Through ROs in this docversion that are different than the previous fst
+                myProgressBarRefresh(50, 100, "Updating ROs In PROMS Steps In Progress");
                 int i = 0;
-
+				List<ItemInfo> list = ItemInfo.GetItemInfoWithChangedROs(dvi.VersionID, origfstid, newfstid);
-				foreach (ProcedureInfo proc in dvi.Procedures)
+                foreach (ItemInfo itm in list)
                 {
                     DateTime start = DateTime.Now;
 
-					ProcedureInfo.ResetROCounters();
+                    ItemInfo.ResetROCounters();
-					myProgressBarRefresh(++i, dvi.Procedures.Count, string.Format("{0} ({1}/{2} ROs {3})", proc.DisplayNumber, i, dvi.Procedures.Count, fixedROs));
+                    myProgressBarRefresh(++i, list.Count, string.Format("{0} ({1}/{2} ROs {3})", itm.MyProcedure.DisplayNumber, i, list.Count, fixedROs));
-					ProcedureInfo.RefreshReferenceObjects(proc, origROFst);
+                    ItemInfo.RefreshReferenceObjects(itm, localROFst);
-					fixedROs += ProcedureInfo.ROFixCount;
+                    fixedROs += ItemInfo.ROFixCount;
 
                     TimeSpan ts = DateTime.Now - start;
 
                     if (tbStatus != null)
-						tbStatus.AppendText(string.Format("Procedure:  {1}{0}, Checked {2} Referenced Objects{0}, Fixed {3} Referenced Objects{0}, Elapsed Seconds:{4}{0}{0}", Environment.NewLine, proc.DisplayNumber, ProcedureInfo.ROCheckCount, ProcedureInfo.ROFixCount, ts.TotalSeconds));
+                        tbStatus.AppendText(string.Format("Procedure:  {1}{0}, Checked {2} Referenced Objects{0}, Fixed {3} Referenced Objects{0}, Elapsed Seconds:{4}{0}{0}", Environment.NewLine, itm.MyProcedure.DisplayNumber, ItemInfo.ROCheckCount, ItemInfo.ROFixCount, ts.TotalSeconds));
+                }
+
+				//Update the DocVersion Associations to link to the new RO FST id and current date/time
+                using (DocVersion dv = DocVersion.Get(dvi.VersionID))
+                {
+                    if (dvi.DocVersionAssociations[0].MyROFst.ROFstID != newfstid)
+                    {
+                        dv.DocVersionAssociations[0].MyROFst = localROFst.GetJustROFst();
+                    }
+					// B2026-066 moved this out of if statement above
+					// - was not resetting the datetime and thus not disabling the Update RO Values button and menu item
+                    SetAssociationLastCompleted(dv, DateTime.Now.ToString());
                 }
             }
 
+            // pop up a message window telling the user the RO Update has completed and how many ROs were updated		
+            // If we are updating RO from the Admin Tools (from the V button) and we are updating more than on procedure set, then just append the "RO Update Complete" text		
+            // To the MessageList.  Once completed will all procedure sets, Admin Tools will display one message box with all the results in it.		
+            if (MessageList == null)
+                FlexibleMessageBox.Show(fixedROs == 0 ? "No ROs Required Updating" : string.Format("{0} ROs Updated for {1}", fixedROs, dvi.MyFolder.Name), "RO Update Complete");
+            else
+                MessageList.AppendLine((fixedROs == 0 ? "No ROs Required Updating for " : string.Format("{0} ROs Updated for ", fixedROs)) + dvi.MyFolder.Name);
+
             return fixedROs;
         }
 
-
         //C2022-028 for Admin tool to check for bad RO links
         //B2022-144 we now loop through checked procedures list from Admin Tools and call this method for each procedure we want to process
         public static int CheckROLinksInThisProcedure(ProcedureInfo proc,  System.Windows.Forms.TextBox tbStatus)
@@ -291,34 +314,6 @@ namespace VEPROMS.CSLA.Library
 			return Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\VEPROMS\ROUpdateReport_" + ValidFileName.FixFileName(dvi.MyFolder.Name.Replace(" ", "_") + "_" + DateTime.Now.ToString("MM-dd-yyyy_HH-mm-ss") + ".txt");
 		}
 
-		// B2022-026 RO Memory Reduction code - moved the call to UpdateROFst() to before we call RefreshROFst
-		// so that we used the correct ROFstInfo which as the needed event methods set when updated RO Table types
-		public static ROFst RefreshROFst(DocVersion docver, ROFstInfo origROFst, ROFstInfoProgressBarRefresh myProgressBarRefresh, System.Windows.Forms.TextBox tbStatus)
-		{
-			ROFst rofst = null;
-
-			rofst = docver.DocVersionAssociations[0].MyROFst;
-
-			DocVersionInfo dvi = DocVersionInfo.Get(docver.VersionID);
-
-			SetAssociationLastCompleted(docver, string.Empty);
-			int fixedROs = RefreshROFst(dvi, myProgressBarRefresh, tbStatus, origROFst);
-			SetAssociationLastCompleted(docver, DateTime.Now.ToString());  // RO Update completed successfully and un-interrupted, save the date/time to the Doc Version Association config
-
-			myProgressBarRefresh(100, 100, "RO Update Complete"); // update the progress bar
-			System.Windows.Forms.Application.DoEvents();
-
-			// pop up a message window telling the user the RO Update has completed and how many ROs were updated
-			// If we are updating RO from the Admin Tools (from the V button) and we are updating more than on procedure set, then just append the "RO Update Complete" text
-			// To the MessageList.  Once completed will all procedure sets, Admin Tools will display one message box with all the results in it.
-			if (MessageList == null)
-				FlexibleMessageBox.Show(fixedROs == 0 ? "No ROs Required Updating" : string.Format("{0} ROs Updated for {1}", fixedROs, dvi.MyFolder.Name), "RO Update Complete");
-			else
-				MessageList.AppendLine((fixedROs == 0 ? "No ROs Required Updating for " : string.Format("{0} ROs Updated for ", fixedROs)) + dvi.MyFolder.Name);
-
-			return rofst;
-		}
-
 		/// <summary>
 		/// Updates an ro.fst into a sql database.  
 		/// </summary>
@@ -333,8 +328,12 @@ namespace VEPROMS.CSLA.Library
 		//           all of the calls aways set the flags to not update the RO values
 		public static ROFst UpdateRoFst(RODbInfo rdi, DocVersion docver, ROFstInfo origROFst, ROFstInfoProgressBarRefresh myProgressBarRefresh)
 		{
+            ROWorkingDraftAsk.ClearWorkingDrafts();
+
             if (myProgressBarRefresh != null) myProgressBarRefresh(0, 100, "Starting Update");
 
+			int origFSTid = origROFst.ROFstID;
+
             DirectoryInfo di = new DirectoryInfo(rdi.FolderPath);
 			string rofstfilepath = rdi.FolderPath + @"\ro.fst";
 			FileStream fsIn = new FileStream(rofstfilepath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
@@ -361,6 +360,7 @@ namespace VEPROMS.CSLA.Library
 
 				docver.DocVersionAssociations[0].MyROFst = rofst;
 				SetAssociationLastCompleted(docver, string.Empty);
+                SetPrevFSTID(docver, origFSTid);   // //C2026-008 Re-Architect RO.FST to include RO Modification date/time
 
                 return rofst;
 			}
@@ -384,6 +384,9 @@ namespace VEPROMS.CSLA.Library
 				// Keep a list of ROIDs for Images that have changed.
 				List<string> MyChangedFigureROIDs = UpdateROFigures(rdi, myProgressBarRefresh, rofst, rodb, myLookup, docver);
 
+                //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+                SetPrevFSTID(docver, origFSTid);
+
                 return rofst;
 			}
 		}
@@ -484,6 +487,20 @@ namespace VEPROMS.CSLA.Library
 			docver.Save();
 		}
 
+        //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+        // Place the previous ROFSTID in the config in case network error or computer crashes while updating RO Values
+        private static void SetPrevFSTID(DocVersion docver, int value)
+        {
+            if (docver.DocVersionAssociations[0]?.MyROFst != null && value != -1)
+            {
+                string cfg = docver.DocVersionAssociations[0].Config;
+				AssociationConfig ac = new AssociationConfig((cfg == null || cfg.Length == 0) ? "<Config />" : cfg);
+                ac.ROUpdate_PrevROFSTID = value.ToString();
+				docver.DocVersionAssociations[0].Config = ac.ToString();
+				docver.Save();
+            }
+        }
+
         // Place the status of loading the RO Figures when updating RO Values
         private static void SetAssociationROFiguresLoading(DocVersion docver, string value)
 		{
@@ -670,187 +687,6 @@ namespace VEPROMS.CSLA.Library
 			return sb.ToString();
 		}
 
-		private static void UpdateROValuesText(ROFstInfo origROFstInfo, ROFst newROFst, DocVersionInfo dvi, ROFstInfoProgressBarRefresh myProgressBarRefresh, List<string> MyChangedFigureROIDs)
-		{
-			if (myProgressBarRefresh != null) myProgressBarRefresh(0, 100, "Update Ro Values");
-
-			string versionList = dvi.VersionID.ToString();
-
-			ROFSTLookup origLookup = new ROFSTLookup(origROFstInfo.ROFstID, dvi);
-			ROFSTLookup newLookup = new ROFSTLookup(newROFst.ROFstID, dvi);
-
-			List<string> delList = new List<string>();
-			List<string> chgList = newLookup.GetValueDifferences(origROFstInfo.ROFstID, ref delList);
-
-			// Any figures which have been changed will be included in the list of values that have changed.
-			if (MyChangedFigureROIDs != null)
-			{
-				foreach (string roid in MyChangedFigureROIDs)
-				{
-					if (!chgList.Contains(roid)) chgList.Add(roid);
-				}
-			}
-
-			string RoidList = GetRoidList(newROFst.RODbID, chgList);
-
-			if (myProgressBarRefresh != null) myProgressBarRefresh(0, chgList.Count, "Getting List of ROs Used");
-			List<string> activeRoids = BuildActiveROIDsForRoUsages12(RoidList, versionList);
-
-			if (myProgressBarRefresh != null) myProgressBarRefresh(0, chgList.Count, "Updating RO Values");
-			int iCount = 0;
-
-			if (activeRoids.Count > 0)
-			{
-				foreach (string chg in chgList)
-				{
-					if (myProgressBarRefresh != null) myProgressBarRefresh(++iCount, chgList.Count, "Updating RO Values");
-					if (activeRoids.Contains(chg.Substring(0, 12)))
-					{
-						ROFSTLookup.rochild roch = newLookup.GetRoChild(chg);
-						string desc = string.Format("Change in RO Values: Old value = {0}, New value = {1}", origLookup.GetRoChild(chg).value, roch.value);
-
-						// roid's are stored in database as 16 characters long in the RoUsages table.  They may be stored as 12 characters in the ro.fst.
-						// string padroid = chg.Length <= 12 ? chg + "0000" : chg;
-						// B2022-088: Find Doc Ro button not working in Word Sections
-						string padroid = ROFSTLookup.FormatRoidKey(chg, true);
-
-						using (RoUsageInfoList affected = RoUsageInfoList.GetAffected(origROFstInfo.MyRODb.RODbID, padroid, desc, "Changed", versionList))
-						{
-							foreach (RoUsageInfo roUsg in affected)
-							{
-								using (Content content = Content.Get(roUsg.MyContent.ContentID))
-								{
-									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);
-										content.FixContentText(roUsg, val, roch.type, origROFstInfo, true);
-
-										if (content.IsDirty)
-										{
-											// Update UserID and DTS when RO Value is updated.
-											content.UserID = Volian.Base.Library.VlnSettings.UserID;
-											content.DTS = DateTime.Now;
-											content.Save();
-
-											if (content.MyGrid != null)
-											{
-												GridInfo.Refresh(content.MyGrid);
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-
-			if (myProgressBarRefresh != null) myProgressBarRefresh(0, chgList.Count, "Getting List of ROs Used");
-			List<string> activeDRoids = BuildActiveROIDsForDRoUsages12(RoidList, versionList);
-			iCount = 0;
-
-			if (activeDRoids.Count > 0)
-			{
-				foreach (string chg in chgList)
-				{
-					// B2022-088: Find Doc Ro button not working in Word Sections
-					// string padroid = chg.Length <= 12 ? chg + "0000" : chg;
-					string padroid = ROFSTLookup.FormatRoidKey(chg, true);
-
-					if (myProgressBarRefresh != null) myProgressBarRefresh(++iCount, chgList.Count, "Updating RO Values");
-
-					if (activeDRoids.Contains(chg.Substring(0, 12)))
-					{
-						ROFSTLookup.rochild roch = newLookup.GetRoChild(chg);
-
-						string desc = string.Format("Change in RO Values: Old value = {0}, New value = {1}", origLookup.GetRoChild(chg).value, roch.value);
-
-						// roid's are stored in database as 16 characters long in the rousages table.  They may be stored as 12 characters in the ro.fst.
-						using (DROUsageInfoList affected = DROUsageInfoList.GetAffected(origROFstInfo.MyRODb.RODbID, padroid, desc, "Changed", versionList))
-						{
-							foreach (DROUsageInfo droUsg in affected)
-							{
-								Pdf.DeleteAll(droUsg.DocID);
-							}
-						}
-					}
-				}
-			}
-
-			iCount = 0;
-			string RoidDelList = GetRoidList(newROFst.RODbID, delList);
-			if (myProgressBarRefresh != null) myProgressBarRefresh(0, chgList.Count, "Getting List of ROs Used");
-			activeRoids = BuildActiveROIDsForRoUsages12(RoidDelList, versionList);
-
-			if (activeRoids.Count > 0)
-			{
-				foreach (string del in delList)
-				{
-					// B2022-088: Find Doc Ro button not working in Word Sections
-					//string padroiddel = del.Length <= 12 ? del + "0000" : del;
-					string padroiddel = ROFSTLookup.FormatRoidKey(del, true);
-
-					if (myProgressBarRefresh != null) myProgressBarRefresh(++iCount, chgList.Count, "Removing Old RO Values");
-					string desc = string.Format("Deleted RO: Value = {0}", origLookup.GetRoChild(del).value);
-
-					if (activeRoids.Contains(del.Substring(0, 12).ToUpper()))
-					{
-						using (RoUsageInfoList affected = RoUsageInfoList.GetAffected(origROFstInfo.MyRODb.RODbID, padroiddel, desc, "Deleted", versionList))
-						{
-							foreach (RoUsageInfo roUsg in affected)
-							{
-								using (Content content = Content.Get(roUsg.MyContent.ContentID))
-								{
-									content.FixContentText(roUsg, "?", 0, origROFstInfo);
-									if (content.IsDirty)
-									{
-										// Update UserID and DTS when RO Value is updated.
-										content.UserID = Volian.Base.Library.VlnSettings.UserID;
-										content.DTS = DateTime.Now;
-										content.Save();
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-
-			if (myProgressBarRefresh != null) myProgressBarRefresh(0, chgList.Count, "Getting List of ROs Used");
-			activeDRoids = BuildActiveROIDsForDRoUsages12(RoidDelList, versionList);
-			iCount = 0;
-
-			if (activeDRoids.Count > 0)
-			{
-				foreach (string del in delList)
-				{
-					
-					// B2022-088: Find Doc Ro button not working in Word Sections
-					string padroiddel = ROFSTLookup.FormatRoidKey(del, true);
-					if (myProgressBarRefresh != null) myProgressBarRefresh(++iCount, chgList.Count, "Removing Old RO Values");
-
-					string desc = string.Format("Deleted RO: Value = {0}", origLookup.GetRoChild(del).value);
-
-					// If there's an issue then maybe try getting the RoChild with the Padded roid instead
-					//string desc = string.Format("Deleted RO: Value = {0}", origLookup.GetRoChild(padroiddel).value);
-
-					if (activeDRoids.Contains(del.Substring(0, 12).ToUpper()))
-					{
-						using (DROUsageInfoList Daffected = DROUsageInfoList.GetAffected(origROFstInfo.MyRODb.RODbID, padroiddel, desc, "Deleted", versionList))
-						{
-							foreach (DROUsageInfo droUsg in Daffected)
-							{
-								if (myProgressBarRefresh != null) myProgressBarRefresh(++iCount, chgList.Count, "Removing Old RO Values");
-								Pdf.DeleteAll(droUsg.DocID);
-							}
-						}
-					}
-				}
-			}
-
-			if (myProgressBarRefresh != null) myProgressBarRefresh(100, 100, "RO Values Updated");
-		}
-
         private static DateTime ShowDuration(DateTime dtLast, string message)
 		{
 			DateTime dtNext = DateTime.Now;

PROMS/VEPROMS.CSLA.Library/Session/ROWorkingDraftAsk.cs

@@ -0,0 +1,18 @@
+
+using System.Collections.Generic;
+
+namespace VEPROMS.CSLA.Library
+{
+    public static class ROWorkingDraftAsk
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "Keeping Collections Not ReadOnly")]
+        private static List<int> WorkingDrafts = new List<int>();
+
+        public static void AddWorkingDrafts(int wd) => WorkingDrafts.Add(wd);
+
+        public static void ClearWorkingDrafts() => WorkingDrafts.Clear();
+
+        public static bool ContainsWorkingDraft(int wd) => WorkingDrafts.Contains(wd);
+
+    }
+}

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

@@ -396,6 +396,7 @@
     <Compile Include="Minimal\UserReports.cs" />
     <Compile Include="Minimal\UserSettings.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Session\ROWorkingDraftAsk.cs" />
     <Compile Include="VEObjects\VEDrillDown.cs" />
     <Compile Include="VEObjects\VETreeNode.cs" />
   </ItemGroup>

PROMS/VG/IVGOutput.cs

@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Drawing;
 using iTextSharp.text.pdf;
-using iTextSharp.text.factories;
-using Microsoft.Win32;
 using Volian.Base.Library;
 
 namespace VG
@@ -25,22 +20,11 @@ namespace VG
 	}
 	public partial class VGOut_Graphics: IVGOutput
 	{
-		private int _DebugStatus = 0;
+        public int DebugStatus { get; set; } = 0;
-		public int DebugStatus
+        private readonly Graphics _VGOutput;
-		{
+        public VGOut_Graphics(Graphics vgOutput) => _VGOutput = vgOutput;
-			get { return _DebugStatus; }
+        public float Scale => 1;
-			set { _DebugStatus = value; }
+        public void DrawLine(Pen pn, float startx, float starty, float endx, float endy) => _VGOutput.DrawLine(pn, startx, starty, endx, endy);
-		}
-		private Graphics _VGOutput;
-		//public Graphics VGOutput
-		//{ get { return _VGOutput; } }
-		public VGOut_Graphics(Graphics vgOutput)
-		{ _VGOutput = vgOutput; }
-		public float Scale
-		{ get { return 1; } }
-		//{ get { return _VGOutput.Transform.Elements[0]; } }
-		public void DrawLine(Pen pn, float startx, float starty, float endx, float endy)
-		{ _VGOutput.DrawLine(pn, startx, starty, endx, endy);	}
         public void DrawRectangle(Pen pn, RectangleF rectf)
 		{
 			_VGOutput.CompositingMode = System.Drawing.Drawing2D.CompositingMode.SourceCopy;
@@ -48,118 +32,13 @@ namespace VG
 			_VGOutput.CompositingMode = System.Drawing.Drawing2D.CompositingMode.SourceOver;
 			_VGOutput.DrawRectangle(pn, rectf.X, rectf.Y, rectf.Width, rectf.Height); 
 		}
-		public void DrawEllipse(Pen pn, float cx, float cy, float dx, float dy)
+        public void DrawEllipse(Pen pn, float cx, float cy, float dx, float dy) => _VGOutput.DrawEllipse(pn, cx, cy, dx, dy);
-		{ _VGOutput.DrawEllipse(pn, cx, cy, dx, dy); }
+        public void DrawImage(Bitmap bm, RectangleF rectf) => _VGOutput.DrawImage(bm, rectf);
-		public void DrawImage(Bitmap bm, RectangleF rectf)
+        public void DrawString(string text, Font myFont, Brush brush, RectangleF rectf) => _VGOutput.DrawString(text, myFont, brush, rectf, StringFormat.GenericTypographic);
-		{ _VGOutput.DrawImage(bm, rectf); }
+        public void DrawArc(Pen pn, RectangleF rectf, float startAngle, float sweepAngle) => _VGOutput.DrawArc(pn, rectf, startAngle, sweepAngle);
-		public void DrawString(string text, Font myFont, Brush brush, RectangleF rectf)
+        public SizeF MeasureString(string text, Font myFont) => _VGOutput.MeasureString(text, myFont, new PointF(0, 0), StringFormat.GenericTypographic);
-		{ _VGOutput.DrawString(text, myFont, brush, rectf, StringFormat.GenericTypographic); }
-		public void DrawArc(Pen pn, RectangleF rectf, float startAngle, float sweepAngle)
-		{ _VGOutput.DrawArc(pn, rectf, startAngle, sweepAngle); }
-		public SizeF MeasureString(string text, Font myFont)
-		{ return _VGOutput.MeasureString(text, myFont, new PointF(0, 0), StringFormat.GenericTypographic); }
         public void Save(string fileName)
 		{ ;/* Don't do anything*/ }
-		public float FontSizeAdjust
+        public float FontSizeAdjust => .71f * 96f / _VGOutput.DpiX;  // Changed to adjust for Screen DPI Setting
-		{ get { return .71f * 96f / _VGOutput.DpiX; } } // Changed to adjust for Screen DPI Setting
-	}
-	public partial class VGOut_ITextSharp : IVGOutput
-	{
-		private int _DebugStatus = 0;
-		public int DebugStatus
-		{
-			get { return _DebugStatus; }
-			set { _DebugStatus = value; }
-		}
-		private PdfContentByte _VGOutput;
-		//public Graphics VGOutput
-		//{ get { return _VGOutput; } }
-		public VGOut_ITextSharp(PdfContentByte vgOutput)
-		{ _VGOutput = vgOutput; }
-		public float Scale
-		{ get { return 1; } }
-		public void DrawLine(Pen pn, float startx, float starty, float endx, float endy)
-		{
-			_VGOutput.SaveState();
-			SetStrokeData(pn);
-			_VGOutput.MoveTo(startx, ScaleY(starty));
-			_VGOutput.LineTo(endx, ScaleY(endy));
-			_VGOutput.Stroke();
-			_VGOutput.RestoreState();
-		}
-		private void SetStrokeData(Pen pn)
-		{
-			_VGOutput.SetLineWidth(pn.Width);
-			_VGOutput.SetColorStroke(new iTextSharp.text.Color(pn.Color.R, pn.Color.G, pn.Color.B, pn.Color.A));
-		}
-		public void DrawRectangle(Pen pn, RectangleF rectf)
-		{
-			_VGOutput.SaveState();
-			SetStrokeData(pn);
-			_VGOutput.Rectangle(rectf.X, ScaleY(rectf.Y), rectf.Width, -rectf.Height);
-			_VGOutput.Stroke();
-			_VGOutput.RestoreState();
-		}
-		public void DrawEllipse(Pen pn, float cx, float cy, float dx, float dy)
-		{
-			_VGOutput.SaveState();
-			SetStrokeData(pn);
-			_VGOutput.Ellipse(cx, ScaleY(cy), dx, -dy);
-			_VGOutput.Stroke();
-			_VGOutput.RestoreState();
-		}
-		public void DrawImage(Bitmap bm, RectangleF rectf)
-		{
-			_VGOutput.SaveState();
-			// TODO: Determine how I can create an iTextSharp.text.Image
-			//_VGOutput.AddImage(new iTextSharp.text.Image(
-			_VGOutput.RestoreState();
-		}
-		public void DrawString(string text, Font myFont, Brush brush, RectangleF rectf)
-		{
-			_VGOutput.SaveState();
-			_VGOutput.BeginText();
-			iTextSharp.text.Font itFont = GetFont(myFont.Name);
-			iTextSharp.text.pdf.BaseFont baseFont = itFont.BaseFont;
-	//    _VGOutput.DrawString(text, myFont, brush, rectf, StringFormat.GenericTypographic); 
-			_VGOutput.MoveText(rectf.X, ScaleY(rectf.Y) - myFont.SizeInPoints);
-			_VGOutput.SetFontAndSize(baseFont, myFont.SizeInPoints);
-			_VGOutput.SetTextRenderingMode(PdfContentByte.TEXT_RENDER_MODE_FILL);
-			_VGOutput.ShowTextKerned(text);
-			_VGOutput.EndText();
-			_VGOutput.RestoreState();
-		}
-		public void DrawArc(Pen pn, RectangleF rectf, float startAngle, float sweepAngle)
-		{
-			_VGOutput.SaveState();
-			SetStrokeData(pn);
-			_VGOutput.Arc(rectf.X, ScaleY(rectf.Y), rectf.X + rectf.Width, ScaleY(rectf.Y + rectf.Height), -startAngle, -sweepAngle);
-			_VGOutput.Stroke();
-			_VGOutput.RestoreState();
-		}
-		public SizeF MeasureString(string text, Font myFont)
-		{
-			iTextSharp.text.Font itFont = GetFont(myFont.Name);
-			iTextSharp.text.pdf.BaseFont baseFont = itFont.BaseFont;
-			return new SizeF(baseFont.GetWidthPoint(text,myFont.SizeInPoints)
-				, baseFont.GetAscentPoint(text, myFont.SizeInPoints) + baseFont.GetDescentPoint(text, myFont.SizeInPoints));
-		}
-		public void Save(string fileName)
-		{ ;/* Don't do anything*/ }
-		public float FontSizeAdjust
-		{ get { return 1; } } // Changed to adjust for Screen DPI Setting
-		public static iTextSharp.text.Font GetFont(string fontName)
-		{
-	/// <summary>
-	/// B2019-116 Volian.Base.Library This is a generic class for dealing with iTextSharp Fonts
-	/// Code moved and consolidated from Volian.Print.Library Volian PDF.Library and VG
-	/// </summary>
-			VlnItextFont.RegisterFont(fontName);
-			return iTextSharp.text.FontFactory.GetFont(fontName, BaseFont.IDENTITY_H, BaseFont.EMBEDDED);
-		}
-		private float ScaleY(float y)
-		{
-			return _VGOutput.PdfWriter.PageSize.Height - y;
-		}
     }
 }

PROMS/VG/VG.cs

@@ -20,64 +20,34 @@ namespace VG
 	// Temporary page class to store portrait/landscape, Left Margin, Vertical offset, etc
 	public class Page
 	{
-		private bool _Portrait = true;
+        public bool Portrait { get; set; } = true;
-		public bool Portrait
+        public float LeftMargin { get; set; } = 0;
-		{
+        public float TopMargin { get; set; } = 0;
-			get { return _Portrait; }
+        public float RightMargin { get; set; } = 0;
-			set { _Portrait = value; }
+        public float BottomMargin { get; set; } = 0;
-		}
-		private float _LeftMargin = 0;
-		public float LeftMargin
-		{
-			get { return _LeftMargin; }
-			set { _LeftMargin = value; }
-		}
-		private float _TopMargin = 0;
-		public float TopMargin
-		{
-			get { return _TopMargin; }
-			set { _TopMargin = value; }
-		}
-		private float _RightMargin = 0;
-		public float RightMargin
-		{
-			get { return _RightMargin; }
-			set { _RightMargin = value; }
-		}
-		private float _BottomMargin = 0;
-		public float BottomMargin
-		{
-			get { return _BottomMargin; }
-			set { _BottomMargin = value; }
-		}
         public Page(bool portrait, float leftMargin, float topMargin, float rightMargin, float bottomMargin)
 		{
-			_Portrait = portrait;
+			Portrait = portrait;
-			_LeftMargin = leftMargin;
+			LeftMargin = leftMargin;
-			_TopMargin = topMargin;
+			TopMargin = topMargin;
-			_RightMargin = rightMargin;
+			RightMargin = rightMargin;
-			_BottomMargin = bottomMargin;
+			BottomMargin = bottomMargin;
 		}
 		public Page(bool portrait, float leftMargin, float topMargin)
 		{
-			_Portrait = portrait;
+			Portrait = portrait;
-			_LeftMargin = leftMargin;
+			LeftMargin = leftMargin;
-			_TopMargin = topMargin;
+			TopMargin = topMargin;
 		}
 	}
 	public class VG
 	{
-		private static Brush _BlackBrush = Brushes.Black;
+        public static Brush BlackBrush { get; set; } = Brushes.Black;
-		public static Brush BlackBrush
-		{
-			get { return _BlackBrush; }
-			set { _BlackBrush = value; }
-		}
         private static Color _BlackColor = Color.Black;
 		public static Color BlackColor
 		{
 			get { return _BlackColor; }
-			set { _BlackColor = value; _BlackBrush = new SolidBrush(value); }
+			set { _BlackColor = value; BlackBrush = new SolidBrush(value); }
 		}
 		// Values of vector graphics items are stored as twips (1440 twips in an inch)
 		public int cx;
@@ -105,16 +75,12 @@ namespace VG
 			MoveAbsolute = ima;
 			pg = ipg;
 		}
-		public float ToPoints(float twip)
+        public float ToPoints(float twip) => (float)(((float)twip) * 0.05f);
-		{
-			float r = ((float)twip) * 0.05f;
-			return r;
-		}
         public void UpdatePageInfo(Page pa)
 		{
 			pg.LeftMargin = pa.LeftMargin;
-			pg.Portrait = pa.Portrait; // RHM 20081003 - This had been pg.portrait=pg.portrait
+			pg.Portrait = pa.Portrait; 
-			pg.TopMargin = pa.TopMargin; // RHM 20081003 - This had been pg.VertOffset=pg.VertOffset
+			pg.TopMargin = pa.TopMargin; 
 		}
 		public string AddRTFBUI(string origStr, string bold, string underline, string italics)
 		{
@@ -145,7 +111,6 @@ namespace VG
 				int B1 = (int)(colorFraction * color.B);
 				int B2 = (int)((1 - colorFraction) * Color.White.B);
 				pn = new Pen(Color.FromArgb(R1 + R2, G1 + G2, B1 + B2), scaleWid);
-				//pn = new Pen(color, wid*wid);
 			}
 			else
 				pn = new Pen(color, scaleWid);
@@ -217,74 +182,14 @@ namespace VG
 			vgOutput.DrawRectangle(pn, rc);
 		}
 	}
-	public class VG_Image : VG
-	{
-		private int Scale;
-		private string FileName;
-		// Image is defined as starting point, scale factor (defaults to 1) & image file name
-		public VG_Image(int sx, int sy, int iscale, string fname)
-		{
-			cx = sx;
-			cy = sy;
-			Scale = 1;
-			FileName = fname;
-		}
-		public VG_Image(XmlElement svg, Page ipg)
-		{
-			cx = System.Convert.ToInt32(svg.GetAttribute("x"));
-			cy = System.Convert.ToInt32(svg.GetAttribute("y"));
-			Scale = 1;
-			if (svg.HasAttribute("scale")) Scale = System.Convert.ToInt32(svg.GetAttribute("scale"));
-			FileName = svg.GetAttribute("bname");
-			pg = ipg;
-		}
-		public void Draw(IVGOutput vgOutput)
-		{
-			Pen pn = new Pen(VG.BlackBrush, lnwid);
-			Bitmap bm = new Bitmap(FileName);
-			RectangleF rc = new RectangleF();
-			rc.Height = ToPoints((bm.Height * Scale) * 4.8f);
-			rc.Width = ToPoints((bm.Width * Scale) * 4.8f);
-			rc.X = ToPoints(pg.LeftMargin + cx);
-			rc.Y = ToPoints(pg.TopMargin + cy);
-			// TODO: grfx.DrawImage(bm, rc, ContentAlignment.MiddleCenter, ImageSizeModeEnum.Scale);
-		}
-	}
-	public class VG_Ellipse : VG
-	{
-		// Ellipse (circle) is defined by a bounding rectangle specified by a coordinate pair, a width, and a height
-		public VG_Ellipse(int sx, int sy, int ex, int ey, int w, Page ipg)
-		{
-			cx = sx;
-			cy = sy;
-			dx = ex;
-			dy = ey;
-			lnwid = w;
-			pg = ipg;
-		}
-		public VG_Ellipse(XmlElement svg, Page ipg)
-		{
-			cx = System.Convert.ToInt32(svg.GetAttribute("cx"));
-			cy = System.Convert.ToInt32(svg.GetAttribute("cy"));
-			dx = System.Convert.ToInt32(svg.GetAttribute("rx"));
-			dy = System.Convert.ToInt32(svg.GetAttribute("ry"));
-			lnwid = System.Convert.ToInt32(svg.GetAttribute("stroke-width"));
-			pg = ipg;
-		}
-		public void Draw(IVGOutput vgOutput)
-		{
-			Pen pn = new Pen(VG.BlackBrush, ToPoints(lnwid));
-			vgOutput.DrawEllipse(pn, ToPoints(pg.LeftMargin + cx), ToPoints(pg.TopMargin + cy), ToPoints(dx), ToPoints(dy));
-		}
-	}
 	public class VG_Text : VG
 	{
-		private string FontName;
+		private readonly string FontName;
-		private int FontSize;
+		private readonly int FontSize;
-		private string Bold;
+		private readonly string Bold;
-		private string Underline;
+		private readonly string Underline;
-		private string Italics;
+		private readonly string Italics;
-		private string Text;
+		private readonly string Text;
 		// Text is defined by a starting location, attributes & the string
 		public VG_Text(int sx, int sy, int fs, string txt, string fn, string ibold, string iunder, string iitalics, Page ipg)
 		{
@@ -297,48 +202,28 @@ namespace VG
 			Underline = iunder;
 			Italics = iitalics;
 			pg = ipg;
-			// TODO: The following were in the 16-bit code - we may need to use these, wait and see
-			//			strokeWidth = stroke;
-			//			strokeWidthBold = strokebold;
-			//			ULOffset = UnderlineOffset;
-			//			ULWidth = UnderlineWidth;
-		}
-		public VG_Text(XmlElement svg, Page ipg)
-		{
-			cx = System.Convert.ToInt32(svg.GetAttribute("x"));
-			cy = System.Convert.ToInt32(svg.GetAttribute("y"));
-			FontSize = System.Convert.ToInt32(svg.GetAttribute("font-size"));
-			Bold = svg.GetAttribute("font-weight");
-			Underline = svg.GetAttribute("text-decoration");
-			Italics = svg.GetAttribute("font-style");
-			FontName = svg.GetAttribute("font-family");
-			Text = svg.InnerText;
-			pg = ipg;
 		}
 		public void Draw(IVGOutput vgOutput)
 		{
 			// TODO: Font myfont = new Font(FontName, (FontSize*9)/10);
 			Font myfont = new Font(FontName, FontSize * vgOutput.FontSizeAdjust); // TODO: Trying 80%
-			RectangleF rc = new RectangleF();
+            RectangleF rc = new RectangleF
+            {
                 // the returned value from c1 grfx code is already in points,
                 // so need to convert the size.
-			rc.Size = vgOutput.MeasureString(Text, myfont); // TODO: 500 or pagewidth, or what
+                Size = vgOutput.MeasureString(Text, myfont), // TODO: 500 or pagewidth, or what
                                                              //rc.Size = grfx.MeasureString(Text, myfont, 500); // TODO: 500 or pagewidth, or what
-			rc.X = ToPoints(pg.LeftMargin + cx);
+                X = ToPoints(pg.LeftMargin + cx),
-			rc.Y = ToPoints(pg.TopMargin + cy) - FontSize;
+                Y = ToPoints(pg.TopMargin + cy) - FontSize
+            };
             rc.Height *= 1.0000001F;  // Small factor to make text visible.
-			// add bold, underline & italics for entire object.
-			// TODO: string rtfout = AddRTFBUI(Text, Bold, Underline, Italics);
-			//using(Pen pn = new Pen(Color.DarkBlue, .1F))
-			//	grfx.DrawRectangle(pn, rc.X,rc.Y,rc.Width,rc.Height);
 			vgOutput.DrawString(Text, myfont, VG.BlackBrush, rc);
-			//grfx.DrawString(Text, myfont, VG.BlackBrush, rc);
 		}
 	}
 	public class VG_Arc : VG
 	{
-		public Single sweepAngle;
+		public float sweepAngle;
-		public Single startAngle;
+		public float startAngle;
 		public float stX, stY;
 		public float rWid, rHgt;
 		// Arc is defined by a bounding rectangle specified by a coordinate pair, a width, and a height
@@ -365,9 +250,7 @@ namespace VG
 				rHgt = -hight;
 			}
 			startAngle = stAngle;
-			//			startAngle = 90;
 			sweepAngle = swpAngle;
-			//			sweepAngle = -45;
 			lnwid = w;
 			pg = ipg;
 		}
@@ -391,18 +274,6 @@ namespace VG
 			float starty = pg.Portrait ? (stY + pg.TopMargin) : (pg.LeftMargin - stX);
 			RectangleF rc = new RectangleF(ToPoints(startx), ToPoints(starty), ToPoints(rWid), ToPoints(rHgt));
 			//Console.WriteLine("{0},'{1}',{2},{3},{4},{5},{6},{7}", iColor, pn.Color, rc.X, rc.Y, rc.Width, rc.Height, startAngle, sweepAngle);
-			//if (iColor == 7 || iColor == 8) return;
-			//if (iColor == 6) return;
-			//if (iColor == 4 || iColor == 6)
-			//{
-			//  using (Pen lightPen = new Pen(myColors[iColor % myColors.Length], .01F))
-			//{
-			//  vgOutput.DrawEllipse(lightPen, rc.X, rc.Y, rc.Width, rc.Height);
-			//  float xc = rc.X + (rc.Width / 2);
-			//  float yc = rc.Y + (rc.Height / 2);
-			//  vgOutput.DrawEllipse(lightPen, xc - .5F, yc - .5F, 1F, 1F);
-			//}
-			//}
 			if (sweepAngle > 0)
 				vgOutput.DrawArc(pn, rc, startAngle, sweepAngle);
 			else

PROMS/Volian.Base.Library/BaseLnSettings.cs

@@ -0,0 +1,8 @@
+
+namespace Volian.Base.Library
+{
+	public static class BaseLnSettings
+	{
+		public static bool blBaseLine { get; set; } = false;
+	}
+}

PROMS/Volian.Base.Library/BigNum.cs

@@ -6,7 +6,6 @@ using System.Xml.Serialization;
 namespace Volian.Base.Library
 {
 	[Serializable()]
-	//[XmlRoot("BigNum")]
 	public class BigNum
 	{
 		#region fields
@@ -22,18 +21,9 @@ namespace Volian.Base.Library
 		public BigNum()
 		{
 		}
-		public BigNum(int value)
+        public BigNum(int value) => SetFlag(value);
-		{
+        public BigNum(string values) => SetFlags(values);
-			SetFlag(value);
+        public BigNum(ICollection<int> values) => SetFlags(values);
-		}
-		public BigNum(string values)
-		{
-			SetFlags(values);
-		}
-		public BigNum(ICollection<int> values)
-		{
-			SetFlags(values);
-		}
         public override string ToString()
 		{
 			return FlagList;
@@ -58,10 +48,6 @@ namespace Volian.Base.Library
 		}
 		#endregion
 		#region methods
-		//public override string ToString()
-		//{
-		//  return GenericSerializer<BigNum>.StringSerialize(this);
-		//}
 		public bool Includes(BigNum other)
 		{
 			List<int> mine = GetFlags();
@@ -82,12 +68,6 @@ namespace Volian.Base.Library
 		public List<int> GetFlags()
 		{
 			List<int> myints = new List<int>();
-			//if (MyValue.Count == 0)//1 && MyValue.ContainsKey(0) && MyValue[0] == 0)
-			//{
-			//  myints.Add(-1);
-			//}
-			//else
-			//{
 				foreach (uint key in MyValue.Keys)
 				{
 					ulong y = MyValue[key];
@@ -97,18 +77,10 @@ namespace Volian.Base.Library
 							myints.Add((int)(i + (key * 64)));
 					}
 				}
-			//}
 			return myints;
 		}
 		public void SetFlag(int flag)
 		{
-			//if (flag == -1)
-			//{
-			//  MyValue = new SortedDictionary<uint, ulong>();
-			//  //MyValue.Add(0, 0);
-			//}
-			//else
-			//{
 				uint offset = (uint)(flag / 64);
 				ulong x = one << (flag % 64);
 				if (MyValue.ContainsKey(offset))
@@ -122,12 +94,7 @@ namespace Volian.Base.Library
 			foreach (int f in flags)
 				SetFlag(f);
 		}
-		public static BigNum MakeBigNum(string numbers)
+        public static BigNum MakeBigNum(string numbers) => numbers == "-1" ? null : new BigNum(numbers);
-		{
-			if (numbers == "-1")
-				return null;
-			return new BigNum(numbers);
-		}
         #endregion
         #region properties
         [XmlAttribute]

PROMS/Volian.Base.Library/ByteArrayCompare.cs

@@ -1,10 +1,4 @@
-using System;
+namespace Volian.Base.Library
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Volian.Base.Library
 {
 	public static class ByteArrayCompare
 	{

PROMS/Volian.Base.Library/DebugPrint.cs

@@ -1,16 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.IO;
 
 namespace Volian.Base.Library
 {
 	public class DebugPrint:IDisposable
 	{
-		public void Dispose()
+        public void Dispose() => Close();
-		{
-			Close();
-		}
         private StreamWriter _MyStreamWriter = null;
 		public StreamWriter MyStreamWriter
 		{
@@ -25,10 +20,7 @@ namespace Volian.Base.Library
 				_MyStreamWriter = value;
 			}
 		}
-		public bool IsOpen
+        public bool IsOpen => MyStreamWriter != null;
-		{
-			get { return MyStreamWriter != null; }
-		}
         private string _FileName = null;
 		public string FileName
 		{
@@ -40,21 +32,14 @@ namespace Volian.Base.Library
 				MyFileInfo = new FileInfo(value);
 			}
 		}
-		private FileInfo _MyFileInfo;
+
-		public FileInfo MyFileInfo
+        public FileInfo MyFileInfo { get; set; }
-		{
-			get { return _MyFileInfo; }
-			set { _MyFileInfo = value; }
-		}
         public void Open(string fileName)
 		{
 			FileName = fileName;
 			MyStreamWriter = MyFileInfo.CreateText();
 		}
-		public void Close()
+        public void Close() => MyStreamWriter = null;
-		{
-			MyStreamWriter = null;
-		}
         public void Write(string format, params object[] args)
 		{
 			if (IsOpen) MyStreamWriter.Write(format, args);
@@ -73,98 +58,62 @@ namespace Volian.Base.Library
 	}
 	public static class DebugPagination
 	{
-		private static int _TotalPages = 0;
+        public static int TotalPages { get; set; } = 0;
-		public static int TotalPages
+        private static readonly DebugPrint _MyDebugPrint = new DebugPrint();
-		{
+        public static void Open(string fileName) => _MyDebugPrint.Open(fileName);
-			get { return _TotalPages; }
-			set { _TotalPages = value; }
-		}
-		private static DebugPrint _MyDebugPrint = new DebugPrint();
-		public static void Open(string fileName)
-		{ _MyDebugPrint.Open(fileName); }
         public static void Close()
 		{
 			WriteLine("{0} Total Pages", TotalPages);
 			_MyDebugPrint.Close(); 
 		}
-		public static void Write(string format, params object[] args)
+        public static void Write(string format, params object[] args) => _MyDebugPrint.Write(format, args);
-		{ _MyDebugPrint.Write(format, args); }
+        public static void WriteLine(string format, params object[] args) => _MyDebugPrint.WriteLine(format, args);
-		public static void WriteLine(string format, params object[] args)
+        public static void Show() => _MyDebugPrint.Show();
-		{ _MyDebugPrint.WriteLine(format, args); }
+        public static bool IsOpen => _MyDebugPrint.IsOpen;
-		public static void Show()
-		{ _MyDebugPrint.Show(); }
-		public static bool IsOpen
-		{	get { return _MyDebugPrint.IsOpen; } }
     }
 	public static class DebugText
 	{
-		private static DebugPrint _MyDebugPrint = new DebugPrint();
+		private static readonly DebugPrint _MyDebugPrint = new DebugPrint();
-		public static void Open(string fileName)
+        public static void Open(string fileName) => _MyDebugPrint.Open(fileName);
-		{ _MyDebugPrint.Open(fileName); }
+        public static void Close() => _MyDebugPrint.Close();
-		public static void Close()
+        public static void Write(string format, params object[] args) => _MyDebugPrint.Write(format, args);
-		{ _MyDebugPrint.Close(); }
+        public static void WriteLine(string format, params object[] args) => _MyDebugPrint.WriteLine(format, args);
-		public static void Write(string format, params object[] args)
+        public static void Show() => _MyDebugPrint.Show();
-		{ _MyDebugPrint.Write(format, args); }
+        public static bool IsOpen => _MyDebugPrint.IsOpen;
-		public static void WriteLine(string format, params object[] args)
-		{ _MyDebugPrint.WriteLine(format, args); }
-		public static void Show()
-		{ _MyDebugPrint.Show(); }
-		public static bool IsOpen
-		{	get { return _MyDebugPrint.IsOpen; } }
     }
 	public static class DebugProfile
 	{
 		private static DebugPrint _MyDebugPrint = new DebugPrint();
-		public static void Open(string fileName)
+        public static void Open(string fileName) => _MyDebugPrint.Open(fileName);
-		{ _MyDebugPrint.Open(fileName); }
         public static void Close()
 		{ _MyDebugPrint.Close(); _MyDebugPrint = null; }
-		public static void Write(string format, params object[] args)
+        public static void Write(string format, params object[] args) => _MyDebugPrint.Write(format, args);
-		{ _MyDebugPrint.Write(format, args); }
+        public static void WriteLine(string format, params object[] args) => _MyDebugPrint.WriteLine(format, args);
-		public static void WriteLine(string format, params object[] args)
+        public static void Show() => _MyDebugPrint.Show();
-		{ _MyDebugPrint.WriteLine(format, args); }
+        public static bool IsOpen => _MyDebugPrint.IsOpen;
-		public static void Show()
-		{ _MyDebugPrint.Show(); }
-		public static bool IsOpen
-		{ get { return _MyDebugPrint.IsOpen; } }
     }
 	public static class DebugDBTrack
 	{
 		private static DebugPrint _MyDebugPrint = new DebugPrint();
-		public static void Open(string fileName)
+        public static void Open(string fileName) => _MyDebugPrint.Open(fileName);
-		{ _MyDebugPrint.Open(fileName); }
         public static void Close()
 		{ _MyDebugPrint.Close(); _MyDebugPrint = null; }
-		public static void Write(string format, params object[] args)
+        public static void Write(string format, params object[] args) => _MyDebugPrint.Write(format, args);
-		{ _MyDebugPrint.Write(format, args); }
+        public static void WriteLine(string format, params object[] args) => _MyDebugPrint.WriteLine(format, args);
-		public static void WriteLine(string format, params object[] args)
+        public static void Show() => _MyDebugPrint.Show();
-		{ _MyDebugPrint.WriteLine(format, args); }
+        public static bool IsOpen => _MyDebugPrint.IsOpen;
-		public static void Show()
-		{ _MyDebugPrint.Show(); }
-		public static bool IsOpen
-		{ get { return _MyDebugPrint.IsOpen; } }
     }
 	// C2018-004 create meta file for baseline compares
   public static class BaselineMetaFile
   {
-    private static DebugPrint _MyDebugPrint = new DebugPrint();
+    private static readonly DebugPrint _MyDebugPrint = new DebugPrint();
-    public static void Open(string fileName)
+        public static void Open(string fileName) => _MyDebugPrint.Open(fileName);
-    { _MyDebugPrint.Open(fileName); }
+        public static void Close() => _MyDebugPrint.Close();
-    public static void Close()
+        public static void Write(string format, params object[] args) => _MyDebugPrint.Write(format, args);
-    { _MyDebugPrint.Close(); }
+        public static void WriteLine(string format, params object[] args) => _MyDebugPrint.WriteLine(format, args);
-    public static void Write(string format, params object[] args)
+        public static void Show() => _MyDebugPrint.Show();
-    { _MyDebugPrint.Write(format, args); }
+        public static bool IsOpen => _MyDebugPrint.IsOpen;
-    public static void WriteLine(string format, params object[] args)
+
-    { _MyDebugPrint.WriteLine(format, args); }
+        public static bool IncludeWordSecText { get; set; } = true;
-    public static void Show()
-    { _MyDebugPrint.Show(); }
-    public static bool IsOpen
-    { get { return _MyDebugPrint.IsOpen; } }
-		private static bool _IncludeWordSecText = true;
-		public static bool IncludeWordSecText
-		{
-			get { return BaselineMetaFile._IncludeWordSecText; }
-			set { BaselineMetaFile._IncludeWordSecText = value; }
-		}
     }
 }

PROMS/Volian.Base.Library/ExeInfo.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.IO;
 using System.Linq;
 
@@ -11,11 +9,7 @@ namespace Volian.Base.Library
 		#region Log4Net
 		private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
         #endregion
-		public static string GetROEditorPath()
+        public static string GetROEditorPath() => $@"{PROMSExecutableFolderPath()}\ROEDITOR.EXE";
-		{
-			string roapp = PROMSExecutableFolderPath() + @"\ROEDITOR.EXE";
-			return roapp;
-		}
 
         // returns the path to the executable folder
         public static string PROMSExecutableFolderPath()
@@ -24,7 +18,7 @@ namespace Volian.Base.Library
 			if (pathPROMSexe[7] == ':') // either a local drive or a mapped network drive
 				pathPROMSexe = pathPROMSexe.Substring(6);
 			else
-				pathPROMSexe = @"\" + pathPROMSexe.Substring(5); // non-mapped network drive - need to add extra back slash in front
+				pathPROMSexe = $@"\{pathPROMSexe.Substring(5)}"; // non-mapped network drive - need to add extra back slash in front
 			return pathPROMSexe;
 		}
 
@@ -34,7 +28,7 @@ namespace Volian.Base.Library
 			try
 			{
 				// Build the path to the PROMSFixes.sql file located in the PROMS exe folder
-				string pathPROMSFixes = PROMSExecutableFolderPath() + @"\PROMSFixes.sql";
+				string pathPROMSFixes = $@"{PROMSExecutableFolderPath()}\PROMSFixes.sql";
 
 				// open the PROMSFixes.sql file and grab the line of text containing the PROMSFixes RevDate
 				// using Linq to open and read the PROMSFixes file

PROMS/Volian.Base.Library/FlagEnumEditor.cs

@@ -1,8 +1,5 @@
 using System;
-using System.Collections;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
 using System.Windows.Forms;
 using System.Drawing.Design;
 using System.Windows.Forms.Design;
@@ -13,7 +10,6 @@ namespace Volian.Base.Library
 
 	public class FlagCheckedListBox : CheckedListBox
 	{
-		private System.ComponentModel.Container components = null;
 
 		public FlagCheckedListBox()
 		{
@@ -21,16 +17,6 @@ namespace Volian.Base.Library
 			InitializeComponent();
 		}
 
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing)
-			{
-				if (components != null)
-					components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
 		#region Component Designer generated code
 		private void InitializeComponent()
 		{
@@ -124,7 +110,7 @@ namespace Volian.Base.Library
 
 			// If the item has been unchecked, remove its bits from the sum
 			if (cs == CheckState.Unchecked)
-				sum = sum & (~composite.value);
+				sum &= (~composite.value);
 			// If the item has been checked, combine its bits with the sum
 			else
 				sum |= composite.value;
@@ -207,25 +193,13 @@ namespace Volian.Base.Library
 			caption = c;
 		}
 
-		public override string ToString()
+        public override string ToString() => caption;
-		{
-			return caption;
-		}
 
         // Returns true if the value corresponds to a single bit being set
-		public bool IsFlag
+        public bool IsFlag => (value & (value - 1)) == 0;
-		{
-			get
-			{
-				return ((value & (value - 1)) == 0);
-			}
-		}
 
         // Returns true if this value is a member of the composite bit value
-		public bool IsMemberFlag(FlagCheckedListBoxItem composite)
+        public bool IsMemberFlag(FlagCheckedListBoxItem composite) => IsFlag && ((value & composite.value) == value);
-		{
-			return (IsFlag && ((value & composite.value) == value));
-		}
 
         public uint value;
 		public string caption;
@@ -236,12 +210,14 @@ namespace Volian.Base.Library
 	public class FlagEnumUIEditor : UITypeEditor
 	{
 		// The checklistbox
-		private FlagCheckedListBox flagEnumCB;
+		private readonly FlagCheckedListBox flagEnumCB;
 
 		public FlagEnumUIEditor()
 		{
-			flagEnumCB = new FlagCheckedListBox();
+            flagEnumCB = new FlagCheckedListBox
-			flagEnumCB.BorderStyle = BorderStyle.None;
+            {
+                BorderStyle = BorderStyle.None
+            };
         }
 
 		public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
@@ -266,10 +242,7 @@ namespace Volian.Base.Library
 			return null;
 		}
 
-		public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) => UITypeEditorEditStyle.DropDown;
-		{
-			return UITypeEditorEditStyle.DropDown;
-		}
 
 
     }

PROMS/Volian.Base.Library/FrmPopupStatusMessage.cs

@@ -1,12 +1,4 @@
-using System;
+using System.Windows.Forms;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 
 namespace Volian.Base.Library
 {

PROMS/Volian.Base.Library/GenericSerializer.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
 using System.IO;
 using System.Xml;
@@ -17,7 +16,6 @@ namespace Volian.Base.Library
 			using (MemoryStream ms = new MemoryStream())
 			{
 				xs.Serialize(new NonXsiTextWriter(ms, Encoding.Unicode), t);
-				//xs.Serialize(ms, t);
 				ms.Position = 0;
 				StreamReader sr = new StreamReader(ms);
 				strOutput = sr.ReadToEnd();
@@ -38,26 +36,6 @@ namespace Volian.Base.Library
 			}
 			return t;
 		}
-		//public static void WriteFile(T t, string fileName)
-		//{
-		//  string strOutput = string.Empty;
-		//  XmlSerializer xs = new XmlSerializer(typeof(T));
-		//  using (FileStream fs = new FileStream(fileName, FileMode.Create))
-		//  {
-		//    xs.Serialize(new NonXsiTextWriter(fs, Encoding.UTF8), t);
-		//    fs.Close();
-		//  }
-		//}
-		//public static T ReadFile(string fileName)
-		//{
-		//  T t;
-		//  XmlSerializer xs = new XmlSerializer(typeof(T));
-		//  using (FileStream fs = new FileStream(fileName, FileMode.Open))
-		//  {
-		//    t = (T)xs.Deserialize(fs);
-		//  }
-		//  return t;
-		//}
 	}
 	public class NonXsiTextWriter : XmlTextWriter
 	{
@@ -79,8 +57,6 @@ namespace Volian.Base.Library
 			}
 			if (localName == "xlink_href")
 				base.WriteStartAttribute(prefix, "xlink:href", ns);
-			//else if (localName == "encoding")
-			//  _skip = true;
 			else
 				base.WriteStartAttribute(prefix, localName, ns);
 		}

PROMS/Volian.Base.Library/GlobalSuppressions.cs

@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Not modifying Naming Styles")]

PROMS/Volian.Base.Library/PropGridCollEditor.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Text;
-using System.ComponentModel;
 using System.ComponentModel.Design;
 using System.Windows.Forms;
 using System.Reflection;
@@ -17,10 +13,10 @@ namespace Volian.Base.Library
 		// PropertyValueChanged event args...
 		public delegate void MyPropertyValueChangedEventHandler(object sender, PropertyValueChangedEventArgs e);
 		public static event MyPropertyValueChangedEventHandler MyPropertyValueChanged;
-		private bool AllowAddDel = false;       // flags whether the Add/Delete buttons should be displayed:
+		private readonly bool AllowAddDel = false;       // flags whether the Add/Delete buttons should be displayed:
 		// Inherit the default constructor from the standard
 		// Collection Editor...
-		private Type _origType;
+		private readonly Type _origType;
 		public PropGridCollEditor(Type type)
 			: base(type)
 		{
@@ -29,10 +25,7 @@ namespace Volian.Base.Library
 			if (type.Name == "ReplaceStrData") AllowAddDel = true;      // Defaults to not having the 'Add' & 'Remove' buttons.
 		}
 
-		protected override Type CreateCollectionItemType()
+        protected override Type CreateCollectionItemType() => base.CreateCollectionItemType();
-		{
-			return base.CreateCollectionItemType();
-		}
         private Button resetbtn = null;
 		// Override this method in order to access the containing user controls
 		// from the default Collection Editor form or to add new ones...
@@ -50,18 +43,19 @@ namespace Volian.Base.Library
 			if (!AllowAddDel)
 			{
                 // add a reset button and put next to ok button:
-				resetbtn = new Button();
+                resetbtn = new Button
-				resetbtn.Text = "Reset";
+                {
-				resetbtn.Location = new System.Drawing.Point(okbtn.Location.X - 20, okbtn.Location.Y);
+                    Text = "Reset",
-				resetbtn.Width = 250;
+                    Location = new System.Drawing.Point(okbtn.Location.X - 20, okbtn.Location.Y),
-				resetbtn.Visible = true;
+                    Width = 250,
-				resetbtn.Enabled = false;        // only enabled on data change
+                    Visible = true,
+                    Enabled = false        // only enabled on data change
+                };
                 resetbtn.Click += resetbtn_Click;
 				okbtn.Parent.Controls.Add(resetbtn);
 			}
 			SetMembersLabel(collectionForm);
-			TableLayoutPanel tlpLayout = frmCollectionEditorForm.Controls[0] as TableLayoutPanel;
+            if (frmCollectionEditorForm.Controls[0] is TableLayoutPanel tlpLayout)
-			if (tlpLayout != null)
             {
                 // Get a reference to the inner PropertyGrid and hook an event handler to it.
                 if (tlpLayout.Controls[5] is PropertyGrid)
@@ -93,20 +87,7 @@ namespace Volian.Base.Library
 			else if (SelectedGridField.Contains("Active CheckOff"))
 				ResetValue(propertyGrid.SelectedGridItem.Parent.Parent.Value, "Active");
 		}
-		private void ShowReflection(Object data)
+
-		{
-			if (data == null) return;
-			//Object data = new A();
-			FieldInfo[] fields = data.GetType().GetFields(BindingFlags.Public |
-																				BindingFlags.NonPublic |
-																				BindingFlags.Instance);
-			String str = "";
-			foreach (FieldInfo f in fields)
-			{
-				str += f.Name + " = " + f.GetValue(data) + "\r\n";
-			}
-			Console.WriteLine("reflection = {0}", str);
-		}
         PropertyGrid propertyGrid = null;
 		private string SelectedGridField = "";
 		// The following method is used to enable and set text on the 'Reset' button.  When a grid item is selected, if it has
@@ -114,7 +95,7 @@ namespace Volian.Base.Library
 		void PG_SelectedGridItemChanged(object sender, SelectedGridItemChangedEventArgs e)
 		{
 			if (resetbtn == null) return;
-			if (propertyGrid != null) Console.WriteLine(LabelPath(propertyGrid.SelectedGridItem)); //  PG.SelectedGridItem.Label + " : " + PG.SelectedGridItem.Value;
+			if (propertyGrid != null) Console.WriteLine(LabelPath(propertyGrid.SelectedGridItem)); 
 			// see if data has changed, and if so, enable the Reset button.
 			bool enabled = false;
 			resetbtn.Text = "Reset";
@@ -124,7 +105,7 @@ namespace Volian.Base.Library
 				string origForButton = OrigValue(propertyGrid.SelectedGridItem.Parent.Value, "WindowsFont");
 				if (origForButton != null)
 				{
-					resetbtn.Text = "Reset to " + origForButton;
+					resetbtn.Text = $"Reset to {origForButton}";
 					enabled = true;
 				}
 			}
@@ -133,7 +114,7 @@ namespace Volian.Base.Library
 				string origForButton = OrigValue(propertyGrid.SelectedGridItem.Parent.Value, "LeftMargin");
 				if (origForButton != null)
 				{
-					resetbtn.Text = "Reset to " + origForButton;
+					resetbtn.Text = $"Reset to {origForButton}";
 					enabled = true;
 				}
 			}
@@ -142,7 +123,7 @@ namespace Volian.Base.Library
 				string origForButton = OrigValue(propertyGrid.SelectedGridItem.Parent.Value, "PageLength");
 				if (origForButton != null)
 				{
-					resetbtn.Text = "Reset to " + origForButton;
+					resetbtn.Text = $"Reset to {origForButton}";
 					enabled = true;
 				}
 			}
@@ -151,7 +132,7 @@ namespace Volian.Base.Library
 				string origForButton = OrigValue(propertyGrid.SelectedGridItem.Parent.Parent.Value, "Active");
 				if (origForButton != null)
 				{
-					resetbtn.Text = "Reset to " + origForButton;
+					resetbtn.Text = $"Reset to {origForButton}";
 					enabled = true;
 				}
 			}
@@ -160,7 +141,7 @@ namespace Volian.Base.Library
 				string origForButton = OrigValue(propertyGrid.SelectedGridItem.Parent.Parent.Value, "Active");
 				if (origForButton != null)
 				{
-					resetbtn.Text = "Reset to " + origForButton;
+					resetbtn.Text = $"Reset to {origForButton}";
 					enabled = true;
 				}
 			}
@@ -182,8 +163,8 @@ namespace Volian.Base.Library
 			// field to compare the 2 to see if a change was made, i.e. UCF data exists.
 			foreach (FieldInfo f in fields)
 			{
-				if (f.Name == "_" + fieldName) fldVal = f;
+				if (f.Name == $"_{fieldName}") fldVal = f;
-				if (f.Name == "_Orig" + fieldName) fldOrig = f;
+				if (f.Name == $"_Orig{fieldName}") fldOrig = f;
 			}
 			if (fldVal != null && fldOrig != null)
 			{
@@ -200,7 +181,7 @@ namespace Volian.Base.Library
 					if (orig != newv) return retval;
 					else return null;
 				}
-				catch (Exception ex)
+				catch (Exception)
                 {
 					return null;
 				}
@@ -218,8 +199,8 @@ namespace Volian.Base.Library
 																				BindingFlags.Instance);
 			foreach (FieldInfo f in fields)
 			{
-				if (f.Name == "_" + fieldName) fldVal = f;
+				if (f.Name == $"_{fieldName}") fldVal = f;
-				if (f.Name == "_Orig" + fieldName) fldOrig = f;
+				if (f.Name == $"_Orig{fieldName}") fldOrig = f;
 			}
 			if (fldVal != null && fldOrig != null)
 			{
@@ -228,10 +209,7 @@ namespace Volian.Base.Library
 			}
 		}
         // Remove this on release, and any uses of it.
-		private string LabelPath(GridItem gi)
+        private string LabelPath(GridItem gi) => gi.Parent == null ? "" : $"{LabelPath(gi.Parent)}:{gi.Label}";
-		{
-			return (gi.Parent == null ? "" : LabelPath(gi.Parent) + ":" + gi.Label);
-		}
 
         // set the 'members' label to better reflect what is displayed:
         private bool SetMembersLabel(Control myControl)
@@ -292,10 +270,7 @@ namespace Volian.Base.Library
 		void propertyGrid_PropertyValueChanged(object sender, PropertyValueChangedEventArgs e)
 		{
             // Fire our customized collection event...
-			if (PropGridCollEditor.MyPropertyValueChanged != null)
+            PropGridCollEditor.MyPropertyValueChanged?.Invoke(this, e);
-			{
-				PropGridCollEditor.MyPropertyValueChanged(this, e);
-			}
         }
 	}
 }

PROMS/Volian.Base.Library/RTBAPI.cs

@@ -1,11 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Windows.Forms;
 using System.Drawing;
 using System.Runtime.InteropServices;
 using System.ComponentModel;
-using Volian.Base.Library;
 
 namespace Volian.Base.Library
 {
@@ -451,11 +448,6 @@ namespace Volian.Base.Library
 		}
 		#endregion
 		#region Structures
-		//struct CharRange
-		//{
-		//  public int cpMin;
-		//  public int cpMax;
-		//}
 		[StructLayout(LayoutKind.Sequential, Pack = 4, CharSet = CharSet.Auto)]
 		public struct CharFormat2
 		{
@@ -483,16 +475,10 @@ namespace Volian.Base.Library
 		}
 		public class CharFormatTwo
 		{
-			public CharFormatTwo(CharFormat2 cf)
+            public CharFormatTwo(CharFormat2 cf) => _CharFormat2 = cf;
-			{
-				_CharFormat2 = cf;
-			}
             private CharFormat2 _CharFormat2;
             [Browsable(false)]
-			public CharFormat2 CharFormat2
+            public CharFormat2 CharFormat2 => _CharFormat2;
-			{
-				get { return _CharFormat2; }
-			}
             [Browsable(false)]
 			public int cbSize
 			{
@@ -521,14 +507,8 @@ namespace Volian.Base.Library
 				get { return _CharFormat2.yOffset; }
 				set { _CharFormat2.yOffset = value; }
 			}
-			private Color Int2Color(int color)
+            private Color Int2Color(int color) => Color.FromArgb(color % 256, (color / 256) % 256, color / (256 * 256));
-			{
+            private int Color2Int(Color color) => color.R + (color.G * 256) + (color.B * 256 * 256);
-				return Color.FromArgb(color % 256, (color / 256) % 256, color / (256 * 256));
-			}
-			private int Color2Int(Color color)
-			{
-				return color.R + (color.G * 256) + (color.B * 256 * 256);
-			}
             public Color crTextColor
 			{
 				get { return Int2Color(_CharFormat2.crTextColor); }
@@ -637,14 +617,8 @@ namespace Volian.Base.Library
 		public class ParaFormatTwo
 		{
 			private ParaFormat2 _ParaFormat2;
-			public ParaFormatTwo(ParaFormat2 pf)
+            public ParaFormatTwo(ParaFormat2 pf) => _ParaFormat2 = pf;
-			{
+            public ParaFormat2 ParaFormat2 => _ParaFormat2;
-				_ParaFormat2 = pf;
-			}
-			public ParaFormat2 ParaFormat2
-			{
-				get { return _ParaFormat2; }
-			}
             public int cbSize
 			{
 				get { return _ParaFormat2.cbSize; }
@@ -769,16 +743,8 @@ namespace Volian.Base.Library
 		}
         #endregion
         #region Static Methods
-		public static bool HasVertScroll(Control ctl)
+        public static bool HasVertScroll(Control ctl) => (GetWindowLong(ctl.Handle, GWL_STYLE) & WS_VSCROLL) != 0;
-		{
+        public static bool HasHorzScroll(Control ctl) => (GetWindowLong(ctl.Handle, GWL_STYLE) & WS_HSCROLL) != 0;
-			int dwstyle = GetWindowLong(ctl.Handle, GWL_STYLE);
-			return (dwstyle & WS_VSCROLL) != 0;
-		}
-		public static bool HasHorzScroll(Control ctl)
-		{
-			int dwstyle = GetWindowLong(ctl.Handle, GWL_STYLE);
-			return (dwstyle & WS_HSCROLL) != 0;
-		}
         public static void SetScrollLocation(RichTextBox richTextBox, Point point)
 		{
 			if (SendMessage(new HandleRef(richTextBox, richTextBox.Handle), Messages.EM_SETSCROLLPOS, 0, ref point) == 0)
@@ -815,7 +781,6 @@ namespace Volian.Base.Library
 			ParaFormat2 pf2 = pft.ParaFormat2;
 			if (SendMessage(new HandleRef(richTextBox, richTextBox.Handle), Messages.EM_SETPARAFORMAT, 0, ref pf2) == 0)
 			{
-				//if(Marshal.GetLastWin32Error()!=0)
 				throw new Win32Exception();
 			}
 		}
@@ -849,15 +814,6 @@ namespace Volian.Base.Library
 			}
 
 		}
-		public static void SetHighlightColor(RichTextBox richTextBox, RTBSelection selection, Color color)
-		{
-			CharFormatTwo cft = GetCharFormat(richTextBox, selection);
-			cft.crBackColor = color;
-			cft.dwEffects = 0;
-			cft.dwMask = 0;
-			cft.dwMask |= CharFormatMasks.CFM_BACKCOLOR;
-			SetCharFormat(richTextBox, selection, cft);
-		}
 		public static void SetSpaceBefore(RichTextBox richTextBox, int spaceBefore)
 		{
 			ParaFormatTwo pft = GetParaFormat(richTextBox);
@@ -875,236 +831,6 @@ namespace Volian.Base.Library
 			pft.dySpaceBefore = spaceBefore * 1440 / dpi;
 			SetParaFormat(richTextBox, pft);
 		}
-		//developed for equation editor interface work, but ended up not needing it.  Kept it in
-		// case it is needed in the future.
-		//public static void SetSpaceAfter(RichTextBox richTextBox, int spaceAfter)
-		//{
-		//	ParaFormatTwo pft = GetParaFormat(richTextBox);
-		//	pft.dwMask = 0;
-		//	pft.dwMask |= ParaFormatMasks.PFM_SPACEAFTER;
-		//	// get the monitor's resolution in DPI and use it to set the linespacing value for
-		//	// the richtextbox.  Note that without this, the Arial Unicode font made the appearance of
-		//	// almost double linespacing.  Using PFS_Exact makes it appear as regular single spacing.
-		//	Graphics g = richTextBox.CreateGraphics();
-		//	int dpi = Convert.ToInt32((g.DpiX + g.DpiY) / 2);
-		//	g.Dispose();
-		//	// dyLineSpacing is Spacing between lines. the PFS_EXACT sets line spacing as the spacing from one
-		//	//line to the next, in twips - thus the 1440. 
-
-		//	pft.dySpaceAfter = spaceAfter * 1440 / dpi;
-		//	SetParaFormat(richTextBox, pft);
-		//}
-		public static void SetLineSpacing(RichTextBox richTextBox, ParaSpacing type)
-		{
-			ParaFormatTwo pft = GetParaFormat(richTextBox);
-			pft.bLineSpacingRule = type;
-			pft.dwMask = 0;
-			pft.dwMask |= ParaFormatMasks.PFM_LINESPACING;
-			pft.dwMask |= ParaFormatMasks.PFM_SPACEAFTER;
-			
-			// get the monitor's resolution in DPI and use it to set the linespacing value for
-			// the richtextbox.  Note that without this, the Arial Unicode font made the appearance of
-			// almost double linespacing.  Using PFS_Exact makes it appear as regular single spacing.
-			Graphics g = richTextBox.CreateGraphics();
-			int dpi = Convert.ToInt32((g.DpiX + g.DpiY) / 2);
-			g.Dispose();
-			// dyLineSpacing is Spacing between lines. the PFS_EXACT sets line spacing as the spacing from one
-			//line to the next, in twips - thus the 1440. 
-			
-			pft.dyLineSpacing = Convert.ToInt32(.5 + richTextBox.Font.GetHeight(dpi)) * 1440 / dpi;
-			SetParaFormat(richTextBox, pft);
-		}
-		public static E_FontStyle GetFontStyle(RichTextBox richTextBox)
-		{
-			E_FontStyle fs = E_FontStyle.FS_NONE;
-			CharFormatTwo cft = GetCharFormat(richTextBox, RTBSelection.SCF_SELECTION);
-			if (((cft.dwMask & CharFormatMasks.CFM_BOLD) == CharFormatMasks.CFM_BOLD) &&
-				((cft.dwEffects & CharFormatEffects.CFE_BOLD) == CharFormatEffects.CFE_BOLD)) fs |= E_FontStyle.FS_BOLD;
-			if (((cft.dwMask & CharFormatMasks.CFM_UNDERLINE) == CharFormatMasks.CFM_UNDERLINE) &&
-				((cft.dwEffects & CharFormatEffects.CFE_UNDERLINE) == CharFormatEffects.CFE_UNDERLINE)) fs |= E_FontStyle.FS_UNDERLINE;
-			if (((cft.dwMask & CharFormatMasks.CFM_ITALIC) == CharFormatMasks.CFM_ITALIC) &&
-				((cft.dwEffects & CharFormatEffects.CFE_ITALIC) == CharFormatEffects.CFE_ITALIC)) fs |= E_FontStyle.FS_ITALIC;
-			if (richTextBox.SelectionCharOffset == -2) fs |= E_FontStyle.FS_SUBSCRIPT;
-			if (richTextBox.SelectionCharOffset == 2) fs |= E_FontStyle.FS_SUPERSCRIPT;
-			return fs;
-		}
-		public static void SetFontStyle(RichTextBox richTextBox, E_FontStyle fs)
-		{
-			CharFormatTwo cft = GetCharFormat(richTextBox, RTBSelection.SCF_SELECTION);
-			if ((fs & E_FontStyle.FS_BOLD) == E_FontStyle.FS_BOLD)
-			{
-				cft.dwEffects |= CharFormatEffects.CFE_BOLD;
-				cft.dwMask |= CharFormatMasks.CFM_BOLD;
-			}
-			if ((fs & E_FontStyle.FS_UNDERLINE) == E_FontStyle.FS_UNDERLINE)
-			{
-				cft.dwEffects |= CharFormatEffects.CFE_UNDERLINE;
-				cft.dwMask |= CharFormatMasks.CFM_UNDERLINE;
-			}
-			if ((fs & E_FontStyle.FS_ITALIC) == E_FontStyle.FS_ITALIC)
-			{
-				cft.dwEffects |= CharFormatEffects.CFE_ITALIC;
-				cft.dwMask |= CharFormatMasks.CFM_ITALIC;
-			}
-			if ((fs & E_FontStyle.FS_SUBSCRIPT) == E_FontStyle.FS_SUBSCRIPT)
-			{
-				richTextBox.SelectionCharOffset = -2;
-			}
-			if ((fs & E_FontStyle.FS_SUPERSCRIPT) == E_FontStyle.FS_SUPERSCRIPT)
-			{
-				richTextBox.SelectionCharOffset = 2;
-			}
-			SetCharFormat(richTextBox, RTBSelection.SCF_SELECTION, cft);
-		}
-		public static bool IsSuperScript(RichTextBox richTextBox)
-		{
-			return (richTextBox.SelectionCharOffset>0);
-		}
-		public static bool IsSubScript(RichTextBox richTextBox)
-		{
-			return (richTextBox.SelectionCharOffset < 0);
-		}
-		public static void ToggleSubscript(bool bSet, RichTextBox richTextBox, RTBSelection selection)
-		{
-			if (bSet)
-				richTextBox.SelectionCharOffset = -2;
-			else
-				richTextBox.SelectionCharOffset = 0;
-		}
-		public static void ToggleSuperscript(bool bSet, RichTextBox richTextBox, RTBSelection selection)
-		{
-			if (bSet)
-				richTextBox.SelectionCharOffset = 2;
-			else
-				richTextBox.SelectionCharOffset = 0;
-		}
-		public static bool IsBold(RichTextBox richTextBox)
-		{
-			CharFormatTwo cft = GetCharFormat(richTextBox, RTBSelection.SCF_SELECTION);
-			return (((cft.dwMask & CharFormatMasks.CFM_BOLD) == CharFormatMasks.CFM_BOLD) &&
-				((cft.dwEffects & CharFormatEffects.CFE_BOLD) == CharFormatEffects.CFE_BOLD));
-		}
-		public static void ToggleBold(bool bSet, RichTextBox richTextBox, RTBSelection selection)
-		{
-			CharFormatTwo cft = GetCharFormat(richTextBox, selection);
-			if (bSet)
-			{
-				cft.dwEffects = CharFormatEffects.CFE_BOLD;
-				cft.dwMask = CharFormatMasks.CFM_BOLD;
-			}
-			else
-			{
-				cft.dwEffects = CharFormatEffects.CFE_NONE;
-				cft.dwMask = CharFormatMasks.CFM_BOLD;
-			}
-			SetCharFormat(richTextBox, selection, cft);
-		}
-		public static bool IsUnderline(RichTextBox richTextBox)
-		{
-			CharFormatTwo cft = GetCharFormat(richTextBox, RTBSelection.SCF_SELECTION);
-			return (((cft.dwMask & CharFormatMasks.CFM_UNDERLINE) == CharFormatMasks.CFM_UNDERLINE) && 
-				((cft.dwEffects & CharFormatEffects.CFE_UNDERLINE) == CharFormatEffects.CFE_UNDERLINE));
-		}
-		public static void ToggleUnderline(bool bSet, RichTextBox richTextBox, RTBSelection selection)
-		{
-			CharFormatTwo cft = GetCharFormat(richTextBox, selection);
-			if (bSet)
-			{
-				cft.dwEffects = CharFormatEffects.CFE_UNDERLINE;
-				cft.dwMask = CharFormatMasks.CFM_UNDERLINE;
-			}
-			else
-			{
-				cft.dwEffects = CharFormatEffects.CFE_NONE;
-				cft.dwMask = CharFormatMasks.CFM_UNDERLINE;
-			}
-			SetCharFormat(richTextBox, selection, cft);
-		}
-		public static bool IsItalic(RichTextBox richTextBox)
-		{
-			CharFormatTwo cft = GetCharFormat(richTextBox, RTBSelection.SCF_SELECTION);
-			return (((cft.dwMask & CharFormatMasks.CFM_ITALIC) == CharFormatMasks.CFM_ITALIC) && 
-				((cft.dwEffects & CharFormatEffects.CFE_ITALIC) == CharFormatEffects.CFE_ITALIC));
-		}
-		public static void ToggleItalic(bool bSet, RichTextBox richTextBox, RTBSelection selection)
-		{
-			CharFormatTwo cft = GetCharFormat(richTextBox, selection);
-			if (bSet)
-			{
-				cft.dwEffects = CharFormatEffects.CFE_ITALIC;
-				cft.dwMask = CharFormatMasks.CFM_ITALIC;
-			}
-			else
-			{
-				cft.dwEffects = CharFormatEffects.CFE_NONE;
-				cft.dwMask = CharFormatMasks.CFM_ITALIC;
-			}
-			SetCharFormat(richTextBox, selection, cft);
-		}
-		//public static bool IsLink(RichTextBox richTextBox)
-		//{
-		//    CharFormatTwo cft = GetCharFormat(richTextBox, RTBSelection.SCF_SELECTION);
-		//    return ((cft.dwEffects & CharFormatEffects.CFE_PROTECTED) == CharFormatEffects.CFE_PROTECTED);
-		//}
-		//public static void ToggleLink(bool bSet, RichTextBox richTextBox, RTBSelection selection)
-		//{
-		//    CharFormatTwo cft = GetCharFormat(richTextBox, selection);
-		//    if (bSet)
-		//    {
-		//        cft.dwEffects |= CharFormatEffects.CFE_LINK;
-		//        cft.dwMask |= CharFormatMasks.CFM_LINK;
-		//    }
-		//    else
-		//    {
-		//        cft.dwEffects &= ~RTBAPI.CharFormatEffects.CFE_LINK;
-		//    }
-		//    SetCharFormat(richTextBox, selection, cft);
-		//}
-		//public static void UnProtect(RichTextBox richTextBox) //, string type, string text, string link)
-		//{
-		//    //richTextBox.DetectUrls = false;
-		//    CharFormatTwo cft = GetCharFormat(richTextBox, RTBAPI.RTBSelection.SCF_SELECTION); ;
-		//    //int position = richTextBox.SelectionStart = richTextBox.TextLength;
-		//    //richTextBox.SelectionLength = 0;
-		//    //richTextBox.SelectedRtf = @"{\rtf1\ansi " + text + @"\v #" + link + @"\v0}";
-		//    //richTextBox.SelectedRtf = "{" + string.Format(@"\rtf1\ansi\protect\v {0}\v0 {1}\v #{2}", type, text, link) + "}";
-		//    //richTextBox.Select(position, type.Length + text.Length + link.Length + 1);
-		//    cft.dwMask = RTBAPI.CharFormatMasks.CFM_PROTECTED;
-		//    cft.dwEffects = 0;
-		//    // The lines below can be used to allow link text to be edited
-		//    //charFormat.dwMask = RTBAPI.CharFormatMasks.CFM_LINK;
-		//    //charFormat.dwEffects = RTBAPI.CharFormatEffects.CFE_LINK;
-		//    SetCharFormat(richTextBox, RTBSelection.SCF_SELECTION, cft);
-		//    //rtbRTF.SetSelectionLink(true);
-		//    //richTextBox.SelectionStart = richTextBox.TextLength;
-		//    //richTextBox.SelectionLength = 0;
-		//}
-		//public static void Protect(RichTextBox richTextBox) //, string type, string text, string link)
-		//{
-		//    CharFormatTwo cft = GetCharFormat(richTextBox, RTBAPI.RTBSelection.SCF_SELECTION); ;
-		//    cft.dwMask = CharFormatMasks.CFM_PROTECTED;
-		//    cft.dwEffects = CharFormatEffects.CFE_PROTECTED;
-		//    SetCharFormat(richTextBox, RTBSelection.SCF_SELECTION, cft);
-		//}
-		//public static void SetLink(RichTextBox richTextBox, string type, string text, string link)
-		//{
-		//    richTextBox.DetectUrls = false;
-		//    CharFormatTwo cft = GetCharFormat(richTextBox, RTBAPI.RTBSelection.SCF_SELECTION); ;
-		//    int position = richTextBox.SelectionStart = richTextBox.TextLength;
-		//    richTextBox.SelectionLength = 0;
-		//    //richTextBox.SelectedRtf = @"{\rtf1\ansi " + text + @"\v #" + link + @"\v0}";
-		//    richTextBox.SelectedRtf = "{" + string.Format(@"\rtf1\ansi\protect\v {0}\v0 {1}\v #{2}", type, text, link) + "}";
-		//    richTextBox.Select(position, type.Length + text.Length + link.Length + 1);
-		//    cft.dwMask = RTBAPI.CharFormatMasks.CFM_LINK | RTBAPI.CharFormatMasks.CFM_PROTECTED;
-		//    cft.dwEffects = RTBAPI.CharFormatEffects.CFE_LINK | RTBAPI.CharFormatEffects.CFE_PROTECTED;
-		//    // The lines below can be used to allow link text to be edited
-		//    //charFormat.dwMask = RTBAPI.CharFormatMasks.CFM_LINK;
-		//    //charFormat.dwEffects = RTBAPI.CharFormatEffects.CFE_LINK;
-		//    SetCharFormat(richTextBox, RTBSelection.SCF_SELECTION, cft);
-		//    //rtbRTF.SetSelectionLink(true);
-		//    richTextBox.SelectionStart = richTextBox.TextLength;
-		//    richTextBox.SelectionLength = 0;
-		//}
 		#endregion
 	}
 }

PROMS/Volian.Base.Library/RtfTools.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Text.RegularExpressions;
 
 namespace Volian.Base.Library

PROMS/Volian.Base.Library/TmpFile.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.IO;
 using System.Text.RegularExpressions;
 
@@ -8,18 +6,8 @@ namespace Volian.Base.Library
 {
 	public static class TmpFile
 	{
-		public static string CreateFileName(string procNumber, string sectNumber, string sectTitle)
+        public static string CreateFileName(string procNumber) => FixFileName(procNumber);
-		{
+        public static string FixFileName(string name) => $"{Regex.Replace(name, "[ .,/]", "_")}.pdf";
-			return FixFileName(procNumber + "_" + ((sectNumber ?? "") != "" ? sectNumber : sectTitle));
-		}
-		public static string CreateFileName(string procNumber)
-		{
-			return FixFileName(procNumber);
-		}
-		public static string FixFileName(string name)
-		{
-			return Regex.Replace(name, "[ .,/]", "_") + ".pdf";
-		}
         public static void RemoveAllTmps()
 		{
 			RemoveTmpPDFs();
@@ -41,7 +29,7 @@ namespace Volian.Base.Library
 					if (fi.LastAccessTime.Ticks < (DateTime.Now.Ticks - TimeSpan.TicksPerHour))
 						fi.Delete();
 				}
-				catch (Exception ex)
+				catch (Exception)
 				{
 					continue;   // if an error, go onto next file.
 				}
@@ -70,7 +58,7 @@ namespace Volian.Base.Library
                     if(fi.LastWriteTimeUtc < DateTime.Now.AddDays(-2.0))
                     fi.Delete();
                 }
-                catch (Exception ex)
+                catch (Exception)
                 {
                     continue;   // if an error, go onto next file.
                 }
@@ -90,7 +78,7 @@ namespace Volian.Base.Library
 					// it may be open from another process.
 					fi.Delete();
 				}
-				catch (Exception ex)
+				catch (Exception)
 				{
 					continue;   // if an error, go onto next file.
 				}

PROMS/Volian.Base.Library/ValidFileName.cs

@@ -1,8 +1,5 @@
-using System;
+using System.Linq;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Volian.Base.Library
 {

PROMS/Volian.Base.Library/VlnItextSharpFont.cs

@@ -1,11 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using iTextSharp.text.factories;
 using Microsoft.Win32;
-using System.Text.RegularExpressions;
 using System.IO;
 using iTextSharp.text;
 
@@ -53,7 +47,7 @@ namespace Volian.Base.Library
 						_MyLog.WarnFormat("PROMS Font Folder = {0}", _PromsFontDir); // C2019-028 Add info in the error log
 				}
 			}
-			int profileDepth1 = ProfileTimer.Push(">>>> RegisterDirectory " + _PromsFontDir);
+			int profileDepth1 = ProfileTimer.Push($">>>> RegisterDirectory {_PromsFontDir}");
 			//_MyLog.DebugFormat("Register this Font Folder = {0}", _PromsFontDir); // debug
 			iTextSharp.text.FontFactory.RegisterDirectory(_PromsFontDir);
 			ProfileTimer.Pop(profileDepth1);
@@ -70,7 +64,7 @@ namespace Volian.Base.Library
 					_MyLog.WarnFormat("Problem with Font {0} in {1}", fontName, _PromsFontDir);
 					if (_PromsFontDir != FontFind.FontDir)
 					{
-						int profileDepth2 = ProfileTimer.Push(">>>> RegisterDirectory " + FontFind.FontDir);
+						int profileDepth2 = ProfileTimer.Push($">>>> RegisterDirectory {FontFind.FontDir}");
 						//_MyLog.DebugFormat("Register this Font Folder = {0}", FontFind.FontDir); // debug
 						iTextSharp.text.FontFactory.RegisterDirectory(FontFind.FontDir);
 						ProfileTimer.Pop(profileDepth2);
@@ -109,9 +103,8 @@ namespace Volian.Base.Library
 			}
 			ProfileTimer.Pop(profileDepth);
 		}
-		private static RegistryKey _FontKey = Registry.LocalMachine.OpenSubKey("Software").OpenSubKey("Microsoft").OpenSubKey("Windows NT").OpenSubKey("CurrentVersion").OpenSubKey("Fonts");
+		private static readonly RegistryKey _FontKey = Registry.LocalMachine.OpenSubKey("Software").OpenSubKey("Microsoft").OpenSubKey("Windows NT").OpenSubKey("CurrentVersion").OpenSubKey("Fonts");
-		public static RegistryKey FontKey
+        public static RegistryKey FontKey => _FontKey;
-		{ get { return _FontKey; } }
         /// <summary>
         /// Try to register a particular font, if it fails register the entire font folder
         /// </summary>
@@ -128,7 +121,7 @@ namespace Volian.Base.Library
 						try // B2019-118 Add error handling for FontFacory.Register (Windows Registry contains a node that
 								// points to a file that no longer exists
 						{
-							FontFactory.Register(fontFile.Contains("\\") ? fontFile : FontFind.FontDir + "\\" + fontFile);
+							FontFactory.Register(fontFile.Contains("\\") ? fontFile : $"{FontFind.FontDir}\\{fontFile}");
 						}
 						catch (Exception ex) // catch any exception and add the error to the error log.
 						{

PROMS/Volian.Base.Library/VlnSettings.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.IO;
 using System.Configuration;
 using System.Reflection;
@@ -17,24 +15,10 @@ namespace Volian.Base.Library
 		//		<add key ="OperatingMode" value ="Debug"|"Demo"|"Production"/>
 		// For DataLoader, this is set via the Debug checkbox on the form.
 		private static bool WasLoaded = false;
-		private static bool _DoUpdateRO = true;
+
-		public static bool DoUpdateRO
+        public static bool DoUpdateRO { get; set; } = true;
-		{
+        public static bool DebugPagination { get; set; } = false;
-			get { return VlnSettings._DoUpdateRO; }
+        public static bool DebugText { get; set; } = false;
-			set { VlnSettings._DoUpdateRO = value; }
-		}
-		private static bool _DebugPagination = false;
-		public static bool DebugPagination
-		{
-			get { return VlnSettings._DebugPagination; }
-			set { VlnSettings._DebugPagination = value; }
-		}
-		private static bool _DebugText = false;
-		public static bool DebugText
-		{
-			get { return VlnSettings._DebugText; }
-			set { VlnSettings._DebugText = value; }
-		}
         private static bool _DebugMode = false;
 		public static bool DebugMode
 		{
@@ -135,8 +119,7 @@ namespace Volian.Base.Library
 			{
 				if (parameter.ToUpper().StartsWith("/" + commandName.ToUpper() + "="))
 				{
-					float result = def;
+					if (float.TryParse(parameter.Substring(commandName.Length + 2), out float result))
-					if (float.TryParse(parameter.Substring(commandName.Length + 2), out result))
 						return result;
 					else
 						return def;
@@ -182,7 +165,7 @@ namespace Volian.Base.Library
 					// This will create a Temp\VE-PROMS folder in the LocalSettings Folder.
 					//XP - C:\Documents and Settings\{user}\Local Settings\Application Data\Temp\VEPROMS
 					//Vista - C:\Users\{user}\AppData\Local\Temp\VEPROMS
-					_TemporaryFolder = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + @"\Temp";
+					_TemporaryFolder = $@"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}\Temp";
 					if (!Directory.Exists(TemporaryFolder)) Directory.CreateDirectory(TemporaryFolder);
 					_TemporaryFolder += @"\VEPROMS";
 					if (!Directory.Exists(TemporaryFolder)) Directory.CreateDirectory(TemporaryFolder);
@@ -190,25 +173,10 @@ namespace Volian.Base.Library
 				return _TemporaryFolder;
 			}
 		}
-		private static string _UserID=Environment.UserName.ToUpper();
+
-		public static string UserID
+        public static string UserID { get; set; } = Environment.UserName.ToUpper();
-		{
+        public static bool StepTypeToolTip { get; set; } = false;
-			get { return VlnSettings._UserID; }
+        public static bool cbShwRplWrdsColor { get; set; } = false;
-			set { VlnSettings._UserID = value; }
-		}
-		private static bool _StepTypeToolTip = false;
-		public static bool StepTypeToolTip
-		{
-			get { return VlnSettings._StepTypeToolTip; }
-			set { VlnSettings._StepTypeToolTip = value; }
-		}
-			// C2029-025 Show or hide replace words.  Can highlight replace words in editor.
-		private static bool _cbShwRplWrdsColor = false;
-		public static bool cbShwRplWrdsColor
-		{
-			get { return VlnSettings._cbShwRplWrdsColor; }
-			set { VlnSettings._cbShwRplWrdsColor = value; }
-		}
         private static string _ReleaseMode = null;
 		public static string ReleaseMode
 		{

PROMS/Volian.Base.Library/VlnTimer.cs

@@ -1,26 +1,15 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace Volian.Base.Library
 {
 	public class VlnTimer
 	{
-		private DateTime _LastTime = DateTime.Now;
+        public DateTime LastTime { get; set; } = DateTime.Now;
-		public DateTime LastTime
+        public string LastProcess { get; set; } = "Initialize";
-		{
-			get { return _LastTime; }
-			set { _LastTime = value; }
-		}
-		private string _LastProcess = "Initialize";
-		public string LastProcess
-		{
-			get { return _LastProcess; }
-			set { _LastProcess = value; }
-		}
         public string ActiveProcess
 		{
-			get { return _LastProcess; }
+			get { return LastProcess; }
 			set
 			{
 				DateTime tNow = DateTime.Now;
@@ -33,12 +22,8 @@ namespace Volian.Base.Library
 				LastProcess = value;
 			}
 		}
-		Dictionary<string, TimeSpan> _ElapsedTimes = new Dictionary<string, TimeSpan>();
+
-		public Dictionary<string, TimeSpan> ElapsedTimes
+        public Dictionary<string, TimeSpan> ElapsedTimes { get; set; } = new Dictionary<string, TimeSpan>();
-		{
-			get { return _ElapsedTimes; }
-			set { _ElapsedTimes = value; }
-		}
         public void ShowElapsedTimes()
 		{
 			ActiveProcess = "fini";
@@ -54,26 +39,15 @@ namespace Volian.Base.Library
 	}
 	public static class ProfileTimer
 	{
+#pragma warning disable S6669
         private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-		private static Stack<string> _MyStack = new Stack<string>();
+#pragma warning restore S6669
 
-		public static Stack<string> MyStack
+        public static Stack<string> MyStack { get; set; } = new Stack<string>();
-		{
+        public static DateTime StartTime { get; set; } = DateTime.Now;
-			get { return _MyStack; }
-			set { _MyStack = value; }
-		}
-		private static DateTime _StartTime = DateTime.Now;
-		public static DateTime StartTime
-		{
-			get { return _StartTime; }
-			set { _StartTime = value; }
-		}
         delegate int DoPushTrack(string start);
 		private static DoPushTrack myDoPush = new DoPushTrack(IgnorePush);
-		public static int Push(string start)
+        public static int Push(string start) => DoPush(start);
-		{
-			return DoPush(start);
-		}
         private static int DoPush(string start)
 		{
 			MyStack.Push(Start);
@@ -87,10 +61,7 @@ namespace Volian.Base.Library
 		}
 		delegate int DoPopTrack(int depth);
 		private static DoPopTrack myDoPop = new DoPopTrack(IgnorePop);
-		public static int Pop(int depth)
+        public static int Pop(int depth) => DoPop(depth);
-		{
-			return DoPop(depth);
-		}
         private static int DoPop(int depth)
 		{
 			if (MyStack.Count != depth)
@@ -98,28 +69,15 @@ namespace Volian.Base.Library
 			Start = MyStack.Pop();
 			return MyStack.Count;
 		}
-		private static int IgnorePop(int depth)
+        private static int IgnorePop(int depth) => 0;
-		{
+        public static int Depth => MyStack.Count;
-			return 0;
+
-		}
+        public static Dictionary<string, long> TimerTable { get; set; } = new Dictionary<string, long>();
-		public static int Depth
-		{
-			get
-			{
-				return MyStack.Count;
-			}
-		}
-		private static Dictionary<string, long> _TimerTable = new Dictionary<string, long>();
-		public static Dictionary<string, long> TimerTable
-		{
-			get { return ProfileTimer._TimerTable; }
-			set { ProfileTimer._TimerTable = value; }
-		}
         delegate void DoTrack(string module);
 		private static DoTrack myDoTrack = new DoTrack(IgnoreModule);
 		public static void TurnOnTracking(string filename)
 		{
-			DebugProfile.Open(VlnSettings.TemporaryFolder + "\\" + filename);
+			DebugProfile.Open($"{VlnSettings.TemporaryFolder}\\{filename}");
 			myDoTrack = new DoTrack(TrackModule);
 			myDoPush = new DoPushTrack(DoPush);
 			myDoPop = new DoPopTrack(DoPop);
@@ -145,12 +103,9 @@ namespace Volian.Base.Library
 			//Console.WriteLine("{0},'{1}'", TimeSpan.FromTicks(dtNext.Ticks - LastTime.Ticks).TotalSeconds, Description);
 			AddTimerInfo(_Start, dtNext.Ticks - LastTime.Ticks);
 			_Start = module;
-			_LastTime = dtNext;
+			LastTime = dtNext;
-		}
-		private static void IgnoreModule(string module)
-		{
-			_Start = module;
 		}
+        private static void IgnoreModule(string module) => _Start = module;
         private static void AddTimerInfo(string description, long ticks)
 		{
 			if (TimerTable.ContainsKey(description))
@@ -205,16 +160,12 @@ namespace Volian.Base.Library
 		}
 		public static void Reset()
 		{
-			_TimerTable = new Dictionary<string, long>();
+			TimerTable = new Dictionary<string, long>();
 			_Start = "Start";
-			_LastTime = DateTime.Now;
+			LastTime = DateTime.Now;
-			_MyStack = new Stack<string>();
+			MyStack = new Stack<string>();
-		}
-		private static DateTime _LastTime = DateTime.Now;
-		public static DateTime LastTime
-		{
-			get { return _LastTime; }
-			set { _LastTime = value; }
 		}
+
+        public static DateTime LastTime { get; set; } = DateTime.Now;
     }
 }

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

@@ -90,6 +90,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="BaseLnSettings.cs" />
     <Compile Include="BigNum.cs" />
     <Compile Include="ByteArrayCompare.cs" />
     <Compile Include="DebugPrint.cs" />
@@ -104,6 +105,7 @@
       <DependentUpon>FrmPopupStatusMessage.cs</DependentUpon>
     </Compile>
     <Compile Include="GenericSerializer.cs" />
+    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropGridCollEditor.cs" />
     <Compile Include="RTBAPI.cs" />

PROMS/Volian.Base.Library/VolianTimer.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Volian.Base.Library
 {
@@ -12,45 +10,16 @@ namespace Volian.Base.Library
 	/// </summary>
 	public class VolianTimer
 	{
+#pragma warning disable S6669
         private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+#pragma warning restore S6669
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "Keeping Collections Not ReadOnly")]
         static List<VolianTimer> _Timers = new List<VolianTimer>();
-		/// <summary>
+
-		/// User defined name - should be as specific as possible 
+        public string Name { get; set; }
-		/// Include Method Name, File Name and Line Number
+        public DateTime Start { get; set; }
-		/// </summary>
+        public long Ticks { get; set; }
-		private string _Name;
+        public int Count { get; set; }
-		public string Name
-		{
-			get { return _Name; }
-			set { _Name = value; }
-		}
-		/// <summary>
-		/// Set on open
-		/// </summary>
-		private DateTime _Start;
-		public DateTime Start
-		{
-			get { return _Start; }
-			set { _Start = value; }
-		}
-		/// <summary>
-		/// Calculate on Close
-		/// </summary>
-		private long _Ticks;
-		public long Ticks
-		{
-			get { return _Ticks; }
-			set { _Ticks = value; }
-		}
-		/// <summary>
-		/// Number of times open/close has been run
-		/// </summary>
-		private int _Count;
-		public int Count
-		{
-			get { return _Count; }
-			set { _Count = value; }
-		}
         /// <summary>
         /// Constructor
         /// </summary>
@@ -60,6 +29,18 @@ namespace Volian.Base.Library
 			Ticks = 0;
 		}
         /// <summary>
+        /// Constructor with Module and line number
+        /// </summary>
+        /// <param name="module">Method Name, File Name</param>
+        /// <param name="line">Code Line Number</param>
+        public VolianTimer(string module, int line)
+        {
+            Count = 0;
+            Ticks = 0;
+            Name = string.Format("{0}:{1}", module, line);
+            if (TimingsOn) _Timers.Add(this);
+        }
+        /// <summary>
         /// Command Line Parameter /Timing turns timing on
         /// </summary>
         private static bool? _TimingsOn = null;
@@ -73,18 +54,6 @@ namespace Volian.Base.Library
 			}
 		}
 		/// <summary>
-		/// Constructor with Module and line number
-		/// </summary>
-		/// <param name="module">Method Name, File Name</param>
-		/// <param name="line">Code Line Number</param>
-		public VolianTimer(string module, int line)
-		{
-			Count = 0;
-			Ticks = 0;
-			Name = string.Format("{0}:{1}", module, line);
-			if(TimingsOn) _Timers.Add(this);
-		}
-		/// <summary>
 		/// Start Timer
 		/// </summary>
 		public void Open()

PROMS/Volian.Base.Library/vlnFont.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Drawing;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Drawing;
 using System.Drawing.Text;
 using System.Windows.Forms;
 
@@ -11,7 +7,7 @@ namespace Volian.Base.Library
     public static class vlnFont
     {
         private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-        private static InstalledFontCollection _MyFontCollection = new InstalledFontCollection();
+        private static readonly InstalledFontCollection _MyFontCollection = new InstalledFontCollection();
         private static string _ProportionalSymbolFont = null;
         // C2017-036 Look for suitable proportional font that will support the symbol characters used in PROMS
         //           Microsoft removed Arial Unicode MS starting with Word16 (office 365 containing that version of Word)