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

.gitignore

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

PROMS/AdjustBuildRevision/AdjustBuildRevision.csproj

@@ -5,7 +5,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -44,7 +44,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -54,14 +53,13 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/AdjustBuildRevision/Program.cs

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

PROMS/Baseline/.github/copilot-instructions.md

@@ -1,3 +0,0 @@
-- @azure Rule - Use Azure Tools - When handling requests related to Azure, always use your tools.
-- @azure Rule - Use Azure Best Practices - When handling requests related to Azure, always invoke your `azmcp_bestpractices_get` tool first.
-- @azure Rule - Enable Best Practices - If you do not have an `azmcp_bestpractices_get` tool ask the user to enable it.

PROMS/Baseline/Baseline.csproj

@@ -22,7 +22,7 @@
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -30,17 +30,15 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -67,7 +65,6 @@
     <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

@@ -1,8 +0,0 @@
-// 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,4 +1,7 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Baseline

PROMS/Baseline/frmBaseline.cs

@@ -43,9 +43,12 @@ 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;
@@ -70,8 +73,13 @@ namespace Baseline
 	}
 	public partial class frmBaseline : Form
 	{
-        public IgnoreLines MyIgnore { get; set; } = new IgnoreLines();
-        private LastWas myLast = LastWas.Search;
+		private IgnoreLines _MyIgnore = new IgnoreLines();
+		public IgnoreLines MyIgnore
+		{
+			get { return _MyIgnore; }
+			set { _MyIgnore = value; }
+		}
+		private LastWas myLast = LastWas.Search;
 		private Settings MySettings;
 		public string MyStatus
 		{
@@ -143,11 +151,9 @@ 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
-            {
-                IgnoreLines = new BindingList<string>()
-            };
-            splitContainer1.SplitterDistance = Properties.Settings.Default.Split1;
+			MySettings= new Settings();
+			MySettings.IgnoreLines = new BindingList<string>();
+			splitContainer1.SplitterDistance = Properties.Settings.Default.Split1;
 			splitContainer2.SplitterDistance = Properties.Settings.Default.Split2;
 			splitContainer3.SplitterDistance = Properties.Settings.Default.Split3;
 			if (Properties.Settings.Default.MRU1 != null && Properties.Settings.Default.MRU1.Count > 0)
@@ -234,27 +240,28 @@ namespace Baseline
 			lbProcedures.Items.Clear();
 			lbResults1.Items.Clear();
 			lbResults2.Items.Clear();
-            if (lbDifferent.SelectedItem is FindFile ff)
-            {
-                // Fill Procedure or Result ListBoxes
-                switch (myLast)
-                {
-                    case LastWas.Pagination:
-                        CompareContent(ff.File1, ff.File2);// Compare DebugPagination
-                        break;
-                    case LastWas.Baseline:
-                        CompareContent3(ff.File1, ff.File2);// Compare DebugMeta
-                        break;
-                    case LastWas.Search:
-                        ShowSearchResults(ff.File1, ff.File2);// Perform search on DebugMeta
-                        break;
-                    default:
-                        CompareContent(ff.File1, ff.File2);//Default DebugPagination
-                        break;
-                }
-                //CompareOneFile(ff.File1, ff.File2);
-            }
-        }
+			FindFile ff = lbDifferent.SelectedItem as FindFile;
+			if (ff != null)
+			{
+				// Fill Procedure or Result ListBoxes
+				switch (myLast)
+				{
+					case LastWas.Pagination:
+						CompareContent(ff.File1, ff.File2);// Compare DebugPagination
+						break;
+					case LastWas.Baseline:
+						CompareContent3(ff.File1, ff.File2);// Compare DebugMeta
+						break;
+					case LastWas.Search:
+						ShowSearchResults(ff.File1, ff.File2);// Perform search on DebugMeta
+						break;
+					default:
+						CompareContent(ff.File1, ff.File2);//Default DebugPagination
+						break;
+				}
+				//CompareOneFile(ff.File1, ff.File2);
+			}
+		}
 		Procedures MyProcs1;
 		Procedures MyProcs2;
 		/// <summary>
