Merge pull request 'Development' (#111) from Development into master

Merging B2023-091 and B2023-078 from development into master.

PROMS/AdjustBuildRevision/AdjustBuildRevision.csproj

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

PROMS/AdjustBuildRevision/Program.cs

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

PROMS/AdjustBuildRevision/app.config

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

PROMS/Baseline/App.config

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

PROMS/Baseline/Baseline.csproj

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

PROMS/DropDownPanel/DropDownPanel.csproj

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

PROMS/FlexableMessageBox/FlexableMessageBox.csproj

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

PROMS/Formats/Formats.csproj

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -126,7 +126,6 @@
     <Content Include="fmtall\BVPSAOPall.xml" />
     <Content Include="fmtall\BVPSAtchall.xml" />
     <Content Include="fmtall\BVPSBCKall.xml" />
-    <Content Include="fmtall\BVPSFlexDEVall.xml" />
     <Content Include="fmtall\BVPSDEVall.xml" />
     <Content Include="fmtall\BVPSNIBCKall.xml" />
     <Content Include="fmtall\BVPSSAMGall.xml" />
@@ -302,7 +301,6 @@
     <Content Include="fmtall\SHESAMall.xml" />
     <Content Include="fmtall\SHESSDall.xml" />
     <Content Include="fmtall\SHESSD_00all.xml" />
-    <Content Include="fmtall\VEGPBckall.xml" />
     <Content Include="fmtall\VEGP1all.xml" />
     <Content Include="fmtall\VEGP2all.xml" />
     <Content Include="fmtall\VEGPAlrall.xml" />
@@ -378,7 +376,6 @@
     <Content Include="fmtall\wst1all.xml" />
     <Content Include="fmtall\wst2all.xml" />
     <Content Include="fmtall\wstalrall.xml" />
-    <Content Include="fmtall\VEGPBckStpsall.xml" />
     <Content Include="fmtall\wstbckall.xml" />
     <Content Include="fmtall\wstcklall.xml" />
     <Content Include="fmtall\wstdcsall.xml" />
@@ -406,7 +403,6 @@
     <Content Include="genmacall\BVPSAOP.svg" />
     <Content Include="genmacall\BVPSAtch.svg" />
     <Content Include="genmacall\BVPSbck.svg" />
-    <Content Include="genmacall\BVPSFlexdev.svg" />
     <Content Include="genmacall\BVPSdev.svg" />
     <Content Include="genmacall\BVPSNIBCK.svg" />
     <Content Include="genmacall\BVPSSAMG.svg" />
@@ -514,8 +510,6 @@
     <Content Include="genmacall\shervsu.svg" />
     <Content Include="genmacall\shesam.svg" />
     <Content Include="genmacall\shessd.svg" />
-    <Content Include="genmacall\VEGPBck.svg" />
-    <Content Include="genmacall\VEGPBckStps.svg" />
     <Content Include="genmacall\VEGP1.svg" />
     <Content Include="genmacall\VEGP2.svg" />
     <Content Include="genmacall\VEGPAlr.svg" />

PROMS/Formats/app.config

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

PROMS/LBWordLibrary/LBWordLibrary.csproj

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

PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.cs

@@ -24,7 +24,6 @@
 using System;
 using System.Drawing;
 using System.Collections;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Windows.Forms;
 using System.IO;
@@ -141,26 +140,11 @@ namespace CmpRpt
 			// for the Access database.
 			string roIdArg = BuildROList(args);
 			string[] roIDList = roIdArg.Split(',');
-
-			// If the args array contains more than 3 elements remove the extra ones.  The fourth argument (PC=...) is handled in the BuildROList
-			// method above.  If the args array contains more than 3 elements the working dir will not be correctly be set and the report will fail.
-			// The calling code file (DisplayReports.cs) at this time will only send up to 4 args.
-
-			//List<string> args2 = new List<string>(args);
-			//for (int i = 0; i < args2.Count; i++)
-			//	{
-			//		if (i > 2) {
-			//			args2.RemoveAt(i);
-			//		}					
-			//	}
-			////args2.RemoveAt(3);
-			//args = args2.ToArray();
-
-			//if (args.Length == 2 || args.Length == 3)
-			//{
+			if (args.Length == 2 || args.Length == 3)
+			{
 				string path = args[0];
 				Directory.SetCurrentDirectory(path);
-			//}
+			}
 			if (SqlConnectionStr != null)
 				myrodb = new SqlRODB(Directory.GetCurrentDirectory(), SqlConnectionStr, false);
 			else

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

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

PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.sln

@@ -1,31 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.32901.82
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CmpRpt", "CmpRpt.csproj", "{C4293263-EA9C-11D6-8515-00A0CC271352}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{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|x86.ActiveCfg = Debug|x86
-		{C4293263-EA9C-11D6-8515-00A0CC271352}.Debug|x86.Build.0 = Debug|x86
-		{C4293263-EA9C-11D6-8515-00A0CC271352}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C4293263-EA9C-11D6-8515-00A0CC271352}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C4293263-EA9C-11D6-8515-00A0CC271352}.Release|x86.ActiveCfg = Release|x86
-		{C4293263-EA9C-11D6-8515-00A0CC271352}.Release|x86.Build.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {14F0328F-5103-43E9-AFED-8510A6098931}
-	EndGlobalSection
-EndGlobal

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

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

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

