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

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/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" />

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>
@@ -182,8 +176,6 @@
     <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" />
@@ -195,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" />
@@ -291,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" />
@@ -512,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" };
-		public string[] excludeThese = { "WPS", "WPB", "VCBEPP", "PROMSDemo" };
+
-		
-		// 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) 
+				if (fn.ToUpper().StartsWith(excludeThis)) return true;
-					&& !(cbIncludeDemoFormats.Checked && fn.ToUpper().StartsWith("PROMSDEMO"))) return true;
 			return false;
 		}
 
@@ -165,5 +161,5 @@ namespace Formats
 			Application.Exit();
 		}
 
-	}
+}
 }

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>

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

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

PROMS/ReferencedObjects/LibSource/DBEncapsulation/DBEncapsulation.csproj

@@ -62,7 +62,6 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -87,7 +86,6 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -95,7 +93,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -106,7 +104,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/Org.Mentalis.Files/Org.Mentalis.Files.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,14 +44,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>
@@ -61,7 +59,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs

@@ -409,7 +409,7 @@ namespace RODBInterface
 			GetDbServerInfo(ropath);
 			if (!dbProviderType.Equals((int)DB_PROVIDER.SQL_SERVER))
 			{
-				strDatabaseConnectionCommand = "Provider=Microsoft.ACE.OLEDB.12.0;Password=\"\";User ID=Admin;Data Source=" + DataConnectionPath + "\\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";
+				strDatabaseConnectionCommand = "Provider=Microsoft.Jet.OLEDB.4.0;Password=\"\";User ID=Admin;Data Source=" + DataConnectionPath + "\\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";
 			}
 		}
 		#endregion

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.csproj

@@ -62,7 +62,6 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -87,7 +86,6 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -95,7 +93,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -106,7 +104,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -173,17 +171,6 @@
       <Name>VlnStatus</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <COMReference Include="Microsoft.Office.Interop.Access.Dao">
-      <Guid>{4AC9E1DA-5BAD-4AC7-86E3-24F4CDCECA28}</Guid>
-      <VersionMajor>12</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>

PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs

@@ -735,27 +735,23 @@ namespace RODBInterface
 				else
 					parentValue = nd.InnerText;
 
-				if (parentName != "#whitespace")
+				//applicValues = "";
+				applicValues = string.Format("<APL DefaultVal={0}", parentValue);
+				int pcChildIdx = 0;
+				//C2022-001 only save the child ro value in the RO.FST if it is different than the parent (default) value
+				foreach (string c in pcChildern)
 				{
-					//applicValues = "";
+					//string csufx = CvtUserFldToFld(c);
-					applicValues = string.Format("<APL DefaultVal={0}", parentValue);
+					pcChildIdx++;
-					int pcChildIdx = 0;
+					string csufx = string.Format("_PCCHILD{0}", pcChildIdx);
-					//C2022-001 only save the child ro value in the RO.FST if it is different than the parent (default) value
+					//applicValues += ",";
-
+					XmlNode cn = elmnode.SelectSingleNode(parentName + csufx);
-					foreach (string c in pcChildern)
+					if (cn == null || cn.InnerText.Length == 0) // B2024-004 use Parent value if Child text length is zero
+						applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default
+					else
 					{
-						//string csufx = CvtUserFldToFld(c);
+						if (parentValue != cn.InnerText)
-						pcChildIdx++;
+							applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, cn.InnerText);
-						string csufx = string.Format("_PCCHILD{0}", pcChildIdx);
-						//applicValues += ",";
-						XmlNode cn = elmnode.SelectSingleNode(parentName + csufx);
-						if (cn == null || cn.InnerText.Length == 0) // B2024-004 use Parent value if Child text length is zero
-							applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default
-						else
-						{
-							if (parentValue != cn.InnerText)
-								applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, cn.InnerText);
-						}
 					}
 				}
 				applicValues += " /APL>";

PROMS/ReferencedObjects/LibSource/ROFST/ROFST.csproj

@@ -62,7 +62,6 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -87,7 +86,6 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -95,7 +93,7 @@
     <DefineConstants>DEBUG;TRACE;Upgrade2005;</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -106,7 +104,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/ROField/ROFields.csproj

@@ -62,7 +62,6 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -87,7 +86,6 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -95,7 +93,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -106,7 +104,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/Utils/Utils.csproj

@@ -77,7 +77,6 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -102,7 +101,6 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -110,7 +108,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -121,7 +119,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/VlnProfiler/VlnProfiler.csproj

@@ -7,7 +7,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -73,7 +73,6 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -98,7 +97,6 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -106,7 +104,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatus.csproj

@@ -62,7 +62,6 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -87,7 +86,6 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -95,7 +93,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -106,7 +104,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs

@@ -276,10 +276,8 @@ namespace ctlXMLEditLib
 			bool imagechild;	//whether this field is a subchild of an image
 			string imagename;	//if subchild of image, name of image parent (for save)
 			string imagedate;   //if this was filename, save the date/time stamp
