Wed Feb 5 16:13:38 PST 2025

Author: jng
Date: 2025-02-05 16:13:37 -0800 (Wed, 05 Feb 2025)
New Revision: 10115

Modified:
   branches/4.0/MgDev/Bindings/TODO.txt
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ApiTypes.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/CommonTests.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ExternalTests/ByteReaderTest.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ExternalTests/CollectionTests.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ExternalTests/ConvenienceTests.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ExternalTests/PropertiesTest.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/FeatureService/FeatureServiceOperationExecutor.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/FeatureService/Operations.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ITestExecutor.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ITestExecutorCollection.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ITestLogger.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/MapLayer/MapLayerOperationExecutor.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/MapLayer/Operations.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/PlatformApiTestExecutor.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/PlatformResources.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/Properties/AssemblyInfo.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ResourceService/Operations.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ResourceService/ResourceServiceOperationExecutor.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/Sqlite.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/TestCommon.csproj
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/TestDataRoot.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/TestExecutionRun.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/TestExecutorBase.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/TestResult.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/UnitTestException.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/DrawingService/DrawingServiceOperationExecutor.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/DrawingService/Operations.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ExternalTests/ByteReaderReadByChunksTest.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ExternalTests/CollectionTests.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ExternalTests/MapTests.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ExternalTests/RenderingServiceTests.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ExternalTests/ResourceServiceTests.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/MapGuideResources.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/MappingService/MappingServiceOperationExecutor.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/Properties/AssemblyInfo.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/RenderingService/RenderingServiceOperationExecutor.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ServerAdmin/Operations.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ServerAdmin/ServerAdminOperationExecutor.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/SiteService/Operations.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/SiteService/SiteServiceOperationExecutor.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/TestMapGuideApi.csproj
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/WebLayout/Operations.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/WebLayout/WebLayoutOperationExecutor.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMisc/TestMisc.csproj
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestRunner/Properties/AssemblyInfo.cs
   branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestRunner/TestRunner.csproj
   branches/4.0/MgDev/build.bat
   branches/4.0/MgDev/clean.bat
Log:
- .net test runner updates
  - Bulk using cleanup
  - Update Microsoft.Data.Sqlite to 6.x. Fix up SQLite usages as a result of this upgrade
- Update clean.bat to clean our additional directories
- Rework test "installation" in build.bat to copy the test data and publish the .net test runner into it
- Update TODO.txt

Modified: branches/4.0/MgDev/Bindings/TODO.txt
===================================================================

