From be0c91043263a19b195b948d1a9349e1aeabf34c Mon Sep 17 00:00:00 2001 From: John Jenko Date: Thu, 22 Jun 2023 14:37:29 -0400 Subject: [PATCH 1/2] ~ Set to build using DotNet Ver 4.6.2 ~ Upped the minor revision number of PROMS to 2.1 and RO Editor to 2.2 --- .../AdjustBuildRevision.csproj | 2 +- PROMS/AdjustBuildRevision/Program.cs | 4 +- PROMS/AdjustBuildRevision/app.config | 2 +- PROMS/Baseline/App.config | 16 +++---- PROMS/Baseline/Baseline.csproj | 4 +- PROMS/DropDownPanel/DropDownPanel.csproj | 2 +- .../FlexableMessageBox.csproj | 2 +- PROMS/Formats/Formats.csproj | 2 +- .../Formats/Properties/Resources.Designer.cs | 2 +- PROMS/Formats/Properties/Settings.Designer.cs | 2 +- PROMS/Formats/app.config | 2 +- PROMS/LBWordLibrary/LBWordLibrary.csproj | 2 +- .../Exe/RefObj/CmpRpt/CmpRpt.csproj | 2 +- .../Exe/RefObj/CmpRpt/app.config | 2 +- .../Exe/RefObj/ROEditor/AssemblyInfo.cs | 7 ++- .../ROEditor/Properties/Resources.Designer.cs | 2 +- .../Exe/RefObj/ROEditor/ROEditor.csproj | 13 +++--- .../Exe/RefObj/ROEditor/ReferencedObjects.sln | 44 +++++++++---------- .../Exe/RefObj/ROEditor/app.config | 2 +- .../DBEncapsulation/DBEncapsulation.csproj | 2 +- .../Org.Mentalis.Files.csproj | 2 +- .../RODBInterface/RODBInterface.csproj | 2 +- .../LibSource/ROFST/ROFST.csproj | 2 +- .../LibSource/ROField/ROFields.csproj | 2 +- .../LibSource/Utils/Utils.csproj | 2 +- .../LibSource/VlnProfiler/VlnProfiler.csproj | 2 +- .../LibSource/VlnStatus/VlnStatus.csproj | 2 +- .../ctlXMLEditLib/ctlXMLEditLib.csproj | 2 +- PROMS/RoAccessToSql/App.config | 2 +- .../Properties/Resources.Designer.cs | 2 +- .../Properties/Settings.Designer.cs | 2 +- PROMS/RoAccessToSql/RoAccessToSql.csproj | 2 +- PROMS/TablePicker/TablePicker.csproj | 2 +- PROMS/VEPROMS User Interface/App.config | 2 +- .../Properties/AssemblyInfo.cs | 8 +++- .../Properties/Resources.Designer.cs | 2 +- .../Properties/Settings.Designer.cs | 2 +- .../VEPROMS User Interface/VEPROMS_UI.csproj | 19 +++----- .../VEPROMS.CSLA.Library.csproj | 2 +- PROMS/VEPROMS/VEPROMS.sln | 44 +++++++++---------- PROMS/VG/VG.csproj | 2 +- .../Volian.Base.Library.csproj | 2 +- .../Properties/Settings.Designer.cs | 2 +- .../Volian.Controls.Library.csproj | 2 +- PROMS/Volian.Controls.Library/app.config | 2 +- .../Volian.Pipe.Library.csproj | 2 +- .../Volian.Print.Library.csproj | 2 +- .../Volian.Svg.Library.csproj | 2 +- .../Volian.Utils.Library.csproj | 2 +- PROMS/XYPlots/XYPlots.csproj | 2 +- 50 files changed, 121 insertions(+), 120 deletions(-) diff --git a/PROMS/AdjustBuildRevision/AdjustBuildRevision.csproj b/PROMS/AdjustBuildRevision/AdjustBuildRevision.csproj index 40d0acc5..7f9497c0 100644 --- a/PROMS/AdjustBuildRevision/AdjustBuildRevision.csproj +++ b/PROMS/AdjustBuildRevision/AdjustBuildRevision.csproj @@ -27,7 +27,7 @@ - v4.6.1 + v4.6.2 diff --git a/PROMS/AdjustBuildRevision/Program.cs b/PROMS/AdjustBuildRevision/Program.cs index ddd55e43..d4e0b720 100644 --- a/PROMS/AdjustBuildRevision/Program.cs +++ b/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.1.yyMM.dHH") + "\")"); + outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.2.yyMM.dHH") + "\")"); else - outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.0.yyMM.dHH") + "\")"); + outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.1.yyMM.dHH") + "\")"); // if (outline != line) // { // Console.WriteLine("Before: '{0}'", line); diff --git a/PROMS/AdjustBuildRevision/app.config b/PROMS/AdjustBuildRevision/app.config index 3dbff35f..2a0024f7 100644 --- a/PROMS/AdjustBuildRevision/app.config +++ b/PROMS/AdjustBuildRevision/app.config @@ -1,3 +1,3 @@ - + diff --git a/PROMS/Baseline/App.config b/PROMS/Baseline/App.config index 9080336a..21930064 100644 --- a/PROMS/Baseline/App.config +++ b/PROMS/Baseline/App.config @@ -1,20 +1,20 @@ - + - -
+ +
- + - + - + 0, 0 @@ -35,8 +35,8 @@ 167 - + - \ No newline at end of file + diff --git a/PROMS/Baseline/Baseline.csproj b/PROMS/Baseline/Baseline.csproj index 6b5451ea..b3163a7e 100644 --- a/PROMS/Baseline/Baseline.csproj +++ b/PROMS/Baseline/Baseline.csproj @@ -9,7 +9,7 @@ Properties Baseline Baseline - v4.5 + v4.6.2 512 @@ -19,6 +19,7 @@ + AnyCPU @@ -80,6 +81,7 @@ True Resources.resx + True diff --git a/PROMS/DropDownPanel/DropDownPanel.csproj b/PROMS/DropDownPanel/DropDownPanel.csproj index 1ec4caf9..c8da1a5c 100644 --- a/PROMS/DropDownPanel/DropDownPanel.csproj +++ b/PROMS/DropDownPanel/DropDownPanel.csproj @@ -18,7 +18,7 @@ - v4.6.1 + v4.6.2 diff --git a/PROMS/FlexableMessageBox/FlexableMessageBox.csproj b/PROMS/FlexableMessageBox/FlexableMessageBox.csproj index 3f452473..5f7d9b2f 100644 --- a/PROMS/FlexableMessageBox/FlexableMessageBox.csproj +++ b/PROMS/FlexableMessageBox/FlexableMessageBox.csproj @@ -9,7 +9,7 @@ Properties FlexableMessageBox FlexableMessageBox - v4.6.1 + v4.6.2 512 diff --git a/PROMS/Formats/Formats.csproj b/PROMS/Formats/Formats.csproj index 7d1f9ef2..ffa7cbd8 100644 --- a/PROMS/Formats/Formats.csproj +++ b/PROMS/Formats/Formats.csproj @@ -18,7 +18,7 @@ - v4.6.1 + v4.6.2 diff --git a/PROMS/Formats/Properties/Resources.Designer.cs b/PROMS/Formats/Properties/Resources.Designer.cs index 1cf56d9d..2fa0e911 100644 --- a/PROMS/Formats/Properties/Resources.Designer.cs +++ b/PROMS/Formats/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Formats.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/PROMS/Formats/Properties/Settings.Designer.cs b/PROMS/Formats/Properties/Settings.Designer.cs index c5993b74..aa7377c7 100644 --- a/PROMS/Formats/Properties/Settings.Designer.cs +++ b/PROMS/Formats/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace Formats.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/PROMS/Formats/app.config b/PROMS/Formats/app.config index 3dbff35f..2a0024f7 100644 --- a/PROMS/Formats/app.config +++ b/PROMS/Formats/app.config @@ -1,3 +1,3 @@ - + diff --git a/PROMS/LBWordLibrary/LBWordLibrary.csproj b/PROMS/LBWordLibrary/LBWordLibrary.csproj index 662000d9..6bc72442 100644 --- a/PROMS/LBWordLibrary/LBWordLibrary.csproj +++ b/PROMS/LBWordLibrary/LBWordLibrary.csproj @@ -18,7 +18,7 @@ - v4.6.1 + v4.6.2 diff --git a/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.csproj b/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.csproj index 0e3d856a..e8a3e5f1 100644 --- a/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.csproj +++ b/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.csproj @@ -33,7 +33,7 @@ - v4.6.1 + v4.6.2 2.0 diff --git a/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/app.config b/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/app.config index 04c71601..8129eac1 100644 --- a/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/app.config +++ b/PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/app.config @@ -1,6 +1,6 @@ - + diff --git a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs index 13db05e6..8f0cf924 100644 --- a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs +++ b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs @@ -23,8 +23,8 @@ using System.Runtime.CompilerServices; // Build YYMM (two digit year, two digit month) // Revision DHH (day - no leading zero, two digit hour - military time // -[assembly: AssemblyVersion("2.1.2210.2615")] -[assembly: AssemblyFileVersion("2.1.2210.2615")] +[assembly: AssemblyVersion("2.2.2306.2212")] +[assembly: AssemblyFileVersion("2.2.2306.2212")] // // In order to sign your assembly you must specify a key to use. Refer to the @@ -85,6 +85,9 @@ using System.Runtime.CompilerServices; + + + diff --git a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/Properties/Resources.Designer.cs b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/Properties/Resources.Designer.cs index 1206837c..984ddd4d 100644 --- a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/Properties/Resources.Designer.cs +++ b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace ROEditor.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.csproj b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.csproj index 279248c0..751aaec4 100644 --- a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.csproj +++ b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.csproj @@ -44,12 +44,12 @@ - v4.6.1 + v4.6.2 2.0 - bin\Debug\ + ..\..\..\..\VEPROMS User Interface\bin\Debug\ false 285212672 false @@ -71,6 +71,7 @@ full prompt false + x86 bin\Release\ @@ -122,6 +123,10 @@ System.XML + + False + ..\..\..\..\Volian.Base.Library\bin\Debug\Volian.Base.Library.dll + @@ -208,10 +213,6 @@ - - {AEEE9FD1-6892-45E2-A67E-418C06D46FF9} - Volian.Base.Library - {DECA8343-6351-11D6-8487-00A0CC271352} ctlXMLEditLib diff --git a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ReferencedObjects.sln b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ReferencedObjects.sln index 757f1ea7..4f7189d2 100644 --- a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ReferencedObjects.sln +++ b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ReferencedObjects.sln @@ -56,8 +56,8 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|x86 {3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|Win32.ActiveCfg = Debug|Any CPU {3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|x86.ActiveCfg = Debug|x86 {3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|x86.Build.0 = Debug|x86 @@ -70,8 +70,8 @@ Global {3A4A3543-2D44-11D6-8452-00A0CC271352}.Release|x86.Build.0 = Release|x86 {551CB7B3-00B1-11D7-8590-482B59000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {551CB7B3-00B1-11D7-8590-482B59000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {551CB7B3-00B1-11D7-8590-482B59000000}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {551CB7B3-00B1-11D7-8590-482B59000000}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {551CB7B3-00B1-11D7-8590-482B59000000}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {551CB7B3-00B1-11D7-8590-482B59000000}.Debug|Mixed Platforms.Build.0 = Debug|x86 {551CB7B3-00B1-11D7-8590-482B59000000}.Debug|Win32.ActiveCfg = Debug|Any CPU {551CB7B3-00B1-11D7-8590-482B59000000}.Debug|x86.ActiveCfg = Debug|x86 {551CB7B3-00B1-11D7-8590-482B59000000}.Debug|x86.Build.0 = Debug|x86 @@ -83,8 +83,8 @@ Global {551CB7B3-00B1-11D7-8590-482B59000000}.Release|x86.Build.0 = Release|x86 {0C782592-AA05-11D6-84D1-00A0CC271352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0C782592-AA05-11D6-84D1-00A0CC271352}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C782592-AA05-11D6-84D1-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {0C782592-AA05-11D6-84D1-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {0C782592-AA05-11D6-84D1-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {0C782592-AA05-11D6-84D1-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|x86 {0C782592-AA05-11D6-84D1-00A0CC271352}.Debug|Win32.ActiveCfg = Debug|Any CPU {0C782592-AA05-11D6-84D1-00A0CC271352}.Debug|x86.ActiveCfg = Debug|x86 {0C782592-AA05-11D6-84D1-00A0CC271352}.Debug|x86.Build.0 = Debug|x86 @@ -96,8 +96,8 @@ Global {0C782592-AA05-11D6-84D1-00A0CC271352}.Release|x86.Build.0 = Release|x86 {6D44F537-879E-11D6-84B8-00A0CC271352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6D44F537-879E-11D6-84B8-00A0CC271352}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D44F537-879E-11D6-84B8-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {6D44F537-879E-11D6-84B8-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {6D44F537-879E-11D6-84B8-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {6D44F537-879E-11D6-84B8-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|x86 {6D44F537-879E-11D6-84B8-00A0CC271352}.Debug|Win32.ActiveCfg = Debug|Any CPU {6D44F537-879E-11D6-84B8-00A0CC271352}.Debug|x86.ActiveCfg = Debug|x86 {6D44F537-879E-11D6-84B8-00A0CC271352}.Debug|x86.Build.0 = Debug|x86 @@ -109,8 +109,8 @@ Global {6D44F537-879E-11D6-84B8-00A0CC271352}.Release|x86.Build.0 = Release|x86 {0C7825FD-AA05-11D6-84D1-00A0CC271352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0C7825FD-AA05-11D6-84D1-00A0CC271352}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C7825FD-AA05-11D6-84D1-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {0C7825FD-AA05-11D6-84D1-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {0C7825FD-AA05-11D6-84D1-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {0C7825FD-AA05-11D6-84D1-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|x86 {0C7825FD-AA05-11D6-84D1-00A0CC271352}.Debug|Win32.ActiveCfg = Debug|Any CPU {0C7825FD-AA05-11D6-84D1-00A0CC271352}.Debug|x86.ActiveCfg = Debug|x86 {0C7825FD-AA05-11D6-84D1-00A0CC271352}.Debug|x86.Build.0 = Debug|x86 @@ -122,8 +122,8 @@ Global {0C7825FD-AA05-11D6-84D1-00A0CC271352}.Release|x86.Build.0 = Release|x86 {DECA8343-6351-11D6-8487-00A0CC271352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DECA8343-6351-11D6-8487-00A0CC271352}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DECA8343-6351-11D6-8487-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {DECA8343-6351-11D6-8487-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {DECA8343-6351-11D6-8487-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {DECA8343-6351-11D6-8487-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|x86 {DECA8343-6351-11D6-8487-00A0CC271352}.Debug|Win32.ActiveCfg = Debug|Any CPU {DECA8343-6351-11D6-8487-00A0CC271352}.Debug|x86.ActiveCfg = Debug|x86 {DECA8343-6351-11D6-8487-00A0CC271352}.Debug|x86.Build.0 = Debug|x86 @@ -135,8 +135,8 @@ Global {DECA8343-6351-11D6-8487-00A0CC271352}.Release|x86.Build.0 = Release|x86 {38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Debug|Mixed Platforms.Build.0 = Debug|x86 {38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Debug|Win32.ActiveCfg = Debug|Any CPU {38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Debug|x86.ActiveCfg = Debug|x86 {38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Debug|x86.Build.0 = Debug|x86 @@ -148,8 +148,8 @@ Global {38044313-1E5E-4F20-A9E7-3CBDDDCADCDC}.Release|x86.Build.0 = Release|x86 {134D8938-9CDC-4712-9444-D5DCC6638AB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {134D8938-9CDC-4712-9444-D5DCC6638AB6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {134D8938-9CDC-4712-9444-D5DCC6638AB6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {134D8938-9CDC-4712-9444-D5DCC6638AB6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {134D8938-9CDC-4712-9444-D5DCC6638AB6}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {134D8938-9CDC-4712-9444-D5DCC6638AB6}.Debug|Mixed Platforms.Build.0 = Debug|x86 {134D8938-9CDC-4712-9444-D5DCC6638AB6}.Debug|Win32.ActiveCfg = Debug|Any CPU {134D8938-9CDC-4712-9444-D5DCC6638AB6}.Debug|x86.ActiveCfg = Debug|x86 {134D8938-9CDC-4712-9444-D5DCC6638AB6}.Debug|x86.Build.0 = Debug|x86 @@ -162,8 +162,8 @@ Global {134D8938-9CDC-4712-9444-D5DCC6638AB6}.Release|x86.Build.0 = Release|x86 {A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Debug|Mixed Platforms.Build.0 = Debug|x86 {A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Debug|Win32.ActiveCfg = Debug|Any CPU {A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Debug|x86.ActiveCfg = Debug|x86 {A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Debug|x86.Build.0 = Debug|x86 @@ -176,8 +176,8 @@ Global {A46428FC-1E35-4B8D-8B06-A1DF8BAC7A04}.Release|x86.Build.0 = Release|x86 {680054D3-49C4-40E7-92A5-67B97DCE6308}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {680054D3-49C4-40E7-92A5-67B97DCE6308}.Debug|Any CPU.Build.0 = Debug|Any CPU - {680054D3-49C4-40E7-92A5-67B97DCE6308}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {680054D3-49C4-40E7-92A5-67B97DCE6308}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {680054D3-49C4-40E7-92A5-67B97DCE6308}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {680054D3-49C4-40E7-92A5-67B97DCE6308}.Debug|Mixed Platforms.Build.0 = Debug|x86 {680054D3-49C4-40E7-92A5-67B97DCE6308}.Debug|Win32.ActiveCfg = Debug|Any CPU {680054D3-49C4-40E7-92A5-67B97DCE6308}.Debug|x86.ActiveCfg = Debug|x86 {680054D3-49C4-40E7-92A5-67B97DCE6308}.Debug|x86.Build.0 = Debug|x86 @@ -190,8 +190,8 @@ Global {680054D3-49C4-40E7-92A5-67B97DCE6308}.Release|x86.Build.0 = Release|x86 {C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|Mixed Platforms.Build.0 = Debug|x86 {C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|Win32.ActiveCfg = Debug|Any CPU {C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|x86.ActiveCfg = Debug|x86 {C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|x86.Build.0 = Debug|x86 diff --git a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/app.config b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/app.config index 6485998d..29f8d38d 100644 --- a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/app.config +++ b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/app.config @@ -1,7 +1,7 @@ - + diff --git a/PROMS/ReferencedObjects/LibSource/DBEncapsulation/DBEncapsulation.csproj b/PROMS/ReferencedObjects/LibSource/DBEncapsulation/DBEncapsulation.csproj index 71a4fc53..3e34a82c 100644 --- a/PROMS/ReferencedObjects/LibSource/DBEncapsulation/DBEncapsulation.csproj +++ b/PROMS/ReferencedObjects/LibSource/DBEncapsulation/DBEncapsulation.csproj @@ -35,7 +35,7 @@ - v4.6.1 + v4.6.2 2.0 diff --git a/PROMS/ReferencedObjects/LibSource/Org.Mentalis.Files/Org.Mentalis.Files.csproj b/PROMS/ReferencedObjects/LibSource/Org.Mentalis.Files/Org.Mentalis.Files.csproj index c26a1b4c..d05e5d92 100644 --- a/PROMS/ReferencedObjects/LibSource/Org.Mentalis.Files/Org.Mentalis.Files.csproj +++ b/PROMS/ReferencedObjects/LibSource/Org.Mentalis.Files/Org.Mentalis.Files.csproj @@ -18,7 +18,7 @@ - v4.6.1 + v4.6.2 diff --git a/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.csproj b/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.csproj index 6c389120..a7850154 100644 --- a/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.csproj +++ b/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.csproj @@ -35,7 +35,7 @@ - v4.6.1 + v4.6.2 2.0 diff --git a/PROMS/ReferencedObjects/LibSource/ROFST/ROFST.csproj b/PROMS/ReferencedObjects/LibSource/ROFST/ROFST.csproj index 89cc2cad..91edc027 100644 --- a/PROMS/ReferencedObjects/LibSource/ROFST/ROFST.csproj +++ b/PROMS/ReferencedObjects/LibSource/ROFST/ROFST.csproj @@ -35,7 +35,7 @@ - v4.6.1 + v4.6.2 2.0 diff --git a/PROMS/ReferencedObjects/LibSource/ROField/ROFields.csproj b/PROMS/ReferencedObjects/LibSource/ROField/ROFields.csproj index 2a3cfc35..0bd1b17f 100644 --- a/PROMS/ReferencedObjects/LibSource/ROField/ROFields.csproj +++ b/PROMS/ReferencedObjects/LibSource/ROField/ROFields.csproj @@ -35,7 +35,7 @@ - v4.6.1 + v4.6.2 2.0 diff --git a/PROMS/ReferencedObjects/LibSource/Utils/Utils.csproj b/PROMS/ReferencedObjects/LibSource/Utils/Utils.csproj index e97329c3..29ab1b50 100644 --- a/PROMS/ReferencedObjects/LibSource/Utils/Utils.csproj +++ b/PROMS/ReferencedObjects/LibSource/Utils/Utils.csproj @@ -51,7 +51,7 @@ - v4.6.1 + v4.6.2 diff --git a/PROMS/ReferencedObjects/LibSource/VlnProfiler/VlnProfiler.csproj b/PROMS/ReferencedObjects/LibSource/VlnProfiler/VlnProfiler.csproj index a46818af..91d22ce5 100644 --- a/PROMS/ReferencedObjects/LibSource/VlnProfiler/VlnProfiler.csproj +++ b/PROMS/ReferencedObjects/LibSource/VlnProfiler/VlnProfiler.csproj @@ -46,7 +46,7 @@ - v4.6.1 + v4.6.2 2.0 diff --git a/PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatus.csproj b/PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatus.csproj index 3e11f95c..e94f11e0 100644 --- a/PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatus.csproj +++ b/PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatus.csproj @@ -35,7 +35,7 @@ - v4.6.1 + v4.6.2 2.0 diff --git a/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEditLib.csproj b/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEditLib.csproj index 8ac86de0..00d113ef 100644 --- a/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEditLib.csproj +++ b/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEditLib.csproj @@ -35,7 +35,7 @@ - v4.6.1 + v4.6.2 2.0 diff --git a/PROMS/RoAccessToSql/App.config b/PROMS/RoAccessToSql/App.config index e702b746..dc4131e4 100644 --- a/PROMS/RoAccessToSql/App.config +++ b/PROMS/RoAccessToSql/App.config @@ -60,6 +60,6 @@ - + diff --git a/PROMS/RoAccessToSql/Properties/Resources.Designer.cs b/PROMS/RoAccessToSql/Properties/Resources.Designer.cs index 0367b7b4..5dead6fe 100644 --- a/PROMS/RoAccessToSql/Properties/Resources.Designer.cs +++ b/PROMS/RoAccessToSql/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace RoAccessToSql.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/PROMS/RoAccessToSql/Properties/Settings.Designer.cs b/PROMS/RoAccessToSql/Properties/Settings.Designer.cs index 1569bf0e..e5507c40 100644 --- a/PROMS/RoAccessToSql/Properties/Settings.Designer.cs +++ b/PROMS/RoAccessToSql/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace RoAccessToSql.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/PROMS/RoAccessToSql/RoAccessToSql.csproj b/PROMS/RoAccessToSql/RoAccessToSql.csproj index d3780a11..4afa3ebb 100644 --- a/PROMS/RoAccessToSql/RoAccessToSql.csproj +++ b/PROMS/RoAccessToSql/RoAccessToSql.csproj @@ -9,7 +9,7 @@ Properties RoAccessToSql RoAccessToSql - v4.6.1 + v4.6.2 512 diff --git a/PROMS/TablePicker/TablePicker.csproj b/PROMS/TablePicker/TablePicker.csproj index 3f80b928..1e012a02 100644 --- a/PROMS/TablePicker/TablePicker.csproj +++ b/PROMS/TablePicker/TablePicker.csproj @@ -33,7 +33,7 @@ - v4.6.1 + v4.6.2 2.0 diff --git a/PROMS/VEPROMS User Interface/App.config b/PROMS/VEPROMS User Interface/App.config index 3d6910ad..408ec12a 100644 --- a/PROMS/VEPROMS User Interface/App.config +++ b/PROMS/VEPROMS User Interface/App.config @@ -179,4 +179,4 @@ - + diff --git a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs index 377650ff..5e6e156e 100644 --- a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs +++ b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs @@ -44,8 +44,12 @@ using System.Runtime.InteropServices; // Revision DHH (day - no leading zero, two digit hour - military time // // ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ******** -[assembly: AssemblyVersion("2.0.2306.2117")] -[assembly: AssemblyFileVersion("2.0.2306.2117")] +[assembly: AssemblyVersion("2.1.2306.2214")] +[assembly: AssemblyFileVersion("2.1.2306.2214")] + + + + diff --git a/PROMS/VEPROMS User Interface/Properties/Resources.Designer.cs b/PROMS/VEPROMS User Interface/Properties/Resources.Designer.cs index 0ba8ba1a..4b979a37 100644 --- a/PROMS/VEPROMS User Interface/Properties/Resources.Designer.cs +++ b/PROMS/VEPROMS User Interface/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace VEPROMS.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/PROMS/VEPROMS User Interface/Properties/Settings.Designer.cs b/PROMS/VEPROMS User Interface/Properties/Settings.Designer.cs index 4c5a906f..596231d2 100644 --- a/PROMS/VEPROMS User Interface/Properties/Settings.Designer.cs +++ b/PROMS/VEPROMS User Interface/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace VEPROMS.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj index 8f1de909..d511f0be 100644 --- a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj +++ b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj @@ -19,7 +19,7 @@ - v4.6.1 + v4.6.2 @@ -99,9 +99,6 @@ false - - ..\..\..\..\..\..\..\Development\Proms3rdPartyLibraries\DSOFramer\AxInterop.DSOFramer.dll - False @@ -115,21 +112,15 @@ False ..\..\..\Program Files (x86)\DotNetBar for Windows Forms\DevComponents.DotNetBar2.dll - - ..\..\..\..\..\..\..\Development\Proms3rdPartyLibraries\DSOFramer\Interop.DSOFramer.dll - True - False ..\..\..\..\3rdPartyLibraries\Ionic\Ionic.Zip.dll - - False - ..\..\..\..\..\..\..\Development\Proms3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Interpreter.dll + + ..\..\..\..\3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Interpreter.dll - - False - ..\..\..\..\..\..\..\Development\Proms3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Parser.dll + + ..\..\..\..\3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Parser.dll False diff --git a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj index 7ab88bf8..14ae24e0 100644 --- a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj +++ b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj @@ -18,7 +18,7 @@ - v4.6.1 + v4.6.2 diff --git a/PROMS/VEPROMS/VEPROMS.sln b/PROMS/VEPROMS/VEPROMS.sln index 4e7fcc23..09af4b2f 100644 --- a/PROMS/VEPROMS/VEPROMS.sln +++ b/PROMS/VEPROMS/VEPROMS.sln @@ -61,8 +61,8 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|Mixed Platforms.Build.0 = Debug|x86 {8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|Win32.ActiveCfg = Debug|Any CPU {8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|x86.ActiveCfg = Debug|x86 {8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|x86.Build.0 = Debug|x86 @@ -89,8 +89,8 @@ Global {8556527C-6615-487F-8AF7-22EBC3EF0268}.Release|x86.Build.0 = Release|x86 {41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Debug|Mixed Platforms.Build.0 = Debug|x86 {41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Debug|Win32.ActiveCfg = Debug|Any CPU {41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Debug|x86.ActiveCfg = Debug|x86 {41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Debug|x86.Build.0 = Debug|x86 @@ -117,8 +117,8 @@ Global {41B2D786-1C03-4C1A-9247-DA9F0D6B06D5}.Release|x86.Build.0 = Release|x86 {8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Debug|Mixed Platforms.Build.0 = Debug|x86 {8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Debug|Win32.ActiveCfg = Debug|Any CPU {8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Debug|x86.ActiveCfg = Debug|x86 {8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Debug|x86.Build.0 = Debug|x86 @@ -144,8 +144,8 @@ Global {8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Release|x86.ActiveCfg = Release|x86 {8D1C47B4-F302-4C5A-87CC-24FDC5529872}.Release|x86.Build.0 = Release|x86 {34ADDF19-CBBA-4A11-BC99-D141BA2D29EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {34ADDF19-CBBA-4A11-BC99-D141BA2D29EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {34ADDF19-CBBA-4A11-BC99-D141BA2D29EC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {34ADDF19-CBBA-4A11-BC99-D141BA2D29EC}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {34ADDF19-CBBA-4A11-BC99-D141BA2D29EC}.Debug|Mixed Platforms.Build.0 = Debug|x86 {34ADDF19-CBBA-4A11-BC99-D141BA2D29EC}.Debug|Win32.ActiveCfg = Debug|Any CPU {34ADDF19-CBBA-4A11-BC99-D141BA2D29EC}.Debug|x86.ActiveCfg = Debug|x86 {34ADDF19-CBBA-4A11-BC99-D141BA2D29EC}.Debug|x86.Build.0 = Debug|x86 @@ -171,8 +171,8 @@ Global {34ADDF19-CBBA-4A11-BC99-D141BA2D29EC}.Release|x86.Build.0 = Release|x86 {52D74078-3822-410E-889B-464BD21AAB9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {52D74078-3822-410E-889B-464BD21AAB9E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52D74078-3822-410E-889B-464BD21AAB9E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {52D74078-3822-410E-889B-464BD21AAB9E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {52D74078-3822-410E-889B-464BD21AAB9E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {52D74078-3822-410E-889B-464BD21AAB9E}.Debug|Mixed Platforms.Build.0 = Debug|x86 {52D74078-3822-410E-889B-464BD21AAB9E}.Debug|Win32.ActiveCfg = Debug|Any CPU {52D74078-3822-410E-889B-464BD21AAB9E}.Debug|x86.ActiveCfg = Debug|x86 {52D74078-3822-410E-889B-464BD21AAB9E}.Debug|x86.Build.0 = Debug|x86 @@ -199,8 +199,8 @@ Global {52D74078-3822-410E-889B-464BD21AAB9E}.Release|x86.Build.0 = Release|x86 {04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Debug|Mixed Platforms.Build.0 = Debug|x86 {04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Debug|Win32.ActiveCfg = Debug|Any CPU {04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Debug|x86.ActiveCfg = Debug|x86 {04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Debug|x86.Build.0 = Debug|x86 @@ -227,8 +227,8 @@ Global {04E168D0-9CC7-43D9-A9F1-93E481EA86A3}.Release|x86.Build.0 = Release|x86 {70F23722-19A3-4AC1-A900-55831C945786}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {70F23722-19A3-4AC1-A900-55831C945786}.Debug|Any CPU.Build.0 = Debug|Any CPU - {70F23722-19A3-4AC1-A900-55831C945786}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {70F23722-19A3-4AC1-A900-55831C945786}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {70F23722-19A3-4AC1-A900-55831C945786}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {70F23722-19A3-4AC1-A900-55831C945786}.Debug|Mixed Platforms.Build.0 = Debug|x86 {70F23722-19A3-4AC1-A900-55831C945786}.Debug|Win32.ActiveCfg = Debug|Any CPU {70F23722-19A3-4AC1-A900-55831C945786}.Debug|x86.ActiveCfg = Debug|x86 {70F23722-19A3-4AC1-A900-55831C945786}.Debug|x86.Build.0 = Debug|x86 @@ -253,8 +253,8 @@ Global {70F23722-19A3-4AC1-A900-55831C945786}.Release|x86.Build.0 = Release|x86 {94830C07-6A3A-450E-9674-C9B4293A7726}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {94830C07-6A3A-450E-9674-C9B4293A7726}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94830C07-6A3A-450E-9674-C9B4293A7726}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {94830C07-6A3A-450E-9674-C9B4293A7726}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {94830C07-6A3A-450E-9674-C9B4293A7726}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {94830C07-6A3A-450E-9674-C9B4293A7726}.Debug|Mixed Platforms.Build.0 = Debug|x86 {94830C07-6A3A-450E-9674-C9B4293A7726}.Debug|Win32.ActiveCfg = Debug|Any CPU {94830C07-6A3A-450E-9674-C9B4293A7726}.Debug|x86.ActiveCfg = Debug|x86 {94830C07-6A3A-450E-9674-C9B4293A7726}.Debug|x86.Build.0 = Debug|x86 @@ -331,8 +331,8 @@ Global {AEEE9FD1-6892-45E2-A67E-418C06D46FF9}.Release|x86.Build.0 = Release|x86 {23DECB23-7CEA-433E-88BD-67DA7689B89E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {23DECB23-7CEA-433E-88BD-67DA7689B89E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {23DECB23-7CEA-433E-88BD-67DA7689B89E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {23DECB23-7CEA-433E-88BD-67DA7689B89E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {23DECB23-7CEA-433E-88BD-67DA7689B89E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {23DECB23-7CEA-433E-88BD-67DA7689B89E}.Debug|Mixed Platforms.Build.0 = Debug|x86 {23DECB23-7CEA-433E-88BD-67DA7689B89E}.Debug|Win32.ActiveCfg = Debug|Any CPU {23DECB23-7CEA-433E-88BD-67DA7689B89E}.Debug|x86.ActiveCfg = Debug|x86 {23DECB23-7CEA-433E-88BD-67DA7689B89E}.Debug|x86.Build.0 = Debug|x86 @@ -357,8 +357,8 @@ Global {23DECB23-7CEA-433E-88BD-67DA7689B89E}.Release|x86.Build.0 = Release|x86 {D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|Mixed Platforms.Build.0 = Debug|x86 {D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|Win32.ActiveCfg = Debug|Any CPU {D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|x86.ActiveCfg = Debug|x86 {D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|x86.Build.0 = Debug|x86 @@ -383,8 +383,8 @@ Global {D1AB675E-828D-4781-BACD-8A2324CD84A5}.Release|x86.Build.0 = Release|x86 {62314B9C-DA84-4037-8B68-AA18C1F641F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {62314B9C-DA84-4037-8B68-AA18C1F641F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62314B9C-DA84-4037-8B68-AA18C1F641F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {62314B9C-DA84-4037-8B68-AA18C1F641F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {62314B9C-DA84-4037-8B68-AA18C1F641F5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {62314B9C-DA84-4037-8B68-AA18C1F641F5}.Debug|Mixed Platforms.Build.0 = Debug|x86 {62314B9C-DA84-4037-8B68-AA18C1F641F5}.Debug|Win32.ActiveCfg = Debug|Any CPU {62314B9C-DA84-4037-8B68-AA18C1F641F5}.Debug|x86.ActiveCfg = Debug|x86 {62314B9C-DA84-4037-8B68-AA18C1F641F5}.Debug|x86.Build.0 = Debug|x86 diff --git a/PROMS/VG/VG.csproj b/PROMS/VG/VG.csproj index 610b670f..1ab52e35 100644 --- a/PROMS/VG/VG.csproj +++ b/PROMS/VG/VG.csproj @@ -35,7 +35,7 @@ - v4.6.1 + v4.6.2 2.0 diff --git a/PROMS/Volian.Base.Library/Volian.Base.Library.csproj b/PROMS/Volian.Base.Library/Volian.Base.Library.csproj index b16706fc..9672f395 100644 --- a/PROMS/Volian.Base.Library/Volian.Base.Library.csproj +++ b/PROMS/Volian.Base.Library/Volian.Base.Library.csproj @@ -18,7 +18,7 @@ - v4.6.1 + v4.6.2 diff --git a/PROMS/Volian.Controls.Library/Properties/Settings.Designer.cs b/PROMS/Volian.Controls.Library/Properties/Settings.Designer.cs index 6a270487..3c9e111d 100644 --- a/PROMS/Volian.Controls.Library/Properties/Settings.Designer.cs +++ b/PROMS/Volian.Controls.Library/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace Volian.Controls.Library.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj index d43ebd90..a17d5841 100644 --- a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj +++ b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj @@ -18,7 +18,7 @@ - v4.6.1 + v4.6.2 diff --git a/PROMS/Volian.Controls.Library/app.config b/PROMS/Volian.Controls.Library/app.config index d4e30d36..a22567fe 100644 --- a/PROMS/Volian.Controls.Library/app.config +++ b/PROMS/Volian.Controls.Library/app.config @@ -12,4 +12,4 @@ - + diff --git a/PROMS/Volian.Pipe.Library/Volian.Pipe.Library.csproj b/PROMS/Volian.Pipe.Library/Volian.Pipe.Library.csproj index cb777c38..201b3327 100644 --- a/PROMS/Volian.Pipe.Library/Volian.Pipe.Library.csproj +++ b/PROMS/Volian.Pipe.Library/Volian.Pipe.Library.csproj @@ -9,7 +9,7 @@ Properties Volian.Pipe.Library Volian.Pipe.Library - v4.6.1 + v4.6.2 512 "%24/PROMS/Volian.Pipe.Library", RQGAAAAA diff --git a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj index 733c886c..12ed5491 100644 --- a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj +++ b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj @@ -18,7 +18,7 @@ - v4.6.1 + v4.6.2 diff --git a/PROMS/Volian.Svg.Library/Volian.Svg.Library.csproj b/PROMS/Volian.Svg.Library/Volian.Svg.Library.csproj index eb3d3ad3..e6237ee5 100644 --- a/PROMS/Volian.Svg.Library/Volian.Svg.Library.csproj +++ b/PROMS/Volian.Svg.Library/Volian.Svg.Library.csproj @@ -18,7 +18,7 @@ - v4.6.1 + v4.6.2 diff --git a/PROMS/Volian.Utils.Library/Volian.Utils.Library.csproj b/PROMS/Volian.Utils.Library/Volian.Utils.Library.csproj index 1e7c0583..b52497ad 100644 --- a/PROMS/Volian.Utils.Library/Volian.Utils.Library.csproj +++ b/PROMS/Volian.Utils.Library/Volian.Utils.Library.csproj @@ -16,7 +16,7 @@ - v4.6.1 + v4.6.2 diff --git a/PROMS/XYPlots/XYPlots.csproj b/PROMS/XYPlots/XYPlots.csproj index 870e5d5c..afe253f9 100644 --- a/PROMS/XYPlots/XYPlots.csproj +++ b/PROMS/XYPlots/XYPlots.csproj @@ -35,7 +35,7 @@ - v4.6.1 + v4.6.2 2.0 From 376a462c2d01ee2b3c3f023fb4ea1c2b79f2862c Mon Sep 17 00:00:00 2001 From: John Jenko Date: Wed, 28 Jun 2023 10:08:33 -0400 Subject: [PATCH 2/2] B2022-144 added logic to process dividual procedures to check for bad RO Links Also fixed a build issue for the controls library --- .../frmBatchRefresh.Designer.cs | 1 + .../VEPROMS User Interface/frmBatchRefresh.cs | 145 ++++++------------ .../Extension/ROFSTExt.cs | 52 ++----- .../Volian.Controls.Library.csproj | 2 +- 4 files changed, 59 insertions(+), 141 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs b/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs index ee346ceb..a917d5b3 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs @@ -494,6 +494,7 @@ this.swRefreshTblsForSrch.TabIndex = 32; this.swRefreshTblsForSrch.Value = true; this.swRefreshTblsForSrch.ValueObject = "Y"; + this.swRefreshTblsForSrch.ValueChanged += new System.EventHandler(this.swCk_ValueChanged); // // lblRefreshTblForSrch // diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs index c6218f58..8dbc901c 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs @@ -296,47 +296,70 @@ namespace VEPROMS } this.Cursor = Cursors.Default; } + //C2022-028 check for Bad RO Links - we will check all of the RO links found in procedure step text + //B2022-144 Allow to check individual procedures for bad RO links private void CheckROLinks() { bool badLinksFound = false; this.Cursor = Cursors.WaitCursor; - List dvil = new List(); - foreach (TreeNode tn in myDocVersions.Keys) + List pil = new List(); + // populate a list of procedures that the user selected to process + foreach (TreeNode tn in myProcedures.Keys) if (tn.Checked) - dvil.Add(myDocVersions[tn]); + pil.Add(myProcedures[tn]); DateTime pStart = DateTime.Now; txtProcess.AppendText("Check RO Links"); txtProcess.AppendText(Environment.NewLine); txtProcess.AppendText(pStart.ToString("MM/dd/yyyy @ HH:mm")); txtProcess.AppendText(Environment.NewLine); + txtResults.Clear(); Application.DoEvents(); pbProcess.Minimum = 0; - pbProcess.Maximum = dvil.Count; + pbProcess.Maximum = pil.Count; pbProcess.Step = 1; - while (dvil.Count > 0) + int i = 0; + while (pil.Count > 0) { - StringBuilder sbDocVersions = new StringBuilder(); - Queue dviq = new Queue(); - foreach (DocVersionInfo dvi in dvil) - dviq.Enqueue(dvi); - dvil.Clear(); - // if we are processing more than one procedure set, use MessageList to hold the summary results for each set - if (dviq.Count > 1) - ROFstInfo.MessageList = new StringBuilder(); - while (dviq.Count > 0) + StringBuilder sbProcs = new StringBuilder(); + // Put the list of procedures in a queue + Queue piq = new Queue(); + foreach (ProcedureInfo pi in pil) + piq.Enqueue(pi); + pil.Clear(); + string prevStatMsgSet = string.Empty; + string statmsgproc = string.Empty; + while (piq.Count > 0) { string msg = string.Empty; - DocVersionInfo dq = dviq.Dequeue(); - if (!MySessionInfo.CanCheckOutItem(dq.VersionID, CheckOutType.DocVersion, ref msg)) + ProcedureInfo pq = piq.Dequeue(); // get next procedure from queue + if (!MySessionInfo.CanCheckOutItem(pq.ItemID, CheckOutType.Procedure, ref msg)) { - dvil.Add(dq); - sbDocVersions.AppendLine(msg); + pil.Add(pq); // cannot open this procedure to process - save to a list of un-processed procedures + sbProcs.AppendLine(msg); } else { + string statmsgset = string.Format("Check ROs Links in Procedure Set \"{0}\"", pq.MyDocVersion.MyFolder.Name); + if (statmsgset != prevStatMsgSet) + { + txtResults.AppendText(statmsgset); + txtResults.AppendText(Environment.NewLine); + txtResults.AppendText(Environment.NewLine); + prevStatMsgSet = statmsgset; + } + ProcedureInfo.ResetCheckROLinkCounters(); + DoProgressBarRefresh(++i, piq.Count, string.Format("{0} ({1}/{2} ROs)", pq.DisplayNumber, i, piq.Count)); ContentInfo.StaticContentInfoChange += new StaticContentInfoEvent(ContentInfo_StaticContentInfoChange); - badLinksFound |= ProcessCheckROLinks(dq); + statmsgproc = string.Format(" Checking Procedure {0}", pq.DisplayNumber); + txtResults.AppendText(statmsgproc); + txtResults.AppendText(Environment.NewLine); + int numBadROLinks = ROFstInfo.CheckROLinksInThisProcedure(pq, txtProcess); // check the procedure for bad RO links + badLinksFound |= (numBadROLinks > 0); + string smsg = (numBadROLinks > 0) ? string.Format(" {0} Bad RO Link(s) Found", numBadROLinks) : " No Bad RO Links Found"; + txtResults.AppendText(smsg); + txtResults.AppendText(Environment.NewLine); + txtResults.AppendText(Environment.NewLine); ContentInfo.StaticContentInfoChange -= new StaticContentInfoEvent(ContentInfo_StaticContentInfoChange); pbProcess.PerformStep(); Application.DoEvents(); @@ -352,7 +375,7 @@ namespace VEPROMS FlexibleMessageBox.Show("No Bad RO links were detected.", "Check RO Links Complete"); ROFstInfo.MessageList = null; - if (dvil.Count > 0) + if (piq.Count > 0) { frmBatchRefreshCheckedOut frmCO = new frmBatchRefreshCheckedOut(0); frmCO.MySessionInfo = MySessionInfo; @@ -364,89 +387,7 @@ namespace VEPROMS } this.Cursor = Cursors.Default; } - private bool ProcessCheckROLinks(DocVersionInfo dq) - { - bool badLinksFound = false; - string statmsg = string.Format("Checking ROs for {0}", dq.MyFolder.Name); - InitialProgressBarMessage = statmsg; - txtProcess.AppendText(statmsg); - txtProcess.AppendText(Environment.NewLine); - txtResults.AppendText(statmsg); - txtResults.AppendText(Environment.NewLine); - Application.DoEvents(); - //if (dq.DocVersionAssociationCount < 1) - //{ - // ProgressBar.ColorTable = eProgressBarItemColor.Error; - // FinalProgressBarMessage = "No ROs associated"; - // txtProcess.AppendText(Environment.NewLine); - // txtProcess.AppendText(Environment.NewLine); - // txtProcess.AppendText("Error Updating ro.fst. No associated ro.fst"); - // txtProcess.AppendText(Environment.NewLine); - // txtProcess.AppendText(Environment.NewLine); - // txtResults.AppendText("Error Updating ro.fst. No associated ro.fst"); - // txtResults.AppendText(Environment.NewLine); - // txtResults.AppendText(Environment.NewLine); - // return; - //} - - //ROFstInfo roFstInfo = dq.DocVersionAssociations[0].MyROFst; - //string rofstPath = roFstInfo.MyRODb.FolderPath + @"\ro.fst"; - - ////if (!pathExists(rofstPath)) - //if (!File.Exists(rofstPath)) - //{ - // ProgressBar.ColorTable = eProgressBarItemColor.Error; - // FinalProgressBarMessage = "No existing RO.FST"; - // txtProcess.AppendText(Environment.NewLine); - // txtProcess.AppendText(Environment.NewLine); - // txtProcess.AppendText("No existing ro.fst in path " + roFstInfo.MyRODb.FolderPath + ". Check for invalid path"); - // txtProcess.AppendText(Environment.NewLine); - // txtProcess.AppendText(Environment.NewLine); - // txtResults.AppendText("No existing ro.fst in path " + roFstInfo.MyRODb.FolderPath + ". Check for invalid path"); - // txtResults.AppendText(Environment.NewLine); - // txtResults.AppendText(Environment.NewLine); - // return; - //} - - Cursor = Cursors.WaitCursor; - int numBadROLinks = 0; - using (DocVersion dv = DocVersion.Get(dq.VersionID)) - { - // B2022-026 RO Memory Reduction code - first load the new ro.fst so that we can assign the ROTableUpdate event to the correct roFstInfo - //if (dv.ROfstLoadingFigures || dv.NewerRoFst) // B2017-125 see if loading figures was completed - //{ - // // only load the RO.fst - // ROFstInfo.UpdateRoFst(roFstInfo.MyRODb, dv, roFstInfo, DoProgressBarRefresh); - // roFstInfo = dq.DocVersionAssociations[0].MyROFst; - //} - //roFstInfo.ROTableUpdate += new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate); - //ROFst newrofst = ROFstInfo.RefreshROFst(dv, roFstInfo, DoProgressBarRefresh, txtProcess); - //roFstInfo.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate); - numBadROLinks = ROFstInfo.DoCheckROLinksInProcedures(dv, DoProgressBarRefresh, txtProcess); - } - - Cursor = Cursors.Default; - ProgressBar.ColorTable = eProgressBarItemColor.Normal; - FinalProgressBarMessage = "RO Links Checked"; - txtProcess.AppendText(Environment.NewLine); - txtProcess.AppendText(Environment.NewLine); - //txtResults.AppendText("RO links Checked"); - //txtResults.AppendText(Environment.NewLine); - if (numBadROLinks > 0) - { - badLinksFound = true; - txtResults.AppendText(string.Format("{0} Bad RO Links were Found", numBadROLinks)); - txtResults.AppendText(Environment.NewLine); - txtResults.AppendText("A \"Bad RO Link\" Annotation was Placed at each Step Location"); - txtResults.AppendText(Environment.NewLine); - } - else - txtResults.AppendText("No Bad RO Links were Detected"); - txtResults.AppendText(Environment.NewLine); - txtResults.AppendText(Environment.NewLine); - return badLinksFound; - } // B2018-002 - Invalid Transitions - Define Transition Refresh Statistics private int numTransProcessed = 0; private int numTransFixed = 0; diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs index 6f045ee7..113edc89 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs @@ -256,53 +256,29 @@ namespace VEPROMS.CSLA.Library return fixedROs; } + //C2022-028 for Admin tool to check for bad RO links - public static int DoCheckROLinksInProcedures(DocVersion docver, ROFstInfoProgressBarRefresh myProgressBarRefresh, System.Windows.Forms.TextBox tbStatus) - { - /**** commented out for now - keep in case we decide to try to fix some of the RO links - //ROFst rofst = null; - //rofst = docver.DocVersionAssociations[0].MyROFst; - ***/ - - DocVersionInfo dvi = DocVersionInfo.Get(docver.VersionID); - - int badROLinks = CheckROLinksInProcedures(dvi, myProgressBarRefresh, tbStatus); - - myProgressBarRefresh(100, 100, "Check RO Links Complete"); // update the progress bar - System.Windows.Forms.Application.DoEvents(); - - // pop up a message window telling the user the RO Check has completed and how many bad ROs were found - // if MessageList is not null, then append the results message to it. We are running via Admin tools and doing more than one procedure set - // and will diplay the messages once after all processing is completed - if (MessageList != null) - MessageList.AppendLine((badROLinks == 0 ? "No Bad RO Links Found for " : string.Format("{0} Bad RO Links Found in ", badROLinks)) + dvi.MyFolder.Name); - - return badROLinks; - } - public static int CheckROLinksInProcedures(DocVersionInfo dvi, ROFstInfoProgressBarRefresh myProgressBarRefresh, System.Windows.Forms.TextBox tbStatus) + //B2022-144 we now loop through checked procedures list from Admin Tools and call this method for each procedure we want to process + public static int CheckROLinksInThisProcedure(ProcedureInfo proc, System.Windows.Forms.TextBox tbStatus) { int FoundBadROLinks = 0; - + DocVersionInfo dvi = DocVersionInfo.Get(proc.MyDocVersion.VersionID); if (dvi.DocVersionConfig.SelectedSlave <= 0) { int i = 0; - foreach (ProcedureInfo proc in dvi.Procedures) - { - DateTime start = DateTime.Now; + DateTime start = DateTime.Now; - ProcedureInfo.ResetCheckROLinkCounters(); - myProgressBarRefresh(++i, dvi.Procedures.Count, string.Format("{0} ({1}/{2} ROs)", proc.DisplayNumber, i, dvi.Procedures.Count)); - ProcedureInfo.CheckReferenceObjectsLinks(proc); - FoundBadROLinks += ProcedureInfo.BadROLinksCount; + ProcedureInfo.ResetCheckROLinkCounters(); + ProcedureInfo.CheckReferenceObjectsLinks(proc); + FoundBadROLinks += ProcedureInfo.BadROLinksCount; - TimeSpan ts = DateTime.Now - start; + TimeSpan ts = DateTime.Now - start; - if (tbStatus != null) - tbStatus.AppendText(string.Format("Procedure: {1}{0}, Checked {2} Referenced Objects Links{0}, Found {3} Bad RO Links{0} Elapsed Seconds:{5}{0}{0}", Environment.NewLine, proc.DisplayNumber, ProcedureInfo.CheckROLinksCount, ProcedureInfo.BadROLinksCount, ProcedureInfo.FixedROLinksCount, ts.TotalSeconds)); - /*** keep for now - incase we decide to fix RO links later on, this will show the number of RO Links that we fixed - //tbStatus.AppendText(string.Format("Procedure: {1}{0}, Checked {2} Referenced Objects Links{0}, Found {3} Bad RO Links{0}, Fixed {4} Bad RO Links{0} Elapsed Seconds:{5}{0}{0}", Environment.NewLine, proc.DisplayNumber, ProcedureInfo.CheckROLinksCount, ProcedureInfo.BadROLinksCount, ProcedureInfo.FixedROLinksCount, ts.TotalSeconds)); - ***/ - } + if (tbStatus != null) + tbStatus.AppendText(string.Format("Procedure: {1}{0}, Checked {2} Referenced Objects Links{0}, Found {3} Bad RO Links{0} Elapsed Seconds:{5}{0}{0}", Environment.NewLine, proc.DisplayNumber, ProcedureInfo.CheckROLinksCount, ProcedureInfo.BadROLinksCount, ProcedureInfo.FixedROLinksCount, ts.TotalSeconds)); + /*** keep for now - incase we decide to fix RO links later on, this will show the number of RO Links that we fixed + //tbStatus.AppendText(string.Format("Procedure: {1}{0}, Checked {2} Referenced Objects Links{0}, Found {3} Bad RO Links{0}, Fixed {4} Bad RO Links{0} Elapsed Seconds:{5}{0}{0}", Environment.NewLine, proc.DisplayNumber, ProcedureInfo.CheckROLinksCount, ProcedureInfo.BadROLinksCount, ProcedureInfo.FixedROLinksCount, ts.TotalSeconds)); + ***/ } return FoundBadROLinks; // return the total number of bad RO links (in step text only) for the entire procedure set diff --git a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj index d43ebd90..a4caf541 100644 --- a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj +++ b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj @@ -108,7 +108,7 @@ False - True + False ..\..\..\..\3rdPartyLibraries\Edraw\Interop.EDWordLib.dll