-			string name;        //name of element
-			string parenthtid;  //name of parent element in hashtable for PC items
 			public TextBoxAttrTag(bool reqd, string ptn, RadioButton rd, bool img, 
-				string imgname, string imgdate, string elemname) 
+				string imgname, string imgdate) 
 			{
 				this.req_msg = null;
 				this.required = reqd;
@@ -288,12 +286,6 @@ namespace ctlXMLEditLib
 				this.imagechild = img;
 				this.imagename = imgname;
 				this.imagedate = imgdate;
-				this.name = elemname;
-
-				if (name.Contains("_PCCHILD"))
-					this.parenthtid = name.Substring(0, name.IndexOf("_PCCHILD"));
-				else
-					this.parenthtid = null;
 			}
 			public void SetPattern(string pattern) {this.pattern = pattern;}
 			public void SetRequired(bool req) {this.required = req;}
@@ -306,10 +298,6 @@ namespace ctlXMLEditLib
 			public string GetImageName { get {return imagename;}}
 			public string GetImageDate { get {return imagedate;}}
 			public void SetImageDate(string imgdate) {this.imagedate = imgdate;}
-			public string GetName { get { return name; } }
-			public void SetName(string elemname) { this.name = elemname; }
-			public string GetParentHTId { get { return parenthtid; } }
-			public void SetParentHTId(string id) { this.parenthtid = id; }
 		}
 
 		public ctlXMLEdit(VlnXmlElement myelem, XmlSchema myschema, ArrayList reqfields, ArrayList fldsWithApplic, string [] pckids)
@@ -940,7 +928,7 @@ namespace ctlXMLEditLib
 			// initialization.
 			if (mytextbox.Tag == null)
 			{
-				TextBoxAttrTag tag = new TextBoxAttrTag(false, pattern, radio, img, (img?imgname:null), null, mytextbox.Name);
+				TextBoxAttrTag tag = new TextBoxAttrTag(false, pattern, radio, img, (img?imgname:null), null);
 				mytextbox.Tag = (object) tag;
 			}
 			return getannot;
@@ -1148,7 +1136,6 @@ namespace ctlXMLEditLib
 				mytextbox = new TextBox();
 				mytextbox.Location = new Point(screenx+indent, screeny);
 				string tFieldName = (pcChildIdx == 0) ? CvtUserFldToFld(element.Name) : CvtUserFldToFld(pcChildFldName);
-				mytextbox.Name = tFieldName;
 				myHT.Add(tFieldName, mytextbox);
 				tabindx++;
 				Controls.Add(mytextbox);
@@ -1205,39 +1192,14 @@ namespace ctlXMLEditLib
 		// C2021-026 Event handler for Parent/Child child textbox
 		//           if the textbox text is same as parent, then or nothing is entered in the textbox
 		//           then use the parent value and set the text color to gray