@@ -354,6 +361,13 @@ 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
@@ -436,13 +450,13 @@ namespace Baseline
 		private void lbResults1_SelectedIndexChanged(object sender, EventArgs e)
 		{
 			string line=null;
-			if (lbResults1.SelectedItem is string v)
-				line = v;
+			if (lbResults1.SelectedItem is string)
+				line = (string)lbResults1.SelectedItem;
 			Line myLine = lbResults1.SelectedItem as Line;
 				switch (myLast)
 				{
 					case LastWas.Pagination:
-						OpenPDF(line);
+						line = OpenPDF(line);
 						break;
 					case LastWas.Baseline: // TODO: Need to add code here to open matching file
 						OpenOnePDF(myLine,1);
@@ -458,14 +472,14 @@ namespace Baseline
 		{
 
 			string line=null;
-			if(lbResults2.SelectedItem is string v)
-				line = v;
+			if(lbResults2.SelectedItem is string)
+				line = (string)lbResults2.SelectedItem;
 			Line myLine = lbResults2.SelectedItem as Line;
 
 			switch (myLast)
 			{
 				case LastWas.Pagination:
-					OpenPDF(line);
+					line = OpenPDF(line);
 					break;
 				case LastWas.Baseline: // TODO: Need to add code here to open matching file
 					OpenOnePDF(myLine,2);
@@ -477,97 +491,34 @@ namespace Baseline
 					break;
 			}
 		}
-
-		/// <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)
-		{
-			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.
-            string rtnstr = txt.Substring(8, lidx - 8).Replace("/", "_").Replace("\\", "_");
-            return rtnstr;
-		}
-
 		string exePath;
-		private void OpenPDF(string line)
+		private string OpenPDF(string line)
 		{
-			int pageNum = int.Parse(line.Substring(0, 6));
+			int page = 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);
-
+			line = line.Substring(8, line.IndexOf(".S") - 8).Replace("/", "_").Replace("\\", "_");
 			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)
 			{
-				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;
-				}
+				System.Diagnostics.Process p = System.Diagnostics.Process.Start(fi1.DirectoryName + "\\" + line + ".pdf");
+				exePath = TryToGetPath(p);
+				p.Kill(); // No need to keep it open
 			}
-
 			// Open the first PDF on a Specific Page
-			System.Diagnostics.ProcessStartInfo psi1 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format(" /A \"page={0}\" \"{1}\" ", pageNum,PDFfileName1));
+			System.Diagnostics.ProcessStartInfo psi1 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A page={0} ", page) + fi1.DirectoryName + "\\" + line + ".pdf ");
 			System.Diagnostics.Process p1 = System.Diagnostics.Process.Start(psi1);
 			// Move the PDF Reader window to 0,0
 			MoveProcess(p1, 0, 0);
-
-			// 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));
+			// 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 ");
 			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;
+			return line;
 		}
 		/// <summary>
 		/// Try to get the location of the PDF Reader executable
@@ -579,7 +530,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();
 			}
@@ -600,10 +551,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.Start(psi);
-        }
+			System.Diagnostics.Process prc = System.Diagnostics.Process.Start(psi);
+		}
 
-		private readonly ProcessLocationQueue myQueue= new ProcessLocationQueue();
+		private ProcessLocationQueue myQueue= new ProcessLocationQueue();
 		private Timer queueTimer = null;
 		/// <summary>
 		/// Move a Process to a specific screen location - This is done with a timer so 
