[mapguide-commits] r9790 - in sandbox/jng/vanilla_swig/Bindings: . src/Test/DotNet src/Test/DotNet/src src/Test/DotNet/src/TestRunnerFull

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Thu Nov 19 01:55:54 PST 2020 

Author: jng
Date: 2020-11-19 01:55:54 -0800 (Thu, 19 Nov 2020)
New Revision: 9790

Removed:
   sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestCommonFull/
   sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestMapGuideApiFull/
Modified:
   sandbox/jng/vanilla_swig/Bindings/TODO.txt
   sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/FullFramework.sln
   sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunnerFull/TestRunnerFull.csproj
Log:
Remove full versions of TestCommon and TestMapGuideApi as their netstandard2.0 counterparts are already consumable by the full framework test runner

Modified: sandbox/jng/vanilla_swig/Bindings/TODO.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/TODO.txt	2020-11-19 09:51:19 UTC (rev 9789)
+++ sandbox/jng/vanilla_swig/Bindings/TODO.txt	2020-11-19 09:55:54 UTC (rev 9790)
@@ -9,7 +9,7 @@
  - [ ] Relocate/remove existing test code
  - 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
-   - [ ] Consolidate TestCommon and TestMapGuideApi .net projects to unified netstandard2.0 libraries
+   - [x] Consolidate TestCommon and TestMapGuideApi .net projects to unified netstandard2.0 libraries
    - [ ] Tidy mg_exception_callback to no longer take an exception class name argument (it is no longer used or necessary)
    - [ ] Add CentOS 6 Dockerfile that
       - Install SWIG and common libs tarball (from docker build system)

Modified: sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/FullFramework.sln
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/FullFramework.sln	2020-11-19 09:51:19 UTC (rev 9789)
+++ sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/FullFramework.sln	2020-11-19 09:55:54 UTC (rev 9790)
@@ -1,56 +1,70 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26124.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30709.132
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestMiscFull", "src\TestMiscFull\TestMiscFull.csproj", "{27285BB5-37B4-42DD-AB2C-CCD91824D044}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestCommonFull", "src\TestCommonFull\TestCommonFull.csproj", "{EB8713C5-0284-47C5-950A-90E4EB326669}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestRunnerFull", "src\TestRunnerFull\TestRunnerFull.csproj", "{757BA8EB-065F-47A7-834D-025C1559E2A5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestMapGuideApiFull", "src\TestMapGuideApiFull\TestMapGuideApiFull.csproj", "{6584C02F-080F-425D-BE53-9F72F7BE2897}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestCommon", "src\TestCommon\TestCommon.csproj", "{905BB3C2-4969-4AF3-8F4D-659DB683038C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestRunnerFull", "src\TestRunnerFull\TestRunnerFull.csproj", "{757BA8EB-065F-47A7-834D-025C1559E2A5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestMapGuideApi", "src\TestMapGuideApi\TestMapGuideApi.csproj", "{F3AEE349-3493-47C9-A1EF-607775FBCC3A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{27285BB5-37B4-42DD-AB2C-CCD91824D044}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{27285BB5-37B4-42DD-AB2C-CCD91824D044}.Debug|x64.ActiveCfg = Debug|x64
 		{27285BB5-37B4-42DD-AB2C-CCD91824D044}.Debug|x64.Build.0 = Debug|x64
 		{27285BB5-37B4-42DD-AB2C-CCD91824D044}.Debug|x86.ActiveCfg = Debug|x86
 		{27285BB5-37B4-42DD-AB2C-CCD91824D044}.Debug|x86.Build.0 = Debug|x86
+		{27285BB5-37B4-42DD-AB2C-CCD91824D044}.Release|Any CPU.ActiveCfg = Release|x86
 		{27285BB5-37B4-42DD-AB2C-CCD91824D044}.Release|x64.ActiveCfg = Release|x64
 		{27285BB5-37B4-42DD-AB2C-CCD91824D044}.Release|x64.Build.0 = Release|x64
 		{27285BB5-37B4-42DD-AB2C-CCD91824D044}.Release|x86.ActiveCfg = Release|x86
 		{27285BB5-37B4-42DD-AB2C-CCD91824D044}.Release|x86.Build.0 = Release|x86
-		{EB8713C5-0284-47C5-950A-90E4EB326669}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EB8713C5-0284-47C5-950A-90E4EB326669}.Debug|x64.Build.0 = Debug|Any CPU
-		{EB8713C5-0284-47C5-950A-90E4EB326669}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EB8713C5-0284-47C5-950A-90E4EB326669}.Debug|x86.Build.0 = Debug|Any CPU
-		{EB8713C5-0284-47C5-950A-90E4EB326669}.Release|x64.ActiveCfg = Release|Any CPU
-		{EB8713C5-0284-47C5-950A-90E4EB326669}.Release|x64.Build.0 = Release|Any CPU
-		{EB8713C5-0284-47C5-950A-90E4EB326669}.Release|x86.ActiveCfg = Release|Any CPU
-		{EB8713C5-0284-47C5-950A-90E4EB326669}.Release|x86.Build.0 = Release|Any CPU
-		{6584C02F-080F-425D-BE53-9F72F7BE2897}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6584C02F-080F-425D-BE53-9F72F7BE2897}.Debug|x64.Build.0 = Debug|Any CPU
-		{6584C02F-080F-425D-BE53-9F72F7BE2897}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6584C02F-080F-425D-BE53-9F72F7BE2897}.Debug|x86.Build.0 = Debug|Any CPU
-		{6584C02F-080F-425D-BE53-9F72F7BE2897}.Release|x64.ActiveCfg = Release|Any CPU
-		{6584C02F-080F-425D-BE53-9F72F7BE2897}.Release|x64.Build.0 = Release|Any CPU
-		{6584C02F-080F-425D-BE53-9F72F7BE2897}.Release|x86.ActiveCfg = Release|Any CPU
-		{6584C02F-080F-425D-BE53-9F72F7BE2897}.Release|x86.Build.0 = Release|Any CPU
+		{757BA8EB-065F-47A7-834D-025C1559E2A5}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{757BA8EB-065F-47A7-834D-025C1559E2A5}.Debug|x64.ActiveCfg = Debug|x64
 		{757BA8EB-065F-47A7-834D-025C1559E2A5}.Debug|x64.Build.0 = Debug|x64
 		{757BA8EB-065F-47A7-834D-025C1559E2A5}.Debug|x86.ActiveCfg = Debug|x86
 		{757BA8EB-065F-47A7-834D-025C1559E2A5}.Debug|x86.Build.0 = Debug|x86