-		// B2025-028 RO Editor - Parent Child Applicability - Default Values
-		//           Were always setting to the Group parent value instead of individual parent values
-		//           When leaving the textbox
 		private void txtBox_Leave(object sender, EventArgs e)
 		{
 			TextBox tb = sender as TextBox;
 			string dfTxt = "";
-			try
+			string parName = pcGrpBox.Name.Substring(5);
-			{
+			object o = myHT[parName];
-				string parentid = ((TextBoxAttrTag)tb.Tag).GetParentHTId;
+			if (o != null)
-				if (!string.IsNullOrEmpty(parentid))
+				dfTxt = (o as TextBox).Text; // set to use the parent's value (default)
-				{
-					object o = myHT[parentid];
-					if (o != null)
-						dfTxt = (o as TextBox).Text; // set to use the parent's value (default)				
-				}
-				else
-                {
-
-					string parName = pcGrpBox.Name.Substring(5);
-					object o = myHT[parName];
-					if (o != null)
-						dfTxt = (o as TextBox).Text; // set to use the parent's value (default)
-				}
-			}
-            catch 
-			{
-				string parName = pcGrpBox.Name.Substring(5);
-				object o = myHT[parName];
-				if (o != null)
-					dfTxt = (o as TextBox).Text; // set to use the parent's value (default)
-			}
-
 			if (dosaveflag) mysavexml = true;
 			if (tb.Text.Length == 0 || tb.Text == dfTxt)
 			{

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEditLib.csproj

@@ -62,7 +62,6 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -87,7 +86,6 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -95,7 +93,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -106,7 +104,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/RoAccessToSql/RoAccessToSql.cs

@@ -229,7 +229,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.Jet.OLEDB.4.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

PROMS/RoAccessToSql/RoAccessToSql.csproj

@@ -22,7 +22,7 @@
     </SccProvider>
   </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="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
@@ -100,17 +98,6 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <COMReference Include="Microsoft.Office.Interop.Access.Dao">
-      <Guid>{4AC9E1DA-5BAD-4AC7-86E3-24F4CDCECA28}</Guid>
-      <VersionMajor>12</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

PROMS/TablePicker/TablePicker.csproj

@@ -60,7 +60,6 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -85,7 +84,6 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_PreRegistered|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -110,7 +108,6 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -119,7 +116,7 @@
     <BaseAddress>285212672</BaseAddress>
     <FileAlignment>4096</FileAlignment>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
@@ -130,7 +127,7 @@
     <BaseAddress>285212672</BaseAddress>
     <Optimize>true</Optimize>
     <FileAlignment>4096</FileAlignment>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
@@ -141,7 +138,7 @@
     <BaseAddress>285212672</BaseAddress>
     <Optimize>true</Optimize>
     <FileAlignment>4096</FileAlignment>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>

PROMS/VEPROMS User Interface/App.config

@@ -199,4 +199,4 @@
       </providers>
     </roleManager>
   </system.web>
-</configuration>
+</configuration>

PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs

@@ -1,203 +0,0 @@
-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 VEPROMS.CSLA.Library;
-
-namespace VEPROMS
-{
-    // C2025-027 Annotation Type Filtering
-    public partial class dlgAnnotationsSelect : Form
-    {
-        public dlgAnnotationsSelect()
-        {
-            InitializeComponent();
-        }
-
-        public dlgAnnotationsSelect(string userid)
-        {
-            InitializeComponent();
-            UserID = userid;
-        }
-
-        private int _MyItemID;
-        public int MyItemID
-        {
-            get { return _MyItemID; }
-            set { _MyItemID = value; }
-        }
-
-        private string _UserID;
-        public string UserID
-        {
-            get { return _UserID; }
-            set { _UserID = value; }
-        }
-
-        private void btnSelect_Click(object sender, EventArgs e)
-        {
-            MoveSelectedItems(lstUnselected, lstSelected);
-        }
-
-        // Move selected items to lstUnselected.
-        private void btnDeselect_Click(object sender, EventArgs e)
-        {
-            MoveSelectedItems(lstSelected, lstUnselected);
-        }
-
-        // Move selected items from one ListBox to another.
-        private void MoveSelectedItems(ListBox lstFrom, ListBox lstTo)
-        {
-            while (lstFrom.SelectedItems.Count > 0)
-            {
-                lstSelected.DisplayMember = "NameStr";
-                lstSelected.ValueMember = "TypeID";
-
-                AnnotataionItem item = (AnnotataionItem)lstFrom.SelectedItems[0];
-                lstTo.Items.Add(new AnnotataionItem(item.NameStr, item.TypeID));
-                lstFrom.Items.Remove(item);
-            }
-            SetButtonsEditable();
-            btnUpdate.Enabled = true;
-        }
-
-        // Move all items to lstSelected.
-        private void btnSelectAll_Click(object sender, EventArgs e)
-        {
-            MoveAllItems(lstUnselected, lstSelected);
-            btnUpdate.Enabled = true;
-        }
-
-        // Move all items to lstUnselected.
-        private void btnDeselectAll_Click(object sender, EventArgs e)
-        {
-            MoveAllItems(lstSelected, lstUnselected);
-            btnUpdate.Enabled = true;
-        }
-
-        // Move all items from one ListBox to another.
-        private void MoveAllItems(ListBox lstFrom, ListBox lstTo)
-        {
-            lstTo.Items.AddRange(lstFrom.Items);
-            lstFrom.Items.Clear();
-            SetButtonsEditable();
-            btnUpdate.Enabled = true;
-        }
-
-        // Enable and disable buttons.
-        private void lst_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            SetButtonsEditable();
-        }
-        // Save selected list to DB.
-        private void btnUpdate_Click(object sender, EventArgs e)
-        {
-            saveChanges();
-        }
-        public class AnnotataionItem
-        {
-            private string _NameStr;
-            private int _TypeID;
-
-            public AnnotataionItem(string NameStr, int TypeID)
-            {
-                this._NameStr = NameStr;
-                this._TypeID = TypeID;
-            }
-            public string NameStr
-            {
-                get
-                {
-                    return _NameStr;
-                }
-            }
-            public int TypeID
-            {
-                get
-                {
-                    return _TypeID;
-                }
-            }
-        }
-
-        // Enable and disable buttons.
-        private void SetButtonsEditable()
-        {
-            btnSelect.Enabled = (lstUnselected.SelectedItems.Count > 0);
-            btnSelectAll.Enabled = (lstUnselected.Items.Count > 0);
-            btnDeselect.Enabled = (lstSelected.SelectedItems.Count > 0);
-            btnDeselectAll.Enabled = (lstSelected.Items.Count > 0);
-        }
-
-        private void DlgAnnotationsSelect_Load(object sender, EventArgs e)
-        {
-            lstUnselected.DisplayMember = "NameStr";
-            lstUnselected.ValueMember = "TypeID";
-            SetButtonsEditable();
-            DataTable AnnoType = AnnotationstypeSelections.GetAnnoTypes(UserID);
-            foreach (DataRow dr in AnnoType.Rows)
-            {
-                lstUnselected.Items.Add(new AnnotataionItem(dr["Name"].ToString(), (int)dr["TypeID"]));
-            }
-
-            lstSelected.DisplayMember = "NameStr";
-            lstSelected.ValueMember = "TypeID";
-            DataTable lstSelectedTbl = VEPROMS.CSLA.Library.AnnotationstypeSelections.Retrieve(UserID);
-
-            foreach (DataRow lstSelectedRow in lstSelectedTbl.Rows)
-            {
-                lstSelected.Items.Add(new AnnotataionItem(lstSelectedRow["Name"].ToString(), (int)lstSelectedRow["TypeID"]));
-            }
-            btnUpdate.Enabled = false;
-        }
-
-        private void btnCancel_Click_1(object sender, EventArgs e)
-        {
-            if (btnUpdate.Enabled == true)
-            {
-                string message = "Changes have not yet been saved.  Do you want to save the changes prior to closing?";
-                string title = "Save Annotation Selections";
-                MessageBoxButtons buttons = MessageBoxButtons.YesNo;
-                DialogResult result = MessageBox.Show(message, title, buttons);
-                if (result == DialogResult.Yes)
-                {
-                    saveChanges();
-                    this.Close();
-                }
-                else
-                {
-                    this.Close();
-                }
-            }
-            else
-            {
-                this.Close();
-            }
-        }
-
-        private DataTable coverToTable()
-        {
-            DataTable dt = new DataTable();
-            dt.Columns.Add("TypeID", typeof(Int32));
-
-
-            foreach (AnnotataionItem item in lstSelected.Items.OfType<AnnotataionItem>())
-            {
-                dt.Rows.Add(item.TypeID);
-            }
-            return dt;
-        }
-        private void saveChanges()
-        {
-            DataTable dt2 = coverToTable();
-            VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(dt2, UserID);
-            btnUpdate.Enabled = false;
-        }
-    }
-}
-

PROMS/VEPROMS User Interface/DlgPrintProcedure.cs

@@ -66,12 +66,6 @@ namespace VEPROMS
 			set { _prtSectID = value; }
 		}
 