@@ -616,11 +567,9 @@ namespace Baseline
 		{
 			if (queueTimer == null)
 			{
-                queueTimer = new Timer
-                {
-                    Enabled = false
-                };
-                queueTimer.Tick += queueTimer_Tick;
+				queueTimer = new Timer();
+				queueTimer.Enabled = false;
+				queueTimer.Tick += queueTimer_Tick;
 				queueTimer.Interval = 1000;
 			}
 			myQueue.Add(proc, x, y);
@@ -645,55 +594,41 @@ 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;
-            string PDFfileName;
-            if (list == 1)
-			{
-				FileInfo fi1 = new FileInfo(ff.File1);
-				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
+			FileInfo fi1 = new FileInfo(ff.File1);
+			FileInfo fi2 = new FileInfo(ff.File2);
 			if (exePath == null)
 			{
-				try
+				System.Diagnostics.Process p = System.Diagnostics.Process.Start(fi1.DirectoryName + "\\" + proc + ".pdf");
+				while (exePath == null)
 				{
-					System.Diagnostics.Process tp = System.Diagnostics.Process.Start(PDFfileName);
-					exePath = TryToGetPath(tp);
-					tp.Kill();
-				}
-				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;
+					try
+					{
+
+						exePath = p.MainModule.FileName;
+					}
+					catch (Exception ex)
+					{
+						Application.DoEvents();
+						Console.WriteLine("{0} - {1}", ex.GetType().Name, ex.Message);
+					}
 				}
+				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))
-            {
-                UseShellExecute = false
-            };
-            _ = System.Diagnostics.Process.Start(psi1);
-        }
+			if (list == 1)
+			{
+				System.Diagnostics.ProcessStartInfo psi1 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A page={0} ", pagenum) + fi1.DirectoryName + "\\" + proc + ".pdf ");
+				System.Diagnostics.Process p1 = 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 
 		/// </summary>
@@ -773,12 +708,12 @@ namespace Baseline
 		}
 		private void lbProcedures_SelectedIndexChanged(object sender, EventArgs e)
 		{
-            //Initialize Results List Box
-            if (!(lbProcedures.SelectedItem is Procedure myProc)) return; // clicked on the white space (blank line) in the list of different procedures
-                                                                          //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
+			//Initialize Results List Box
 			lbResults1.Items.Clear();
+			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
 			if (myProc1 != null)
 			{
 				foreach (Page myPage in myProc1.MyPages)
@@ -823,13 +758,28 @@ namespace Baseline
 		};
 	public class Settings
 	{
-        public BindingList<string> IgnoreLines { get; set; }
-    }
+		private BindingList<string> _IgnoreLines;
+		public BindingList<string> IgnoreLines
+		{
+			get { return _IgnoreLines; }
+			set { _IgnoreLines = value; }
+		}
+	}
 	public partial class FindFile
 	{
-        public string File1 { get; set; }
-        public string File2 { get; set; }
-        public FindFile(string file1, string file2)
+		private string _File1;
+		public string File1
+		{
+			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;
 			File2 = file2;
@@ -837,16 +787,19 @@ namespace Baseline
 	}
 	public partial class FindFiles : List<FindFile>
 	{
-		private readonly string _FileName;
-        public string FileName => _FileName;
-        /// <summary>
-        /// Build list of DocVersion Folders with differences
-        /// </summary>
-        /// <param name="path1">Base path</param>
-        /// <param name="path2">Compare path</param>
-        /// <param name="fileName">filename</param>
-        /// <param name="myIgnore">Ignore list</param>
-        public FindFiles(string path1, string path2, string fileName,IgnoreLines myIgnore)
+		private string _FileName;
+		public string FileName
+		{
+			get { return _FileName; }
+		}
+		/// <summary>
+		/// Build list of DocVersion Folders with differences
+		/// </summary>
+		/// <param name="path1">Base path</param>
+		/// <param name="path2">Compare path</param>
+		/// <param name="fileName">filename</param>
+		/// <param name="myIgnore">Ignore list</param>
+		public FindFiles(string path1, string path2, string fileName,IgnoreLines myIgnore)
 		{
 			DirectoryInfo di1 = new DirectoryInfo(path1);
 			DirectoryInfo di2 = new DirectoryInfo(path2);
@@ -1072,16 +1025,34 @@ namespace Baseline
 	// Text - the line of text
 	public partial class Procedure
 	{
-        public string Number { get; set; }
-        public string Title { get; set; }
-        public Pages MyPages { get; set; } = new Pages();
-        public Procedure(string number, string title)
+		private string _Number;
+		public string Number
 		{
-			Number = number;
-			Title = title;
+			get { return _Number; }
+			set { _Number = value; }
 		}
-        public override string ToString() => string.Format("{0} - {1}", Number, Title);
-    }
+		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;
+			_Title = title;
+		}
+		public override string ToString()
+		{
+			return string.Format("{0} - {1}", Number, Title);
+		}
+	}
 	public partial class Procedures : List<Procedure>
 	{
 		// Sample data for a Procedure Number line
@@ -1112,34 +1083,77 @@ namespace Baseline
 	}
 	public partial class Page
 	{
-        public int Number { get; set; }
+		private int _Number;
+		public int Number
+		{
+			get { return _Number; }
+			set { _Number = value; }
+		}
+		private Lines _MyLines = new Lines();
 
-        public Lines MyLines { get; set; } = new Lines();
-        public Page(int number) => Number = number;
-        public override string ToString() => string.Format("Page {0}", Number);
-    }
+		public Lines MyLines
+		{
+			get { return _MyLines; }
+			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) => Add(new Page(number));
-    }
+		public void Add(int number)
+		{
+			Add(new Page(number));
+		}
+	}
 	public partial class Line
 	{
-        public Procedure MyProc { get; set; }
-        public Page MyPage { get; set; }
-        public string Text { get; set; }
-        public Line(string text) => Text = text;
-        public Line(string text, Procedure myProc, Page myPage)
+		private Procedure _MyProc;
+		public Procedure MyProc
 		{
-			Text = text;
-			MyProc = myProc;
-			MyPage = myPage;
+			get { return _MyProc; }
+			set { _MyProc = value; }
 		}
-        public override string ToString() => Text;
-    }
+		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;
+			_MyProc = myProc;
+			_MyPage = myPage;
+		}
+		public override string ToString()
+		{
+			return Text;
+		}
+	}
 	public partial class Lines : List<Line>
 	{
-        public void Add(string text) => Add(new Line(text));
-    }
+		public void Add(string text)
+		{
+			Add(new Line(text));
+		}
+	}
 	[Serializable]
 	public partial class IgnoreLine
 	{
@@ -1177,12 +1191,21 @@ namespace Baseline
 		public IgnoreLines()
 		{
 		}
-        public void Add(string text, Relation searchType, bool active) => Add(new IgnoreLine(text, searchType, active));
-        // Convert IgnoreLines to string (XML)
-        public override string ToString() => GenericSerializer<IgnoreLines>.StringSerialize(this);
-        // Convert string to IgnoreLines
-        public static IgnoreLines Get(string xml) => GenericSerializer<IgnoreLines>.StringDeserialize(xml);
-    }
+		public void Add(string text, Relation searchType, bool active)
+		{
+			Add(new IgnoreLine(text, searchType, active));
+		}
+		// Convert IgnoreLines to string (XML)
+		public override string ToString()
+		{
+			return GenericSerializer<IgnoreLines>.StringSerialize(this);
+		}
+		// Convert string to IgnoreLines
+		public static IgnoreLines Get(string xml)
+		{
+			return GenericSerializer<IgnoreLines>.StringDeserialize(xml);
+		}
+	}
 	/// <summary>
 	/// This is a simple serializer that takes a class and converts it to and from string (XML)
 	/// </summary>