--- branches/4.0/MgDev/Bindings/TODO.txt	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/TODO.txt	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,3 +1,6 @@
+x - Resolved
+~ - Not resolving and/or deferred
+
  - [x] Check that .net error messages are being read (https://github.com/jumpinjackie/mapguide-api-bindings/issues/35)
  - [x] Explore whether our current instability is due to invalid class layout assumptions due to stubbing ACE_Recursive_Thread_Mutex to avoid leaking ACE headers
  - [x] Generate XML documentation for our .net wrapper binding projects
@@ -9,7 +12,7 @@
  - [ ] Relocate/remove existing test code
  - [x] Move packages dir up to to top-level MgDev subdirectory and make sure nuget.config sources from this dir
  - [x] Update build batch files to build bindings/portable
- - [ ] Fix binding pre-build events to copy ACE/GEOS/lib_json dlls from their respective Oem directories
+ - [~] Fix binding pre-build events to copy ACE/GEOS/lib_json dlls from their respective Oem directories
  - Split .net binding into the Foundation/Geometry/PlatformBase/MapGuideCommon/Web layout (https://github.com/jumpinjackie/mapguide-api-bindings/issues/18)
    - [x] Add .targets files to each C# project so that native dlls are copied properly when consumed by legacy .net framework applications/libraries
    - [x] Consolidate TestCommon and TestMapGuideApi .net projects to unified netstandard2.0 libraries
@@ -16,7 +19,7 @@
    - [x] Tidy mg_exception_callback to no longer take an exception class name argument (it is no longer used or necessary)
    - [x] Add sanity test for all class ids generated by ClassMapGen
    - Either
-      - ( ) Add CentOS 6 Dockerfile that
+      - (~) Add CentOS 6 Dockerfile that
         - Install SWIG and common libs tarball (from docker build system)
         - Install same compilers/tools as the same docker image used to produce the common libs tarball
         - Generate and build the .net/Java SWIG glue libraries
@@ -41,9 +44,8 @@
    - [x] Verify test suite still passes (Windows)
    - [x] Tomcat/JSP now working on Linux, but none of the JSP code compiles (lots of <MapGuide API symbol> cannot be resolved)
    - [ ] Verify test suite still passes (Linux)
- - [ ] Migrate to SWIG 4.1.0 (https://github.com/jumpinjackie/mapguide-api-bindings/issues/36)
-   - [x] SWIG 4.1 has not been released yet, so migrate to swig git master
-   - [ ] Check if we can get rid of custom .net wstring marshaler (presumably SWIG 4.0 has better support in this area)
+ - [x] Migrate to SWIG 4.1.0 (https://github.com/jumpinjackie/mapguide-api-bindings/issues/36)
+   - [~] Check if we can get rid of custom .net wstring marshaler (presumably SWIG 4.0 has better support in this area)
  - PHP 8 binding (https://github.com/jumpinjackie/mapguide-api-bindings/issues/21)
    - [x] Re-base work against PHP 8.1
    - !!! Immediate problems that need to be addressed (to get Test1.php passing again) !!!
@@ -96,8 +98,6 @@
         - Copy the publish output into the mapviewernet/bin directory on install layout preparation. We expect this to have
            - The OSGeo.* assemblies
            - The supporting native dlls
-     - If raw .aspx files cannot consume our netstandard2.0 package, retian Oem/SwigEx for the purpose of building "legacy" .net bindings
-        - ( ) If this is indeed the case, replace the NMake-based .net projects (that call csc.exe) with SDK-style csproj files that target net48
    - [x] MapGuide Developer's Guide
    - [x] viewer samples (PHP)
    - [x] viewer samples (Java)
@@ -112,7 +112,7 @@
       - GetDistance -> GetDistanceSimple
       - GetAzimuth -> GetAzimuthSimple
       - GetCoordinate -> GetCoordinateSimple
-   - [ ] See if later git master builds of SWIG address this issue, allowing us to revert these renames
+   - [~] See if later git master builds of SWIG address this issue, allowing us to revert these renames
    - MgMap
       - Create -> CreateStateless
    - MgPropertyDefinition/MgClassDefinition/MgFeatureSchema

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ApiTypes.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ApiTypes.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ApiTypes.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace OSGeo.MapGuide.Test.Common
+namespace OSGeo.MapGuide.Test.Common
 {
     public class ApiTypes
     {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/CommonTests.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/CommonTests.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/CommonTests.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,8 +1,5 @@
 using System;
 using System.Reflection;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Common
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ExternalTests/ByteReaderTest.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ExternalTests/ByteReaderTest.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ExternalTests/ByteReaderTest.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace OSGeo.MapGuide.Test.Common.ExternalTests
+namespace OSGeo.MapGuide.Test.Common.ExternalTests
 {
     internal class ByteReaderTestData
     {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ExternalTests/CollectionTests.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ExternalTests/CollectionTests.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ExternalTests/CollectionTests.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace OSGeo.MapGuide.Test.Common.ExternalTests
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ExternalTests/ConvenienceTests.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ExternalTests/ConvenienceTests.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ExternalTests/ConvenienceTests.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Text;
 
 namespace OSGeo.MapGuide.Test.Common.ExternalTests
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ExternalTests/PropertiesTest.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ExternalTests/PropertiesTest.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ExternalTests/PropertiesTest.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Common.ExternalTests
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/FeatureService/FeatureServiceOperationExecutor.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/FeatureService/FeatureServiceOperationExecutor.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/FeatureService/FeatureServiceOperationExecutor.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,8 +1,4 @@
 using OSGeo.MapGuide.Test.Common;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Operations
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/FeatureService/Operations.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/FeatureService/Operations.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/FeatureService/Operations.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,9 +1,6 @@
 using OSGeo.MapGuide.Test.Common;
 using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Operations
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ITestExecutor.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ITestExecutor.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ITestExecutor.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Common
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ITestExecutorCollection.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ITestExecutorCollection.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ITestExecutorCollection.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Common
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ITestLogger.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ITestLogger.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ITestLogger.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Common
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/MapLayer/MapLayerOperationExecutor.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/MapLayer/MapLayerOperationExecutor.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/MapLayer/MapLayerOperationExecutor.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,9 +1,5 @@
 using OSGeo.MapGuide.Test.Common;
-using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Operations
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/MapLayer/Operations.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/MapLayer/Operations.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/MapLayer/Operations.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,10 +1,7 @@
 using OSGeo.MapGuide.Test.Common;
-using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Globalization;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Operations
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/PlatformApiTestExecutor.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/PlatformApiTestExecutor.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/PlatformApiTestExecutor.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,8 +1,6 @@
 using OSGeo.MapGuide.Test.Common;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using System.Collections.Specialized;
 
 namespace OSGeo.MapGuide.Test.Operations

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/PlatformResources.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/PlatformResources.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/PlatformResources.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace OSGeo.MapGuide.Test.Common
+namespace OSGeo.MapGuide.Test.Common
 {
     public static class PlatformResources
     {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/Properties/AssemblyInfo.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/Properties/AssemblyInfo.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/Properties/AssemblyInfo.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ResourceService/Operations.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ResourceService/Operations.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ResourceService/Operations.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,9 +1,6 @@
 using OSGeo.MapGuide.Test.Common;
 using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Operations
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ResourceService/ResourceServiceOperationExecutor.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ResourceService/ResourceServiceOperationExecutor.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/ResourceService/ResourceServiceOperationExecutor.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,8 +1,4 @@
 using OSGeo.MapGuide.Test.Common;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Operations
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/Sqlite.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/Sqlite.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/Sqlite.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.Data.Sqlite;
+using Microsoft.Data.Sqlite;
 using System.IO;
 using System.Text;
 
@@ -76,24 +72,31 @@
                 return null;
 
             int ordinal = _rdr.GetOrdinal(name);
-            if (ordinal >= 0)
+            try
             {
-                if (!_rdr.IsDBNull(ordinal))
+                if (ordinal >= 0)
                 {
-                    var type = _rdr.GetFieldType(ordinal);
-                    if (type == typeof(byte[]))
+                    if (!_rdr.IsDBNull(ordinal))
                     {
-                        return new SqliteGcBlob(_rdr.GetFieldValue<byte[]>(ordinal));
+                        var type = _rdr.GetFieldType(ordinal);
+                        if (type == typeof(byte[]))
+                        {
+                            return new SqliteGcBlob(_rdr.GetFieldValue<byte[]>(ordinal));
+                        }
+                        else
+                        {
+                            var result = GetString(name);
+                            return new SqliteGcBlob(Encoding.UTF8.GetBytes(result));
+                        }
                     }
-                    else
-                    {
-                        var result = GetString(name);
-                        return new SqliteGcBlob(Encoding.UTF8.GetBytes(result));
-                    }
                 }
+
+                return null;
             }
-
-            return null;
+            catch
+            {
+                return null;
+            }
         }
 
         public string GetString(string name)
@@ -102,15 +105,22 @@
                 return string.Empty;
 
             int ordinal = _rdr.GetOrdinal(name);
-            if (ordinal >= 0)
+            try
             {
-                if (!_rdr.IsDBNull(ordinal))
+                if (ordinal >= 0)
                 {
-                    return _rdr[ordinal].ToString();
+                    if (!_rdr.IsDBNull(ordinal))
+                    {
+                        return _rdr[ordinal].ToString();
+                    }
                 }
+
+                return string.Empty;
             }
-
-            return string.Empty;
+            catch
+            {
+                return string.Empty;
+            }
         }
 
         public int NextRow() => (_rdr?.Read() == true) ? Sqlite.Row : Sqlite.EndOfReader;

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/TestCommon.csproj
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/TestCommon.csproj	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/TestCommon.csproj	2025-02-06 00:13:37 UTC (rev 10115)
@@ -13,7 +13,7 @@
     <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.SQLite" Version="2.0.1" />
+    <PackageReference Include="Microsoft.Data.SQLite" Version="6.0.36" />
     <PackageReference Include="OSGeo.MapGuide.Foundation" Version="4.0.0" />
     <PackageReference Include="OSGeo.MapGuide.Geometry" Version="4.0.0" />
     <PackageReference Include="OSGeo.MapGuide.PlatformBase" Version="4.0.0" />

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/TestDataRoot.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/TestDataRoot.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/TestDataRoot.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace OSGeo.MapGuide.Test.Common
+namespace OSGeo.MapGuide.Test.Common
 {
     public static class TestDataRoot
     {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/TestExecutionRun.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/TestExecutionRun.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/TestExecutionRun.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Common
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/TestExecutorBase.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/TestExecutorBase.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/TestExecutorBase.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,8 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Common
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/TestResult.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/TestResult.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/TestResult.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,10 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Common
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/UnitTestException.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/UnitTestException.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestCommon/UnitTestException.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Common
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/DrawingService/DrawingServiceOperationExecutor.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/DrawingService/DrawingServiceOperationExecutor.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/DrawingService/DrawingServiceOperationExecutor.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,8 +1,4 @@
 using OSGeo.MapGuide.Test.Common;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Operations
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/DrawingService/Operations.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/DrawingService/Operations.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/DrawingService/Operations.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,9 +1,5 @@
 using OSGeo.MapGuide.Test.Common;
-using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Operations
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ExternalTests/ByteReaderReadByChunksTest.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ExternalTests/ByteReaderReadByChunksTest.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ExternalTests/ByteReaderReadByChunksTest.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,6 +1,5 @@
 using OSGeo.MapGuide;
 using OSGeo.MapGuide.Test.Common;
-using System;
 using System.Buffers;
 
 namespace TestMapGuideApi.ExternalTests

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ExternalTests/CollectionTests.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ExternalTests/CollectionTests.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ExternalTests/CollectionTests.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,9 +1,4 @@
 using OSGeo.MapGuide.Test.Common;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Web.ExternalTests
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ExternalTests/MapTests.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ExternalTests/MapTests.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ExternalTests/MapTests.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,9 +1,5 @@
 using OSGeo.MapGuide.Test.Common;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Web.ExternalTests
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ExternalTests/RenderingServiceTests.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ExternalTests/RenderingServiceTests.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ExternalTests/RenderingServiceTests.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,14 +1,10 @@
 using OSGeo.MapGuide.Test.Common;
 using System;
-using System.Collections.Generic;
 #if HAVE_SYSTEM_DRAWING
 using System.Drawing;
 using System.Drawing.Imaging;
 #endif
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Web.ExternalTests
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ExternalTests/ResourceServiceTests.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ExternalTests/ResourceServiceTests.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ExternalTests/ResourceServiceTests.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,11 +1,7 @@
 using OSGeo.MapGuide.Test.Common;
 using OSGeo.MapGuide.Test.Common.ExternalTests;
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Web.ExternalTests

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/MapGuideResources.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/MapGuideResources.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/MapGuideResources.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace OSGeo.MapGuide.Test
+namespace OSGeo.MapGuide.Test
 {
     public static class MapGuideResources
     {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/MappingService/MappingServiceOperationExecutor.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/MappingService/MappingServiceOperationExecutor.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/MappingService/MappingServiceOperationExecutor.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,9 +1,4 @@
 using OSGeo.MapGuide.Test.Common;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Operations
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/Properties/AssemblyInfo.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/Properties/AssemblyInfo.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/Properties/AssemblyInfo.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/RenderingService/RenderingServiceOperationExecutor.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/RenderingService/RenderingServiceOperationExecutor.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/RenderingService/RenderingServiceOperationExecutor.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,9 +1,4 @@
 using OSGeo.MapGuide.Test.Common;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Operations
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ServerAdmin/Operations.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ServerAdmin/Operations.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ServerAdmin/Operations.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,10 +1,6 @@
 using OSGeo.MapGuide.Test.Common;
 using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Operations
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ServerAdmin/ServerAdminOperationExecutor.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ServerAdmin/ServerAdminOperationExecutor.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/ServerAdmin/ServerAdminOperationExecutor.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,9 +1,4 @@
 using OSGeo.MapGuide.Test.Common;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Operations
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/SiteService/Operations.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/SiteService/Operations.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/SiteService/Operations.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,10 +1,5 @@
 using OSGeo.MapGuide.Test.Common;
-using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Operations
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/SiteService/SiteServiceOperationExecutor.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/SiteService/SiteServiceOperationExecutor.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/SiteService/SiteServiceOperationExecutor.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,9 +1,4 @@
 using OSGeo.MapGuide.Test.Common;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Operations
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/TestMapGuideApi.csproj
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/TestMapGuideApi.csproj	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/TestMapGuideApi.csproj	2025-02-06 00:13:37 UTC (rev 10115)
@@ -19,11 +19,11 @@
     <ProjectReference Include="..\TestCommon\TestCommon.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.SQLite" Version="2.0.1" />
+    <PackageReference Include="Microsoft.Data.SQLite" Version="6.0.36" />
     <PackageReference Include="OSGeo.MapGuide.Foundation" Version="4.0.0" />
     <PackageReference Include="OSGeo.MapGuide.Geometry" Version="4.0.0" />
     <PackageReference Include="OSGeo.MapGuide.MapGuideCommon" Version="4.0.0" />
     <PackageReference Include="OSGeo.MapGuide.Web" Version="4.0.0" />
-    <PackageReference Include="System.Buffers" Version="4.5.1" />
+    <PackageReference Include="System.Buffers" Version="4.6.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/WebLayout/Operations.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/WebLayout/Operations.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/WebLayout/Operations.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,11 +1,7 @@
 using OSGeo.MapGuide.Test.Common;
 using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Operations
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/WebLayout/WebLayoutOperationExecutor.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/WebLayout/WebLayoutOperationExecutor.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMapGuideApi/WebLayout/WebLayoutOperationExecutor.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,10 +1,5 @@
 using OSGeo.MapGuide.Test.Common;
-using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Operations
 {

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMisc/TestMisc.csproj
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMisc/TestMisc.csproj	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestMisc/TestMisc.csproj	2025-02-06 00:13:37 UTC (rev 10115)
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.2.1" />
+    <PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Include="OSGeo.MapGuide.Foundation" Version="4.0.0" />
     <PackageReference Include="OSGeo.MapGuide.Geometry" Version="4.0.0" />
     <PackageReference Include="OSGeo.MapGuide.MapGuideCommon" Version="4.0.0" />

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestRunner/Properties/AssemblyInfo.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestRunner/Properties/AssemblyInfo.cs	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestRunner/Properties/AssemblyInfo.cs	2025-02-06 00:13:37 UTC (rev 10115)
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following

Modified: branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestRunner/TestRunner.csproj
===================================================================
--- branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestRunner/TestRunner.csproj	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/Bindings/src/Test/DotNet/src/TestRunner/TestRunner.csproj	2025-02-06 00:13:37 UTC (rev 10115)
@@ -18,7 +18,8 @@
     <ProjectReference Include="..\TestMapGuideApi\TestMapGuideApi.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.2.1" />
+    <PackageReference Include="CommandLineParser" Version="2.9.1" />
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.36" />
     <PackageReference Include="OSGeo.MapGuide.Foundation" Version="4.0.0" />
     <PackageReference Include="OSGeo.MapGuide.Geometry" Version="4.0.0" />
     <PackageReference Include="OSGeo.MapGuide.Web" Version="4.0.0" />

Modified: branches/4.0/MgDev/build.bat
===================================================================
--- branches/4.0/MgDev/build.bat	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/build.bat	2025-02-06 00:13:37 UTC (rev 10115)
@@ -459,10 +459,14 @@
 if "%TYPECOMPONENT%"=="doc" goto quit
 :install_test
 echo [install]: Test Suite
-%XCOPY% "%MG_UNIT_TEST%" "%MG_OUTPUT_TEST%\UnitTest"
-copy /Y test_readme.txt "%MG_OUTPUT_TEST%"
-copy /Y run_tests.bat "%MG_OUTPUT_TEST%"
-copy /Y run_tests.sh "%MG_OUTPUT_TEST%"
+%XCOPY% "%MG_UNIT_TEST%\TestData" "%MG_OUTPUT_TEST%\UnitTest\TestData"
+rem Deploy/copy test runners into same destination
+pushd Bindings\src\Test\DotNet\src\TestRunner
+dotnet publish -c Release -f net6.0 -r win-x64 --self-contained true -o "%MG_OUTPUT_TEST%\UnitTest\DotNet"
+popd
+rem copy /Y test_readme.txt "%MG_OUTPUT_TEST%"
+rem copy /Y run_tests.bat "%MG_OUTPUT_TEST%"
+rem copy /Y run_tests.sh "%MG_OUTPUT_TEST%"
 goto quit
 
 :error

Modified: branches/4.0/MgDev/clean.bat
===================================================================
--- branches/4.0/MgDev/clean.bat	2025-01-30 06:39:45 UTC (rev 10114)
+++ branches/4.0/MgDev/clean.bat	2025-02-06 00:13:37 UTC (rev 10115)
@@ -6,7 +6,16 @@
 if exist Oem\CsMap\CsMapDev\lib160 rd /S /Q Oem\CsMap\CsMapDev\lib160
 if exist Oem\CsMap\CsMapDev\obj160 rd /S /Q Oem\CsMap\CsMapDev\obj160
 echo [clean]: Packages
+if exist Bindings\linux-x64 rd /S /Q Bindings\linux-x64
+if exist Bindings\src\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\linux-x64\native\*.so* del /F Bindings\src\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\linux-x64\native\*.so*
+if exist Bindings\src\Managed\DotNet\OSGeo.MapGuide.Geometry\runtimes\linux-x64\native\*.so* del /F Bindings\src\Managed\DotNet\OSGeo.MapGuide.Geometry\runtimes\linux-x64\native\*.so*
+if exist Bindings\src\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\runtimes\linux-x64\native\*.so* del /F Bindings\src\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\runtimes\linux-x64\native\*.so*
+if exist Bindings\src\Managed\DotNet\OSGeo.MapGuide.PlatformBase\runtimes\linux-x64\native\*.so* del /F Bindings\src\Managed\DotNet\OSGeo.MapGuide.PlatformBase\runtimes\linux-x64\native\*.so*
+if exist Bindings\src\Managed\DotNet\OSGeo.MapGuide.Portable\runtimes\linux-x64\native\*.so* del /F Bindings\src\Managed\DotNet\OSGeo.MapGuide.Portable\runtimes\linux-x64\native\*.so*
+if exist Bindings\src\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\linux-x64\native\*.so* del /F Bindings\src\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\linux-x64\native\*.so*
 if exist Bindings\packages rd /S /Q Bindings\packages
+if exist Bindings\src\lib rd /S /Q Bindings\src\lib
+if exist Bindings\src\obj rd /S /Q Bindings\src\obj
 if exist packages\DotNet rd /S /Q packages\DotNet
 if exist packages\Java rd /S /Q packages\Java
 if exist packages\Php rd /S /Q packages\Php