-		private bool _OverwritePDF;
-		public bool OverwritePDF
-		{
-			get { return cbxOverwritePDF2.Checked; }
-			set { cbxOverwritePDF2.Checked = value; }
-		}
 
 		// C2018-033 Used to turn off using the date/time PDF file prefix and suffix when doing batch file autmatic baseline print testing (frmVEPROMS.cs RunAutomatic())
 		//           This is needed so the the automatic baselines can compare results from different runs of PROMS
@@ -399,7 +393,6 @@ namespace VEPROMS
 		{
 			SetupForProcedure();
 			_MyTimer = new Timer();
-			_MyTimer.Tick -= new EventHandler(_MyTimer_Tick);
 			_MyTimer.Tick += new EventHandler(_MyTimer_Tick);
 			_MyTimer.Interval = 100;
 			_MyTimer.Enabled = true;
@@ -425,12 +418,7 @@ namespace VEPROMS
 			//txbPDFLocation.Text = _PDFPath;
 			BuildPDFFileName();
 			ProcedureConfig pc = _MyProcedure.MyConfig as ProcedureConfig;
-			// C2025-033 set which Child procedure is being printed used for PageStyle items
+			if(SelectedSlave > 0) pc.SelectedSlave = SelectedSlave;
-			VlnSvgPageHelper.PrintingChild = SelectedSlave;
-			if (SelectedSlave > 0)
-			{
-				pc.SelectedSlave = SelectedSlave;
-			}
 			if (pc != null)
 			{
 				//C2021-062 use the save rev number for all procedures if set, or just use the rev number in the current procedure config

PROMS/VEPROMS User Interface/Properties/Resources.Designer.cs

@@ -250,16 +250,6 @@ namespace VEPROMS.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap toolbox {
-            get {
-                object obj = ResourceManager.GetObject("toolbox", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

PROMS/VEPROMS User Interface/Properties/Settings.Designer.cs

@@ -410,5 +410,17 @@ namespace VEPROMS.Properties {
                 this["VisioPath"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public int UCFImportOpt {
+            get {
+                return ((int)(this["UCFImportOpt"]));
+            }
+            set {
+                this["UCFImportOpt"] = value;
+            }
+        }
     }
 }

PROMS/VEPROMS User Interface/Properties/Settings.settings

@@ -80,9 +80,11 @@
     <Setting Name="UpdateSettings" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+
     <Setting Name="cbShwRplWrdsColor" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    
     <Setting Name="PasteNoReturns" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
@@ -101,5 +103,8 @@
     <Setting Name="VisioPath" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="UCFImportOpt" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

PROMS/VEPROMS User Interface/VEPROMS_UI.csproj

@@ -50,7 +50,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' ">
@@ -61,14 +61,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>
@@ -77,7 +76,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>
@@ -86,7 +85,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -95,7 +94,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>
@@ -104,7 +103,7 @@
     <Reference Include="C1.Win.C1Command.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=e808566f358766d8" />
     <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
     <Reference Include="C1.Win.C1Input.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=7e7ff60f0c214f9a, processorArchitecture=MSIL" />
-    <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+    <Reference Include="Csla, Version=3.8.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\CSLA20cs_DLL_Net_4.8.1_Build\Csla.dll</HintPath>
     </Reference>
@@ -112,6 +111,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\3rdPartyLibraries\DotNetBar\DotNetBar4.6Build\DevComponents.DotNetBar2.dll</HintPath>
     </Reference>
+    <Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\3rdPartyLibraries\Ionic\Ionic.Zip.dll</HintPath>
+    </Reference>
     <Reference Include="Itenso.Rtf.Interpreter">
       <HintPath>..\..\..\..\3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Interpreter.dll</HintPath>
     </Reference>
@@ -122,10 +125,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\3rdPartyLibraries\Log4Net\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Data">
@@ -134,8 +133,6 @@
     <Reference Include="System.Deployment" />
     <Reference Include="System.Design" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
@@ -155,17 +152,6 @@
       <DependentUpon>AboutVEPROMS.cs</DependentUpon>
     </Compile>
     <Compile Include="BookMarks.cs" />
-    <Compile Include="dlgAnnotationsSelect.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="dlgAnnotationsSelect.Designer.cs">
-      <DependentUpon>dlgAnnotationsSelect.cs</DependentUpon>
-    </Compile>
-    <Compile Include="dlgAnnotationsSelect.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>dlgAnnotationsSelect.resx</DependentUpon>
-    </Compile>
     <Compile Include="dlgApproveProcedure.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -178,15 +164,6 @@
     <Compile Include="dlgCheckedOutProcedure.designer.cs">
       <DependentUpon>dlgCheckedOutProcedure.cs</DependentUpon>
     </Compile>
-    <Compile Include="dlgExportImportEP.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="dlgMSWordMessage.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="dlgMSWordMessage.Designer.cs">
-      <DependentUpon>dlgMSWordMessage.cs</DependentUpon>
-    </Compile>
     <Compile Include="dlgCheckOpenTabs.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -229,12 +206,6 @@
     <Compile Include="dlgPickROFolder.designer.cs">
       <DependentUpon>dlgPickROFolder.cs</DependentUpon>
     </Compile>
-    <Compile Include="dlgPrintAllApprovedProcedures.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="dlgPrintAllApprovedProcedures.Designer.cs">
-      <DependentUpon>dlgPrintAllApprovedProcedures.cs</DependentUpon>
-    </Compile>
     <Compile Include="DlgPrintProcedure.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -253,6 +224,12 @@
     <Compile Include="dlgTransitionReport.designer.cs">
       <DependentUpon>dlgTransitionReport.cs</DependentUpon>
     </Compile>
+    <Compile Include="dlgUCFDetail.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="dlgUCFDetail.Designer.cs">
+      <DependentUpon>dlgUCFDetail.cs</DependentUpon>
+    </Compile>
     <Compile Include="frmAnnotationsCleanup.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -271,12 +248,6 @@
     <Compile Include="frmBatchRefreshCheckedOut.designer.cs">
       <DependentUpon>frmBatchRefreshCheckedOut.cs</DependentUpon>
     </Compile>
-    <Compile Include="frmGenTools.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmGenTools.designer.cs">
-      <DependentUpon>frmGenTools.cs</DependentUpon>
-    </Compile>
     <Compile Include="frmManageUser.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -307,6 +278,12 @@
     <Compile Include="frmSI.Designer.cs">
       <DependentUpon>frmSI.cs</DependentUpon>
     </Compile>
+    <Compile Include="frmUCF.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmUCF.designer.cs">
+      <DependentUpon>frmUCF.cs</DependentUpon>
+    </Compile>
     <Compile Include="frmVEPROMS.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -354,13 +331,6 @@
       <SubType>Designer</SubType>
       <DependentUpon>AboutVEPROMS.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="dlgAnnotationsSelect.resx">
-      <DependentUpon>dlgAnnotationsSelect.cs</DependentUpon>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Include="dlgMSWordMessage.resx">
-      <DependentUpon>dlgMSWordMessage.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="dlgCheckOpenTabs.resx">
       <DependentUpon>dlgCheckOpenTabs.cs</DependentUpon>
     </EmbeddedResource>
@@ -370,9 +340,6 @@
     <EmbeddedResource Include="dlgImpHowToHandleROs.resx">
       <DependentUpon>dlgImpHowToHandleROs.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="dlgPrintAllApprovedProcedures.resx">
-      <DependentUpon>dlgPrintAllApprovedProcedures.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="DlgPrintProcedure.resx">
       <DependentUpon>DlgPrintProcedure.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -380,12 +347,12 @@
     <EmbeddedResource Include="dlgSetChangeBarStartDate.resx">
       <DependentUpon>dlgSetChangeBarStartDate.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="dlgUCFDetail.resx">
+      <DependentUpon>dlgUCFDetail.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmAnnotationsCleanup.resx">
       <DependentUpon>frmAnnotationsCleanup.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmGenTools.resx">
-      <DependentUpon>frmGenTools.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="frmPDFStatusForm.resx">
       <DependentUpon>frmPDFStatusForm.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -401,6 +368,9 @@
     <EmbeddedResource Include="frmSI.resx">
       <DependentUpon>frmSI.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmUCF.resx">
+      <DependentUpon>frmUCF.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmVEPROMS.resx">
       <SubType>Designer</SubType>
       <DependentUpon>frmVEPROMS.cs</DependentUpon>
@@ -508,7 +478,6 @@
     <Content Include="PROMSRollback %28v2.0%29.Sql">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Resources\toolbox.png" />
     <Content Include="ROBuild.Sql">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -599,6 +568,8 @@
     <Content Include="Resources\Save.png" />
     <Content Include="Resources\SaveAllHS.png" />
     <Content Include="Resources\SaveAs.png" />
+    <Content Include="UCFDetails.xsl" />
+    <Content Include="UCFSummary.xsl" />
     <Content Include="VEicon.ico" />
     <Content Include="veproms.ico" />
     <Content Include="Vicon.ico" />

PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs

@@ -1,229 +0,0 @@
-
-namespace VEPROMS
-{
-	partial class dlgAnnotationsSelect
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.lstUnselected = new System.Windows.Forms.ListBox();
-			this.lstSelected = new System.Windows.Forms.ListBox();
-			this.btnSelect = new System.Windows.Forms.Button();
-			this.btnSelectAll = new System.Windows.Forms.Button();
-			this.btnDeselectAll = new System.Windows.Forms.Button();
-			this.btnDeselect = new System.Windows.Forms.Button();
-			this.btnUpdate = new System.Windows.Forms.Button();
-			this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-			this.btnCancel = new System.Windows.Forms.Button();
-			this.lblMessage = new System.Windows.Forms.Label();
-			this.lblAvailableTypes = new System.Windows.Forms.Label();
-			this.lblSelected = new System.Windows.Forms.Label();
-			this.tableLayoutPanel1.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// lstUnselected
-			// 
-			this.lstUnselected.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.lstUnselected.FormattingEnabled = true;
-			this.lstUnselected.IntegralHeight = false;
-			this.lstUnselected.ItemHeight = 16;
-			this.lstUnselected.Location = new System.Drawing.Point(3, 3);
-			this.lstUnselected.Name = "lstUnselected";
-			this.tableLayoutPanel1.SetRowSpan(this.lstUnselected, 4);
-			this.lstUnselected.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
-			this.lstUnselected.Size = new System.Drawing.Size(287, 347);
-			this.lstUnselected.TabIndex = 0;
-			this.lstUnselected.SelectedIndexChanged += new System.EventHandler(this.lst_SelectedIndexChanged);
-			// 
-			// lstSelected
-			// 
-			this.lstSelected.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.lstSelected.FormattingEnabled = true;
-			this.lstSelected.IntegralHeight = false;
-			this.lstSelected.ItemHeight = 16;
-			this.lstSelected.Location = new System.Drawing.Point(334, 3);
-			this.lstSelected.Name = "lstSelected";
-			this.tableLayoutPanel1.SetRowSpan(this.lstSelected, 4);
-			this.lstSelected.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
-			this.lstSelected.Size = new System.Drawing.Size(288, 347);
-			this.lstSelected.TabIndex = 1;
-			this.lstSelected.SelectedIndexChanged += new System.EventHandler(this.lst_SelectedIndexChanged);
-			// 
-			// btnSelect
-			// 
-			this.btnSelect.Anchor = System.Windows.Forms.AnchorStyles.None;
-			this.btnSelect.Location = new System.Drawing.Point(298, 32);
-			this.btnSelect.Name = "btnSelect";
-			this.btnSelect.Size = new System.Drawing.Size(28, 23);
-			this.btnSelect.TabIndex = 2;
-			this.btnSelect.Text = ">";
-			this.btnSelect.UseVisualStyleBackColor = true;
-			this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click);
-			// 
-			// btnSelectAll
-			// 
-			this.btnSelectAll.Anchor = System.Windows.Forms.AnchorStyles.None;
-			this.btnSelectAll.Location = new System.Drawing.Point(296, 120);
-			this.btnSelectAll.Name = "btnSelectAll";
-			this.btnSelectAll.Size = new System.Drawing.Size(32, 23);
-			this.btnSelectAll.TabIndex = 3;
-			this.btnSelectAll.Text = ">>";
-			this.btnSelectAll.UseVisualStyleBackColor = true;
-			this.btnSelectAll.Click += new System.EventHandler(this.btnSelectAll_Click);
-			// 
-			// btnDeselectAll
-			// 
-			this.btnDeselectAll.Anchor = System.Windows.Forms.AnchorStyles.None;
-			this.btnDeselectAll.Location = new System.Drawing.Point(297, 207);
-			this.btnDeselectAll.Name = "btnDeselectAll";
-			this.btnDeselectAll.Size = new System.Drawing.Size(30, 26);
-			this.btnDeselectAll.TabIndex = 5;
-			this.btnDeselectAll.Text = "<<";
-			this.btnDeselectAll.UseVisualStyleBackColor = true;
-			this.btnDeselectAll.Click += new System.EventHandler(this.btnDeselectAll_Click);
-			// 
-			// btnDeselect
-			// 
-			this.btnDeselect.Anchor = System.Windows.Forms.AnchorStyles.None;
-			this.btnDeselect.Location = new System.Drawing.Point(298, 297);
-			this.btnDeselect.Name = "btnDeselect";
-			this.btnDeselect.Size = new System.Drawing.Size(28, 23);
-			this.btnDeselect.TabIndex = 4;
-			this.btnDeselect.Text = "<";
-			this.btnDeselect.UseVisualStyleBackColor = true;
-			this.btnDeselect.Click += new System.EventHandler(this.btnDeselect_Click);
-			// 
-			// btnUpdate
-			// 
-			this.btnUpdate.Anchor = System.Windows.Forms.AnchorStyles.None;
-			this.btnUpdate.Location = new System.Drawing.Point(536, 422);
-			this.btnUpdate.Name = "btnUpdate";
-			this.btnUpdate.Size = new System.Drawing.Size(100, 35);
-			this.btnUpdate.TabIndex = 8;
-			this.btnUpdate.Text = "Save";
-			this.btnUpdate.UseVisualStyleBackColor = true;
-			this.btnUpdate.Click += new System.EventHandler(this.btnUpdate_Click);
-			// 
-			// tableLayoutPanel1
-			// 
-			this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.tableLayoutPanel1.ColumnCount = 3;
-			this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-			this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 38F));
-			this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-			this.tableLayoutPanel1.Controls.Add(this.lstUnselected, 0, 0);
-			this.tableLayoutPanel1.Controls.Add(this.lstSelected, 2, 0);
-			this.tableLayoutPanel1.Controls.Add(this.btnDeselect, 1, 3);
-			this.tableLayoutPanel1.Controls.Add(this.btnDeselectAll, 1, 2);
-			this.tableLayoutPanel1.Controls.Add(this.btnSelect, 1, 0);
-			this.tableLayoutPanel1.Controls.Add(this.btnSelectAll, 1, 1);
-			this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 62);
-			this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-			this.tableLayoutPanel1.RowCount = 4;
-			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
-			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
-			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
-			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
-			this.tableLayoutPanel1.Size = new System.Drawing.Size(625, 353);
-			this.tableLayoutPanel1.TabIndex = 6;
-			// 
-			// btnCancel
-			// 
-			this.btnCancel.Location = new System.Drawing.Point(411, 422);
-			this.btnCancel.Name = "btnCancel";
-			this.btnCancel.Size = new System.Drawing.Size(100, 35);
-			this.btnCancel.TabIndex = 9;
-			this.btnCancel.Text = "Close";
-			this.btnCancel.UseVisualStyleBackColor = true;
-			this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click_1);
-			// 
-			// lblMessage
-			// 
-			this.lblMessage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.lblMessage.Location = new System.Drawing.Point(43, 12);
-			this.lblMessage.Name = "lblMessage";
-			this.lblMessage.Size = new System.Drawing.Size(317, 16);
-			this.lblMessage.TabIndex = 10;
-			this.lblMessage.Text = "Updates will appear when PROMS is restarted.";
-			// 
-			// lblAvailableTypes
-			// 
-			this.lblAvailableTypes.AutoSize = true;
-			this.lblAvailableTypes.Location = new System.Drawing.Point(12, 43);
-			this.lblAvailableTypes.Name = "lblAvailableTypes";
-			this.lblAvailableTypes.Size = new System.Drawing.Size(110, 16);
-			this.lblAvailableTypes.TabIndex = 11;
-			this.lblAvailableTypes.Text = "Types Available ";
-			// 
-			// lblSelected
-			// 
-			this.lblSelected.AutoSize = true;
-			this.lblSelected.Location = new System.Drawing.Point(343, 43);
-			this.lblSelected.Name = "lblSelected";
-			this.lblSelected.Size = new System.Drawing.Size(104, 16);
-			this.lblSelected.TabIndex = 12;
-			this.lblSelected.Text = "Types Selected";
-			// 
-			// dlgAnnotationsSelect
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(653, 466);
-			this.Controls.Add(this.lblSelected);
-			this.Controls.Add(this.lblAvailableTypes);
-			this.Controls.Add(this.btnCancel);
-			this.Controls.Add(this.tableLayoutPanel1);
-			this.Controls.Add(this.btnUpdate);
-			this.Controls.Add(this.lblMessage);
-			this.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Name = "dlgAnnotationsSelect";
-			this.Text = "Filter Annotation Types";
-			this.Load += new System.EventHandler(this.DlgAnnotationsSelect_Load);
-			this.tableLayoutPanel1.ResumeLayout(false);
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-		private System.Windows.Forms.ListBox lstUnselected;
-		private System.Windows.Forms.ListBox lstSelected;
-		private System.Windows.Forms.Button btnSelect;
-		private System.Windows.Forms.Button btnSelectAll;
-		private System.Windows.Forms.Button btnDeselectAll;
-		private System.Windows.Forms.Button btnDeselect;
-		private System.Windows.Forms.Button btnUpdate;
-
-		private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-		private System.Windows.Forms.Button btnCancel;
-		private System.Windows.Forms.Label lblMessage;
-		private System.Windows.Forms.Label lblAvailableTypes;
-		private System.Windows.Forms.Label lblSelected;
-	}
-}