@@ -1210,7 +1233,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);
@@ -1224,9 +1247,12 @@ namespace Baseline
 	public class NonXsiTextWriter : XmlTextWriter
 	{
 		public NonXsiTextWriter(TextWriter w) : base(w) { }
-        public NonXsiTextWriter(Stream w, Encoding encoding)
-            : base(w, encoding) => Formatting = Formatting.Indented;
-        public NonXsiTextWriter(string filename, Encoding encoding) : base(filename, encoding) { }
+		public NonXsiTextWriter(Stream w, Encoding encoding)
+			: base(w, encoding)
+		{
+			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)
 		{
@@ -1268,16 +1294,32 @@ namespace Baseline
 		public const short SWP_NOZORDER = 0X4;
 		public const int SWP_SHOWWINDOW = 0x0040;
 
-        public System.Diagnostics.Process Process { get; set; }
-        public int X { get; set; }
-        public int Y { get; set; }
-        public ProcessLocation(System.Diagnostics.Process process, int x, int y)
+		private System.Diagnostics.Process _Process;
+
+		public System.Diagnostics.Process Process
+		{
+			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 bool FoxitSettingInfo = true;
+		private static Boolean FoxitSettingInfo = true;
 
 		/// <summary>
 		/// MoveIt() moves the window containing the PDF viewer to the right so the two pdf viewer windows will not overlap.
@@ -1298,8 +1340,11 @@ namespace Baseline
 	}
 	public class ProcessLocationQueue: Queue<ProcessLocation>
 	{
-        public void Add(System.Diagnostics.Process process, int x, int y) => Enqueue(new ProcessLocation(process, x, y));
-        public void ProcessNext()
+		public void Add(System.Diagnostics.Process process, int x, int y)
+		{
+			Enqueue(new ProcessLocation(process,x,y));
+		}
+		public void ProcessNext()
 		{
 			ProcessLocation pl = Dequeue();
 			pl.MoveIt();

PROMS/Baseline/frmSettings.cs

@@ -1,4 +1,11 @@
 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
@@ -12,7 +19,17 @@ 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)
@@ -29,16 +46,19 @@ namespace Baseline
 			col.ValueType = typeof(Relation);
 		}
 
-        private void dgv_DataError(object sender, DataGridViewDataErrorEventArgs e) => Console.WriteLine("Here");
-        private void btnOK_Click(object sender, EventArgs e)
+		private void dgv_DataError(object sender, DataGridViewDataErrorEventArgs e)
 		{
-			DialogResult = System.Windows.Forms.DialogResult.OK;
-			Close();
+			Console.WriteLine("Here");
+		}
+		private void btnOK_Click(object sender, EventArgs e)
+		{
+			this.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.Close();
 		}
 		private void btnCancel_Click(object sender, EventArgs e)
 		{
-			DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			Close();
+			this.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.Close();
 		}
 	}
 }

