Merge branch 'main' of https://github.com/microsoft/CSS_SQL_Networking_Tools

Malcolm-Stewart · Malcolm-Stewart · commit 9d40add6af37 · 2022-08-31T17:36:05.000-04:00
diff --git a/DBTest/DBTest/DBTest.csproj b/DBTest/DBTest/DBTest.csproj
@@ -11,6 +11,21 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>x64</PlatformTarget>
@@ -45,5 +60,12 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/DBTest/DBTest/Program.cs b/DBTest/DBTest/Program.cs
@@ -36,7 +36,7 @@ class Program
         static string CursorType       = "FIREHOSE";  // FIREHOSE, DATASET, NONE (executing a non-row-returning command)
 
 
-        static void Main(string[] args)
+        static int Main(string[] args)
         {
             //
             // Set command-line rules and parse the command-line
@@ -59,7 +59,7 @@ static void Main(string[] args)
             {
                 Console.WriteLine("Bad arguments: " + ruleViolation);
                 displayUsage();
-                return;           // exit the application
+                return (-1);           // exit the application   // Clintonw 
             }
             else  // for case-insensitive argument names, use lower-case to match
             {
@@ -71,7 +71,7 @@ static void Main(string[] args)
                 {
                     Console.WriteLine("The provider type must be SqlClient, ODBC, or OLEDB.");
                     displayUsage();
-                    return;
+                    return (-1);
                 }
                 ConnectionString = cp.GetArgOrBlank("connect");                // argument is required
                 CommandString = cp.GetArgOrBlank("command");                      // argument is optional
@@ -80,35 +80,35 @@ static void Main(string[] args)
                 {
                     Console.WriteLine("The timeout vaue must be numeric and 0 or higher.");
                     displayUsage();
-                    return;
+                    return (-1);
                 }
                 CursorType = cp.GetArgOrBlank("cursor", "Firehose").ToUpper();    // argument is optional with a default value
                 if (CursorType != "FIREHOSE" && CursorType != "DATASET" && CursorType != "NONE")
                 {
                     Console.WriteLine("The cursor type must be FireHose, DataSet, or None.");
                     displayUsage();
-                    return;
+                    return (-1);
                 }
                 value = cp.GetArgOrBlank("top", "10");                            // argument is optional with a default value
                 if (int.TryParse(value, out RowsToDisplay) == false || RowsToDisplay < -1)
                 {
                     Console.WriteLine("The top vaue must be numeric and -1 or higher.");
                     displayUsage();
-                    return;
+                    return (-1);
                 }
                 value = cp.GetArgOrBlank("repeat", "1");                          // argument is optional with a default value
                 if (int.TryParse(value, out RepeatCount) == false || RepeatCount < 1)
                 {
                     Console.WriteLine("The repeat vaue must be numeric and 1 or higher.");
                     displayUsage();
-                    return;
+                    return (-1);
                 }
                 value = cp.GetArgOrBlank("delay", "1");                           // argument is optional with a default value
                 if (int.TryParse(value, out DelaySec) == false || DelaySec < 1)
                 {
                     Console.WriteLine("The delay vaue must be numeric and 1 or higher.");
                     displayUsage();
-                    return;
+                    return (-1);
                 }
                 values = cp.GetArgs("stoponerror");
                 if (values.Count != 0) StopOnError = true;
@@ -159,9 +159,10 @@ static void Main(string[] args)
             {
                 if (i > 0) System.Threading.Thread.Sleep(DelaySec * 1000);
                 bool success = DatabaseTest();
-                if (!success && StopOnError) break;
+                if (!success && StopOnError) return (-2);   // break clintonw 
             }
             Console.WriteLine("All Tests Complete.");
+            return 0;                                       // clintonw
         }
 
         static public void displayUsage()
diff --git a/DBTest/DBTest/Properties/AssemblyInfo.cs b/DBTest/DBTest/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft: CSS SQL Networking Team")]
 [assembly: AssemblyProduct("DBTEST.EXE")]
-[assembly: AssemblyCopyright("Copyright ©  2021")]
+[assembly: AssemblyCopyright("Copyright ©  2021, 2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1198.0")]
-[assembly: AssemblyFileVersion("1.0.1198.0")]
+[assembly: AssemblyVersion("1.0.1199.0")]
+[assembly: AssemblyFileVersion("1.0.1199.0")]

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class Program`
`36`	`36`	`static string CursorType = "FIREHOSE"; // FIREHOSE, DATASET, NONE (executing a non-row-returning command)`
`37`	`37`
`38`	`38`
`39`		`- static void Main(string[] args)`
	`39`	`+ static int Main(string[] args)`
`40`	`40`	`{`
`41`	`41`	`//`
`42`	`42`	`// Set command-line rules and parse the command-line`
`@@ -59,7 +59,7 @@ static void Main(string[] args)`
`59`	`59`	`{`
`60`	`60`	`Console.WriteLine("Bad arguments: " + ruleViolation);`
`61`	`61`	`displayUsage();`
`62`		`- return; // exit the application`
	`62`	`+ return (-1); // exit the application // Clintonw`
`63`	`63`	`}`
`64`	`64`	`else // for case-insensitive argument names, use lower-case to match`
`65`	`65`	`{`
`@@ -71,7 +71,7 @@ static void Main(string[] args)`
`71`	`71`	`{`
`72`	`72`	`Console.WriteLine("The provider type must be SqlClient, ODBC, or OLEDB.");`
`73`	`73`	`displayUsage();`
`74`		`- return;`
	`74`	`+ return (-1);`
`75`	`75`	`}`
`76`	`76`	`ConnectionString = cp.GetArgOrBlank("connect"); // argument is required`
`77`	`77`	`CommandString = cp.GetArgOrBlank("command"); // argument is optional`
`@@ -80,35 +80,35 @@ static void Main(string[] args)`
`80`	`80`	`{`
`81`	`81`	`Console.WriteLine("The timeout vaue must be numeric and 0 or higher.");`
`82`	`82`	`displayUsage();`
`83`		`- return;`
	`83`	`+ return (-1);`
`84`	`84`	`}`
`85`	`85`	`CursorType = cp.GetArgOrBlank("cursor", "Firehose").ToUpper(); // argument is optional with a default value`
`86`	`86`	`if (CursorType != "FIREHOSE" && CursorType != "DATASET" && CursorType != "NONE")`
`87`	`87`	`{`
`88`	`88`	`Console.WriteLine("The cursor type must be FireHose, DataSet, or None.");`
`89`	`89`	`displayUsage();`
`90`		`- return;`
	`90`	`+ return (-1);`
`91`	`91`	`}`
`92`	`92`	`value = cp.GetArgOrBlank("top", "10"); // argument is optional with a default value`
`93`	`93`	`if (int.TryParse(value, out RowsToDisplay) == false \|\| RowsToDisplay < -1)`
`94`	`94`	`{`
`95`	`95`	`Console.WriteLine("The top vaue must be numeric and -1 or higher.");`
`96`	`96`	`displayUsage();`
`97`		`- return;`
	`97`	`+ return (-1);`
`98`	`98`	`}`
`99`	`99`	`value = cp.GetArgOrBlank("repeat", "1"); // argument is optional with a default value`
`100`	`100`	`if (int.TryParse(value, out RepeatCount) == false \|\| RepeatCount < 1)`
`101`	`101`	`{`
`102`	`102`	`Console.WriteLine("The repeat vaue must be numeric and 1 or higher.");`
`103`	`103`	`displayUsage();`
`104`		`- return;`
	`104`	`+ return (-1);`
`105`	`105`	`}`
`106`	`106`	`value = cp.GetArgOrBlank("delay", "1"); // argument is optional with a default value`
`107`	`107`	`if (int.TryParse(value, out DelaySec) == false \|\| DelaySec < 1)`
`108`	`108`	`{`
`109`	`109`	`Console.WriteLine("The delay vaue must be numeric and 1 or higher.");`
`110`	`110`	`displayUsage();`
`111`		`- return;`
	`111`	`+ return (-1);`
`112`	`112`	`}`
`113`	`113`	`values = cp.GetArgs("stoponerror");`
`114`	`114`	`if (values.Count != 0) StopOnError = true;`
`@@ -159,9 +159,10 @@ static void Main(string[] args)`
`159`	`159`	`{`
`160`	`160`	`if (i > 0) System.Threading.Thread.Sleep(DelaySec * 1000);`
`161`	`161`	`bool success = DatabaseTest();`
`162`		`- if (!success && StopOnError) break;`
	`162`	`+ if (!success && StopOnError) return (-2); // break clintonw`
`163`	`163`	`}`
`164`	`164`	`Console.WriteLine("All Tests Complete.");`
	`165`	`+ return 0; // clintonw`
`165`	`166`	`}`
`166`	`167`
`167`	`168`	`static public void displayUsage()`