PROMS/VEPROMS User Interface/dlgApproveProcedure.cs

@@ -65,13 +65,11 @@ 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;
-			this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			_MyDocVersion = myDocVersion;
 			_MyDocVersion.ResetProcedures();    // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list
 			InitializeComponent();
 			FlexGridAddEvents();
-			_MyApproval.StatusUpdated -= new ApprovalStatusChangeEvent(_MyApproval_StatusUpdated);
 			_MyApproval.StatusUpdated += new ApprovalStatusChangeEvent(_MyApproval_StatusUpdated);
 			SetupComboBoxes();
 			foreach (ProcedureInfo pi in myDocVersion.Procedures)
@@ -103,7 +101,6 @@ namespace VEPROMS
 			//fgProcs.SetupEditor += new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_SetupEditor);
 			//fgProcs.StartEdit += new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_StartEdit);
 			//fgProcs.ValidateEdit += new C1.Win.C1FlexGrid.ValidateEditEventHandler(fgProcs_ValidateEdit);
-			fgProcs.ComboCloseUp -= new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_ComboCloseUp);
 			fgProcs.ComboCloseUp += new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_ComboCloseUp);
 			//fgProcs.MouseDown += new MouseEventHandler(fgProcs_MouseDown);
 			//fgProcs.MouseUp += new MouseEventHandler(fgProcs_MouseUp); 