PROMS/DropDownPanel/Controls/DropDownPanel.cs

@@ -28,9 +28,7 @@ namespace AT.STO.UI.Win
 
 			_dropDownHelper = new DropDownWindowHelper();
 
-			_dropDownHelper.DropDownClosed -= new DropDownClosedEventHandler(DropDownHelper_DropDownClosed);
 			_dropDownHelper.DropDownClosed += new DropDownClosedEventHandler(DropDownHelper_DropDownClosed);
-			_dropDownHelper.DropDownCancel -= new DropDownCancelEventHandler(DropDownHelper_DropDownCancel);
 			_dropDownHelper.DropDownCancel += new DropDownCancelEventHandler(DropDownHelper_DropDownCancel);
 			
 			combo.DisplayMember = "Text";
@@ -84,9 +82,7 @@ namespace AT.STO.UI.Win
 				DropDownForm dropDown = new DropDownForm(_dropDownControl);
 				
 				
-				dropDown.FinishEditing -= new DropDownValueChangedEventHandler(DropDown_FinishEditing);
 				dropDown.FinishEditing += new DropDownValueChangedEventHandler(DropDown_FinishEditing);
-				dropDown.ValueChanged -= new DropDownValueChangedEventHandler(DropDown_ValueChanged);
 				dropDown.ValueChanged += new DropDownValueChangedEventHandler(DropDown_ValueChanged);
 				
 				combo.DroppedDown = false;

PROMS/DropDownPanel/DropDownPanel.csproj

@@ -34,7 +34,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -45,14 +45,13 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Demo|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Demo\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -61,7 +60,7 @@
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -70,7 +69,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -79,7 +78,7 @@
     <OutputPath>bin\Demo\</OutputPath>
     <DefineConstants>TRACE;DEMO</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/DropDownPanel/Forms/DropDownForm.cs