+		{757BA8EB-065F-47A7-834D-025C1559E2A5}.Release|Any CPU.ActiveCfg = Release|x86
 		{757BA8EB-065F-47A7-834D-025C1559E2A5}.Release|x64.ActiveCfg = Release|x64
 		{757BA8EB-065F-47A7-834D-025C1559E2A5}.Release|x64.Build.0 = Release|x64
 		{757BA8EB-065F-47A7-834D-025C1559E2A5}.Release|x86.ActiveCfg = Release|x86
 		{757BA8EB-065F-47A7-834D-025C1559E2A5}.Release|x86.Build.0 = Release|x86
+		{905BB3C2-4969-4AF3-8F4D-659DB683038C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{905BB3C2-4969-4AF3-8F4D-659DB683038C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{905BB3C2-4969-4AF3-8F4D-659DB683038C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{905BB3C2-4969-4AF3-8F4D-659DB683038C}.Debug|x64.Build.0 = Debug|Any CPU
+		{905BB3C2-4969-4AF3-8F4D-659DB683038C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{905BB3C2-4969-4AF3-8F4D-659DB683038C}.Debug|x86.Build.0 = Debug|Any CPU
+		{905BB3C2-4969-4AF3-8F4D-659DB683038C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{905BB3C2-4969-4AF3-8F4D-659DB683038C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{905BB3C2-4969-4AF3-8F4D-659DB683038C}.Release|x64.ActiveCfg = Release|Any CPU
+		{905BB3C2-4969-4AF3-8F4D-659DB683038C}.Release|x64.Build.0 = Release|Any CPU
+		{905BB3C2-4969-4AF3-8F4D-659DB683038C}.Release|x86.ActiveCfg = Release|Any CPU
+		{905BB3C2-4969-4AF3-8F4D-659DB683038C}.Release|x86.Build.0 = Release|Any CPU
+		{F3AEE349-3493-47C9-A1EF-607775FBCC3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3AEE349-3493-47C9-A1EF-607775FBCC3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3AEE349-3493-47C9-A1EF-607775FBCC3A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F3AEE349-3493-47C9-A1EF-607775FBCC3A}.Debug|x64.Build.0 = Debug|Any CPU
+		{F3AEE349-3493-47C9-A1EF-607775FBCC3A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F3AEE349-3493-47C9-A1EF-607775FBCC3A}.Debug|x86.Build.0 = Debug|Any CPU
+		{F3AEE349-3493-47C9-A1EF-607775FBCC3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F3AEE349-3493-47C9-A1EF-607775FBCC3A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3AEE349-3493-47C9-A1EF-607775FBCC3A}.Release|x64.ActiveCfg = Release|Any CPU
+		{F3AEE349-3493-47C9-A1EF-607775FBCC3A}.Release|x64.Build.0 = Release|Any CPU
+		{F3AEE349-3493-47C9-A1EF-607775FBCC3A}.Release|x86.ActiveCfg = Release|Any CPU
+		{F3AEE349-3493-47C9-A1EF-607775FBCC3A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunnerFull/TestRunnerFull.csproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunnerFull/TestRunnerFull.csproj	2020-11-19 09:51:19 UTC (rev 9789)
+++ sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunnerFull/TestRunnerFull.csproj	2020-11-19 09:55:54 UTC (rev 9790)
@@ -13,10 +13,6 @@
     <Compile Include="..\TestRunner\Program.cs" Link="Program.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\TestCommonFull\TestCommonFull.csproj" />
-    <ProjectReference Include="..\TestMapGuideApiFull\TestMapGuideApiFull.csproj" />
-  </ItemGroup>
-  <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.2.1" />
     <PackageReference Include="OSGeo.MapGuide.Foundation" Version="4.0.0" />
     <PackageReference Include="OSGeo.MapGuide.Geometry" Version="4.0.0" />
@@ -30,4 +26,8 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\TestCommon\TestCommon.csproj" />
+    <ProjectReference Include="..\TestMapGuideApi\TestMapGuideApi.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

More information about the mapguide-commits mailing list