[mapguide-commits] r9782 - in sandbox/jng/vanilla_swig/Bindings/src: Bindings Bindings/DotNet Bindings/DotNet/Foundation Bindings/DotNet/Geometry Bindings/DotNet/MapGuideCommon Bindings/DotNet/PlatformBase Bindings/DotNet/Web IMake Managed/DotNet/MapGuideDotNetApi Managed/DotNet/OSGeo.MapGuide.Foundation Managed/DotNet/OSGeo.MapGuide.Geometry Managed/DotNet/OSGeo.MapGuide.MapGuideCommon Managed/DotNet/OSGeo.MapGuide.PlatformBase Managed/DotNet/OSGeo.MapGuide.Web Test/DotNet/src/TestCommon/ExternalTests Test/DotNet/src/TestRunner
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat Nov 14 02:58:50 PST 2020
Author: jng
Date: 2020-11-14 02:58:50 -0800 (Sat, 14 Nov 2020)
New Revision: 9782
Added:
sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestCommon/ExternalTests/StandardCatchTest.cs
Modified:
sandbox/jng/vanilla_swig/Bindings/src/Bindings/Bindings.sln
sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/DotNetUnmanagedApi.vcxproj
sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Foundation/FoundationApi.vcxproj
sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Geometry/GeometryApi.vcxproj
sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/MapGuideCommon/MapGuideCommonApi.vcxproj
sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/PlatformBase/PlatformBaseApi.vcxproj
sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Web/WebApi.vcxproj
sandbox/jng/vanilla_swig/Bindings/src/IMake/
sandbox/jng/vanilla_swig/Bindings/src/IMake/IMake.vcxproj
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/MapGuideDotNetApi.csproj
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/OSGeo.MapGuide.Foundation.csproj
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/OSGeo.MapGuide.Geometry.csproj
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/OSGeo.MapGuide.MapGuideCommon.csproj
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/OSGeo.MapGuide.PlatformBase.csproj
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/OSGeo.MapGuide.Web.csproj
sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunner/Program.cs
Log:
- Make IMake x64 only in line with other projects in the Bindings.sln
- Parameterize more of the IMake invocation in the pre-build events
- Activate XML documentation for the .net wrapper projects
- Add .net memory stats for the test runner
- Add new .net tests to exercise MgException handling in the classic way and through the use of exception filters on the specific exception code
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/Bindings.sln
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/Bindings.sln 2020-11-14 09:34:38 UTC (rev 9781)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/Bindings.sln 2020-11-14 10:58:50 UTC (rev 9782)
@@ -112,14 +112,12 @@
{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release|Any CPU.ActiveCfg = Release|x64
{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release|x64.ActiveCfg = Release|x64
{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release|x64.Build.0 = Release|x64
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|Any CPU.ActiveCfg = Debug|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x64.ActiveCfg = Debug|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x64.Build.0 = Debug|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x64.Deploy.0 = Debug|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|Any CPU.ActiveCfg = Release|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.ActiveCfg = Release|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.Build.0 = Release|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.Deploy.0 = Release|Win32
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|Any CPU.ActiveCfg = Debug|x64
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x64.ActiveCfg = Debug|x64
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|Any CPU.ActiveCfg = Release|x64
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.ActiveCfg = Release|x64
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.Build.0 = Release|x64
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.Deploy.0 = Release|x64
{696D2664-D17F-4357-8A19-2B5DC4B29962}.Debug|Any CPU.ActiveCfg = Debug|x64
{696D2664-D17F-4357-8A19-2B5DC4B29962}.Debug|x64.ActiveCfg = Debug|x64
{696D2664-D17F-4357-8A19-2B5DC4B29962}.Debug|x64.Build.0 = Debug|x64
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/DotNetUnmanagedApi.vcxproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/DotNetUnmanagedApi.vcxproj 2020-11-14 09:34:38 UTC (rev 9781)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/DotNetUnmanagedApi.vcxproj 2020-11-14 10:58:50 UTC (rev 9782)
@@ -57,9 +57,9 @@
<PreBuildEvent>
<Command>del /Q "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\*.cs"
if exist "$(ProjectDir)MapGuideApi_Properties.i" del /Q "$(ProjectDir)MapGuideApi_Properties.i"
-"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l C# -o "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\Constants.cs" -t
+"..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l C# -o "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\Constants.cs" -t
copy "$(ProjectDir)dotnetcore.i" "$(ProjectDir)language.i"
-"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\MapGuideApiGen.xml" -l C#
+"..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\MapGuideApiGen.xml" -l C#
"..\..\Tools\swig\install\swig.exe" -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module MapGuideDotNetUnmanagedApi -o "$(ProjectDir)MgApi_wrap.cpp" -outdir "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi" MapGuideApi.i
del /Q ..\..\Managed\DotNet\MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs
</Command>
@@ -94,9 +94,9 @@
<PreBuildEvent>
<Command>del /Q "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\*.cs"
if exist "$(ProjectDir)MapGuideApi_Properties.i" del /Q "$(ProjectDir)MapGuideApi_Properties.i"
-"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l C# -o "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\Constants.cs" -t
+"..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l C# -o "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\Constants.cs" -t
copy "$(ProjectDir)dotnetcore.i" "$(ProjectDir)language.i"
-"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\MapGuideApiGen.xml" -l C#
+"..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\MapGuideApiGen.xml" -l C#
"..\..\Tools\swig\install\swig.exe" -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module MapGuideDotNetUnmanagedApi -o "$(ProjectDir)MgApi_wrap.cpp" -outdir "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi" MapGuideApi.i
del /Q ..\..\Managed\DotNet\MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs
</Command>
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Foundation/FoundationApi.vcxproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Foundation/FoundationApi.vcxproj 2020-11-14 09:34:38 UTC (rev 9781)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Foundation/FoundationApi.vcxproj 2020-11-14 10:58:50 UTC (rev 9782)
@@ -57,14 +57,14 @@
<PreBuildEvent>
<Command>if exist "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Foundation\*.cs" del /Q "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Foundation\*.cs"
if exist "$(ProjectDir)FoundationApi_Properties.i" del /Q "$(ProjectDir)FoundationApi_Properties.i"
-"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)FoundationConstants.xml" -l C# -o "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Foundation\Constants.cs" -t
+"..\..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)FoundationConstants.xml" -l C# -o "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Foundation\Constants.cs" -t
copy "$(ProjectDir)..\dotnetcore_split.i" "$(ProjectDir)language.i"
-"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)FoundationApiGen.xml" -l C# -x "FoundationApi"
+"..\..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)FoundationApiGen.xml" -l C# -x "FoundationApi"
"..\..\..\Tools\swig\install\swig.exe" -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module FoundationUnmanagedApi -o "$(ProjectDir)FoundationUnmanagedApi_wrap.cpp" -outdir "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Foundation" FoundationApi.i
del /Q ..\..\..\Managed\DotNet\OSGeo.MapGuide.Foundation\FoundationUnmanagedApi.cs
copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\ACE*.*" "$(TargetDir)\native\"
copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\xerces-c*.*" "$(TargetDir)\native\"
-copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgFoundation*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Common\bin\$(Configuration)64\MgFoundation*.*" "$(TargetDir)\native\"
</Command>
</PreBuildEvent>
<ClCompile>
@@ -97,14 +97,14 @@
<PreBuildEvent>
<Command>if exist "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Foundation\*.cs" del /Q "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Foundation\*.cs"
if exist "$(ProjectDir)FoundationApi_Properties.i" del /Q "$(ProjectDir)FoundationApi_Properties.i"
-"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)FoundationConstants.xml" -l C# -o "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Foundation\Constants.cs" -t
+"..\..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)FoundationConstants.xml" -l C# -o "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Foundation\Constants.cs" -t
copy "$(ProjectDir)..\dotnetcore_split.i" "$(ProjectDir)language.i"
-"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)FoundationApiGen.xml" -l C# -x "FoundationApi"
+"..\..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)FoundationApiGen.xml" -l C# -x "FoundationApi"
"..\..\..\Tools\swig\install\swig.exe" -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module FoundationUnmanagedApi -o "$(ProjectDir)FoundationUnmanagedApi_wrap.cpp" -outdir "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Foundation" FoundationApi.i
del /Q ..\..\..\Managed\DotNet\OSGeo.MapGuide.Foundation\FoundationUnmanagedApi.cs
copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\ACE*.*" "$(TargetDir)\native\"
copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\xerces-c*.*" "$(TargetDir)\native\"
-copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgFoundation*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Common\bin\$(Configuration)64\MgFoundation*.*" "$(TargetDir)\native\"
</Command>
</PreBuildEvent>
<ClCompile>
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Geometry/GeometryApi.vcxproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Geometry/GeometryApi.vcxproj 2020-11-14 09:34:38 UTC (rev 9781)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Geometry/GeometryApi.vcxproj 2020-11-14 10:58:50 UTC (rev 9782)
@@ -57,9 +57,9 @@
<PreBuildEvent>
<Command>if exist "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Geometry\*.cs" del /Q "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Geometry\*.cs"
if exist "$(ProjectDir)GeometryApi_Properties.i" del /Q "$(ProjectDir)GeometryApi_Properties.i"
-"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)GeometryConstants.xml" -l C# -o "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Geometry\Constants.cs" -t
+"..\..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)GeometryConstants.xml" -l C# -o "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Geometry\Constants.cs" -t
copy "$(ProjectDir)..\dotnetcore_split.i" "$(ProjectDir)language.i"
-"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)GeometryApiGen.xml" -l C# -x "GeometryApi"
+"..\..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)GeometryApiGen.xml" -l C# -x "GeometryApi"
"..\..\..\Tools\swig\install\swig.exe" -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module GeometryUnmanagedApi -o "$(ProjectDir)GeometryUnmanagedApi_wrap.cpp" -outdir "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Geometry" GeometryApi.i
del /Q ..\..\..\Managed\DotNet\OSGeo.MapGuide.Geometry\GeometryUnmanagedApi.cs
</Command>
@@ -94,13 +94,13 @@
<PreBuildEvent>
<Command>if exist "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Geometry\*.cs" del /Q "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Geometry\*.cs"
if exist "$(ProjectDir)GeometryApi_Properties.i" del /Q "$(ProjectDir)GeometryApi_Properties.i"
-"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)GeometryConstants.xml" -l C# -o "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Geometry\Constants.cs" -t
+"..\..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)GeometryConstants.xml" -l C# -o "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Geometry\Constants.cs" -t
copy "$(ProjectDir)..\dotnetcore_split.i" "$(ProjectDir)language.i"
-"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)GeometryApiGen.xml" -l C# -x "GeometryApi"
+"..\..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)GeometryApiGen.xml" -l C# -x "GeometryApi"
"..\..\..\Tools\swig\install\swig.exe" -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module GeometryUnmanagedApi -o "$(ProjectDir)GeometryUnmanagedApi_wrap.cpp" -outdir "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Geometry" GeometryApi.i
del /Q ..\..\..\Managed\DotNet\OSGeo.MapGuide.Geometry\GeometryUnmanagedApi.cs
copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\GEOS*.*" "$(TargetDir)\native\"
-copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgGeometry*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Common\bin\$(Configuration)64\MgGeometry*.*" "$(TargetDir)\native\"
</Command>
</PreBuildEvent>
<ClCompile>
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/MapGuideCommon/MapGuideCommonApi.vcxproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/MapGuideCommon/MapGuideCommonApi.vcxproj 2020-11-14 09:34:38 UTC (rev 9781)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/MapGuideCommon/MapGuideCommonApi.vcxproj 2020-11-14 10:58:50 UTC (rev 9782)
@@ -57,12 +57,12 @@
<PreBuildEvent>
<Command>if exist "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\*.cs" del /Q "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\*.cs"
if exist "$(ProjectDir)MapGuideCommonApi_Properties.i" del /Q "$(ProjectDir)MapGuideCommonApi_Properties.i"
-"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)MapGuideCommonConstants.xml" -l C# -o "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\Constants.cs" -t
+"..\..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)MapGuideCommonConstants.xml" -l C# -o "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\Constants.cs" -t
copy "$(ProjectDir)..\dotnetcore_split.i" "$(ProjectDir)language.i"
-"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)MapGuideCommonApiGen.xml" -l C# -x "MapGuideCommonApi"
+"..\..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)MapGuideCommonApiGen.xml" -l C# -x "MapGuideCommonApi"
"..\..\..\Tools\swig\install\swig.exe" -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module MapGuideCommonUnmanagedApi -o "$(ProjectDir)MapGuideCommonUnmanagedApi_wrap.cpp" -outdir "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon" MapGuideCommonApi.i
del /Q ..\..\..\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\MapGuideCommonUnmanagedApi.cs
-copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgMapGuideCommon*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Common\bin\$(Configuration)64\MgMapGuideCommon*.*" "$(TargetDir)\native\"
</Command>
</PreBuildEvent>
<ClCompile>
@@ -95,12 +95,12 @@
<PreBuildEvent>
<Command>if exist "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\*.cs" del /Q "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\*.cs"
if exist "$(ProjectDir)MapGuideCommonApi_Properties.i" del /Q "$(ProjectDir)MapGuideCommonApi_Properties.i"
-"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)MapGuideCommonConstants.xml" -l C# -o "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\Constants.cs" -t
+"..\..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)MapGuideCommonConstants.xml" -l C# -o "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\Constants.cs" -t
copy "$(ProjectDir)..\dotnetcore_split.i" "$(ProjectDir)language.i"
-"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)MapGuideCommonApiGen.xml" -l C# -x "MapGuideCommonApi"
+"..\..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)MapGuideCommonApiGen.xml" -l C# -x "MapGuideCommonApi"
"..\..\..\Tools\swig\install\swig.exe" -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module MapGuideCommonUnmanagedApi -o "$(ProjectDir)MapGuideCommonUnmanagedApi_wrap.cpp" -outdir "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon" MapGuideCommonApi.i
del /Q ..\..\..\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\MapGuideCommonUnmanagedApi.cs
-copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgMapGuideCommon*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Common\bin\$(Configuration)64\MgMapGuideCommon*.*" "$(TargetDir)\native\"
</Command>
</PreBuildEvent>
<ClCompile>
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/PlatformBase/PlatformBaseApi.vcxproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/PlatformBase/PlatformBaseApi.vcxproj 2020-11-14 09:34:38 UTC (rev 9781)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/PlatformBase/PlatformBaseApi.vcxproj 2020-11-14 10:58:50 UTC (rev 9782)
@@ -57,14 +57,14 @@
<PreBuildEvent>
<Command>if exist "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.PlatformBase\*.cs" del /Q "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.PlatformBase\*.cs"
if exist "$(ProjectDir)PlatformBaseApi_Properties.i" del /Q "$(ProjectDir)PlatformBaseApi_Properties.i"
-"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)PlatformBaseConstants.xml" -l C# -o "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.PlatformBase\Constants.cs" -t
+"..\..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)PlatformBaseConstants.xml" -l C# -o "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.PlatformBase\Constants.cs" -t
copy "$(ProjectDir)..\dotnetcore_split.i" "$(ProjectDir)language.i"
-"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)PlatformBaseApiGen.xml" -l C# -x "PlatformBaseApi"
+"..\..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)PlatformBaseApiGen.xml" -l C# -x "PlatformBaseApi"
"..\..\..\Tools\swig\install\swig.exe" -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module PlatformBaseUnmanagedApi -o "$(ProjectDir)PlatformBaseUnmanagedApi_wrap.cpp" -outdir "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.PlatformBase" PlatformBaseApi.i
del /Q ..\..\..\Managed\DotNet\OSGeo.MapGuide.PlatformBase\PlatformBaseUnmanagedApi.cs
-copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgMdfModel*.*" "$(TargetDir)\native\"
-copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgMdfParser*.*" "$(TargetDir)\native\"
-copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgPlatformBase*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Common\bin\$(Configuration)64\MgMdfModel*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Common\bin\$(Configuration)64\MgMdfModel*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Common\bin\$(Configuration)64\MgPlatformBase*.*" "$(TargetDir)\native\"
</Command>
</PreBuildEvent>
<ClCompile>
@@ -97,14 +97,14 @@
<PreBuildEvent>
<Command>if exist "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.PlatformBase\*.cs" del /Q "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.PlatformBase\*.cs"
if exist "$(ProjectDir)PlatformBaseApi_Properties.i" del /Q "$(ProjectDir)PlatformBaseApi_Properties.i"
-"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)PlatformBaseConstants.xml" -l C# -o "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.PlatformBase\Constants.cs" -t
+"..\..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)PlatformBaseConstants.xml" -l C# -o "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.PlatformBase\Constants.cs" -t
copy "$(ProjectDir)..\dotnetcore_split.i" "$(ProjectDir)language.i"
-"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)PlatformBaseApiGen.xml" -l C# -x "PlatformBaseApi"
+"..\..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)PlatformBaseApiGen.xml" -l C# -x "PlatformBaseApi"
"..\..\..\Tools\swig\install\swig.exe" -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module PlatformBaseUnmanagedApi -o "$(ProjectDir)PlatformBaseUnmanagedApi_wrap.cpp" -outdir "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.PlatformBase" PlatformBaseApi.i
del /Q ..\..\..\Managed\DotNet\OSGeo.MapGuide.PlatformBase\PlatformBaseUnmanagedApi.cs
-copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgMdfModel*.*" "$(TargetDir)\native\"
-copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgMdfParser*.*" "$(TargetDir)\native\"
-copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgPlatformBase*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Common\bin\$(Configuration)64\MgMdfModel*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Common\bin\$(Configuration)64\MgMdfModel*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Common\bin\$(Configuration)64\MgPlatformBase*.*" "$(TargetDir)\native\"
</Command>
</PreBuildEvent>
<ClCompile>
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Web/WebApi.vcxproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Web/WebApi.vcxproj 2020-11-14 09:34:38 UTC (rev 9781)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Web/WebApi.vcxproj 2020-11-14 10:58:50 UTC (rev 9782)
@@ -57,9 +57,9 @@
<PreBuildEvent>
<Command>if exist "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Web\*.cs" del /Q "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Web\*.cs"
if exist "$(ProjectDir)WebApi_Properties.i" del /Q "$(ProjectDir)WebApi_Properties.i"
-"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)WebConstants.xml" -l C# -o "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Web\Constants.cs" -t
+"..\..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)WebConstants.xml" -l C# -o "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Web\Constants.cs" -t
copy "$(ProjectDir)..\dotnetcore_split.i" "$(ProjectDir)language.i"
-"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)WebApiGen.xml" -l C# -x "WebApi"
+"..\..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)WebApiGen.xml" -l C# -x "WebApi"
"..\..\..\Tools\swig\install\swig.exe" -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module WebUnmanagedApi -o "$(ProjectDir)WebUnmanagedApi_wrap.cpp" -outdir "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Web" WebApi.i
del /Q ..\..\..\Managed\DotNet\OSGeo.MapGuide.Web\WebUnmanagedApi.cs
copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgHttpHandler*.*" "$(TargetDir)\native\"
@@ -98,9 +98,9 @@
<PreBuildEvent>
<Command>if exist "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Web\*.cs" del /Q "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Web\*.cs"
if exist "$(ProjectDir)WebApi_Properties.i" del /Q "$(ProjectDir)WebApi_Properties.i"
-"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)WebConstants.xml" -l C# -o "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Web\Constants.cs" -t
+"..\..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)WebConstants.xml" -l C# -o "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Web\Constants.cs" -t
copy "$(ProjectDir)..\dotnetcore_split.i" "$(ProjectDir)language.i"
-"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)WebApiGen.xml" -l C# -x "WebApi"
+"..\..\..\IMake\$(Platform)\$(Configuration)\bin\IMake.exe" -p "$(ProjectDir)WebApiGen.xml" -l C# -x "WebApi"
"..\..\..\Tools\swig\install\swig.exe" -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module WebUnmanagedApi -o "$(ProjectDir)WebUnmanagedApi_wrap.cpp" -outdir "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Web" WebApi.i
del /Q ..\..\..\Managed\DotNet\OSGeo.MapGuide.Web\WebUnmanagedApi.cs
copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgHttpHandler*.*" "$(TargetDir)\native\"
Index: sandbox/jng/vanilla_swig/Bindings/src/IMake
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/IMake 2020-11-14 09:34:38 UTC (rev 9781)
+++ sandbox/jng/vanilla_swig/Bindings/src/IMake 2020-11-14 10:58:50 UTC (rev 9782)
Property changes on: sandbox/jng/vanilla_swig/Bindings/src/IMake
___________________________________________________________________
Modified: svn:ignore
## -1,3 +1,4 ##
+IMake.vcxproj.user
Release
Win32
-IMake.vcxproj.user
+x64
Modified: sandbox/jng/vanilla_swig/Bindings/src/IMake/IMake.vcxproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/IMake/IMake.vcxproj 2020-11-14 09:34:38 UTC (rev 9781)
+++ sandbox/jng/vanilla_swig/Bindings/src/IMake/IMake.vcxproj 2020-11-14 10:58:50 UTC (rev 9782)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
+ <ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
+ <Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
+ <ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
- <Platform>Win32</Platform>
+ <Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
@@ -16,12 +16,12 @@
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
@@ -29,10 +29,10 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
@@ -39,21 +39,20 @@
<PropertyGroup>
<_ProjectFileVersion>11.0.61030.0</_ProjectFileVersion>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>Win32\</OutDir>
- <IntDir>Debug\</IntDir>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>$(Platform)\$(Configuration)\bin</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\obj</IntDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>Win32\</OutDir>
- <IntDir>Release\</IntDir>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>$(Platform)\$(Configuration)\bin</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\obj</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -67,11 +66,11 @@
<ProgramDatabaseFile>$(OutDir)IMake.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention />
- <TargetMachine>MachineX86</TargetMachine>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -87,8 +86,8 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention />
- <TargetMachine>MachineX86</TargetMachine>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -95,8 +94,8 @@
<ClCompile Include="IMake.cpp" />
<ClCompile Include="SimpleXmlParser.cpp" />
<ClCompile Include="stdafx.cpp">
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
Modified: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/MapGuideDotNetApi.csproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/MapGuideDotNetApi.csproj 2020-11-14 09:34:38 UTC (rev 9781)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/MapGuideDotNetApi.csproj 2020-11-14 10:58:50 UTC (rev 9782)
@@ -18,6 +18,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\..\..\..\packages\DotNet\Release</OutputPath>
+ <DocumentationFile>..\..\..\..\packages\DotNet\Release\MapGuideDotNetApi.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Modified: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/OSGeo.MapGuide.Foundation.csproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/OSGeo.MapGuide.Foundation.csproj 2020-11-14 09:34:38 UTC (rev 9781)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/OSGeo.MapGuide.Foundation.csproj 2020-11-14 10:58:50 UTC (rev 9782)
@@ -18,6 +18,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\..\..\..\packages\DotNet\Release</OutputPath>
+ <DocumentationFile>..\..\..\..\packages\DotNet\Release\OSGeo.MapGuide.Foundation.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Modified: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/OSGeo.MapGuide.Geometry.csproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/OSGeo.MapGuide.Geometry.csproj 2020-11-14 09:34:38 UTC (rev 9781)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/OSGeo.MapGuide.Geometry.csproj 2020-11-14 10:58:50 UTC (rev 9782)
@@ -18,6 +18,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\..\..\..\packages\DotNet\Release</OutputPath>
+ <DocumentationFile>..\..\..\..\packages\DotNet\Release\OSGeo.MapGuide.Geometry.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Modified: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/OSGeo.MapGuide.MapGuideCommon.csproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/OSGeo.MapGuide.MapGuideCommon.csproj 2020-11-14 09:34:38 UTC (rev 9781)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/OSGeo.MapGuide.MapGuideCommon.csproj 2020-11-14 10:58:50 UTC (rev 9782)
@@ -18,6 +18,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\..\..\..\packages\DotNet\Release</OutputPath>
+ <DocumentationFile>..\..\..\..\packages\DotNet\Release\OSGeo.MapGuide.MapGuideCommon.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Modified: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/OSGeo.MapGuide.PlatformBase.csproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/OSGeo.MapGuide.PlatformBase.csproj 2020-11-14 09:34:38 UTC (rev 9781)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/OSGeo.MapGuide.PlatformBase.csproj 2020-11-14 10:58:50 UTC (rev 9782)
@@ -18,6 +18,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\..\..\..\packages\DotNet\Release</OutputPath>
+ <DocumentationFile>..\..\..\..\packages\DotNet\Release\OSGeo.MapGuide.PlatformBase.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Modified: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/OSGeo.MapGuide.Web.csproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/OSGeo.MapGuide.Web.csproj 2020-11-14 09:34:38 UTC (rev 9781)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/OSGeo.MapGuide.Web.csproj 2020-11-14 10:58:50 UTC (rev 9782)
@@ -18,6 +18,8 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\..\..\..\packages\DotNet\Release</OutputPath>
+ <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+ <DocumentationFile>..\..\..\..\packages\DotNet\Release\OSGeo.MapGuide.Web.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Added: sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestCommon/ExternalTests/StandardCatchTest.cs
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestCommon/ExternalTests/StandardCatchTest.cs (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestCommon/ExternalTests/StandardCatchTest.cs 2020-11-14 10:58:50 UTC (rev 9782)
@@ -0,0 +1,44 @@
+using OSGeo.MapGuide;
+using OSGeo.MapGuide.Test.Common;
+
+namespace TestCommon.ExternalTests
+{
+ public class StandardCatchTest : IExternalTest
+ {
+ public void Execute(IPlatformFactory factory, ITestLogger logger)
+ {
+ try
+ {
+ var resId = new MgResourceIdentifier("");
+ Assert.Fail("This should've thrown");
+ }
+ catch (MgException ex)
+ {
+ Assert.Equals(MgExceptionCodes.MgInvalidRepositoryTypeException, ex.GetExceptionCode());
+ }
+ }
+ }
+
+ public class CatchViaExceptionFilterTest : IExternalTest
+ {
+ public void Execute(IPlatformFactory factory, ITestLogger logger)
+ {
+ bool bHitCorrectCatchBlock = false;
+ try
+ {
+ var resId = new MgResourceIdentifier("");
+ Assert.Fail("This should've thrown");
+ }
+ catch (MgException ex) when (ex.GetExceptionCode() == MgExceptionCodes.MgInvalidRepositoryTypeException)
+ {
+ //This is the block that should be hit
+ bHitCorrectCatchBlock = true;
+ }
+ catch (MgException ex) when (ex.GetExceptionCode() != MgExceptionCodes.MgInvalidRepositoryTypeException)
+ {
+ Assert.Fail("Wrong exception filter triggered");
+ }
+ Assert.IsTrue(bHitCorrectCatchBlock);
+ }
+ }
+}
Modified: sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunner/Program.cs
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunner/Program.cs 2020-11-14 09:34:38 UTC (rev 9781)
+++ sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunner/Program.cs 2020-11-14 10:58:50 UTC (rev 9782)
@@ -22,6 +22,9 @@
[Option("log-path", Required = false, HelpText = "Custom log path. If not set, will default to UnitTests.log on the current directory")]
public string LogPath { get; set; }
+
+ [Option("admin-pass", Required = false, HelpText = "The MapGuide Administrator password", Default = "admin")]
+ public string AdminPass { get; set; }
}
@@ -68,6 +71,8 @@
//Usage: MgTestRunner.exe <webconfig.ini path> <MENTOR_DICTIONARY_PATH> [test log path]
static int Main(string[] args)
{
+ var memBefore = GC.GetTotalMemory(true);
+
int exitCode = 0;
Parser.Default.ParseArguments<Options>(args)
.WithParsed(opts =>
@@ -75,6 +80,8 @@
exitCode = Run(opts);
});
+ var memBeforeGC = GC.GetTotalMemory(false);
+
//If you have built the .net SWIG glue wrapper with REFCOUNTING_DIAGNOSTICS, then
//you should be seeing a whole bunch of refcounting chatter, which is verification
//that we are actually releasing our unmanaged resources
@@ -81,6 +88,12 @@
GC.Collect();
GC.WaitForPendingFinalizers();
+ var memAfterGC = GC.GetTotalMemory(true);
+
+ Console.WriteLine($"Total Memory (start): {memBefore} bytes");
+ Console.WriteLine($"Total Memory (before final GC): {memBeforeGC} bytes");
+ Console.WriteLine($"Total Memory (after final GC): {memAfterGC} bytes");
+
return exitCode;
}
@@ -122,7 +135,7 @@
Console.WriteLine($"Using CS Library: {csFactory.GetBaseLibrary()}");
MapGuideApi.MgInitializeWebTier(options.WebConfigPath);
- userInfo = new MgUserInformation("Administrator", "admin");
+ userInfo = new MgUserInformation("Administrator", options.AdminPass);
siteConn = new MgSiteConnection();
siteConn.Open(userInfo);
More information about the mapguide-commits
mailing list