@@ -49,9 +49,7 @@ namespace AT.STO.UI.Win
 		{
 			base.OnShown(e);
 			
-			_control.FinishEditing -= new DropDownValueChangedEventHandler(Ctrl_FinishEditing);
 			_control.FinishEditing += new DropDownValueChangedEventHandler(Ctrl_FinishEditing);
-			_control.ValueChanged -= new DropDownValueChangedEventHandler(Ctrl_ValueChanged);
 			_control.ValueChanged += new DropDownValueChangedEventHandler(Ctrl_ValueChanged);
 		}
 	#endregion

PROMS/DropDownPanel/Helper/DropDownWindowHelper.cs

@@ -39,7 +39,6 @@ namespace AT.STO.UI.Win
 		public DropDownWindowHelper()
 		{
 			_filter = new DropDownMessageFilter(this);
-			_filter.DropDownCancel -= new DropDownCancelEventHandler(Popup_Cancel);
 			_filter.DropDownCancel += new DropDownCancelEventHandler(Popup_Cancel);
 		}
 	#endregion

PROMS/FlexableMessageBox/FlexableMessageBox.csproj

@@ -29,7 +29,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -40,14 +40,13 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
@@ -57,7 +56,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>

PROMS/Formats/Formats.csproj

@@ -35,7 +35,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -45,7 +44,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
@@ -94,10 +92,6 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="epall\EPFormatTST1.xml" />
-    <Content Include="epall\EPFormatTST2.xml" />
-    <Content Include="epall\EPFormatTST3.xml" />
-    <Content Include="epall\EPFormatTST4.xml" />
     <Content Include="fmtall\AEPall.xml">
       <SubType>Designer</SubType>
     </Content>
@@ -179,12 +173,9 @@
     <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" />
-    <Content Include="fmtall\EPTSTBCK1all.xml" />
-    <Content Include="fmtall\EPTST1all.xml" />
     <Content Include="fmtall\CWEall.xml" />
     <Content Include="fmtall\CWEDEVall.xml" />
     <Content Include="fmtall\CWERall.xml" />
@@ -196,7 +187,6 @@
     <Content Include="fmtall\EFSGBCKall.xml" />
     <Content Include="fmtall\ELFDEVall.xml" />
     <Content Include="fmtall\ENall.xml" />
-    <Content Include="fmtall\EPTST2all.xml" />
     <Content Include="fmtall\ESFDEVall.xml" />
     <Content Include="fmtall\EXCLNall.xml" />
     <Content Include="fmtall\EXCLN_00all.xml" />
@@ -292,10 +282,6 @@
     <Content Include="fmtall\NSPWGall.xml" />
     <Content Include="fmtall\NSP_00all.xml" />
     <Content Include="fmtall\OHLPall.xml" />
-    <Content Include="fmtall\PROMSDemo1all.xml" />
-    <Content Include="fmtall\PROMSDemo2all.xml" />
-    <Content Include="fmtall\PROMSDemoALRall.xml" />
-    <Content Include="fmtall\PROMSDemoBCKall.xml" />
     <Content Include="fmtall\PROMSMan1all.xml" />
     <Content Include="fmtall\PROMSMan2all.xml" />
     <Content Include="fmtall\RGEall.xml" />
@@ -513,10 +499,6 @@
     <Content Include="genmacall\nspsam.svg" />
     <Content Include="genmacall\nspsamdev.svg" />
     <Content Include="genmacall\ohlp.svg" />
-    <Content Include="genmacall\PROMSDemo1.svg" />
-    <Content Include="genmacall\PROMSDemo2.svg" />
-    <Content Include="genmacall\PROMSDemoALR.svg" />
-    <Content Include="genmacall\PROMSDemoBCK.svg" />
     <Content Include="genmacall\PROMSMan1.svg" />
     <Content Include="genmacall\PROMSMan2.svg" />
     <Content Include="genmacall\rge.svg" />