@@ -278,7 +275,6 @@ namespace VEPROMS
 		{
 			MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
 			_MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing
-			this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			_MyDocVersion = myDocVersion;
 			_MyDocVersion.ResetProcedures();    // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list
@@ -299,7 +295,6 @@ namespace VEPROMS
 		{
 			MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
 			_MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing
-			this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			_MyDocVersion = myProcedure.MyDocVersion;
 			_MyDocVersion.ResetProcedures();    // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list
@@ -455,7 +450,6 @@ namespace VEPROMS
 			int checkedCount = clbMore.CheckedItems.Count;
 			string oldLabel = lblMore.Text;
 			pbMore.Visible = true;
-			ItemInfoList.ConsistencyCheckUpdated -= new ItemInfoListCCEvent(ItemInfoList_ConsistencyCheckUpdated);
 			ItemInfoList.ConsistencyCheckUpdated += new ItemInfoListCCEvent(ItemInfoList_ConsistencyCheckUpdated);
 			List<ProcedureInfo> myProcs = new List<ProcedureInfo>();
 			// B2018-136 use the list of procedures that have checkboxes and are checked (right panel) instead of the list to be approved (left panel)
@@ -1309,7 +1303,7 @@ namespace VEPROMS
 				pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
 				if (si.IsApproved == 1)
 				{
-					dlgExportImport dlg = new dlgExportImport("Export", pi, MyFrmVEPROMS, (selectedSlave)); // "true tell export to convert ROs and Transitions to text
+					dlgExportImport dlg = new dlgExportImport("Export", pi, MyFrmVEPROMS, (E_UCFImportOptions)0); // "true tell export to convert ROs and Transitions to text
 					dlg.DocReplace = frm.DocReplace;  // this tells approval to prepare an export file with resolved transitions and ROs, word sections are saved with resolved ROs during approval PDF creation and saved in DocReplace
 					System.Xml.XmlDocument xd = new System.Xml.XmlDocument();
 					dlg.ExportItem(xd, pi, "procedure");