@@ -23,8 +23,8 @@ using System.Runtime.CompilerServices;
 //      Build YYMM (two digit year, two digit month)
 //      Revision DHH (day - no leading zero, two digit hour - military time
 //
-[assembly: AssemblyVersion("2.3.2404.1611")]
-[assembly: AssemblyFileVersion("2.3.2404.1611")]
+[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 
@@ -89,8 +89,6 @@ using System.Runtime.CompilerServices;
 
 
 
-
-
 
 
 

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

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

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.32901.82
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30723.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ROEditor", "ROEditor.csproj", "{3A4A3543-2D44-11D6-8452-00A0CC271352}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -38,6 +38,43 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "..\..\..\LibSource\Utils\Utils.csproj", "{680054D3-49C4-40E7-92A5-67B97DCE6308}"
 EndProject
 Global
+	GlobalSection(SourceCodeControl) = preSolution
+		SccNumberOfProjects = 11
+		SccProjectName0 = \u0022$/PROMS/ReferencedObjects/ROEditor\u0022,\u0020XSEAAAAA
+		SccLocalPath0 = ..\\..\\..
+		SccProvider0 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe
+		SccProjectFilePathRelativizedFromConnection0 = Exe\\RefObj\\ROEditor\\
+		SccProjectUniqueName1 = ROEditor.csproj
+		SccLocalPath1 = ..\\..\\..
+		SccProjectFilePathRelativizedFromConnection1 = Exe\\RefObj\\ROEditor\\
+		SccProjectUniqueName2 = ..\\..\\..\\LibSource\\ctlXMLEditLib\\ctlXMLEditLib.csproj
+		SccLocalPath2 = ..\\..\\..
+		SccProjectFilePathRelativizedFromConnection2 = LibSource\\ctlXMLEditLib\\
+		SccProjectUniqueName3 = ..\\..\\..\\LibSource\\DBEncapsulation\\DBEncapsulation.csproj
+		SccLocalPath3 = ..\\..\\..
+		SccProjectFilePathRelativizedFromConnection3 = LibSource\\DBEncapsulation\\
+		SccProjectUniqueName4 = ..\\..\\..\\LibSource\\Org.Mentalis.Files\\Org.Mentalis.Files.csproj
+		SccLocalPath4 = ..\\..\\..
+		SccProjectFilePathRelativizedFromConnection4 = LibSource\\Org.Mentalis.Files\\
+		SccProjectUniqueName5 = ..\\..\\..\\LibSource\\RODBInterface\\RODBInterface.csproj
+		SccLocalPath5 = ..\\..\\..
+		SccProjectFilePathRelativizedFromConnection5 = LibSource\\RODBInterface\\
+		SccProjectUniqueName6 = ..\\..\\..\\LibSource\\ROField\\ROFields.csproj
+		SccLocalPath6 = ..\\..\\..
+		SccProjectFilePathRelativizedFromConnection6 = LibSource\\ROField\\
+		SccProjectUniqueName7 = ..\\..\\..\\LibSource\\ROFST\\ROFST.csproj
+		SccLocalPath7 = ..\\..\\..
+		SccProjectFilePathRelativizedFromConnection7 = LibSource\\ROFST\\
+		SccProjectUniqueName8 = ..\\..\\..\\LibSource\\Utils\\Utils.csproj
+		SccLocalPath8 = ..\\..\\..
+		SccProjectFilePathRelativizedFromConnection8 = LibSource\\Utils\\
+		SccProjectUniqueName9 = ..\\..\\..\\LibSource\\VlnProfiler\\VlnProfiler.csproj
+		SccLocalPath9 = ..\\..\\..
+		SccProjectFilePathRelativizedFromConnection9 = LibSource\\VlnProfiler\\
+		SccProjectUniqueName10 = ..\\..\\..\\LibSource\\VlnStatus\\VlnStatus.csproj
+		SccLocalPath10 = ..\\..\\..
+		SccProjectFilePathRelativizedFromConnection10 = LibSource\\VlnStatus\\
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Mixed Platforms = Debug|Mixed Platforms
@@ -187,26 +224,4 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {4814B42F-2708-4185-8450-20347EB2FDF6}
-	EndGlobalSection
-	GlobalSection(SourceCodeControl) = preSolution
-		SccNumberOfProjects = 5
-		SccProjectName0 = \u0022$/PROMS/ReferencedObjects/ROEditor\u0022,\u0020XSEAAAAA
-		SccLocalPath0 = ..\\..\\..
-		SccProvider0 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe
-		SccProjectFilePathRelativizedFromConnection0 = Exe\\RefObj\\ROEditor\\
-		SccProjectUniqueName1 = ..\\..\\..\\LibSource\\Org.Mentalis.Files\\Org.Mentalis.Files.csproj
-		SccLocalPath1 = ..\\..\\..
-		SccProjectFilePathRelativizedFromConnection1 = LibSource\\Org.Mentalis.Files\\
-		SccProjectUniqueName2 = ..\\..\\..\\LibSource\\ROFST\\ROFST.csproj
-		SccLocalPath2 = ..\\..\\..
-		SccProjectFilePathRelativizedFromConnection2 = LibSource\\ROFST\\
-		SccProjectUniqueName3 = ..\\..\\..\\LibSource\\Utils\\Utils.csproj
-		SccLocalPath3 = ..\\..\\..
-		SccProjectFilePathRelativizedFromConnection3 = LibSource\\Utils\\
-		SccProjectUniqueName4 = ..\\..\\..\\LibSource\\VlnProfiler\\VlnProfiler.csproj
-		SccLocalPath4 = ..\\..\\..
-		SccProjectFilePathRelativizedFromConnection4 = LibSource\\VlnProfiler\\
-	EndGlobalSection
 EndGlobal

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

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

PROMS/ReferencedObjects/Exe/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.sln

@@ -1,31 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.32901.82
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ROEditor", "ROEditor.csproj", "{3A4A3543-2D44-11D6-8452-00A0CC271352}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x86 = Release|x86
-	EndGlobalSection
-	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|x86.ActiveCfg = Debug|x86
-		{3A4A3543-2D44-11D6-8452-00A0CC271352}.Debug|x86.Build.0 = Debug|x86
-		{3A4A3543-2D44-11D6-8452-00A0CC271352}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A4A3543-2D44-11D6-8452-00A0CC271352}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A4A3543-2D44-11D6-8452-00A0CC271352}.Release|x86.ActiveCfg = Release|x86
-		{3A4A3543-2D44-11D6-8452-00A0CC271352}.Release|x86.Build.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7CEE041D-449C-4B54-B381-6845BD8E9B79}
-	EndGlobalSection
-EndGlobal

PROMS/ReferencedObjects/LibSource/DBEncapsulation/DBEncapsulation.csproj

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