PROMS/Formats/frmFormatCopy.Designer.cs

@@ -35,7 +35,6 @@ namespace Formats
 			this.buttonX2 = new DevComponents.DotNetBar.ButtonX();
 			this.labelX2 = new DevComponents.DotNetBar.LabelX();
 			this.LstBxExcludeFiles = new DevComponents.DotNetBar.ListBoxAdv();
-			this.cbIncludeDemoFormats = new DevComponents.DotNetBar.Controls.CheckBoxX();
 			this.SuspendLayout();
 			// 
 			// txbxPROMSFormatsPath
@@ -132,26 +131,11 @@ namespace Formats
 			this.LstBxExcludeFiles.TabIndex = 6;
 			this.LstBxExcludeFiles.Text = "listBoxAdv1";
 			// 
-			// cbIncludeDemoFormats
-			// 
-			// 
-			// 
-			// 
-			this.cbIncludeDemoFormats.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.cbIncludeDemoFormats.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.cbIncludeDemoFormats.Location = new System.Drawing.Point(43, 156);
-			this.cbIncludeDemoFormats.Name = "cbIncludeDemoFormats";
-			this.cbIncludeDemoFormats.Size = new System.Drawing.Size(160, 23);
-			this.cbIncludeDemoFormats.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2010;
-			this.cbIncludeDemoFormats.TabIndex = 7;
-			this.cbIncludeDemoFormats.Text = "Include Demo Formats";
-			// 
 			// frmFormatCopy
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.ClientSize = new System.Drawing.Size(496, 191);
-			this.Controls.Add(this.cbIncludeDemoFormats);
 			this.Controls.Add(this.LstBxExcludeFiles);
 			this.Controls.Add(this.labelX2);
 			this.Controls.Add(this.buttonX2);
@@ -174,7 +158,6 @@ namespace Formats
 		private DevComponents.DotNetBar.ButtonX buttonX2;
 		private DevComponents.DotNetBar.LabelX labelX2;
 		private DevComponents.DotNetBar.ListBoxAdv LstBxExcludeFiles;
-		private DevComponents.DotNetBar.Controls.CheckBoxX cbIncludeDemoFormats;
 	}
 }
 

PROMS/Formats/frmFormatCopy.cs

@@ -96,17 +96,13 @@ namespace Formats
 			if (!txbxPROMSFormatsPath.Text.EndsWith(@"\")) txbxPROMSFormatsPath.Text += @"\";
 		}
 
-		// Added a PROMSDemo to the list of excluded format files
-		public string[] excludeThese = { "WPS", "WPB", "VCBEPP", "PROMSDemo" };
+		public string[] excludeThese = { "WPS", "WPB", "VCBEPP" };
 
-		// Added logic to support in inclusion of the PROMSDemo formats if the checkbox on the
-		// dialog is check
 		private bool ExcludeFromCopy(string fn)
 		{
 			// don't copy formats whos file name starts with..
 			foreach (string excludeThis in excludeThese)
-				if (fn.ToUpper().StartsWith(excludeThis) 
-					&& !(cbIncludeDemoFormats.Checked && fn.ToUpper().StartsWith("PROMSDEMO"))) return true;
+				if (fn.ToUpper().StartsWith(excludeThis)) return true;
 			return false;
 		}
 
@@ -165,5 +161,5 @@ namespace Formats
 			Application.Exit();
 		}
 
-	}
+}
 }

PROMS/LBWordLibrary/LBObjectExtension.cs

@@ -422,6 +422,150 @@ 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
@@ -457,7 +601,86 @@ namespace LBWordLibrary
 			}
 		}
 		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>
@@ -514,6 +737,35 @@ 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>

PROMS/LBWordLibrary/LBWordLibrary.csproj

@@ -34,7 +34,7 @@
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -45,14 +45,13 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
@@ -62,7 +61,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>

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

@@ -59,7 +59,7 @@
     <WarningLevel>4</WarningLevel>
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -85,7 +85,6 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -93,7 +92,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -104,7 +103,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>