[mapguide-commits] r9813 - in sandbox/jng/vanilla_swig/Portable: . DesktopUnmanagedApi/DotNet DesktopUnmanagedApi/DotNet/Partials DesktopUnmanagedApi/JavaApiEx DesktopUnmanagedApi/JavaApiEx/TestApps DesktopUnmanagedApi/MapGuideApi DotNetHarness Localization MapViewer/Properties MapViewer.Desktop MapViewer.Desktop/Properties MapViewerTest MgAppLayout MgPortable MgPortable/Log MgPortable/MapLayer MgPortable/Services MgPortable/Services/Drawing MgPortable/Services/Feature MgPortable/Services/Feature/Commands MgPortable/Services/Rendering MgPortable/Services/Resource MgPortable/Services/Stylization MgPortable/Services/Tile MgPortable/System Samples Samples/AdvancedSample Samples/AdvancedSample/Properties Samples/BasicSample Samples/FreeFormExample Samples/SampleExtension UnitTest

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Sat Nov 28 05:10:51 PST 2020


Author: jng
Date: 2020-11-28 05:10:51 -0800 (Sat, 28 Nov 2020)
New Revision: 9813

Added:
   sandbox/jng/vanilla_swig/Portable/MgPortable/
   sandbox/jng/vanilla_swig/Portable/MgPortable/MgPortable.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/MgPortable.vcxproj
   sandbox/jng/vanilla_swig/Portable/MgPortable/MgPortable.vcxproj.filters
   sandbox/jng/vanilla_swig/Portable/MgPortable/MgPortableBuild.cpp
   sandbox/jng/vanilla_swig/Portable/Portable.sln
   sandbox/jng/vanilla_swig/Portable/PortableDotNet.sln
Removed:
   sandbox/jng/vanilla_swig/Portable/MgDesktop/
   sandbox/jng/vanilla_swig/Portable/MgDesktopApi.sln
   sandbox/jng/vanilla_swig/Portable/MgDesktopDotNet.sln
   sandbox/jng/vanilla_swig/Portable/MgPortable/MgDesktop.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/MgDesktop.vcxproj
   sandbox/jng/vanilla_swig/Portable/MgPortable/MgDesktop.vcxproj.filters
   sandbox/jng/vanilla_swig/Portable/MgPortable/MgDesktopBuild.cpp
Modified:
   sandbox/jng/vanilla_swig/Portable/CMakeLists.txt
   sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/DotNet/DesktopApi.vcxproj
   sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/DotNet/MapGuideDesktopApiGen.xml
   sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/DotNet/MapGuideDesktopConstants.xml
   sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/DotNet/Partials/AssemblyInfo.cs
   sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj
   sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/JavaApiEx/TestApps/Test.java
   sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/MapGuideApi/MapGuideApiGen.xml
   sandbox/jng/vanilla_swig/Portable/DotNetHarness/DotNetHarness.csproj
   sandbox/jng/vanilla_swig/Portable/Localization/configuration.xml
   sandbox/jng/vanilla_swig/Portable/MapViewer.Desktop/MapViewer.Desktop.csproj
   sandbox/jng/vanilla_swig/Portable/MapViewer.Desktop/MgDesktopMapViewerProvider.cs
   sandbox/jng/vanilla_swig/Portable/MapViewer.Desktop/Properties/AssemblyInfo.cs
   sandbox/jng/vanilla_swig/Portable/MapViewer/Properties/AssemblyInfo.cs
   sandbox/jng/vanilla_swig/Portable/MapViewerTest/CompactViewer.cs
   sandbox/jng/vanilla_swig/Portable/MapViewerTest/Program.cs
   sandbox/jng/vanilla_swig/Portable/MgAppLayout/Program.cs
   sandbox/jng/vanilla_swig/Portable/MgPortable/CMakeLists.txt
   sandbox/jng/vanilla_swig/Portable/MgPortable/Log/LogDetail.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Log/LogEntryData.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Log/LogManager.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Log/LogThread.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Log/LogThread.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/MapLayer/Layer.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/MapLayer/Map.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/MapLayer/Selection.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/ByteSourceRasterStreamImpl.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/DataReader.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Drawing/DrawingServiceUtil.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/DrawingService.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/ApplySchema.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/CreateFeatureSource.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/DeleteCommand.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/DescribeSchema.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/DescribeSchema.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/EnumerateDataStores.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/ExtendedSelectCommand.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/FeatureManipulationCommand.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/FeatureServiceCommand.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/GetConnectionPropertyValues.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/GetFeatureProviders.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/GetLongTransactions.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/GetProviderCapabilities.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/GetSchemaMapping.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/GetSpatialContexts.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/InsertCommand.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/SelectAggregateCommand.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/SelectCommand.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/SelectFeatures.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/SelectFeatures.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/SqlCommand.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/UpdateCommand.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/UpdateFeatures.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/DataReaderCreator.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FdoConnectionPool.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FdoConnectionUtil.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureClassCacheItem.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureDefs.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureSchemaCacheItem.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureServiceCache.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureServiceCache.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureServiceCacheEntry.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureSetReader.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureSourceCacheItem.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureStringFunctions.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureUtil.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/MgCSTrans.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/ProjectedFeatureReader.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/ProxyDataReader.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/RasterHelper.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/RdbmsFeatureSourceParams.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/SpatialContextCacheItem.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/TransformCache.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/FeatureReader.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/FeatureService.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/ImageFormats.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/MappingService.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/ProfilingService.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/CustomLogoInfo.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/CustomTextInfo.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/DwfVersion.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/FeatureInformation.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/Layout.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/MapPlot.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/MapPlotCollection.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/MappingDefs.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/MappingUtil.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/PlotSpecification.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/PrintLayout.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/RSMgFeatureReader.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/RSMgRaster.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/RSMgSymbolManager.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/RenderingOptions.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/UnitType.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Resource/ResourceContentCache.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Resource/ResourceContentCache.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Resource/UnmanagedDataManager.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/ResourceService.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/ScrollableFeatureReader.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/SqlReader.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Stylization/SEMgSymbolManager.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Tile/TileCache.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Tile/TileDefs.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/TileService.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Transaction.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/System/ConfigProperties.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/System/PlatformInit.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/System/ThreadBase.h
   sandbox/jng/vanilla_swig/Portable/MgPortable/System/TimerUtil.cpp
   sandbox/jng/vanilla_swig/Portable/MgPortable/changelog.txt
   sandbox/jng/vanilla_swig/Portable/Samples/AdvancedSample/MainForm.cs
   sandbox/jng/vanilla_swig/Portable/Samples/AdvancedSample/Properties/AssemblyInfo.cs
   sandbox/jng/vanilla_swig/Portable/Samples/BasicSample/MainForm.cs
   sandbox/jng/vanilla_swig/Portable/Samples/FreeFormExample/MainForm.cs
   sandbox/jng/vanilla_swig/Portable/Samples/SampleExtension/SamplesTaskPane.cs
   sandbox/jng/vanilla_swig/Portable/Samples/samples_readme.txt
   sandbox/jng/vanilla_swig/Portable/UnitTest/CMakeLists.txt
   sandbox/jng/vanilla_swig/Portable/UnitTest/TestFeatureService.cpp
   sandbox/jng/vanilla_swig/Portable/UnitTest/TestKmlService.cpp
   sandbox/jng/vanilla_swig/Portable/UnitTest/TestLogManager.cpp
   sandbox/jng/vanilla_swig/Portable/UnitTest/TestLogManagerThread.cpp
   sandbox/jng/vanilla_swig/Portable/UnitTest/TestMappingService.cpp
   sandbox/jng/vanilla_swig/Portable/UnitTest/TestPerformance.cpp
   sandbox/jng/vanilla_swig/Portable/UnitTest/TestProfilingService.cpp
   sandbox/jng/vanilla_swig/Portable/UnitTest/TestRenderingService.cpp
   sandbox/jng/vanilla_swig/Portable/UnitTest/TestResourceService.cpp
   sandbox/jng/vanilla_swig/Portable/UnitTest/TestServiceFactory.h
   sandbox/jng/vanilla_swig/Portable/UnitTest/TestTileService.cpp
   sandbox/jng/vanilla_swig/Portable/UnitTest/UnitTest.vcxproj
   sandbox/jng/vanilla_swig/Portable/UnitTest/main.cpp
Log:
More Desktop -> Portable renaming

Modified: sandbox/jng/vanilla_swig/Portable/CMakeLists.txt
===================================================================
--- sandbox/jng/vanilla_swig/Portable/CMakeLists.txt	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/CMakeLists.txt	2020-11-28 13:10:51 UTC (rev 9813)
@@ -11,5 +11,5 @@
 set(MG_COMPONENT "portable")
 set_install_subdir("portable/")
 
-add_subdirectory(MgDesktop)
+add_subdirectory(MgPortable)
 add_subdirectory(UnitTest)
\ No newline at end of file

Modified: sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/DotNet/DesktopApi.vcxproj
===================================================================
--- sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/DotNet/DesktopApi.vcxproj	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/DotNet/DesktopApi.vcxproj	2020-11-28 13:10:51 UTC (rev 9813)
@@ -81,12 +81,12 @@
 ..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\MapGuideDesktopConstants.xml -l C# -o ./MapGuideDesktopConstants.cs -t
 copy ..\dotnet.i .\language.i
 ..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\MapGuideDesktopApiGen.xml -l C#
-..\..\..\Oem\SWIGEx\Win32\swig -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideDesktopApi.i
+..\..\..\Oem\SWIGEx\Win32\swig -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgPortableApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideDesktopApi.i
 </Command>
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\Inc;..\..\..\Oem\FDO\Inc\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\DWFTK\develop\global\src;..\..\..\Oem\DWFTK\develop\global\src\dwf;..\..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\Inc;..\..\..\Oem\FDO\Inc\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\DWFTK\develop\global\src;..\..\..\Oem\DWFTK\develop\global\src\dwf;..\..\MgPortable;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -95,7 +95,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>MgDesktopd.lib;FDO.lib;FDOCommon.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MgPortabled.lib;FDO.lib;FDOCommon.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\..\bin\debug\MapGuideDesktopUnmanagedApi.dll</OutputFile>
       <AdditionalLibraryDirectories>..\..\Lib\Debug;..\..\..\Common\lib\$(Configuration);..\..\..\Oem\FDO\Lib;..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -110,13 +110,13 @@
 ..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\MapGuideDesktopConstants.xml -l C# -o ./MapGuideDesktopConstants.cs -t
 copy ..\dotnet.i .\language.i
 ..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe -p .\MapGuideDesktopApiGen.xml -l C#
-..\..\..\Oem\SWIGEx\Win32\swig -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideDesktopApi.i
+..\..\..\Oem\SWIGEx\Win32\swig -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgPortableApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideDesktopApi.i
 </Command>
     </PreBuildEvent>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\Inc;..\..\..\Oem\FDO\Inc\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\DWFTK\develop\global\src;..\..\..\Oem\DWFTK\develop\global\src\dwf;..\..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\Inc;..\..\..\Oem\FDO\Inc\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\DWFTK\develop\global\src;..\..\..\Oem\DWFTK\develop\global\src\dwf;..\..\MgPortable;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -124,7 +124,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>MgDesktop.lib;FDO.lib;FDOCommon.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MgPortable.lib;FDO.lib;FDOCommon.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\..\bin\release\$(ProjectName).dll</OutputFile>
       <AdditionalLibraryDirectories>..\..\Lib\release;..\..\..\Common\lib\$(Configuration);..\..\..\Oem\FDO\Lib;..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>FDO.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -146,7 +146,7 @@
 ..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\MapGuideDesktopConstants.xml -l C# -o ./MapGuideDesktopConstants.cs -t
 copy ..\dotnet.i .\language.i
 ..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\MapGuideDesktopApiGen.xml -l C#
-..\..\..\Oem\SWIGEx\Win32\swig -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideDesktopApi.i
+..\..\..\Oem\SWIGEx\Win32\swig -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgPortableApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideDesktopApi.i
 </Command>
     </PreBuildEvent>
     <Midl>
@@ -154,7 +154,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\Inc;..\..\..\Oem\FDO\Inc\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\DWFTK\develop\global\src;..\..\..\Oem\DWFTK\develop\global\src\dwf;..\..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\Inc;..\..\..\Oem\FDO\Inc\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\DWFTK\develop\global\src;..\..\..\Oem\DWFTK\develop\global\src\dwf;..\..\MgPortable;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -163,7 +163,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>MgDesktopd.lib;FDO.lib;FDOCommon.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MgPortabled.lib;FDO.lib;FDOCommon.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\..\bin\debug\MapGuideDesktopUnmanagedApi.dll</OutputFile>
       <AdditionalLibraryDirectories>..\..\Lib\Debug64;..\..\..\Common\lib\$(Configuration)64;..\..\..\Oem\FDO\Lib64;..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -178,7 +178,7 @@
 ..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\MapGuideDesktopConstants.xml -l C# -o ./MapGuideDesktopConstants.cs -t
 copy ..\dotnet.i .\language.i
 ..\..\..\BuildTools\WebTools\IMake\Win64\IMake.exe -p .\MapGuideDesktopApiGen.xml -l C#
-..\..\..\Oem\SWIGEx\Win32\swig -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideDesktopApi.i
+..\..\..\Oem\SWIGEx\Win32\swig -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgPortableApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideDesktopApi.i
 </Command>
     </PreBuildEvent>
     <Midl>
@@ -187,7 +187,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\Inc;..\..\..\Oem\FDO\Inc\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\DWFTK\develop\global\src;..\..\..\Oem\DWFTK\develop\global\src\dwf;..\..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\Inc;..\..\..\Oem\FDO\Inc\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\DWFTK\develop\global\src;..\..\..\Oem\DWFTK\develop\global\src\dwf;..\..\MgPortable;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -195,7 +195,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>MgDesktop.lib;FDO.lib;FDOCommon.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MgPortable.lib;FDO.lib;FDOCommon.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\..\bin\release64\$(ProjectName).dll</OutputFile>
       <AdditionalLibraryDirectories>..\..\Lib\Release64;..\..\..\Common\lib\$(Configuration)64;..\..\..\Oem\FDO\Lib64;..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>FDO.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -218,7 +218,7 @@
     <None Include="MapGuideDesktopConstants.xml" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="MgDesktopApi_wrap.cpp" />
+    <ClCompile Include="MgPortableApi_wrap.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Modified: sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/DotNet/MapGuideDesktopApiGen.xml
===================================================================
--- sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/DotNet/MapGuideDesktopApiGen.xml	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/DotNet/MapGuideDesktopApiGen.xml	2020-11-28 13:10:51 UTC (rev 9813)
@@ -29,7 +29,7 @@
 
 #include "Foundation.h"
 #include "GeometryCommon.h"
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 #if defined(PHP) || defined(JAVA)
 typedef std::wstring STRINGPARAM;
@@ -54,7 +54,7 @@
     %import "../../../Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.i"
     %import "../../../Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.i"
     %include "language.i"   //typemaps specific for each language
-    %include "../../MgDesktop/System/ClassId.h"
+    %include "../../MgPortable/System/ClassId.h"
 
     #if defined(PHPSWIG)
     // We force UTF-8 encoding for PHP
@@ -88,37 +88,37 @@
     
     <!-- MapGuideDesktop classes -->
 
-    <Header path="../../MgDesktop/Services/DataReader.h" />
-    <Header path="../../MgDesktop/Services/DrawingService.h" />
-    <Header path="../../MgDesktop/Services/FeatureReader.h" />
-    <Header path="../../MgDesktop/Services/FeatureService.h" />
-    <Header path="../../MgDesktop/Services/MappingService.h" />
-    <Header path="../../MgDesktop/Services/ProfilingService.h" />
-    <Header path="../../MgDesktop/Services/RenderingService.h" />
-    <Header path="../../MgDesktop/Services/ResourceService.h" />
-    <Header path="../../MgDesktop/Services/ScrollableFeatureReader.h" />
-    <Header path="../../MgDesktop/Services/ServiceFactory.h" />
-    <Header path="../../MgDesktop/Services/SqlReader.h" />
-    <Header path="../../MgDesktop/Services/TileService.h" />
-    <Header path="../../MgDesktop/Services/Transaction.h" />
+    <Header path="../../MgPortable/Services/DataReader.h" />
+    <Header path="../../MgPortable/Services/DrawingService.h" />
+    <Header path="../../MgPortable/Services/FeatureReader.h" />
+    <Header path="../../MgPortable/Services/FeatureService.h" />
+    <Header path="../../MgPortable/Services/MappingService.h" />
+    <Header path="../../MgPortable/Services/ProfilingService.h" />
+    <Header path="../../MgPortable/Services/RenderingService.h" />
+    <Header path="../../MgPortable/Services/ResourceService.h" />
+    <Header path="../../MgPortable/Services/ScrollableFeatureReader.h" />
+    <Header path="../../MgPortable/Services/ServiceFactory.h" />
+    <Header path="../../MgPortable/Services/SqlReader.h" />
+    <Header path="../../MgPortable/Services/TileService.h" />
+    <Header path="../../MgPortable/Services/Transaction.h" />
 
-    <Header path="../../MgDesktop/Services/Feature/RdbmsFeatureSourceParams.h" />
+    <Header path="../../MgPortable/Services/Feature/RdbmsFeatureSourceParams.h" />
 
-    <Header path="../../MgDesktop/Services/Rendering/DwfVersion.h" />
-    <Header path="../../MgDesktop/Services/Rendering/FeatureInformation.h" />
-    <Header path="../../MgDesktop/Services/Rendering/Layout.h" />
-    <Header path="../../MgDesktop/Services/Rendering/MapPlot.h" />
-    <Header path="../../MgDesktop/Services/Rendering/DwfVersion.h" />
-    <Header path="../../MgDesktop/Services/Rendering/MapPlotCollection.h" />
-    <Header path="../../MgDesktop/Services/Rendering/PlotSpecification.h" />
-    <Header path="../../MgDesktop/Services/Rendering/RenderingOptions.h" />
+    <Header path="../../MgPortable/Services/Rendering/DwfVersion.h" />
+    <Header path="../../MgPortable/Services/Rendering/FeatureInformation.h" />
+    <Header path="../../MgPortable/Services/Rendering/Layout.h" />
+    <Header path="../../MgPortable/Services/Rendering/MapPlot.h" />
+    <Header path="../../MgPortable/Services/Rendering/DwfVersion.h" />
+    <Header path="../../MgPortable/Services/Rendering/MapPlotCollection.h" />
+    <Header path="../../MgPortable/Services/Rendering/PlotSpecification.h" />
+    <Header path="../../MgPortable/Services/Rendering/RenderingOptions.h" />
 
-    <Header path="../../MgDesktop/System/PlatformInit.h" />
-    <Header path="../../MgDesktop/System/ExceptionCodes.h" />
+    <Header path="../../MgPortable/System/PlatformInit.h" />
+    <Header path="../../MgPortable/System/ExceptionCodes.h" />
 
-    <Header path="../../MgDesktop/MapLayer/Layer.h" />
-    <Header path="../../MgDesktop/MapLayer/Map.h" />
-    <Header path="../../MgDesktop/MapLayer/Selection.h" />
+    <Header path="../../MgPortable/MapLayer/Layer.h" />
+    <Header path="../../MgPortable/MapLayer/Map.h" />
+    <Header path="../../MgPortable/MapLayer/Selection.h" />
 
 </Headers>
 

Modified: sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/DotNet/MapGuideDesktopConstants.xml
===================================================================
--- sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/DotNet/MapGuideDesktopConstants.xml	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/DotNet/MapGuideDesktopConstants.xml	2020-11-28 13:10:51 UTC (rev 9813)
@@ -85,10 +85,10 @@
    must also add them to Makefile.am in the JavaApi and PhpApi folders.
 -->
 <Headers>
-    <Header path="../../MgDesktop/Services/ImageFormats.h" />
-    <Header path="../../MgDesktop/Services/Rendering/MapPlotInstruction.h" />
-    <Header path="../../MgDesktop/Services/Rendering/UnitType.h" />
-    <Header path="../../MgDesktop/System/ExceptionCodes.h" />
+    <Header path="../../MgPortable/Services/ImageFormats.h" />
+    <Header path="../../MgPortable/Services/Rendering/MapPlotInstruction.h" />
+    <Header path="../../MgPortable/Services/Rendering/UnitType.h" />
+    <Header path="../../MgPortable/System/ExceptionCodes.h" />
 </Headers>
 
 </Parameters>

Modified: sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/DotNet/Partials/AssemblyInfo.cs
===================================================================
--- sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/DotNet/Partials/AssemblyInfo.cs	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/DotNet/Partials/AssemblyInfo.cs	2020-11-28 13:10:51 UTC (rev 9813)
@@ -75,4 +75,4 @@
 //       documentation for more information on this.
 //
 [assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("MgDesktop.snk")]
+[assembly: AssemblyKeyFile("MgPortable.snk")]

Modified: sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj
===================================================================
--- sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj	2020-11-28 13:10:51 UTC (rev 9813)
@@ -108,7 +108,7 @@
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgDesktop;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgPortable;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <ExceptionHandling>Async</ExceptionHandling>
@@ -118,7 +118,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>MgFoundationd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgGeometryd.lib;MgPlatformBased.lib;MgDesktopd.lib;ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MgFoundationd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgGeometryd.lib;MgPlatformBased.lib;MgPortabled.lib;ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\Common\lib\$(Configuration);..\..\lib\debug;..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -148,7 +148,7 @@
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgDesktop;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgPortable;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <ExceptionHandling>Async</ExceptionHandling>
@@ -158,7 +158,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>MgFoundationd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgGeometryd.lib;MgPlatformBased.lib;MgDesktopd.lib;ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MgFoundationd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgGeometryd.lib;MgPlatformBased.lib;MgPortabled.lib;ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\Common\lib\$(Configuration)64;..\..\lib\debug64;..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -189,7 +189,7 @@
     </PreBuildEvent>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgDesktop;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgPortable;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -197,7 +197,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>MgFoundation.lib;MgMdfModel.lib;MgMdfParser.lib;MgGeometry.lib;MgPlatformBase.lib;MgDesktop.lib;ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MgFoundation.lib;MgMdfModel.lib;MgMdfParser.lib;MgGeometry.lib;MgPlatformBase.lib;MgPortable.lib;ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\Common\lib\$(Configuration);..\..\lib\release;..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -229,7 +229,7 @@
     </PreBuildEvent>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgDesktop;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgPortable;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -237,7 +237,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>MgFoundation.lib;MgMdfModel.lib;MgMdfParser.lib;MgGeometry.lib;MgPlatformBase.lib;MgDesktop.lib;ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MgFoundation.lib;MgMdfModel.lib;MgMdfParser.lib;MgGeometry.lib;MgPlatformBase.lib;MgPortable.lib;ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\Common\lib\$(Configuration)64;..\..\lib\release64;..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>

Modified: sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/JavaApiEx/TestApps/Test.java
===================================================================
--- sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/JavaApiEx/TestApps/Test.java	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/JavaApiEx/TestApps/Test.java	2020-11-28 13:10:51 UTC (rev 9813)
@@ -8,14 +8,14 @@
  *
  * Run with:
  *
- * $JAVA -classpath .;$JARPATH -Djava.library.path=$MGDESKTOPDIR Test
+ * $JAVA -classpath .;$JARPATH -Djava.library.path=$MgPortableDIR Test
  *
  * Where:
  *
  *  $JAVAC - Path to javac.exe (JDK must be same bitness as mg-desktop dlls)
  *  $JAVA - Path to java.exe (JDK must be same bitness as mg-desktop dlls)
- *  $MGDESKTOPDIR - Path to directory containing mg-desktop dlls
- *  $JARPATH - Path to MapGuideDesktopApi.jar, presumably $MGDESKTOPDIR
+ *  $MgPortableDIR - Path to directory containing mg-desktop dlls
+ *  $JARPATH - Path to MapGuideDesktopApi.jar, presumably $MgPortableDIR
  *
  */
 

Modified: sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/MapGuideApi/MapGuideApiGen.xml
===================================================================
--- sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/MapGuideApi/MapGuideApiGen.xml	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/DesktopUnmanagedApi/MapGuideApi/MapGuideApiGen.xml	2020-11-28 13:10:51 UTC (rev 9813)
@@ -24,7 +24,7 @@
 
 #include "Foundation.h"
 #include "GeometryCommon.h"
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 #if defined(PHP) || defined(JAVA)
 typedef std::wstring STRINGPARAM;
@@ -50,7 +50,7 @@
   %include "../../../Common/Foundation/System/FoundationClassId.h"
   %include "../../../Common/Geometry/GeometryClassId.h"
   %include "../../../Common/PlatformBase/Services/PlatformBaseClassId.h"
-  %include "../../MgDesktop/System/ClassId.h"
+  %include "../../MgPortable/System/ClassId.h"
 
 #if defined(PHPSWIG)
   // We force UTF-8 encoding for PHP
@@ -266,37 +266,37 @@
 
     <!-- mg-desktop classes -->
 
-    <Header path="../../MgDesktop/Services/DataReader.h" />
-    <Header path="../../MgDesktop/Services/DrawingService.h" />
-    <Header path="../../MgDesktop/Services/FeatureReader.h" />
-    <Header path="../../MgDesktop/Services/FeatureService.h" />
-    <Header path="../../MgDesktop/Services/MappingService.h" />
-    <Header path="../../MgDesktop/Services/ProfilingService.h" />
-    <Header path="../../MgDesktop/Services/RenderingService.h" />
-    <Header path="../../MgDesktop/Services/ResourceService.h" />
-    <Header path="../../MgDesktop/Services/ScrollableFeatureReader.h" />
-    <Header path="../../MgDesktop/Services/ServiceFactory.h" />
-    <Header path="../../MgDesktop/Services/SqlReader.h" />
-    <Header path="../../MgDesktop/Services/TileService.h" />
-    <Header path="../../MgDesktop/Services/Transaction.h" />
+    <Header path="../../MgPortable/Services/DataReader.h" />
+    <Header path="../../MgPortable/Services/DrawingService.h" />
+    <Header path="../../MgPortable/Services/FeatureReader.h" />
+    <Header path="../../MgPortable/Services/FeatureService.h" />
+    <Header path="../../MgPortable/Services/MappingService.h" />
+    <Header path="../../MgPortable/Services/ProfilingService.h" />
+    <Header path="../../MgPortable/Services/RenderingService.h" />
+    <Header path="../../MgPortable/Services/ResourceService.h" />
+    <Header path="../../MgPortable/Services/ScrollableFeatureReader.h" />
+    <Header path="../../MgPortable/Services/ServiceFactory.h" />
+    <Header path="../../MgPortable/Services/SqlReader.h" />
+    <Header path="../../MgPortable/Services/TileService.h" />
+    <Header path="../../MgPortable/Services/Transaction.h" />
 
-    <Header path="../../MgDesktop/Services/Feature/RdbmsFeatureSourceParams.h" />
+    <Header path="../../MgPortable/Services/Feature/RdbmsFeatureSourceParams.h" />
 
-    <Header path="../../MgDesktop/Services/Rendering/DwfVersion.h" />
-    <Header path="../../MgDesktop/Services/Rendering/FeatureInformation.h" />
-    <Header path="../../MgDesktop/Services/Rendering/Layout.h" />
-    <Header path="../../MgDesktop/Services/Rendering/MapPlot.h" />
-    <Header path="../../MgDesktop/Services/Rendering/DwfVersion.h" />
-    <Header path="../../MgDesktop/Services/Rendering/MapPlotCollection.h" />
-    <Header path="../../MgDesktop/Services/Rendering/PlotSpecification.h" />
-    <Header path="../../MgDesktop/Services/Rendering/RenderingOptions.h" />
+    <Header path="../../MgPortable/Services/Rendering/DwfVersion.h" />
+    <Header path="../../MgPortable/Services/Rendering/FeatureInformation.h" />
+    <Header path="../../MgPortable/Services/Rendering/Layout.h" />
+    <Header path="../../MgPortable/Services/Rendering/MapPlot.h" />
+    <Header path="../../MgPortable/Services/Rendering/DwfVersion.h" />
+    <Header path="../../MgPortable/Services/Rendering/MapPlotCollection.h" />
+    <Header path="../../MgPortable/Services/Rendering/PlotSpecification.h" />
+    <Header path="../../MgPortable/Services/Rendering/RenderingOptions.h" />
 
-    <Header path="../../MgDesktop/System/PlatformInit.h" />
-    <Header path="../../MgDesktop/System/ExceptionCodes.h" />
+    <Header path="../../MgPortable/System/PlatformInit.h" />
+    <Header path="../../MgPortable/System/ExceptionCodes.h" />
 
-    <Header path="../../MgDesktop/MapLayer/Layer.h" />
-    <Header path="../../MgDesktop/MapLayer/Map.h" />
-    <Header path="../../MgDesktop/MapLayer/Selection.h" />
+    <Header path="../../MgPortable/MapLayer/Layer.h" />
+    <Header path="../../MgPortable/MapLayer/Map.h" />
+    <Header path="../../MgPortable/MapLayer/Selection.h" />
 
 </Headers>
 

Modified: sandbox/jng/vanilla_swig/Portable/DotNetHarness/DotNetHarness.csproj
===================================================================
--- sandbox/jng/vanilla_swig/Portable/DotNetHarness/DotNetHarness.csproj	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/DotNetHarness/DotNetHarness.csproj	2020-11-28 13:10:51 UTC (rev 9813)
@@ -327,7 +327,7 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <None Include="..\MgDesktop\Platform.ini">
+    <None Include="..\MgPortable\Platform.ini">
       <Link>Platform.ini</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

Modified: sandbox/jng/vanilla_swig/Portable/Localization/configuration.xml
===================================================================
--- sandbox/jng/vanilla_swig/Portable/Localization/configuration.xml	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/Localization/configuration.xml	2020-11-28 13:10:51 UTC (rev 9813)
@@ -3,7 +3,7 @@
 		<assembly name="OSGeo.MapGuide.Viewer" folder="MapViewer" namespace="OSGeo.MapGuide.Viewer" />
         <assembly name="OSGeo.MapGuide.Viewer.Desktop" folder="MapViewer.Desktop" namespace="OSGeo.MapGuide.Viewer.Desktop" />
 
-		<keyfile>..\DesktopUnmanagedApi\DotNet\MgDesktop.snk</keyfile>
+		<keyfile>..\DesktopUnmanagedApi\DotNet\MgPortable.snk</keyfile>
 		<versionassembly>..\bin\Release\MgAppLayout.exe</versionassembly>
 		<sourcefolder>..</sourcefolder>
 		<outputfolder>compiled</outputfolder>

Modified: sandbox/jng/vanilla_swig/Portable/MapViewer/Properties/AssemblyInfo.cs
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MapViewer/Properties/AssemblyInfo.cs	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MapViewer/Properties/AssemblyInfo.cs	2020-11-28 13:10:51 UTC (rev 9813)
@@ -35,4 +35,4 @@
 [assembly: AssemblyVersion("3.1.0.0")]
 [assembly: AssemblyFileVersion("3.1.0.0")]
 
-[assembly: AssemblyKeyFile("..\\DesktopUnmanagedApi\\DotNet\\MgDesktop.snk")]
+[assembly: AssemblyKeyFile("..\\DesktopUnmanagedApi\\DotNet\\MgPortable.snk")]

Modified: sandbox/jng/vanilla_swig/Portable/MapViewer.Desktop/MapViewer.Desktop.csproj
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MapViewer.Desktop/MapViewer.Desktop.csproj	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MapViewer.Desktop/MapViewer.Desktop.csproj	2020-11-28 13:10:51 UTC (rev 9813)
@@ -79,7 +79,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="MgDesktopMapViewerProvider.cs" />
+    <Compile Include="MgPortableMapViewerProvider.cs" />
     <Compile Include="MgdTransientMapState.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Strings.Designer.cs" />

Modified: sandbox/jng/vanilla_swig/Portable/MapViewer.Desktop/MgDesktopMapViewerProvider.cs
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MapViewer.Desktop/MgDesktopMapViewerProvider.cs	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MapViewer.Desktop/MgDesktopMapViewerProvider.cs	2020-11-28 13:10:51 UTC (rev 9813)
@@ -6,7 +6,7 @@
 
 namespace OSGeo.MapGuide.Viewer.Desktop
 {
-    public class MgDesktopMapViewerProvider : MgMapViewerProvider
+    public class MgPortableMapViewerProvider : MgMapViewerProvider
     {
         private MgdMap _implMap;
         private MgdRenderingService _renderSvc;
@@ -13,7 +13,7 @@
         private MgdMappingService _mappingSvc;
         private MgdServiceFactory _fact;
 
-        public MgDesktopMapViewerProvider(MgdMap map) : base(map) 
+        public MgPortableMapViewerProvider(MgdMap map) : base(map) 
         {
             _implMap = map;
         }

Modified: sandbox/jng/vanilla_swig/Portable/MapViewer.Desktop/Properties/AssemblyInfo.cs
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MapViewer.Desktop/Properties/AssemblyInfo.cs	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MapViewer.Desktop/Properties/AssemblyInfo.cs	2020-11-28 13:10:51 UTC (rev 9813)
@@ -35,4 +35,4 @@
 [assembly: AssemblyVersion("3.1.0.0")]
 [assembly: AssemblyFileVersion("3.1.0.0")]
 
-[assembly: AssemblyKeyFile("..\\DesktopUnmanagedApi\\DotNet\\MgDesktop.snk")]
+[assembly: AssemblyKeyFile("..\\DesktopUnmanagedApi\\DotNet\\MgPortable.snk")]

Modified: sandbox/jng/vanilla_swig/Portable/MapViewerTest/CompactViewer.cs
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MapViewerTest/CompactViewer.cs	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MapViewerTest/CompactViewer.cs	2020-11-28 13:10:51 UTC (rev 9813)
@@ -22,7 +22,7 @@
         public void LoadMap(MgResourceIdentifier resId)
         {
             var map = new MgdMap(resId);
-            viewer.Init(new MgDesktopMapViewerProvider(map));
+            viewer.Init(new MgPortableMapViewerProvider(map));
             //viewer.RefreshMap();
         }
     }

Modified: sandbox/jng/vanilla_swig/Portable/MapViewerTest/Program.cs
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MapViewerTest/Program.cs	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MapViewerTest/Program.cs	2020-11-28 13:10:51 UTC (rev 9813)
@@ -60,7 +60,7 @@
                 map = new MgdMap(resId);
 
             //This is just a pass-through call to MgMapViewer.Init()
-            frm.LoadMap(new MgDesktopMapViewerProvider(map));
+            frm.LoadMap(new MgPortableMapViewerProvider(map));
 
             Application.ApplicationExit += new EventHandler(OnAppExit);
             Application.Run(frm);

Modified: sandbox/jng/vanilla_swig/Portable/MgAppLayout/Program.cs
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgAppLayout/Program.cs	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgAppLayout/Program.cs	2020-11-28 13:10:51 UTC (rev 9813)
@@ -61,7 +61,7 @@
             }*/
 
             var mdfId = new MgResourceIdentifier(layout.Map.MapDefinition);
-            var provider = new MgDesktopMapViewerProvider(null);
+            var provider = new MgPortableMapViewerProvider(null);
             var resSvc = (MgResourceService)provider.CreateService(MgServiceType.ResourceService);
             if (resSvc.ResourceExists(mdfId))
             {

Deleted: sandbox/jng/vanilla_swig/Portable/MgDesktopApi.sln
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktopApi.sln	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgDesktopApi.sln	2020-11-28 13:10:51 UTC (rev 9813)
@@ -1,276 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.22823.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "..\Common\Foundation\Foundation.vcxproj", "{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Geometry", "..\Common\Geometry\Geometry.vcxproj", "{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PlatformBase", "..\Common\PlatformBase\PlatformBase.vcxproj", "{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MdfModel", "..\Common\MdfModel\MdfModel.vcxproj", "{C50254F2-654A-48DE-AF5B-20605AEF8D10}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MdfParser", "..\Common\MdfParser\MdfParser.vcxproj", "{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Renderers", "..\Common\Renderers\Renderers.vcxproj", "{38161685-88ED-415E-A545-CCC17BE069AE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Stylization", "..\Common\Stylization\Stylization.vcxproj", "{341D5463-186E-49BA-B942-3D3BE28D65C0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GwsCommon", "..\Server\src\Gws\GwsCommon\GwsCommon.vcxproj", "{DB2CC2E3-4754-4932-B865-424A44E58FD0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GwsQueryEngine", "..\Server\src\Gws\GwsQueryEngine\GwsQueryEngine.vcxproj", "{8D947123-A12C-45DA-BD00-8B62DD5A0459}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GwsResource", "..\Server\src\Gws\GwsResource\GwsResource.vcxproj", "{8F654896-85DC-4F32-99B2-670D66B0FBF1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GwsInclude", "..\Server\src\Gws\Include\GwsInclude.vcxproj", "{E6B0012F-58F6-42F4-8F02-065C35829569}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FoundationDotNetApi", "..\Web\src\DotNetApi\Foundation\FoundationDotNetApi.vcxproj", "{5FE54BF6-2939-46BB-A811-277D46C901C4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GeometryDotNetApi", "..\Web\src\DotNetApi\Geometry\GeometryDotNetApi.vcxproj", "{D70DE528-8829-42E6-8EF6-E8F2FCDA6334}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PlatformBaseDotNetApi", "..\Web\src\DotNetApi\PlatformBase\PlatformBaseDotNetApi.vcxproj", "{41B4993D-2D85-4DF9-BC71-83837F620C8D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FoundationApi", "..\Web\src\DotNetUnmanagedApi\Foundation\FoundationApi.vcxproj", "{A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GeometryApi", "..\Web\src\DotNetUnmanagedApi\Geometry\GeometryApi.vcxproj", "{7A6EFE8B-A2F8-4C47-87A3-B7D1C4385AC2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PlatformBaseApi", "..\Web\src\DotNetUnmanagedApi\PlatformBase\PlatformBaseApi.vcxproj", "{CB91F23F-4882-433B-961B-15946BA8B965}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MapGuideDesktopUnmanagedApi", "DesktopUnmanagedApi\DotNet\DesktopApi.vcxproj", "{E706FB1C-4431-4508-8A2F-239A143EFA1C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CBC0339F-E68B-48BA-9059-945483BEBDCA} = {CBC0339F-E68B-48BA-9059-945483BEBDCA}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MgDesktop", "MgDesktop\MgDesktop.vcxproj", "{CBC0339F-E68B-48BA-9059-945483BEBDCA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4} = {F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}
-		{8D947123-A12C-45DA-BD00-8B62DD5A0459} = {8D947123-A12C-45DA-BD00-8B62DD5A0459}
-		{E6B0012F-58F6-42F4-8F02-065C35829569} = {E6B0012F-58F6-42F4-8F02-065C35829569}
-		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7} = {85882748-DD71-4D2B-9E5A-03AF8C8D91B7}
-		{341D5463-186E-49BA-B942-3D3BE28D65C0} = {341D5463-186E-49BA-B942-3D3BE28D65C0}
-		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425} = {A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}
-		{38161685-88ED-415E-A545-CCC17BE069AE} = {38161685-88ED-415E-A545-CCC17BE069AE}
-		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B} = {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}
-		{8F654896-85DC-4F32-99B2-670D66B0FBF1} = {8F654896-85DC-4F32-99B2-670D66B0FBF1}
-		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0} = {D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}
-		{DB2CC2E3-4754-4932-B865-424A44E58FD0} = {DB2CC2E3-4754-4932-B865-424A44E58FD0}
-		{C50254F2-654A-48DE-AF5B-20605AEF8D10} = {C50254F2-654A-48DE-AF5B-20605AEF8D10}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTest", "UnitTest\UnitTest.vcxproj", "{67505883-F667-4C18-BCCA-63F3B76C64FF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CBC0339F-E68B-48BA-9059-945483BEBDCA} = {CBC0339F-E68B-48BA-9059-945483BEBDCA}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DesktopDotNetApi", "DesktopUnmanagedApi\DotNet\DesktopDotNetApi.vcxproj", "{AB42A48E-8C9C-4D05-826A-1E5B6C457753}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E706FB1C-4431-4508-8A2F-239A143EFA1C} = {E706FB1C-4431-4508-8A2F-239A143EFA1C}
-		{D70DE528-8829-42E6-8EF6-E8F2FCDA6334} = {D70DE528-8829-42E6-8EF6-E8F2FCDA6334}
-		{5FE54BF6-2939-46BB-A811-277D46C901C4} = {5FE54BF6-2939-46BB-A811-277D46C901C4}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaApiEx", "DesktopUnmanagedApi\JavaApiEx\JavaApiEx.vcxproj", "{C02F44CB-D916-428D-A1A5-04E225A2A4EC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7} = {85882748-DD71-4D2B-9E5A-03AF8C8D91B7}
-		{CBC0339F-E68B-48BA-9059-945483BEBDCA} = {CBC0339F-E68B-48BA-9059-945483BEBDCA}
-		{C50254F2-654A-48DE-AF5B-20605AEF8D10} = {C50254F2-654A-48DE-AF5B-20605AEF8D10}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Security", "..\Common\Security\Security.vcxproj", "{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Debug|Win32.Build.0 = Debug|Win32
-		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Debug|x64.ActiveCfg = Debug|x64
-		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Debug|x64.Build.0 = Debug|x64
-		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Release|Win32.ActiveCfg = Release|Win32
-		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Release|Win32.Build.0 = Release|Win32
-		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Release|x64.ActiveCfg = Release|x64
-		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Release|x64.Build.0 = Release|x64
-		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Debug|Win32.Build.0 = Debug|Win32
-		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Debug|x64.ActiveCfg = Debug|x64
-		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Debug|x64.Build.0 = Debug|x64
-		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Release|Win32.ActiveCfg = Release|Win32
-		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Release|Win32.Build.0 = Release|Win32
-		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Release|x64.ActiveCfg = Release|x64
-		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Release|x64.Build.0 = Release|x64
-		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Debug|Win32.Build.0 = Debug|Win32
-		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Debug|x64.ActiveCfg = Debug|x64
-		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Debug|x64.Build.0 = Debug|x64
-		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Release|Win32.ActiveCfg = Release|Win32
-		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Release|Win32.Build.0 = Release|Win32
-		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Release|x64.ActiveCfg = Release|x64
-		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Release|x64.Build.0 = Release|x64
-		{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Debug|Win32.Build.0 = Debug|Win32
-		{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Debug|x64.ActiveCfg = Debug|x64
-		{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Debug|x64.Build.0 = Debug|x64
-		{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Release|Win32.ActiveCfg = Release|Win32
-		{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Release|Win32.Build.0 = Release|Win32
-		{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Release|x64.ActiveCfg = Release|x64
-		{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Release|x64.Build.0 = Release|x64
-		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Debug|Win32.Build.0 = Debug|Win32
-		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Debug|x64.ActiveCfg = Debug|x64
-		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Debug|x64.Build.0 = Debug|x64
-		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Release|Win32.ActiveCfg = Release|Win32
-		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Release|Win32.Build.0 = Release|Win32
-		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Release|x64.ActiveCfg = Release|x64
-		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Release|x64.Build.0 = Release|x64
-		{38161685-88ED-415E-A545-CCC17BE069AE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{38161685-88ED-415E-A545-CCC17BE069AE}.Debug|Win32.Build.0 = Debug|Win32
-		{38161685-88ED-415E-A545-CCC17BE069AE}.Debug|x64.ActiveCfg = Debug|x64
-		{38161685-88ED-415E-A545-CCC17BE069AE}.Debug|x64.Build.0 = Debug|x64
-		{38161685-88ED-415E-A545-CCC17BE069AE}.Release|Win32.ActiveCfg = Release|Win32
-		{38161685-88ED-415E-A545-CCC17BE069AE}.Release|Win32.Build.0 = Release|Win32
-		{38161685-88ED-415E-A545-CCC17BE069AE}.Release|x64.ActiveCfg = Release|x64
-		{38161685-88ED-415E-A545-CCC17BE069AE}.Release|x64.Build.0 = Release|x64
-		{341D5463-186E-49BA-B942-3D3BE28D65C0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{341D5463-186E-49BA-B942-3D3BE28D65C0}.Debug|Win32.Build.0 = Debug|Win32
-		{341D5463-186E-49BA-B942-3D3BE28D65C0}.Debug|x64.ActiveCfg = Debug|x64
-		{341D5463-186E-49BA-B942-3D3BE28D65C0}.Debug|x64.Build.0 = Debug|x64
-		{341D5463-186E-49BA-B942-3D3BE28D65C0}.Release|Win32.ActiveCfg = Release|Win32
-		{341D5463-186E-49BA-B942-3D3BE28D65C0}.Release|Win32.Build.0 = Release|Win32
-		{341D5463-186E-49BA-B942-3D3BE28D65C0}.Release|x64.ActiveCfg = Release|x64
-		{341D5463-186E-49BA-B942-3D3BE28D65C0}.Release|x64.Build.0 = Release|x64
-		{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Debug|Win32.Build.0 = Debug|Win32
-		{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Debug|x64.ActiveCfg = Debug|x64
-		{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Debug|x64.Build.0 = Debug|x64
-		{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Release|Win32.ActiveCfg = Release|Win32
-		{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Release|Win32.Build.0 = Release|Win32
-		{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Release|x64.ActiveCfg = Release|x64
-		{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Release|x64.Build.0 = Release|x64
-		{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Debug|Win32.Build.0 = Debug|Win32
-		{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Debug|x64.ActiveCfg = Debug|x64
-		{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Debug|x64.Build.0 = Debug|x64
-		{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Release|Win32.ActiveCfg = Release|Win32
-		{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Release|Win32.Build.0 = Release|Win32
-		{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Release|x64.ActiveCfg = Release|x64
-		{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Release|x64.Build.0 = Release|x64
-		{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Debug|Win32.Build.0 = Debug|Win32
-		{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Debug|x64.ActiveCfg = Debug|x64
-		{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Debug|x64.Build.0 = Debug|x64
-		{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Release|Win32.ActiveCfg = Release|Win32
-		{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Release|Win32.Build.0 = Release|Win32
-		{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Release|x64.ActiveCfg = Release|x64
-		{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Release|x64.Build.0 = Release|x64
-		{E6B0012F-58F6-42F4-8F02-065C35829569}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E6B0012F-58F6-42F4-8F02-065C35829569}.Debug|Win32.Build.0 = Debug|Win32
-		{E6B0012F-58F6-42F4-8F02-065C35829569}.Debug|x64.ActiveCfg = Debug|x64
-		{E6B0012F-58F6-42F4-8F02-065C35829569}.Debug|x64.Build.0 = Debug|x64
-		{E6B0012F-58F6-42F4-8F02-065C35829569}.Release|Win32.ActiveCfg = Release|Win32
-		{E6B0012F-58F6-42F4-8F02-065C35829569}.Release|Win32.Build.0 = Release|Win32
-		{E6B0012F-58F6-42F4-8F02-065C35829569}.Release|x64.ActiveCfg = Release|x64
-		{E6B0012F-58F6-42F4-8F02-065C35829569}.Release|x64.Build.0 = Release|x64
-		{5FE54BF6-2939-46BB-A811-277D46C901C4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5FE54BF6-2939-46BB-A811-277D46C901C4}.Debug|Win32.Build.0 = Debug|Win32
-		{5FE54BF6-2939-46BB-A811-277D46C901C4}.Debug|x64.ActiveCfg = Debug|x64
-		{5FE54BF6-2939-46BB-A811-277D46C901C4}.Debug|x64.Build.0 = Debug|x64
-		{5FE54BF6-2939-46BB-A811-277D46C901C4}.Release|Win32.ActiveCfg = Release|Win32
-		{5FE54BF6-2939-46BB-A811-277D46C901C4}.Release|Win32.Build.0 = Release|Win32
-		{5FE54BF6-2939-46BB-A811-277D46C901C4}.Release|x64.ActiveCfg = Release|x64
-		{5FE54BF6-2939-46BB-A811-277D46C901C4}.Release|x64.Build.0 = Release|x64
-		{D70DE528-8829-42E6-8EF6-E8F2FCDA6334}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D70DE528-8829-42E6-8EF6-E8F2FCDA6334}.Debug|Win32.Build.0 = Debug|Win32
-		{D70DE528-8829-42E6-8EF6-E8F2FCDA6334}.Debug|x64.ActiveCfg = Debug|x64
-		{D70DE528-8829-42E6-8EF6-E8F2FCDA6334}.Debug|x64.Build.0 = Debug|x64
-		{D70DE528-8829-42E6-8EF6-E8F2FCDA6334}.Release|Win32.ActiveCfg = Release|Win32
-		{D70DE528-8829-42E6-8EF6-E8F2FCDA6334}.Release|Win32.Build.0 = Release|Win32
-		{D70DE528-8829-42E6-8EF6-E8F2FCDA6334}.Release|x64.ActiveCfg = Release|x64
-		{D70DE528-8829-42E6-8EF6-E8F2FCDA6334}.Release|x64.Build.0 = Release|x64
-		{41B4993D-2D85-4DF9-BC71-83837F620C8D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{41B4993D-2D85-4DF9-BC71-83837F620C8D}.Debug|Win32.Build.0 = Debug|Win32
-		{41B4993D-2D85-4DF9-BC71-83837F620C8D}.Debug|x64.ActiveCfg = Debug|x64
-		{41B4993D-2D85-4DF9-BC71-83837F620C8D}.Debug|x64.Build.0 = Debug|x64
-		{41B4993D-2D85-4DF9-BC71-83837F620C8D}.Release|Win32.ActiveCfg = Release|Win32
-		{41B4993D-2D85-4DF9-BC71-83837F620C8D}.Release|Win32.Build.0 = Release|Win32
-		{41B4993D-2D85-4DF9-BC71-83837F620C8D}.Release|x64.ActiveCfg = Release|x64
-		{41B4993D-2D85-4DF9-BC71-83837F620C8D}.Release|x64.Build.0 = Release|x64
-		{A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2}.Debug|Win32.Build.0 = Debug|Win32
-		{A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2}.Debug|x64.ActiveCfg = Debug|x64
-		{A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2}.Debug|x64.Build.0 = Debug|x64
-		{A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2}.Release|Win32.ActiveCfg = Release|Win32
-		{A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2}.Release|Win32.Build.0 = Release|Win32
-		{A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2}.Release|x64.ActiveCfg = Release|x64
-		{A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2}.Release|x64.Build.0 = Release|x64
-		{7A6EFE8B-A2F8-4C47-87A3-B7D1C4385AC2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7A6EFE8B-A2F8-4C47-87A3-B7D1C4385AC2}.Debug|Win32.Build.0 = Debug|Win32
-		{7A6EFE8B-A2F8-4C47-87A3-B7D1C4385AC2}.Debug|x64.ActiveCfg = Debug|x64
-		{7A6EFE8B-A2F8-4C47-87A3-B7D1C4385AC2}.Debug|x64.Build.0 = Debug|x64
-		{7A6EFE8B-A2F8-4C47-87A3-B7D1C4385AC2}.Release|Win32.ActiveCfg = Release|Win32
-		{7A6EFE8B-A2F8-4C47-87A3-B7D1C4385AC2}.Release|Win32.Build.0 = Release|Win32
-		{7A6EFE8B-A2F8-4C47-87A3-B7D1C4385AC2}.Release|x64.ActiveCfg = Release|x64
-		{7A6EFE8B-A2F8-4C47-87A3-B7D1C4385AC2}.Release|x64.Build.0 = Release|x64
-		{CB91F23F-4882-433B-961B-15946BA8B965}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CB91F23F-4882-433B-961B-15946BA8B965}.Debug|Win32.Build.0 = Debug|Win32
-		{CB91F23F-4882-433B-961B-15946BA8B965}.Debug|x64.ActiveCfg = Debug|x64
-		{CB91F23F-4882-433B-961B-15946BA8B965}.Debug|x64.Build.0 = Debug|x64
-		{CB91F23F-4882-433B-961B-15946BA8B965}.Release|Win32.ActiveCfg = Release|Win32
-		{CB91F23F-4882-433B-961B-15946BA8B965}.Release|Win32.Build.0 = Release|Win32
-		{CB91F23F-4882-433B-961B-15946BA8B965}.Release|x64.ActiveCfg = Release|x64
-		{CB91F23F-4882-433B-961B-15946BA8B965}.Release|x64.Build.0 = Release|x64
-		{E706FB1C-4431-4508-8A2F-239A143EFA1C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E706FB1C-4431-4508-8A2F-239A143EFA1C}.Debug|Win32.Build.0 = Debug|Win32
-		{E706FB1C-4431-4508-8A2F-239A143EFA1C}.Debug|x64.ActiveCfg = Debug|x64
-		{E706FB1C-4431-4508-8A2F-239A143EFA1C}.Debug|x64.Build.0 = Debug|x64
-		{E706FB1C-4431-4508-8A2F-239A143EFA1C}.Release|Win32.ActiveCfg = Release|Win32
-		{E706FB1C-4431-4508-8A2F-239A143EFA1C}.Release|Win32.Build.0 = Release|Win32
-		{E706FB1C-4431-4508-8A2F-239A143EFA1C}.Release|x64.ActiveCfg = Release|x64
-		{E706FB1C-4431-4508-8A2F-239A143EFA1C}.Release|x64.Build.0 = Release|x64
-		{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Debug|Win32.Build.0 = Debug|Win32
-		{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Debug|x64.ActiveCfg = Debug|x64
-		{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Debug|x64.Build.0 = Debug|x64
-		{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Release|Win32.ActiveCfg = Release|Win32
-		{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Release|Win32.Build.0 = Release|Win32
-		{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Release|x64.ActiveCfg = Release|x64
-		{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Release|x64.Build.0 = Release|x64
-		{67505883-F667-4C18-BCCA-63F3B76C64FF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{67505883-F667-4C18-BCCA-63F3B76C64FF}.Debug|Win32.Build.0 = Debug|Win32
-		{67505883-F667-4C18-BCCA-63F3B76C64FF}.Debug|x64.ActiveCfg = Debug|x64
-		{67505883-F667-4C18-BCCA-63F3B76C64FF}.Debug|x64.Build.0 = Debug|x64
-		{67505883-F667-4C18-BCCA-63F3B76C64FF}.Release|Win32.ActiveCfg = Release|Win32
-		{67505883-F667-4C18-BCCA-63F3B76C64FF}.Release|Win32.Build.0 = Release|Win32
-		{67505883-F667-4C18-BCCA-63F3B76C64FF}.Release|x64.ActiveCfg = Release|x64
-		{67505883-F667-4C18-BCCA-63F3B76C64FF}.Release|x64.Build.0 = Release|x64
-		{AB42A48E-8C9C-4D05-826A-1E5B6C457753}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AB42A48E-8C9C-4D05-826A-1E5B6C457753}.Debug|Win32.Build.0 = Debug|Win32
-		{AB42A48E-8C9C-4D05-826A-1E5B6C457753}.Debug|x64.ActiveCfg = Debug|Win32
-		{AB42A48E-8C9C-4D05-826A-1E5B6C457753}.Release|Win32.ActiveCfg = Release|Win32
-		{AB42A48E-8C9C-4D05-826A-1E5B6C457753}.Release|Win32.Build.0 = Release|Win32
-		{AB42A48E-8C9C-4D05-826A-1E5B6C457753}.Release|x64.ActiveCfg = Release|x64
-		{AB42A48E-8C9C-4D05-826A-1E5B6C457753}.Release|x64.Build.0 = Release|x64
-		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug|Win32.Build.0 = Debug|Win32
-		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug|x64.ActiveCfg = Debug|x64
-		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug|x64.Build.0 = Debug|x64
-		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|Win32.ActiveCfg = Release|Win32
-		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|Win32.Build.0 = Release|Win32
-		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|x64.ActiveCfg = Release|x64
-		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|x64.Build.0 = Release|x64
-		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|Win32.Build.0 = Debug|Win32
-		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|x64.ActiveCfg = Debug|x64
-		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|x64.Build.0 = Debug|x64
-		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|Win32.ActiveCfg = Release|Win32
-		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|Win32.Build.0 = Release|Win32
-		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|x64.ActiveCfg = Release|x64
-		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

Deleted: sandbox/jng/vanilla_swig/Portable/MgDesktopDotNet.sln
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktopDotNet.sln	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgDesktopDotNet.sln	2020-11-28 13:10:51 UTC (rev 9813)
@@ -1,76 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2012 for Windows Desktop
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetHarness", "DotNetHarness\DotNetHarness.csproj", "{A5881D59-BD24-4A3A-A707-F18A25724D29}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetUnitTest", "DotNetUnitTest\DotNetUnitTest.csproj", "{FDA196F0-3C55-4360-B207-BA5EF6D746F8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapViewer", "MapViewer\MapViewer.csproj", "{D46ED17B-329B-4D80-9181-FEF8307EFCBB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapViewer.Desktop", "MapViewer.Desktop\MapViewer.Desktop.csproj", "{E2001B46-F226-4F7B-911E-252B9644236E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapViewerTest", "MapViewerTest\MapViewerTest.csproj", "{E2FC8B99-0638-4C01-86C4-1B625D966981}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MgAppLayout", "MgAppLayout\MgAppLayout.csproj", "{F6054D81-E857-49FB-945F-AC2ECD9BB27A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A5881D59-BD24-4A3A-A707-F18A25724D29}.Debug|x64.ActiveCfg = Debug|x64
-		{A5881D59-BD24-4A3A-A707-F18A25724D29}.Debug|x64.Build.0 = Debug|x64
-		{A5881D59-BD24-4A3A-A707-F18A25724D29}.Debug|x86.ActiveCfg = Debug|x86
-		{A5881D59-BD24-4A3A-A707-F18A25724D29}.Debug|x86.Build.0 = Debug|x86
-		{A5881D59-BD24-4A3A-A707-F18A25724D29}.Release|x64.ActiveCfg = Release|x64
-		{A5881D59-BD24-4A3A-A707-F18A25724D29}.Release|x64.Build.0 = Release|x64
-		{A5881D59-BD24-4A3A-A707-F18A25724D29}.Release|x86.ActiveCfg = Release|x86
-		{A5881D59-BD24-4A3A-A707-F18A25724D29}.Release|x86.Build.0 = Release|x86
-		{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Debug|x64.ActiveCfg = Debug|x64
-		{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Debug|x64.Build.0 = Debug|x64
-		{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Debug|x86.ActiveCfg = Debug|x86
-		{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Debug|x86.Build.0 = Debug|x86
-		{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Release|x64.ActiveCfg = Release|x64
-		{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Release|x64.Build.0 = Release|x64
-		{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Release|x86.ActiveCfg = Release|x86
-		{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Release|x86.Build.0 = Release|x86
-		{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Debug|x64.Build.0 = Debug|Any CPU
-		{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Debug|x86.Build.0 = Debug|Any CPU
-		{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Release|x64.ActiveCfg = Release|Any CPU
-		{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Release|x64.Build.0 = Release|Any CPU
-		{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Release|x86.ActiveCfg = Release|Any CPU
-		{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Release|x86.Build.0 = Release|Any CPU
-		{E2001B46-F226-4F7B-911E-252B9644236E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E2001B46-F226-4F7B-911E-252B9644236E}.Debug|x64.Build.0 = Debug|Any CPU
-		{E2001B46-F226-4F7B-911E-252B9644236E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E2001B46-F226-4F7B-911E-252B9644236E}.Debug|x86.Build.0 = Debug|Any CPU
-		{E2001B46-F226-4F7B-911E-252B9644236E}.Release|x64.ActiveCfg = Release|Any CPU
-		{E2001B46-F226-4F7B-911E-252B9644236E}.Release|x64.Build.0 = Release|Any CPU
-		{E2001B46-F226-4F7B-911E-252B9644236E}.Release|x86.ActiveCfg = Release|Any CPU
-		{E2001B46-F226-4F7B-911E-252B9644236E}.Release|x86.Build.0 = Release|Any CPU
-		{E2FC8B99-0638-4C01-86C4-1B625D966981}.Debug|x64.ActiveCfg = Debug|x64
-		{E2FC8B99-0638-4C01-86C4-1B625D966981}.Debug|x64.Build.0 = Debug|x64
-		{E2FC8B99-0638-4C01-86C4-1B625D966981}.Debug|x86.ActiveCfg = Debug|x86
-		{E2FC8B99-0638-4C01-86C4-1B625D966981}.Debug|x86.Build.0 = Debug|x86
-		{E2FC8B99-0638-4C01-86C4-1B625D966981}.Release|x64.ActiveCfg = Release|x64
-		{E2FC8B99-0638-4C01-86C4-1B625D966981}.Release|x64.Build.0 = Release|x64
-		{E2FC8B99-0638-4C01-86C4-1B625D966981}.Release|x86.ActiveCfg = Release|x86
-		{E2FC8B99-0638-4C01-86C4-1B625D966981}.Release|x86.Build.0 = Release|x86
-		{F6054D81-E857-49FB-945F-AC2ECD9BB27A}.Debug|x64.ActiveCfg = Debug|x64
-		{F6054D81-E857-49FB-945F-AC2ECD9BB27A}.Debug|x64.Build.0 = Debug|x64
-		{F6054D81-E857-49FB-945F-AC2ECD9BB27A}.Debug|x86.ActiveCfg = Debug|x86
-		{F6054D81-E857-49FB-945F-AC2ECD9BB27A}.Debug|x86.Build.0 = Debug|x86
-		{F6054D81-E857-49FB-945F-AC2ECD9BB27A}.Release|x64.ActiveCfg = Release|x64
-		{F6054D81-E857-49FB-945F-AC2ECD9BB27A}.Release|x64.Build.0 = Release|x64
-		{F6054D81-E857-49FB-945F-AC2ECD9BB27A}.Release|x86.ActiveCfg = Release|x86
-		{F6054D81-E857-49FB-945F-AC2ECD9BB27A}.Release|x86.Build.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/CMakeLists.txt
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/CMakeLists.txt	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/CMakeLists.txt	2020-11-28 13:10:51 UTC (rev 9813)
@@ -1,4 +1,4 @@
-project(mgdesktop)
+project(MgPortable)
 
 #NOTE: DWF headers *must* go before MdfModel headers because we want Version.h from
 #MdfModel first and not DWF Toolkit
@@ -23,17 +23,17 @@
     ${MG_SERVER_GWS_DIR}/GwsQueryEngine/inc
 )
 
-set (MgDesktop_SRCS
-    MgDesktopBuild.cpp
+set (MgPortable_SRCS
+    MgPortableBuild.cpp
 )
 
 add_definitions(-DDWFCORE_STATIC -DDWFTK_STATIC -DDWFTK_USE_DWFCORE_ZLIB -DDWFTK_BUILD_EXPAT -DWHIP_STATIC_LIB)
 
-add_library(MgDesktop${MG_VERSION_SUFFIX} SHARED ${MgDesktop_SRCS})
-install(TARGETS MgDesktop${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(libMgDesktop${MG_VERSION_SUFFIX}.so libMgDesktop.so ${MG_COMPONENT})
+add_library(MgPortable${MG_VERSION_SUFFIX} SHARED ${MgPortable_SRCS})
+install(TARGETS MgPortable${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
+install_symlink(libMgPortable${MG_VERSION_SUFFIX}.so libMgPortable.so ${MG_COMPONENT})
 
-target_link_libraries(MgDesktop${MG_VERSION_SUFFIX}
+target_link_libraries(MgPortable${MG_VERSION_SUFFIX}
     ${ACE_LIBRARY}
     ${XERCESC_LIBRARIES}
     ${FDO_LIBRARY}

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Log/LogDetail.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Log/LogDetail.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Log/LogDetail.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef MgdLogDetail_H_
 #define MgdLogDetail_H_
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "LogManager.h"
 
 //

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Log/LogEntryData.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Log/LogEntryData.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Log/LogEntryData.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "LogEntryData.h"
 
 //-------------------------------------------------------------------------

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Log/LogManager.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Log/LogManager.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Log/LogManager.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "LogEntryData.h"
 #include "LogManager.h"
 #include "LogThread.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Log/LogThread.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Log/LogThread.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Log/LogThread.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "LogThread.h"
 #include "LogEntryData.h"
 //#include "ServerManager.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Log/LogThread.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Log/LogThread.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Log/LogThread.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef MG_LOG_THREAD_H
 #define MG_LOG_THREAD_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "System/ThreadBase.h"
 
 class MgdLogThread : public MgdThreadBase

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/MapLayer/Layer.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/MapLayer/Layer.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/MapLayer/Layer.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_MAP_LAYER_H
 #define DESKTOP_MAP_LAYER_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 class MgdScrollableFeatureReader;
 

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/MapLayer/Map.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/MapLayer/Map.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/MapLayer/Map.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_MAP_H
 #define DESKTOP_MAP_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "MdfModel.h"
 #include <vector>
 #include <list>

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/MapLayer/Selection.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/MapLayer/Selection.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/MapLayer/Selection.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_SELECTION_H
 #define DESKTOP_SELECTION_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "Map.h"
 
 /// \ingroup Desktop_Map_and_Layers_Module

Deleted: sandbox/jng/vanilla_swig/Portable/MgPortable/MgDesktop.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/MgDesktop.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/MgDesktop.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -1,99 +0,0 @@
-//
-//  Copyright (C) 2004-2011 by Autodesk, Inc.
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of version 2.1 of the GNU Lesser
-//  General Public License as published by the Free Software Foundation.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-//
-
-#ifndef MGDESKTOP_H
-#define MGDESKTOP_H
-
-#include "Foundation.h"
-#include "PlatformBase.h"
-
-#ifdef _WIN32
-#ifdef DESKTOP_EXPORTS
-#    define MG_DESKTOP_API __declspec(dllexport)
-#else
-#    define MG_DESKTOP_API __declspec(dllimport)
-#endif
-#else
-#define MG_DESKTOP_API
-#endif
-
-#if !defined(DWFTK_USE_DWFCORE_ZLIB)
-    #define DWFTK_USE_DWFCORE_ZLIB
-#endif
-#pragma warning( disable : 4290 )
-
-#include "System/ClassId.h"
-#include "System/ConfigProperties.h"
-#include "System/PlatformInit.h"
-#include "System/ExceptionCodes.h"
-
-#include "MapLayer/Layer.h"
-#include "MapLayer/Map.h"
-#include "MapLayer/Selection.h"
-
-#include "Services/DataReader.h"
-#include "Services/DrawingService.h"
-#include "Services/FeatureReader.h"
-#include "Services/ScrollableFeatureReader.h"
-#include "Services/FeatureService.h"
-#include "Services/ImageFormats.h"
-#include "Services/MappingService.h"
-#include "Services/ProfilingService.h"
-#include "Services/RenderingService.h"
-#include "Services/ResourceService.h"
-#include "Services/ServiceFactory.h"
-#include "Services/SqlReader.h"
-#include "Services/TileService.h"
-#include "Services/Transaction.h"
-
-#include "Services/Feature/RdbmsFeatureSourceParams.h"
-
-#include "Services/Rendering/CustomLogoInfo.h"
-#include "Services/Rendering/CustomTextInfo.h"
-#include "Services/Rendering/DwfVersion.h"
-#include "Services/Rendering/FeatureInformation.h"
-#include "Services/Rendering/Layout.h"
-#include "Services/Rendering/MapPlot.h"
-#include "Services/Rendering/MapPlotCollection.h"
-#include "Services/Rendering/MapPlotInstruction.h"
-#include "Services/Rendering/PlotSpecification.h"
-#include "Services/Rendering/PrintLayout.h"
-#include "Services/Rendering/RenderingOptions.h"
-#include "Services/Rendering/UnitType.h"
-
-#include "Services/Resource/UnmanagedDataType.h"
-
-#define NOT_IMPLEMENTED(method) \
-    throw new MgException(MgExceptionCodes::MgNotImplementedException, method, __LINE__, __WFILE__, NULL, L"", NULL)
-
-//Uncomment to debug memory leaks. This is the header for Visual Leak Detector
-//See: http://vld.codeplex.com for download and setup
-/*
-#ifdef _WIN32
-#ifdef _DEBUG
-#define USING_VLD
-#include <vld.h>
-#endif
-#endif
-*/
-
-//Uncomment to get extra FDO join chatter when running unit tests
-//#define DEBUG_FDOJOIN
-//Uncomment to get extra connection pool chatter
-//#define DEBUG_FDO_CONNECTION_POOL
-
-#endif
\ No newline at end of file

Deleted: sandbox/jng/vanilla_swig/Portable/MgPortable/MgDesktop.vcxproj
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/MgDesktop.vcxproj	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/MgDesktop.vcxproj	2020-11-28 13:10:51 UTC (rev 9813)
@@ -1,1037 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{CBC0339F-E68B-48BA-9059-945483BEBDCA}</ProjectGuid>
-    <RootNamespace>MgDesktop</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 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">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <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|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" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\release\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\release64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;DESKTOP_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;FDOSpatial.lib;ExpressionEngine.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;MgGwsCommond.lib;MgGwsQueryEngined.lib;xerces-c_3mgD.lib;dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;MgSecurityd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ShowProgress>NotSet</ShowProgress>
-      <OutputFile>$(OutDir)MgDesktopd.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\FDO\Lib;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)\vc10.0;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);..\..\Common\lib\$(Configuration);..\..\Server\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;FDOSpatial.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>
-      </OptimizeReferences>
-      <EnableCOMDATFolding>
-      </EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>..\lib\debug\MgDesktopd.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)Resources
-xcopy /S /Y /I ..\..\Common\Schema\*.xsd $(OutDir)Schema
-xcopy /Y $(ProjectDir)Platform.ini $(OutDir)
-</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DESKTOP_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;FDOSpatial.lib;ExpressionEngine.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;MgGwsCommon.lib;MgGwsQueryEngine.lib;xerces-c_3mg.lib;dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;MgSecurity.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\FDO\Lib;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)\vc10.0;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);..\..\Common\lib\$(Configuration);..\..\Server\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <DelayLoadDLLs>MgMdfParser.dll;MgGeometry.dll;MgGwsCommon.dll;MgGwsResource.dll;FDO.dll;FDOCommon.dll;FDOSpatial.dll;MgStylization.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>..\lib\release\MgDesktop.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)Resources
-xcopy /S /Y /I ..\..\Common\Schema\*.xsd $(OutDir)Schema
-xcopy /Y $(ProjectDir)Platform.ini $(OutDir)
-</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;DESKTOP_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;FDOSpatial.lib;ExpressionEngine.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;MgGwsCommond.lib;MgGwsQueryEngined.lib;xerces-c_3mgD.lib;dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;MgSecurityd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ShowProgress>NotSet</ShowProgress>
-      <OutputFile>$(OutDir)MgDesktopd.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\FDO\Lib64;..\..\Oem\DWFTK\develop\global\lib\x64\static\$(Configuration)\vc10.0;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;..\..\Common\lib\$(Configuration)64;..\..\Server\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;FDOSpatial.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>
-      </OptimizeReferences>
-      <EnableCOMDATFolding>
-      </EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>..\lib\debug64\MgDesktopd.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)Resources
-xcopy /S /Y /I ..\..\Common\Schema\*.xsd $(OutDir)Schema
-xcopy /Y $(ProjectDir)Platform.ini $(OutDir)
-</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DESKTOP_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;FDOSpatial.lib;ExpressionEngine.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;MgGwsCommon.lib;MgGwsQueryEngine.lib;xerces-c_3mg.lib;dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;MgSecurity.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\FDO\Lib64;..\..\Oem\DWFTK\develop\global\lib\x64\static\$(Configuration)\vc10.0;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;..\..\Common\lib\$(Configuration)64;..\..\Server\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <DelayLoadDLLs>MgMdfParser.dll;MgGeometry.dll;MgGwsCommon.dll;MgGwsResource.dll;FDO.dll;FDOCommon.dll;FDOSpatial.dll;MgStylization.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>..\lib\release64\MgDesktop.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)Resources
-xcopy /S /Y /I ..\..\Common\Schema\*.xsd $(OutDir)Schema
-xcopy /Y $(ProjectDir)Platform.ini $(OutDir)
-</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="Log\LogDetail.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Log\LogEntryData.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Log\LogManager.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Log\LogThread.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\ApplySchema.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\CreateFeatureSource.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\DeleteCommand.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\DescribeSchema.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\EnumerateDataStores.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\ExtendedSelectCommand.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\FeatureManipulationCommand.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\FeatureServiceCommand.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\GetConnectionPropertyValues.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\GetFeatureProviders.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\GetLongTransactions.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\GetProviderCapabilities.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\GetSchemaMapping.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\GetSpatialContexts.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\InsertCommand.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\SelectAggregateCommand.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\SelectCommand.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\SelectFeatures.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\SqlCommand.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\UpdateCommand.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\UpdateFeatures.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FdoFeatureReader.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FdoFilterCollection.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FdoReaderCollection.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureDistribution.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureGeometricFunctions.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureNumericFunctions.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureSetReader.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureStringFunctions.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\ProxyDataReader.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\MappingService.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\ProfilingService.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\FeatureInformation.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\ByteSourceDwfInputStreamImpl.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\ByteSourceRasterStreamImpl.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\ResourceContentCache.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="System\ConfigProperties.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\CustomLogoInfo.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\CustomTextInfo.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\DataReader.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\DrawingService.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Drawing\DrawingServiceUtil.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\DwfVersion.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FdoConnectionPool.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FdoConnectionUtil.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FdoForcedOneToOneFeatureReader.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureClassCacheItem.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureConnection.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\FeatureInfoRenderer.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\FeatureReader.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureSchemaCacheItem.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\FeatureService.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureServiceCache.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureServiceCacheEntry.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureSourceCacheItem.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureUtil.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\GwsConnectionPool.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\GwsFeatureReader.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\ImageFormats.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\JoinFeatureReader.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="MapLayer\Layer.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\Layout.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\LegendPlotUtil.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="MapLayer\Map.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\MappingUtil.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\MapPlot.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\MapPlotCollection.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\MgCSTrans.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="MgDesktopBuild.cpp" />
-    <ClCompile Include="Services\Resource\OperationInfo.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\OperationParameter.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="System\ExceptionCodes.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="System\PlatformInit.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\PlotSpecification.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\PrintLayout.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\ProjectedFeatureReader.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\RasterHelper.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\RdbmsFeatureSourceParams.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\RenderingOptions.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\RenderingService.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\ResourceDefs.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\ResourcePackageHandler.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\ResourcePackageLoader.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\ResourcePackageManifestHandler.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\ResourcePackageManifestParser.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\ResourceService.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\RSMgFeatureReader.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\RSMgRaster.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\RSMgSymbolManager.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\ScrollableFeatureReader.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="MapLayer\Selection.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Stylization\SEMgSymbolManager.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\ServiceFactory.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\SpatialContextCacheItem.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\SqlReader.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Tile\TileCache.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Tile\TileDefs.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\TileService.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Transaction.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\TransformCache.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\UnitType.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\UnmanagedDataManager.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\UnmanagedDataType.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\ZipFileHandler.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\ZipFileReader.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="System\ThreadBase.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="System\TimerUtil.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Log\LogDetail.h" />
-    <ClInclude Include="Log\LogEntryData.h" />
-    <ClInclude Include="Log\LogManager.h" />
-    <ClInclude Include="Log\LogThread.h" />
-    <ClInclude Include="Log\LogType.h" />
-    <ClInclude Include="ExceptionCodes.h" />
-    <ClInclude Include="Services\CryptoDefs.h" />
-    <ClInclude Include="Services\Feature\BooleanDataReaderCreator.h" />
-    <ClInclude Include="Services\Feature\ByteDataReaderCreator.h" />
-    <ClInclude Include="Services\Feature\Commands\ApplySchema.h" />
-    <ClInclude Include="Services\Feature\Commands\CreateFeatureSource.h" />
-    <ClInclude Include="Services\Feature\Commands\DeleteCommand.h" />
-    <ClInclude Include="Services\Feature\Commands\DescribeSchema.h" />
-    <ClInclude Include="Services\Feature\Commands\EnumerateDataStores.h" />
-    <ClInclude Include="Services\Feature\Commands\ExtendedSelectCommand.h" />
-    <ClInclude Include="Services\Feature\Commands\FeatureManipulationCommand.h" />
-    <ClInclude Include="Services\Feature\Commands\FeatureServiceCommand.h" />
-    <ClInclude Include="Services\Feature\Commands\GetConnectionPropertyValues.h" />
-    <ClInclude Include="Services\Feature\Commands\GetFeatureProviders.h" />
-    <ClInclude Include="Services\Feature\Commands\GetLongTransactions.h" />
-    <ClInclude Include="Services\Feature\Commands\GetProviderCapabilities.h" />
-    <ClInclude Include="Services\Feature\Commands\GetSchemaMapping.h" />
-    <ClInclude Include="Services\Feature\Commands\GetSpatialContexts.h" />
-    <ClInclude Include="Services\Feature\Commands\InsertCommand.h" />
-    <ClInclude Include="Services\Feature\Commands\SelectAggregateCommand.h" />
-    <ClInclude Include="Services\Feature\Commands\SelectCommand.h" />
-    <ClInclude Include="Services\Feature\Commands\SelectFeatures.h" />
-    <ClInclude Include="Services\Feature\Commands\SqlCommand.h" />
-    <ClInclude Include="Services\Feature\Commands\UpdateCommand.h" />
-    <ClInclude Include="Services\Feature\Commands\UpdateFeatures.h" />
-    <ClInclude Include="Services\Feature\DataReaderCreator.h" />
-    <ClInclude Include="Services\Feature\DateTimeDataReaderCreator.h" />
-    <ClInclude Include="Services\Feature\DoubleDataReaderCreator.h" />
-    <ClInclude Include="Services\Feature\FdoFeatureReader.h" />
-    <ClInclude Include="Services\Feature\FdoFilterCollection.h" />
-    <ClInclude Include="Services\Feature\FdoReaderCollection.h" />
-    <ClInclude Include="Services\Feature\FeatureDistribution.h" />
-    <ClInclude Include="Services\Feature\FeatureGeometricFunctions.h" />
-    <ClInclude Include="Services\Feature\FeatureNumericFunctions.h" />
-    <ClInclude Include="Services\Feature\FeatureSetReader.h" />
-    <ClInclude Include="Services\Feature\FeatureStringFunctions.h" />
-    <ClInclude Include="Services\Feature\GeometryDataReaderCreator.h" />
-    <ClInclude Include="Services\Feature\Int16DataReaderCreator.h" />
-    <ClInclude Include="Services\Feature\Int32DataReaderCreator.h" />
-    <ClInclude Include="Services\Feature\Int64DataReaderCreator.h" />
-    <ClInclude Include="Services\Feature\Matrix.h" />
-    <ClInclude Include="Services\Feature\ProxyDataReader.h" />
-    <ClInclude Include="Services\Feature\SingleDataReaderCreator.h" />
-    <ClInclude Include="Services\Feature\StringDataReaderCreator.h" />
-    <ClInclude Include="Services\Feature\UniqueFunction.h" />
-    <ClInclude Include="Services\MappingService.h" />
-    <ClInclude Include="Services\ProfilingService.h" />
-    <ClInclude Include="Services\Rendering\FeatureInformation.h" />
-    <ClInclude Include="Services\Resource\ByteSourceDwfInputStreamImpl.h" />
-    <ClInclude Include="Services\ByteSourceRasterStreamImpl.h" />
-    <ClInclude Include="Services\Resource\ResourceContentCache.h" />
-    <ClInclude Include="System\ClassId.h" />
-    <ClInclude Include="System\ConfigProperties.h" />
-    <ClInclude Include="Services\Rendering\CustomLogoInfo.h" />
-    <ClInclude Include="Services\Rendering\CustomTextInfo.h" />
-    <ClInclude Include="Services\DataReader.h" />
-    <ClInclude Include="Services\Drawing\DrawingDefs.h" />
-    <ClInclude Include="Services\DrawingService.h" />
-    <ClInclude Include="Services\Drawing\DrawingServiceUtil.h" />
-    <ClInclude Include="Exception\DwfException.h" />
-    <ClInclude Include="Services\Rendering\DwfVersion.h" />
-    <ClInclude Include="Services\Feature\FdoConnectionPool.h" />
-    <ClInclude Include="Services\Feature\FdoConnectionUtil.h" />
-    <ClInclude Include="Services\Feature\FdoForcedOneToOneFeatureReader.h" />
-    <ClInclude Include="Services\Feature\FeatureClassCacheItem.h" />
-    <ClInclude Include="Services\Feature\FeatureConnection.h" />
-    <ClInclude Include="Services\Feature\FeatureDefs.h" />
-    <ClInclude Include="Services\Rendering\FeatureInfoRenderer.h" />
-    <ClInclude Include="Services\FeatureReader.h" />
-    <ClInclude Include="Services\Feature\FeatureSchemaCacheItem.h" />
-    <ClInclude Include="Services\FeatureService.h" />
-    <ClInclude Include="Services\Feature\FeatureServiceCache.h" />
-    <ClInclude Include="Services\Feature\FeatureServiceCacheEntry.h" />
-    <ClInclude Include="Services\Feature\FeatureSourceCacheItem.h" />
-    <ClInclude Include="Services\Feature\FeatureUtil.h" />
-    <ClInclude Include="Services\Feature\GwsConnectionPool.h" />
-    <ClInclude Include="Services\Feature\GwsFeatureReader.h" />
-    <ClInclude Include="Services\Rendering\icons.h" />
-    <ClInclude Include="Services\ImageFormats.h" />
-    <ClInclude Include="Services\Feature\JoinFeatureReader.h" />
-    <ClInclude Include="MapLayer\Layer.h" />
-    <ClInclude Include="Services\Rendering\Layout.h" />
-    <ClInclude Include="Services\Rendering\LegendPlotUtil.h" />
-    <ClInclude Include="MapLayer\Map.h" />
-    <ClInclude Include="Services\Rendering\MappingDefs.h" />
-    <ClInclude Include="Services\Rendering\MappingUtil.h" />
-    <ClInclude Include="Services\Rendering\MapPlot.h" />
-    <ClInclude Include="Services\Rendering\MapPlotCollection.h" />
-    <ClInclude Include="Services\Rendering\MapPlotInstruction.h" />
-    <ClInclude Include="Services\Feature\MgCSTrans.h" />
-    <ClInclude Include="MgDesktop.h" />
-    <ClInclude Include="System\ExceptionCodes.h" />
-    <ClInclude Include="System\Mutex.h" />
-    <ClInclude Include="Services\Resource\OperationInfo.h" />
-    <ClInclude Include="Services\Resource\OperationParameter.h" />
-    <ClInclude Include="Exception\ParameterNotFoundException.h" />
-    <ClInclude Include="System\PlatformInit.h" />
-    <ClInclude Include="Services\Rendering\PlotSpecification.h" />
-    <ClInclude Include="Services\Rendering\PrintLayout.h" />
-    <ClInclude Include="Services\Feature\ProjectedFeatureReader.h" />
-    <ClInclude Include="Services\Feature\RasterHelper.h" />
-    <ClInclude Include="Services\Feature\RdbmsFeatureSourceParams.h" />
-    <ClInclude Include="Services\Rendering\RenderingOptions.h" />
-    <ClInclude Include="Services\RenderingService.h" />
-    <ClInclude Include="Services\Resource\ResourceDefs.h" />
-    <ClInclude Include="Services\Resource\ResourcePackageHandler.h" />
-    <ClInclude Include="Services\Resource\ResourcePackageLoader.h" />
-    <ClInclude Include="Services\Resource\ResourcePackageManifestHandler.h" />
-    <ClInclude Include="Services\Resource\ResourcePackageManifestParser.h" />
-    <ClInclude Include="Services\ResourceService.h" />
-    <ClInclude Include="Services\Rendering\RSMgFeatureReader.h" />
-    <ClInclude Include="Services\Rendering\RSMgInputStream.h" />
-    <ClInclude Include="Services\Rendering\RSMgRaster.h" />
-    <ClInclude Include="Services\Rendering\RSMgSymbolManager.h" />
-    <ClInclude Include="Services\ScrollableFeatureReader.h" />
-    <ClInclude Include="MapLayer\Selection.h" />
-    <ClInclude Include="Services\Stylization\SEMgSymbolManager.h" />
-    <ClInclude Include="Services\ServiceFactory.h" />
-    <ClInclude Include="Services\Feature\SpatialContextCacheItem.h" />
-    <ClInclude Include="Services\SqlReader.h" />
-    <ClInclude Include="Exception\StylizeLayerFailedException.h" />
-    <ClInclude Include="Services\Tile\TileCache.h" />
-    <ClInclude Include="Services\Tile\TileDefs.h" />
-    <ClInclude Include="Services\TileService.h" />
-    <ClInclude Include="Services\Transaction.h" />
-    <ClInclude Include="Services\Feature\TransformCache.h" />
-    <ClInclude Include="Services\Rendering\UnitType.h" />
-    <ClInclude Include="Services\Resource\UnmanagedDataManager.h" />
-    <ClInclude Include="Services\Resource\UnmanagedDataType.h" />
-    <ClInclude Include="Services\Resource\ZipFileHandler.h" />
-    <ClInclude Include="Services\Resource\ZipFileReader.h" />
-    <ClInclude Include="System\ThreadBase.h" />
-    <ClInclude Include="System\TimerUtil.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Platform.ini" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

Deleted: sandbox/jng/vanilla_swig/Portable/MgPortable/MgDesktop.vcxproj.filters
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/MgDesktop.vcxproj.filters	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/MgDesktop.vcxproj.filters	2020-11-28 13:10:51 UTC (rev 9813)
@@ -1,771 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Services\Resource\ByteSourceDwfInputStreamImpl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\ByteSourceRasterStreamImpl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="System\ConfigProperties.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\CustomLogoInfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\CustomTextInfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\DataReader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\DrawingService.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Drawing\DrawingServiceUtil.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\DwfVersion.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FdoConnectionPool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FdoConnectionUtil.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FdoForcedOneToOneFeatureReader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureClassCacheItem.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureConnection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\FeatureInfoRenderer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\FeatureReader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureSchemaCacheItem.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\FeatureService.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureServiceCache.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureServiceCacheEntry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureSourceCacheItem.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureUtil.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\GwsConnectionPool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\GwsFeatureReader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\ImageFormats.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\JoinFeatureReader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MapLayer\Layer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\Layout.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\LegendPlotUtil.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MapLayer\Map.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\MappingUtil.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\MapPlot.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\MapPlotCollection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\MgCSTrans.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MgDesktopBuild.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\OperationInfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\OperationParameter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="System\PlatformInit.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\PlotSpecification.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\PrintLayout.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\ProjectedFeatureReader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\RasterHelper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\RdbmsFeatureSourceParams.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\RenderingOptions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\RenderingService.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\ResourceDefs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\ResourcePackageHandler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\ResourcePackageLoader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\ResourcePackageManifestHandler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\ResourcePackageManifestParser.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\ResourceService.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\RSMgFeatureReader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\RSMgRaster.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\RSMgSymbolManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\ScrollableFeatureReader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MapLayer\Selection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Stylization\SEMgSymbolManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\ServiceFactory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\SpatialContextCacheItem.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\SqlReader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Tile\TileCache.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Tile\TileDefs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\TileService.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Transaction.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\TransformCache.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\UnitType.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\UnmanagedDataManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\UnmanagedDataType.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\ZipFileHandler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\ZipFileReader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\ProfilingService.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="System\TimerUtil.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureDistribution.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureGeometricFunctions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureNumericFunctions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureStringFunctions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\ProxyDataReader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Log\LogDetail.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Log\LogEntryData.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Log\LogManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Log\LogThread.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="System\ThreadBase.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\MappingService.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Rendering\FeatureInformation.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\ApplySchema.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\CreateFeatureSource.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\DeleteCommand.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\DescribeSchema.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\EnumerateDataStores.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\ExtendedSelectCommand.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\FeatureManipulationCommand.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\FeatureServiceCommand.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\GetConnectionPropertyValues.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\GetFeatureProviders.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\GetLongTransactions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\GetProviderCapabilities.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\GetSchemaMapping.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\GetSpatialContexts.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\InsertCommand.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\SelectAggregateCommand.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\SelectCommand.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\SelectFeatures.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\SqlCommand.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\UpdateCommand.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\Commands\UpdateFeatures.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FdoFeatureReader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FdoFilterCollection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FdoReaderCollection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Feature\FeatureSetReader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Services\Resource\ResourceContentCache.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="System\ExceptionCodes.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Services\Resource\ByteSourceDwfInputStreamImpl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\ByteSourceRasterStreamImpl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="System\ClassId.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="System\ConfigProperties.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Rendering\CustomLogoInfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Rendering\CustomTextInfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\DataReader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Drawing\DrawingDefs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\DrawingService.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Drawing\DrawingServiceUtil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Exception\DwfException.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Rendering\DwfVersion.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\FdoConnectionPool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\FdoConnectionUtil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\FdoForcedOneToOneFeatureReader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\FeatureClassCacheItem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\FeatureConnection.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\FeatureDefs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Rendering\FeatureInfoRenderer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\FeatureReader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\FeatureSchemaCacheItem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\FeatureService.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\FeatureServiceCache.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\FeatureServiceCacheEntry.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\FeatureSourceCacheItem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\FeatureUtil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\GwsConnectionPool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\GwsFeatureReader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Rendering\icons.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\ImageFormats.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\JoinFeatureReader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MapLayer\Layer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Rendering\Layout.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Rendering\LegendPlotUtil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MapLayer\Map.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Rendering\MappingDefs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Rendering\MappingUtil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Rendering\MapPlot.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Rendering\MapPlotCollection.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Rendering\MapPlotInstruction.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\MgCSTrans.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MgDesktop.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="System\Mutex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Resource\OperationInfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Resource\OperationParameter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Exception\ParameterNotFoundException.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="System\PlatformInit.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Rendering\PlotSpecification.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Rendering\PrintLayout.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\ProjectedFeatureReader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\RasterHelper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\RdbmsFeatureSourceParams.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Rendering\RenderingOptions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\RenderingService.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Resource\ResourceDefs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Resource\ResourcePackageHandler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Resource\ResourcePackageLoader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Resource\ResourcePackageManifestHandler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Resource\ResourcePackageManifestParser.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\ResourceService.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Rendering\RSMgFeatureReader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Rendering\RSMgInputStream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Rendering\RSMgRaster.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Rendering\RSMgSymbolManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\ScrollableFeatureReader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MapLayer\Selection.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Stylization\SEMgSymbolManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\ServiceFactory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\SpatialContextCacheItem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\SqlReader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Exception\StylizeLayerFailedException.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Tile\TileCache.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Tile\TileDefs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\TileService.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Transaction.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\TransformCache.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Rendering\UnitType.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Resource\UnmanagedDataManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Resource\UnmanagedDataType.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Resource\ZipFileHandler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Resource\ZipFileReader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\ProfilingService.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="System\TimerUtil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\BooleanDataReaderCreator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\ByteDataReaderCreator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\DataReaderCreator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\DateTimeDataReaderCreator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\DoubleDataReaderCreator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\FeatureDistribution.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\FeatureGeometricFunctions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\FeatureNumericFunctions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\FeatureStringFunctions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\GeometryDataReaderCreator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Int16DataReaderCreator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Int32DataReaderCreator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Int64DataReaderCreator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\UniqueFunction.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\StringDataReaderCreator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\SingleDataReaderCreator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\ProxyDataReader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Matrix.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Log\LogType.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Log\LogDetail.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Log\LogEntryData.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Log\LogManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Log\LogThread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="System\ThreadBase.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\MappingService.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Rendering\FeatureInformation.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Commands\UpdateFeatures.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Commands\ApplySchema.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Commands\CreateFeatureSource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Commands\DeleteCommand.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Commands\DescribeSchema.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Commands\EnumerateDataStores.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Commands\ExtendedSelectCommand.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Commands\FeatureManipulationCommand.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Commands\FeatureServiceCommand.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Commands\GetConnectionPropertyValues.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Commands\GetFeatureProviders.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Commands\GetLongTransactions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Commands\GetProviderCapabilities.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Commands\GetSchemaMapping.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Commands\GetSpatialContexts.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Commands\InsertCommand.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Commands\SelectAggregateCommand.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Commands\SelectCommand.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Commands\SelectFeatures.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Commands\SqlCommand.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\Commands\UpdateCommand.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\FdoFilterCollection.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\FdoFeatureReader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\FdoReaderCollection.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Feature\FeatureSetReader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\CryptoDefs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Services\Resource\ResourceContentCache.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ExceptionCodes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="System\ExceptionCodes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Platform.ini" />
-  </ItemGroup>
-</Project>
\ No newline at end of file

Deleted: sandbox/jng/vanilla_swig/Portable/MgPortable/MgDesktopBuild.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/MgDesktopBuild.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/MgDesktopBuild.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -1,136 +0,0 @@
-//
-//  Copyright (C) 2004-2011 by Autodesk, Inc.
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of version 2.1 of the GNU Lesser
-//  General Public License as published by the Free Software Foundation.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-//
-
-#include "System/ConfigProperties.cpp"
-#include "System/ExceptionCodes.cpp"
-#include "System/PlatformInit.cpp"
-#include "System/TimerUtil.cpp"
-#include "System/ThreadBase.cpp"
-
-#include "Log/LogDetail.cpp"
-#include "Log/LogEntryData.cpp"
-#include "Log/LogManager.cpp"
-#include "Log/LogThread.cpp"
-
-#include "MapLayer/Layer.cpp"
-#include "MapLayer/Map.cpp"
-#include "MapLayer/Selection.cpp"
-
-#include "Services/ByteSourceRasterStreamImpl.cpp"
-#include "Services/DataReader.cpp"
-#include "Services/DrawingService.cpp"
-#include "Services/FeatureReader.cpp"
-#include "Services/FeatureService.cpp"
-#include "Services/ImageFormats.cpp"
-#include "Services/MappingService.cpp"
-#include "Services/ProfilingService.cpp"
-#include "Services/RenderingService.cpp"
-#include "Services/ResourceService.cpp"
-#include "Services/ScrollableFeatureReader.cpp"
-#include "Services/ServiceFactory.cpp"
-#include "Services/SqlReader.cpp"
-#include "Services/TileService.cpp"
-#include "Services/Transaction.cpp"
-
-#include "Services/Drawing/DrawingServiceUtil.cpp"
-
-#include "Services/Feature/FdoConnectionPool.cpp"
-#include "Services/Feature/FdoConnectionUtil.cpp"
-#include "Services/Feature/FdoFeatureReader.cpp"
-#include "Services/Feature/FdoFilterCollection.cpp"
-#include "Services/Feature/FdoForcedOneToOneFeatureReader.cpp"
-#include "Services/Feature/FdoReaderCollection.cpp"
-#include "Services/Feature/FeatureClassCacheItem.cpp"
-#include "Services/Feature/FeatureConnection.cpp"
-#include "Services/Feature/FeatureDistribution.cpp"
-#include "Services/Feature/FeatureGeometricFunctions.cpp"
-#include "Services/Feature/FeatureNumericFunctions.cpp"
-#include "Services/Feature/FeatureSchemaCacheItem.cpp"
-#include "Services/Feature/FeatureServiceCacheEntry.cpp"
-#include "Services/Feature/FeatureServiceCache.cpp"
-#include "Services/Feature/FeatureSetReader.cpp"
-#include "Services/Feature/FeatureSourceCacheItem.cpp"
-#include "Services/Feature/FeatureStringFunctions.cpp"
-#include "Services/Feature/FeatureUtil.cpp"
-#include "Services/Feature/GwsConnectionPool.cpp"
-#include "Services/Feature/GwsFeatureReader.cpp"
-#include "Services/Feature/JoinFeatureReader.cpp"
-#include "Services/Feature/MgCSTrans.cpp"
-#include "Services/Feature/ProjectedFeatureReader.cpp"
-#include "Services/Feature/ProxyDataReader.cpp"
-#include "Services/Feature/RasterHelper.cpp"
-#include "Services/Feature/RdbmsFeatureSourceParams.cpp"
-#include "Services/Feature/SpatialContextCacheItem.cpp"
-#include "Services/Feature/TransformCache.cpp"
-#include "Services/Feature/Commands/ApplySchema.cpp"
-#include "Services/Feature/Commands/CreateFeatureSource.cpp"
-#include "Services/Feature/Commands/DeleteCommand.cpp"
-#include "Services/Feature/Commands/DescribeSchema.cpp"
-#include "Services/Feature/Commands/EnumerateDataStores.cpp"
-#include "Services/Feature/Commands/ExtendedSelectCommand.cpp"
-#include "Services/Feature/Commands/FeatureManipulationCommand.cpp"
-#include "Services/Feature/Commands/FeatureServiceCommand.cpp"
-#include "Services/Feature/Commands/GetConnectionPropertyValues.cpp"
-#include "Services/Feature/Commands/GetFeatureProviders.cpp"
-#include "Services/Feature/Commands/GetLongTransactions.cpp"
-#include "Services/Feature/Commands/GetProviderCapabilities.cpp"
-#include "Services/Feature/Commands/GetSchemaMapping.cpp"
-#include "Services/Feature/Commands/GetSpatialContexts.cpp"
-#include "Services/Feature/Commands/InsertCommand.cpp"
-#include "Services/Feature/Commands/SelectAggregateCommand.cpp"
-#include "Services/Feature/Commands/SelectCommand.cpp"
-#include "Services/Feature/Commands/SelectFeatures.cpp"
-#include "Services/Feature/Commands/SqlCommand.cpp"
-#include "Services/Feature/Commands/UpdateCommand.cpp"
-#include "Services/Feature/Commands/UpdateFeatures.cpp"
-
-#include "Services/Rendering/CustomLogoInfo.cpp"
-#include "Services/Rendering/CustomTextInfo.cpp"
-#include "Services/Rendering/DwfVersion.cpp"
-#include "Services/Rendering/FeatureInfoRenderer.cpp"
-#include "Services/Rendering/FeatureInformation.cpp"
-#include "Services/Rendering/Layout.cpp"
-#include "Services/Rendering/LegendPlotUtil.cpp"
-#include "Services/Rendering/MappingUtil.cpp"
-#include "Services/Rendering/MapPlot.cpp"
-#include "Services/Rendering/MapPlotCollection.cpp"
-#include "Services/Rendering/PrintLayout.cpp"
-#include "Services/Rendering/PlotSpecification.cpp"
-#include "Services/Rendering/RenderingOptions.cpp"
-#include "Services/Rendering/RSMgFeatureReader.cpp"
-#include "Services/Rendering/RSMgRaster.cpp"
-#include "Services/Rendering/RSMgSymbolManager.cpp"
-#include "Services/Rendering/UnitType.cpp"
-
-#include "Services/Resource/ByteSourceDwfInputStreamImpl.cpp"
-#include "Services/Resource/OperationInfo.cpp"
-#include "Services/Resource/OperationParameter.cpp"
-#include "Services/Resource/ResourceContentCache.cpp"
-#include "Services/Resource/ResourceDefs.cpp"
-#include "Services/Resource/ResourcePackageHandler.cpp"
-#include "Services/Resource/ResourcePackageLoader.cpp"
-#include "Services/Resource/ResourcePackageManifestHandler.cpp"
-#include "Services/Resource/ResourcePackageManifestParser.cpp"
-#include "Services/Resource/UnmanagedDataManager.cpp"
-#include "Services/Resource/UnmanagedDataType.cpp"
-#include "Services/Resource/ZipFileHandler.cpp"
-#include "Services/Resource/ZipFileReader.cpp"
-
-#include "Services/Stylization/SEMgSymbolManager.cpp"
-
-#include "Services/Tile/TileDefs.cpp"
-#include "Services/Tile/TileCache.cpp"
\ No newline at end of file

Copied: sandbox/jng/vanilla_swig/Portable/MgPortable/MgPortable.h (from rev 9812, sandbox/jng/vanilla_swig/Portable/MgDesktop/MgDesktop.h)
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgPortable/MgPortable.h	                        (rev 0)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/MgPortable.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -0,0 +1,99 @@
+//
+//  Copyright (C) 2004-2011 by Autodesk, Inc.
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of version 2.1 of the GNU Lesser
+//  General Public License as published by the Free Software Foundation.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+#ifndef MgPortable_H
+#define MgPortable_H
+
+#include "Foundation.h"
+#include "PlatformBase.h"
+
+#ifdef _WIN32
+#ifdef DESKTOP_EXPORTS
+#    define MG_DESKTOP_API __declspec(dllexport)
+#else
+#    define MG_DESKTOP_API __declspec(dllimport)
+#endif
+#else
+#define MG_DESKTOP_API
+#endif
+
+#if !defined(DWFTK_USE_DWFCORE_ZLIB)
+    #define DWFTK_USE_DWFCORE_ZLIB
+#endif
+#pragma warning( disable : 4290 )
+
+#include "System/ClassId.h"
+#include "System/ConfigProperties.h"
+#include "System/PlatformInit.h"
+#include "System/ExceptionCodes.h"
+
+#include "MapLayer/Layer.h"
+#include "MapLayer/Map.h"
+#include "MapLayer/Selection.h"
+
+#include "Services/DataReader.h"
+#include "Services/DrawingService.h"
+#include "Services/FeatureReader.h"
+#include "Services/ScrollableFeatureReader.h"
+#include "Services/FeatureService.h"
+#include "Services/ImageFormats.h"
+#include "Services/MappingService.h"
+#include "Services/ProfilingService.h"
+#include "Services/RenderingService.h"
+#include "Services/ResourceService.h"
+#include "Services/ServiceFactory.h"
+#include "Services/SqlReader.h"
+#include "Services/TileService.h"
+#include "Services/Transaction.h"
+
+#include "Services/Feature/RdbmsFeatureSourceParams.h"
+
+#include "Services/Rendering/CustomLogoInfo.h"
+#include "Services/Rendering/CustomTextInfo.h"
+#include "Services/Rendering/DwfVersion.h"
+#include "Services/Rendering/FeatureInformation.h"
+#include "Services/Rendering/Layout.h"
+#include "Services/Rendering/MapPlot.h"
+#include "Services/Rendering/MapPlotCollection.h"
+#include "Services/Rendering/MapPlotInstruction.h"
+#include "Services/Rendering/PlotSpecification.h"
+#include "Services/Rendering/PrintLayout.h"
+#include "Services/Rendering/RenderingOptions.h"
+#include "Services/Rendering/UnitType.h"
+
+#include "Services/Resource/UnmanagedDataType.h"
+
+#define NOT_IMPLEMENTED(method) \
+    throw new MgException(MgExceptionCodes::MgNotImplementedException, method, __LINE__, __WFILE__, NULL, L"", NULL)
+
+//Uncomment to debug memory leaks. This is the header for Visual Leak Detector
+//See: http://vld.codeplex.com for download and setup
+/*
+#ifdef _WIN32
+#ifdef _DEBUG
+#define USING_VLD
+#include <vld.h>
+#endif
+#endif
+*/
+
+//Uncomment to get extra FDO join chatter when running unit tests
+//#define DEBUG_FDOJOIN
+//Uncomment to get extra connection pool chatter
+//#define DEBUG_FDO_CONNECTION_POOL
+
+#endif
\ No newline at end of file

Copied: sandbox/jng/vanilla_swig/Portable/MgPortable/MgPortable.vcxproj (from rev 9812, sandbox/jng/vanilla_swig/Portable/MgDesktop/MgDesktop.vcxproj)
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgPortable/MgPortable.vcxproj	                        (rev 0)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/MgPortable.vcxproj	2020-11-28 13:10:51 UTC (rev 9813)
@@ -0,0 +1,1037 @@
+<?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">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{CBC0339F-E68B-48BA-9059-945483BEBDCA}</ProjectGuid>
+    <RootNamespace>MgPortable</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 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">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <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|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" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\debug\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\release\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\release64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;DESKTOP_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;FDOSpatial.lib;ExpressionEngine.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;MgGwsCommond.lib;MgGwsQueryEngined.lib;xerces-c_3mgD.lib;dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;MgSecurityd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ShowProgress>NotSet</ShowProgress>
+      <OutputFile>$(OutDir)MgPortabled.dll</OutputFile>
+      <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\FDO\Lib;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)\vc10.0;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);..\..\Common\lib\$(Configuration);..\..\Server\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;FDOSpatial.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>
+      </OptimizeReferences>
+      <EnableCOMDATFolding>
+      </EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>..\lib\debug\MgPortabled.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <PostBuildEvent>
+      <Command>xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)Resources
+xcopy /S /Y /I ..\..\Common\Schema\*.xsd $(OutDir)Schema
+xcopy /Y $(ProjectDir)Platform.ini $(OutDir)
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DESKTOP_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;FDOSpatial.lib;ExpressionEngine.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;MgGwsCommon.lib;MgGwsQueryEngine.lib;xerces-c_3mg.lib;dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;MgSecurity.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
+      <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\FDO\Lib;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)\vc10.0;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);..\..\Common\lib\$(Configuration);..\..\Server\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <DelayLoadDLLs>MgMdfParser.dll;MgGeometry.dll;MgGwsCommon.dll;MgGwsResource.dll;FDO.dll;FDOCommon.dll;FDOSpatial.dll;MgStylization.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\lib\release\MgPortable.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <PostBuildEvent>
+      <Command>xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)Resources
+xcopy /S /Y /I ..\..\Common\Schema\*.xsd $(OutDir)Schema
+xcopy /Y $(ProjectDir)Platform.ini $(OutDir)
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;DESKTOP_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;FDOSpatial.lib;ExpressionEngine.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;MgGwsCommond.lib;MgGwsQueryEngined.lib;xerces-c_3mgD.lib;dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;MgSecurityd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ShowProgress>NotSet</ShowProgress>
+      <OutputFile>$(OutDir)MgPortabled.dll</OutputFile>
+      <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\FDO\Lib64;..\..\Oem\DWFTK\develop\global\lib\x64\static\$(Configuration)\vc10.0;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;..\..\Common\lib\$(Configuration)64;..\..\Server\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;FDOSpatial.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>
+      </OptimizeReferences>
+      <EnableCOMDATFolding>
+      </EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>..\lib\debug64\MgPortabled.lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+    <PostBuildEvent>
+      <Command>xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)Resources
+xcopy /S /Y /I ..\..\Common\Schema\*.xsd $(OutDir)Schema
+xcopy /Y $(ProjectDir)Platform.ini $(OutDir)
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DESKTOP_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;FDOSpatial.lib;ExpressionEngine.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;MgGwsCommon.lib;MgGwsQueryEngine.lib;xerces-c_3mg.lib;dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;MgSecurity.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
+      <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\FDO\Lib64;..\..\Oem\DWFTK\develop\global\lib\x64\static\$(Configuration)\vc10.0;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;..\..\Common\lib\$(Configuration)64;..\..\Server\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <DelayLoadDLLs>MgMdfParser.dll;MgGeometry.dll;MgGwsCommon.dll;MgGwsResource.dll;FDO.dll;FDOCommon.dll;FDOSpatial.dll;MgStylization.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>..\lib\release64\MgPortable.lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+    <PostBuildEvent>
+      <Command>xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)Resources
+xcopy /S /Y /I ..\..\Common\Schema\*.xsd $(OutDir)Schema
+xcopy /Y $(ProjectDir)Platform.ini $(OutDir)
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="Log\LogDetail.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Log\LogEntryData.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Log\LogManager.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Log\LogThread.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\ApplySchema.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\CreateFeatureSource.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\DeleteCommand.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\DescribeSchema.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\EnumerateDataStores.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\ExtendedSelectCommand.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\FeatureManipulationCommand.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\FeatureServiceCommand.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\GetConnectionPropertyValues.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\GetFeatureProviders.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\GetLongTransactions.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\GetProviderCapabilities.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\GetSchemaMapping.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\GetSpatialContexts.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\InsertCommand.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\SelectAggregateCommand.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\SelectCommand.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\SelectFeatures.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\SqlCommand.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\UpdateCommand.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\UpdateFeatures.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FdoFeatureReader.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FdoFilterCollection.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FdoReaderCollection.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureDistribution.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureGeometricFunctions.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureNumericFunctions.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureSetReader.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureStringFunctions.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\ProxyDataReader.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\MappingService.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\ProfilingService.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\FeatureInformation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\ByteSourceDwfInputStreamImpl.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\ByteSourceRasterStreamImpl.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\ResourceContentCache.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="System\ConfigProperties.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\CustomLogoInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\CustomTextInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\DataReader.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\DrawingService.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Drawing\DrawingServiceUtil.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\DwfVersion.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FdoConnectionPool.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FdoConnectionUtil.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FdoForcedOneToOneFeatureReader.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureClassCacheItem.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureConnection.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\FeatureInfoRenderer.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\FeatureReader.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureSchemaCacheItem.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\FeatureService.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureServiceCache.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureServiceCacheEntry.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureSourceCacheItem.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureUtil.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\GwsConnectionPool.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\GwsFeatureReader.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\ImageFormats.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\JoinFeatureReader.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="MapLayer\Layer.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\Layout.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\LegendPlotUtil.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="MapLayer\Map.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\MappingUtil.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\MapPlot.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\MapPlotCollection.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\MgCSTrans.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="MgPortableBuild.cpp" />
+    <ClCompile Include="Services\Resource\OperationInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\OperationParameter.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="System\ExceptionCodes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="System\PlatformInit.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\PlotSpecification.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\PrintLayout.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\ProjectedFeatureReader.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\RasterHelper.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\RdbmsFeatureSourceParams.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\RenderingOptions.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\RenderingService.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\ResourceDefs.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\ResourcePackageHandler.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\ResourcePackageLoader.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\ResourcePackageManifestHandler.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\ResourcePackageManifestParser.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\ResourceService.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\RSMgFeatureReader.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\RSMgRaster.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\RSMgSymbolManager.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\ScrollableFeatureReader.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="MapLayer\Selection.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Stylization\SEMgSymbolManager.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\ServiceFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\SpatialContextCacheItem.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\SqlReader.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Tile\TileCache.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Tile\TileDefs.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\TileService.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Transaction.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\TransformCache.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\UnitType.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\UnmanagedDataManager.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\UnmanagedDataType.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\ZipFileHandler.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\ZipFileReader.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="System\ThreadBase.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="System\TimerUtil.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Log\LogDetail.h" />
+    <ClInclude Include="Log\LogEntryData.h" />
+    <ClInclude Include="Log\LogManager.h" />
+    <ClInclude Include="Log\LogThread.h" />
+    <ClInclude Include="Log\LogType.h" />
+    <ClInclude Include="ExceptionCodes.h" />
+    <ClInclude Include="Services\CryptoDefs.h" />
+    <ClInclude Include="Services\Feature\BooleanDataReaderCreator.h" />
+    <ClInclude Include="Services\Feature\ByteDataReaderCreator.h" />
+    <ClInclude Include="Services\Feature\Commands\ApplySchema.h" />
+    <ClInclude Include="Services\Feature\Commands\CreateFeatureSource.h" />
+    <ClInclude Include="Services\Feature\Commands\DeleteCommand.h" />
+    <ClInclude Include="Services\Feature\Commands\DescribeSchema.h" />
+    <ClInclude Include="Services\Feature\Commands\EnumerateDataStores.h" />
+    <ClInclude Include="Services\Feature\Commands\ExtendedSelectCommand.h" />
+    <ClInclude Include="Services\Feature\Commands\FeatureManipulationCommand.h" />
+    <ClInclude Include="Services\Feature\Commands\FeatureServiceCommand.h" />
+    <ClInclude Include="Services\Feature\Commands\GetConnectionPropertyValues.h" />
+    <ClInclude Include="Services\Feature\Commands\GetFeatureProviders.h" />
+    <ClInclude Include="Services\Feature\Commands\GetLongTransactions.h" />
+    <ClInclude Include="Services\Feature\Commands\GetProviderCapabilities.h" />
+    <ClInclude Include="Services\Feature\Commands\GetSchemaMapping.h" />
+    <ClInclude Include="Services\Feature\Commands\GetSpatialContexts.h" />
+    <ClInclude Include="Services\Feature\Commands\InsertCommand.h" />
+    <ClInclude Include="Services\Feature\Commands\SelectAggregateCommand.h" />
+    <ClInclude Include="Services\Feature\Commands\SelectCommand.h" />
+    <ClInclude Include="Services\Feature\Commands\SelectFeatures.h" />
+    <ClInclude Include="Services\Feature\Commands\SqlCommand.h" />
+    <ClInclude Include="Services\Feature\Commands\UpdateCommand.h" />
+    <ClInclude Include="Services\Feature\Commands\UpdateFeatures.h" />
+    <ClInclude Include="Services\Feature\DataReaderCreator.h" />
+    <ClInclude Include="Services\Feature\DateTimeDataReaderCreator.h" />
+    <ClInclude Include="Services\Feature\DoubleDataReaderCreator.h" />
+    <ClInclude Include="Services\Feature\FdoFeatureReader.h" />
+    <ClInclude Include="Services\Feature\FdoFilterCollection.h" />
+    <ClInclude Include="Services\Feature\FdoReaderCollection.h" />
+    <ClInclude Include="Services\Feature\FeatureDistribution.h" />
+    <ClInclude Include="Services\Feature\FeatureGeometricFunctions.h" />
+    <ClInclude Include="Services\Feature\FeatureNumericFunctions.h" />
+    <ClInclude Include="Services\Feature\FeatureSetReader.h" />
+    <ClInclude Include="Services\Feature\FeatureStringFunctions.h" />
+    <ClInclude Include="Services\Feature\GeometryDataReaderCreator.h" />
+    <ClInclude Include="Services\Feature\Int16DataReaderCreator.h" />
+    <ClInclude Include="Services\Feature\Int32DataReaderCreator.h" />
+    <ClInclude Include="Services\Feature\Int64DataReaderCreator.h" />
+    <ClInclude Include="Services\Feature\Matrix.h" />
+    <ClInclude Include="Services\Feature\ProxyDataReader.h" />
+    <ClInclude Include="Services\Feature\SingleDataReaderCreator.h" />
+    <ClInclude Include="Services\Feature\StringDataReaderCreator.h" />
+    <ClInclude Include="Services\Feature\UniqueFunction.h" />
+    <ClInclude Include="Services\MappingService.h" />
+    <ClInclude Include="Services\ProfilingService.h" />
+    <ClInclude Include="Services\Rendering\FeatureInformation.h" />
+    <ClInclude Include="Services\Resource\ByteSourceDwfInputStreamImpl.h" />
+    <ClInclude Include="Services\ByteSourceRasterStreamImpl.h" />
+    <ClInclude Include="Services\Resource\ResourceContentCache.h" />
+    <ClInclude Include="System\ClassId.h" />
+    <ClInclude Include="System\ConfigProperties.h" />
+    <ClInclude Include="Services\Rendering\CustomLogoInfo.h" />
+    <ClInclude Include="Services\Rendering\CustomTextInfo.h" />
+    <ClInclude Include="Services\DataReader.h" />
+    <ClInclude Include="Services\Drawing\DrawingDefs.h" />
+    <ClInclude Include="Services\DrawingService.h" />
+    <ClInclude Include="Services\Drawing\DrawingServiceUtil.h" />
+    <ClInclude Include="Exception\DwfException.h" />
+    <ClInclude Include="Services\Rendering\DwfVersion.h" />
+    <ClInclude Include="Services\Feature\FdoConnectionPool.h" />
+    <ClInclude Include="Services\Feature\FdoConnectionUtil.h" />
+    <ClInclude Include="Services\Feature\FdoForcedOneToOneFeatureReader.h" />
+    <ClInclude Include="Services\Feature\FeatureClassCacheItem.h" />
+    <ClInclude Include="Services\Feature\FeatureConnection.h" />
+    <ClInclude Include="Services\Feature\FeatureDefs.h" />
+    <ClInclude Include="Services\Rendering\FeatureInfoRenderer.h" />
+    <ClInclude Include="Services\FeatureReader.h" />
+    <ClInclude Include="Services\Feature\FeatureSchemaCacheItem.h" />
+    <ClInclude Include="Services\FeatureService.h" />
+    <ClInclude Include="Services\Feature\FeatureServiceCache.h" />
+    <ClInclude Include="Services\Feature\FeatureServiceCacheEntry.h" />
+    <ClInclude Include="Services\Feature\FeatureSourceCacheItem.h" />
+    <ClInclude Include="Services\Feature\FeatureUtil.h" />
+    <ClInclude Include="Services\Feature\GwsConnectionPool.h" />
+    <ClInclude Include="Services\Feature\GwsFeatureReader.h" />
+    <ClInclude Include="Services\Rendering\icons.h" />
+    <ClInclude Include="Services\ImageFormats.h" />
+    <ClInclude Include="Services\Feature\JoinFeatureReader.h" />
+    <ClInclude Include="MapLayer\Layer.h" />
+    <ClInclude Include="Services\Rendering\Layout.h" />
+    <ClInclude Include="Services\Rendering\LegendPlotUtil.h" />
+    <ClInclude Include="MapLayer\Map.h" />
+    <ClInclude Include="Services\Rendering\MappingDefs.h" />
+    <ClInclude Include="Services\Rendering\MappingUtil.h" />
+    <ClInclude Include="Services\Rendering\MapPlot.h" />
+    <ClInclude Include="Services\Rendering\MapPlotCollection.h" />
+    <ClInclude Include="Services\Rendering\MapPlotInstruction.h" />
+    <ClInclude Include="Services\Feature\MgCSTrans.h" />
+    <ClInclude Include="MgPortable.h" />
+    <ClInclude Include="System\ExceptionCodes.h" />
+    <ClInclude Include="System\Mutex.h" />
+    <ClInclude Include="Services\Resource\OperationInfo.h" />
+    <ClInclude Include="Services\Resource\OperationParameter.h" />
+    <ClInclude Include="Exception\ParameterNotFoundException.h" />
+    <ClInclude Include="System\PlatformInit.h" />
+    <ClInclude Include="Services\Rendering\PlotSpecification.h" />
+    <ClInclude Include="Services\Rendering\PrintLayout.h" />
+    <ClInclude Include="Services\Feature\ProjectedFeatureReader.h" />
+    <ClInclude Include="Services\Feature\RasterHelper.h" />
+    <ClInclude Include="Services\Feature\RdbmsFeatureSourceParams.h" />
+    <ClInclude Include="Services\Rendering\RenderingOptions.h" />
+    <ClInclude Include="Services\RenderingService.h" />
+    <ClInclude Include="Services\Resource\ResourceDefs.h" />
+    <ClInclude Include="Services\Resource\ResourcePackageHandler.h" />
+    <ClInclude Include="Services\Resource\ResourcePackageLoader.h" />
+    <ClInclude Include="Services\Resource\ResourcePackageManifestHandler.h" />
+    <ClInclude Include="Services\Resource\ResourcePackageManifestParser.h" />
+    <ClInclude Include="Services\ResourceService.h" />
+    <ClInclude Include="Services\Rendering\RSMgFeatureReader.h" />
+    <ClInclude Include="Services\Rendering\RSMgInputStream.h" />
+    <ClInclude Include="Services\Rendering\RSMgRaster.h" />
+    <ClInclude Include="Services\Rendering\RSMgSymbolManager.h" />
+    <ClInclude Include="Services\ScrollableFeatureReader.h" />
+    <ClInclude Include="MapLayer\Selection.h" />
+    <ClInclude Include="Services\Stylization\SEMgSymbolManager.h" />
+    <ClInclude Include="Services\ServiceFactory.h" />
+    <ClInclude Include="Services\Feature\SpatialContextCacheItem.h" />
+    <ClInclude Include="Services\SqlReader.h" />
+    <ClInclude Include="Exception\StylizeLayerFailedException.h" />
+    <ClInclude Include="Services\Tile\TileCache.h" />
+    <ClInclude Include="Services\Tile\TileDefs.h" />
+    <ClInclude Include="Services\TileService.h" />
+    <ClInclude Include="Services\Transaction.h" />
+    <ClInclude Include="Services\Feature\TransformCache.h" />
+    <ClInclude Include="Services\Rendering\UnitType.h" />
+    <ClInclude Include="Services\Resource\UnmanagedDataManager.h" />
+    <ClInclude Include="Services\Resource\UnmanagedDataType.h" />
+    <ClInclude Include="Services\Resource\ZipFileHandler.h" />
+    <ClInclude Include="Services\Resource\ZipFileReader.h" />
+    <ClInclude Include="System\ThreadBase.h" />
+    <ClInclude Include="System\TimerUtil.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Platform.ini" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: sandbox/jng/vanilla_swig/Portable/MgPortable/MgPortable.vcxproj.filters (from rev 9812, sandbox/jng/vanilla_swig/Portable/MgDesktop/MgDesktop.vcxproj.filters)
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgPortable/MgPortable.vcxproj.filters	                        (rev 0)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/MgPortable.vcxproj.filters	2020-11-28 13:10:51 UTC (rev 9813)
@@ -0,0 +1,771 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Services\Resource\ByteSourceDwfInputStreamImpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\ByteSourceRasterStreamImpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="System\ConfigProperties.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\CustomLogoInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\CustomTextInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\DataReader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\DrawingService.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Drawing\DrawingServiceUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\DwfVersion.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FdoConnectionPool.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FdoConnectionUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FdoForcedOneToOneFeatureReader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureClassCacheItem.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureConnection.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\FeatureInfoRenderer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\FeatureReader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureSchemaCacheItem.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\FeatureService.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureServiceCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureServiceCacheEntry.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureSourceCacheItem.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\GwsConnectionPool.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\GwsFeatureReader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\ImageFormats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\JoinFeatureReader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MapLayer\Layer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\Layout.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\LegendPlotUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MapLayer\Map.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\MappingUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\MapPlot.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\MapPlotCollection.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\MgCSTrans.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MgPortableBuild.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\OperationInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\OperationParameter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="System\PlatformInit.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\PlotSpecification.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\PrintLayout.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\ProjectedFeatureReader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\RasterHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\RdbmsFeatureSourceParams.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\RenderingOptions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\RenderingService.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\ResourceDefs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\ResourcePackageHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\ResourcePackageLoader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\ResourcePackageManifestHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\ResourcePackageManifestParser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\ResourceService.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\RSMgFeatureReader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\RSMgRaster.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\RSMgSymbolManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\ScrollableFeatureReader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MapLayer\Selection.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Stylization\SEMgSymbolManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\ServiceFactory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\SpatialContextCacheItem.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\SqlReader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Tile\TileCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Tile\TileDefs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\TileService.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Transaction.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\TransformCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\UnitType.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\UnmanagedDataManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\UnmanagedDataType.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\ZipFileHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\ZipFileReader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\ProfilingService.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="System\TimerUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureDistribution.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureGeometricFunctions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureNumericFunctions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureStringFunctions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\ProxyDataReader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Log\LogDetail.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Log\LogEntryData.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Log\LogManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Log\LogThread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="System\ThreadBase.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\MappingService.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Rendering\FeatureInformation.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\ApplySchema.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\CreateFeatureSource.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\DeleteCommand.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\DescribeSchema.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\EnumerateDataStores.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\ExtendedSelectCommand.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\FeatureManipulationCommand.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\FeatureServiceCommand.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\GetConnectionPropertyValues.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\GetFeatureProviders.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\GetLongTransactions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\GetProviderCapabilities.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\GetSchemaMapping.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\GetSpatialContexts.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\InsertCommand.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\SelectAggregateCommand.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\SelectCommand.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\SelectFeatures.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\SqlCommand.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\UpdateCommand.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\Commands\UpdateFeatures.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FdoFeatureReader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FdoFilterCollection.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FdoReaderCollection.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Feature\FeatureSetReader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Services\Resource\ResourceContentCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="System\ExceptionCodes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Services\Resource\ByteSourceDwfInputStreamImpl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\ByteSourceRasterStreamImpl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="System\ClassId.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="System\ConfigProperties.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Rendering\CustomLogoInfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Rendering\CustomTextInfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\DataReader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Drawing\DrawingDefs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\DrawingService.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Drawing\DrawingServiceUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Exception\DwfException.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Rendering\DwfVersion.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\FdoConnectionPool.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\FdoConnectionUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\FdoForcedOneToOneFeatureReader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\FeatureClassCacheItem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\FeatureConnection.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\FeatureDefs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Rendering\FeatureInfoRenderer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\FeatureReader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\FeatureSchemaCacheItem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\FeatureService.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\FeatureServiceCache.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\FeatureServiceCacheEntry.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\FeatureSourceCacheItem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\FeatureUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\GwsConnectionPool.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\GwsFeatureReader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Rendering\icons.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\ImageFormats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\JoinFeatureReader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MapLayer\Layer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Rendering\Layout.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Rendering\LegendPlotUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MapLayer\Map.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Rendering\MappingDefs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Rendering\MappingUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Rendering\MapPlot.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Rendering\MapPlotCollection.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Rendering\MapPlotInstruction.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\MgCSTrans.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MgPortable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="System\Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Resource\OperationInfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Resource\OperationParameter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Exception\ParameterNotFoundException.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="System\PlatformInit.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Rendering\PlotSpecification.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Rendering\PrintLayout.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\ProjectedFeatureReader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\RasterHelper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\RdbmsFeatureSourceParams.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Rendering\RenderingOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\RenderingService.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Resource\ResourceDefs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Resource\ResourcePackageHandler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Resource\ResourcePackageLoader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Resource\ResourcePackageManifestHandler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Resource\ResourcePackageManifestParser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\ResourceService.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Rendering\RSMgFeatureReader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Rendering\RSMgInputStream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Rendering\RSMgRaster.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Rendering\RSMgSymbolManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\ScrollableFeatureReader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MapLayer\Selection.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Stylization\SEMgSymbolManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\ServiceFactory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\SpatialContextCacheItem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\SqlReader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Exception\StylizeLayerFailedException.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Tile\TileCache.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Tile\TileDefs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\TileService.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Transaction.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\TransformCache.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Rendering\UnitType.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Resource\UnmanagedDataManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Resource\UnmanagedDataType.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Resource\ZipFileHandler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Resource\ZipFileReader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\ProfilingService.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="System\TimerUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\BooleanDataReaderCreator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\ByteDataReaderCreator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\DataReaderCreator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\DateTimeDataReaderCreator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\DoubleDataReaderCreator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\FeatureDistribution.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\FeatureGeometricFunctions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\FeatureNumericFunctions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\FeatureStringFunctions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\GeometryDataReaderCreator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Int16DataReaderCreator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Int32DataReaderCreator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Int64DataReaderCreator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\UniqueFunction.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\StringDataReaderCreator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\SingleDataReaderCreator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\ProxyDataReader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Matrix.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Log\LogType.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Log\LogDetail.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Log\LogEntryData.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Log\LogManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Log\LogThread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="System\ThreadBase.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\MappingService.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Rendering\FeatureInformation.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Commands\UpdateFeatures.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Commands\ApplySchema.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Commands\CreateFeatureSource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Commands\DeleteCommand.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Commands\DescribeSchema.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Commands\EnumerateDataStores.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Commands\ExtendedSelectCommand.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Commands\FeatureManipulationCommand.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Commands\FeatureServiceCommand.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Commands\GetConnectionPropertyValues.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Commands\GetFeatureProviders.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Commands\GetLongTransactions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Commands\GetProviderCapabilities.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Commands\GetSchemaMapping.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Commands\GetSpatialContexts.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Commands\InsertCommand.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Commands\SelectAggregateCommand.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Commands\SelectCommand.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Commands\SelectFeatures.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Commands\SqlCommand.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\Commands\UpdateCommand.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\FdoFilterCollection.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\FdoFeatureReader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\FdoReaderCollection.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Feature\FeatureSetReader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\CryptoDefs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Services\Resource\ResourceContentCache.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ExceptionCodes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="System\ExceptionCodes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Platform.ini" />
+  </ItemGroup>
+</Project>
\ No newline at end of file

Copied: sandbox/jng/vanilla_swig/Portable/MgPortable/MgPortableBuild.cpp (from rev 9812, sandbox/jng/vanilla_swig/Portable/MgDesktop/MgDesktopBuild.cpp)
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgPortable/MgPortableBuild.cpp	                        (rev 0)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/MgPortableBuild.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -0,0 +1,136 @@
+//
+//  Copyright (C) 2004-2011 by Autodesk, Inc.
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of version 2.1 of the GNU Lesser
+//  General Public License as published by the Free Software Foundation.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+#include "System/ConfigProperties.cpp"
+#include "System/ExceptionCodes.cpp"
+#include "System/PlatformInit.cpp"
+#include "System/TimerUtil.cpp"
+#include "System/ThreadBase.cpp"
+
+#include "Log/LogDetail.cpp"
+#include "Log/LogEntryData.cpp"
+#include "Log/LogManager.cpp"
+#include "Log/LogThread.cpp"
+
+#include "MapLayer/Layer.cpp"
+#include "MapLayer/Map.cpp"
+#include "MapLayer/Selection.cpp"
+
+#include "Services/ByteSourceRasterStreamImpl.cpp"
+#include "Services/DataReader.cpp"
+#include "Services/DrawingService.cpp"
+#include "Services/FeatureReader.cpp"
+#include "Services/FeatureService.cpp"
+#include "Services/ImageFormats.cpp"
+#include "Services/MappingService.cpp"
+#include "Services/ProfilingService.cpp"
+#include "Services/RenderingService.cpp"
+#include "Services/ResourceService.cpp"
+#include "Services/ScrollableFeatureReader.cpp"
+#include "Services/ServiceFactory.cpp"
+#include "Services/SqlReader.cpp"
+#include "Services/TileService.cpp"
+#include "Services/Transaction.cpp"
+
+#include "Services/Drawing/DrawingServiceUtil.cpp"
+
+#include "Services/Feature/FdoConnectionPool.cpp"
+#include "Services/Feature/FdoConnectionUtil.cpp"
+#include "Services/Feature/FdoFeatureReader.cpp"
+#include "Services/Feature/FdoFilterCollection.cpp"
+#include "Services/Feature/FdoForcedOneToOneFeatureReader.cpp"
+#include "Services/Feature/FdoReaderCollection.cpp"
+#include "Services/Feature/FeatureClassCacheItem.cpp"
+#include "Services/Feature/FeatureConnection.cpp"
+#include "Services/Feature/FeatureDistribution.cpp"
+#include "Services/Feature/FeatureGeometricFunctions.cpp"
+#include "Services/Feature/FeatureNumericFunctions.cpp"
+#include "Services/Feature/FeatureSchemaCacheItem.cpp"
+#include "Services/Feature/FeatureServiceCacheEntry.cpp"
+#include "Services/Feature/FeatureServiceCache.cpp"
+#include "Services/Feature/FeatureSetReader.cpp"
+#include "Services/Feature/FeatureSourceCacheItem.cpp"
+#include "Services/Feature/FeatureStringFunctions.cpp"
+#include "Services/Feature/FeatureUtil.cpp"
+#include "Services/Feature/GwsConnectionPool.cpp"
+#include "Services/Feature/GwsFeatureReader.cpp"
+#include "Services/Feature/JoinFeatureReader.cpp"
+#include "Services/Feature/MgCSTrans.cpp"
+#include "Services/Feature/ProjectedFeatureReader.cpp"
+#include "Services/Feature/ProxyDataReader.cpp"
+#include "Services/Feature/RasterHelper.cpp"
+#include "Services/Feature/RdbmsFeatureSourceParams.cpp"
+#include "Services/Feature/SpatialContextCacheItem.cpp"
+#include "Services/Feature/TransformCache.cpp"
+#include "Services/Feature/Commands/ApplySchema.cpp"
+#include "Services/Feature/Commands/CreateFeatureSource.cpp"
+#include "Services/Feature/Commands/DeleteCommand.cpp"
+#include "Services/Feature/Commands/DescribeSchema.cpp"
+#include "Services/Feature/Commands/EnumerateDataStores.cpp"
+#include "Services/Feature/Commands/ExtendedSelectCommand.cpp"
+#include "Services/Feature/Commands/FeatureManipulationCommand.cpp"
+#include "Services/Feature/Commands/FeatureServiceCommand.cpp"
+#include "Services/Feature/Commands/GetConnectionPropertyValues.cpp"
+#include "Services/Feature/Commands/GetFeatureProviders.cpp"
+#include "Services/Feature/Commands/GetLongTransactions.cpp"
+#include "Services/Feature/Commands/GetProviderCapabilities.cpp"
+#include "Services/Feature/Commands/GetSchemaMapping.cpp"
+#include "Services/Feature/Commands/GetSpatialContexts.cpp"
+#include "Services/Feature/Commands/InsertCommand.cpp"
+#include "Services/Feature/Commands/SelectAggregateCommand.cpp"
+#include "Services/Feature/Commands/SelectCommand.cpp"
+#include "Services/Feature/Commands/SelectFeatures.cpp"
+#include "Services/Feature/Commands/SqlCommand.cpp"
+#include "Services/Feature/Commands/UpdateCommand.cpp"
+#include "Services/Feature/Commands/UpdateFeatures.cpp"
+
+#include "Services/Rendering/CustomLogoInfo.cpp"
+#include "Services/Rendering/CustomTextInfo.cpp"
+#include "Services/Rendering/DwfVersion.cpp"
+#include "Services/Rendering/FeatureInfoRenderer.cpp"
+#include "Services/Rendering/FeatureInformation.cpp"
+#include "Services/Rendering/Layout.cpp"
+#include "Services/Rendering/LegendPlotUtil.cpp"
+#include "Services/Rendering/MappingUtil.cpp"
+#include "Services/Rendering/MapPlot.cpp"
+#include "Services/Rendering/MapPlotCollection.cpp"
+#include "Services/Rendering/PrintLayout.cpp"
+#include "Services/Rendering/PlotSpecification.cpp"
+#include "Services/Rendering/RenderingOptions.cpp"
+#include "Services/Rendering/RSMgFeatureReader.cpp"
+#include "Services/Rendering/RSMgRaster.cpp"
+#include "Services/Rendering/RSMgSymbolManager.cpp"
+#include "Services/Rendering/UnitType.cpp"
+
+#include "Services/Resource/ByteSourceDwfInputStreamImpl.cpp"
+#include "Services/Resource/OperationInfo.cpp"
+#include "Services/Resource/OperationParameter.cpp"
+#include "Services/Resource/ResourceContentCache.cpp"
+#include "Services/Resource/ResourceDefs.cpp"
+#include "Services/Resource/ResourcePackageHandler.cpp"
+#include "Services/Resource/ResourcePackageLoader.cpp"
+#include "Services/Resource/ResourcePackageManifestHandler.cpp"
+#include "Services/Resource/ResourcePackageManifestParser.cpp"
+#include "Services/Resource/UnmanagedDataManager.cpp"
+#include "Services/Resource/UnmanagedDataType.cpp"
+#include "Services/Resource/ZipFileHandler.cpp"
+#include "Services/Resource/ZipFileReader.cpp"
+
+#include "Services/Stylization/SEMgSymbolManager.cpp"
+
+#include "Services/Tile/TileDefs.cpp"
+#include "Services/Tile/TileCache.cpp"
\ No newline at end of file

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/ByteSourceRasterStreamImpl.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/ByteSourceRasterStreamImpl.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/ByteSourceRasterStreamImpl.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef MG_BYTE_SOURCE_RASTER_STREAM_IMPL_H_
 #define MG_BYTE_SOURCE_RASTER_STREAM_IMPL_H_
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "Fdo.h"
 
 ///\cond INTERNAL

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/DataReader.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/DataReader.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/DataReader.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_DATA_READER_H
 #define DESKTOP_DATA_READER_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 class FdoIDataReader;
 class MgdFeatureConnection;

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Drawing/DrawingServiceUtil.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Drawing/DrawingServiceUtil.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Drawing/DrawingServiceUtil.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "DrawingServiceUtil.h"
 #include "DrawingDefs.h"
 #include "System/XmlUtil.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/DrawingService.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/DrawingService.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/DrawingService.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_DRAWING_SERVICE_H
 #define DESKTOP_DRAWING_SERVICE_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 /// \ingroup Desktop_Service_Module
 /// \{
@@ -25,8 +25,8 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 /// \brief
-/// Allows low level access to \link DWF DWF™ \endlink
-/// (Design Web Format™) data stored in a resource repository as
+/// Allows low level access to \link DWF DWF� \endlink
+/// (Design Web Format�) data stored in a resource repository as
 /// part of a drawing source.
 ///
 /// \remarks

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/ApplySchema.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/Commands/ApplySchema.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/ApplySchema.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef MG_SERVER_APPLY_SCHEMA_H_
 #define MG_SERVER_APPLY_SCHEMA_H_
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "System/XmlDefs.h"
 #include "System/XmlUtil.h"
 #include "Fdo.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/CreateFeatureSource.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/Commands/CreateFeatureSource.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/CreateFeatureSource.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "CreateFeatureSource.h"
 #include "Services/Feature/FdoConnectionUtil.h"
 #include "Services/Feature/FeatureUtil.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/DeleteCommand.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/Commands/DeleteCommand.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/DeleteCommand.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -16,7 +16,7 @@
 //
 
 #include "Services/Feature/FeatureDefs.h"
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "Services/FeatureService.h"
 #include "Services/Feature/FeatureConnection.h"
 #include "FeatureManipulationCommand.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/DescribeSchema.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/Commands/DescribeSchema.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/DescribeSchema.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -1465,7 +1465,7 @@
     if (mgException != NULL)
     {
         //Sorry, if you're complaining about duplicate identity properties, then we need that thing called context
-        if (mgException->IsOfClass(Foundation_Exception_MgDuplicateObjectException))
+        if (mgException->GetExceptionCode() == MgExceptionCodes::MgDuplicateObjectException)
         {
             STRING detail = mgException->GetDetails();
             MgStringCollection args;

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/DescribeSchema.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/Commands/DescribeSchema.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/DescribeSchema.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef MG_SERVER_DESCRIBE_SCHEMA_H_
 #define MG_SERVER_DESCRIBE_SCHEMA_H_
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "System/XmlDefs.h"
 #include "System/XmlUtil.h"
 #include "Fdo.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/EnumerateDataStores.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/Commands/EnumerateDataStores.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/EnumerateDataStores.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef _MG_SERVER_ENUMERATE_DATASTORES_H_
 #define _MG_SERVER_ENUMERATE_DATASTORES_H_
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "System/XmlDefs.h"
 #include "System/XmlUtil.h"
 #include "Fdo.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/ExtendedSelectCommand.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/Commands/ExtendedSelectCommand.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/ExtendedSelectCommand.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -16,7 +16,7 @@
 //
 
 #include "Services/Feature/FeatureDefs.h"
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "Services/FeatureService.h"
 #include "FeatureServiceCommand.h"
 #include "ExtendedSelectCommand.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/FeatureManipulationCommand.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/Commands/FeatureManipulationCommand.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/FeatureManipulationCommand.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -16,7 +16,7 @@
 //
 
 #include "Services/Feature/FeatureDefs.h"
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "Services/FeatureService.h"
 #include "FeatureManipulationCommand.h"
 #include "Services/Feature/FeatureConnection.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/FeatureServiceCommand.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/Commands/FeatureServiceCommand.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/FeatureServiceCommand.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -16,7 +16,7 @@
 //
 
 #include "Services/Feature/FeatureDefs.h"
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "Services/FeatureService.h"
 #include "FeatureServiceCommand.h"
 #include "ExtendedSelectCommand.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/GetConnectionPropertyValues.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/Commands/GetConnectionPropertyValues.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/GetConnectionPropertyValues.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef _MG_SERVER_GETCONNECTIONPROPERTYVALUES_H_
 #define _MG_SERVER_GETCONNECTIONPROPERTYVALUES_H_
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "System/XmlDefs.h"
 #include "System/XmlUtil.h"
 #include "Fdo.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/GetFeatureProviders.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/Commands/GetFeatureProviders.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/GetFeatureProviders.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef _MG_SERVER_GET_FEATURE_PROVIDERS_H_
 #define _MG_SERVER_GET_FEATURE_PROVIDERS_H_
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "System/XmlDefs.h"
 #include "System/XmlUtil.h"
 #include "Fdo.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/GetLongTransactions.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/Commands/GetLongTransactions.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/GetLongTransactions.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef _MG_SERVERGETLONGTRANSACTIONS_H_
 #define _MG_SERVERGETLONGTRANSACTIONS_H_
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "System/XmlDefs.h"
 #include "System/XmlUtil.h"
 #include "Fdo.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/GetProviderCapabilities.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/Commands/GetProviderCapabilities.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/GetProviderCapabilities.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef _MG_SERVER_GET_PROVIDER_CAPABILITIES_H_
 #define _MG_SERVER_GET_PROVIDER_CAPABILITIES_H_
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "System/XmlDefs.h"
 #include "System/XmlUtil.h"
 #include "Fdo.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/GetSchemaMapping.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/Commands/GetSchemaMapping.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/GetSchemaMapping.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef _MG_SERVER_GET_SCHEMA_MAPPING_H_
 #define _MG_SERVER_GET_SCHEMA_MAPPING_H_
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "System/XmlDefs.h"
 #include "System/XmlUtil.h"
 #include "Fdo.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/GetSpatialContexts.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/Commands/GetSpatialContexts.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/GetSpatialContexts.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef MG_SERVERGETSPATIALCONTEXTS_H_
 #define MG_SERVERGETSPATIALCONTEXTS_H_
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "System/XmlDefs.h"
 #include "System/XmlUtil.h"
 #include "Fdo.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/InsertCommand.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/Commands/InsertCommand.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/InsertCommand.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -16,7 +16,7 @@
 //
 
 #include "Services/Feature/FeatureDefs.h"
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "Services/FeatureService.h"
 #include "Services/Feature/FeatureConnection.h"
 #include "FeatureManipulationCommand.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/SelectAggregateCommand.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/Commands/SelectAggregateCommand.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/SelectAggregateCommand.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -16,7 +16,7 @@
 //
 
 #include "Services/Feature/FeatureDefs.h"
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "Services/FeatureService.h"
 #include "FeatureServiceCommand.h"
 #include "SelectCommand.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/SelectCommand.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/Commands/SelectCommand.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/SelectCommand.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -16,7 +16,7 @@
 //
 
 #include "Services/Feature/FeatureDefs.h"
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "Services/FeatureService.h"
 #include "FeatureServiceCommand.h"
 #include "SelectCommand.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/SelectFeatures.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/Commands/SelectFeatures.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/SelectFeatures.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -16,7 +16,7 @@
 //
 
 #include "Services/Feature/FeatureDefs.h"
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "Services/FeatureService.h"
 #include "SelectFeatures.h"
 #include "Services/Feature/FeatureConnection.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/SelectFeatures.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/Commands/SelectFeatures.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/SelectFeatures.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_SELECT_FEATURES_H_
 #define DESKTOP_SELECT_FEATURES_H_
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "System/XmlDefs.h"
 #include "System/XmlUtil.h"
 #include "Fdo.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/SqlCommand.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/Commands/SqlCommand.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/SqlCommand.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef _MG_SERVER_SQLCOMMAND_H_
 #define _MG_SERVER_SQLCOMMAND_H_
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "System/XmlDefs.h"
 #include "System/XmlUtil.h"
 #include "Fdo.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/UpdateCommand.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/Commands/UpdateCommand.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/UpdateCommand.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -16,7 +16,7 @@
 //
 
 #include "Services/Feature/FeatureDefs.h"
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "Services/FeatureService.h"
 #include "Services/Feature/FeatureConnection.h"
 #include "FeatureManipulationCommand.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/UpdateFeatures.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/Commands/UpdateFeatures.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/Commands/UpdateFeatures.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef _MG_SERVER_UPDATE_FEATURES_H_
 #define _MG_SERVER_UPDATE_FEATURES_H_
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "System/XmlDefs.h"
 #include "System/XmlUtil.h"
 #include "Fdo.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/DataReaderCreator.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/DataReaderCreator.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/DataReaderCreator.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -21,7 +21,7 @@
 using namespace std;
 
 #include <vector>
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "ProxyDataReader.h"
 
 /// \cond INTERNAL

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FdoConnectionPool.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/FdoConnectionPool.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FdoConnectionPool.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "System/Mutex.h"
 #include "FdoConnectionPool.h"
 #include "FdoConnectionUtil.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FdoConnectionUtil.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/FdoConnectionUtil.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FdoConnectionUtil.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "FdoConnectionUtil.h"
 #include "Fdo.h"
 #include "FeatureServiceCache.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureClassCacheItem.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/FeatureClassCacheItem.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureClassCacheItem.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "FeatureClassCacheItem.h"
 
 ///////////////////////////////////////////////////////////////////////////////

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureDefs.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/FeatureDefs.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureDefs.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_FEATURE_DEFS_H
 #define DESKTOP_FEATURE_DEFS_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 #define CHECK_FEATURE_SOURCE_ARGUMENT(resource, method)                                        \
     CHECKARGUMENTNULL(resource, method);                                                            \

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureSchemaCacheItem.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/FeatureSchemaCacheItem.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureSchemaCacheItem.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "FeatureSchemaCacheItem.h"
 
 ///////////////////////////////////////////////////////////////////////////////

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureServiceCache.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/FeatureServiceCache.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureServiceCache.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "FeatureServiceCache.h"
 
 Ptr<MgdFeatureServiceCache> MgdFeatureServiceCache::smInstance = (MgdFeatureServiceCache*)NULL;

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureServiceCache.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/FeatureServiceCache.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureServiceCache.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_FEATURE_SERVICE_CACHE_H
 #define DESKTOP_FEATURE_SERVICE_CACHE_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "FeatureServiceCacheEntry.h"
 #include "SpatialContextCacheItem.h"
 

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureServiceCacheEntry.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/FeatureServiceCacheEntry.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureServiceCacheEntry.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "FeatureServiceCacheEntry.h"
 
 

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureSetReader.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/FeatureSetReader.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureSetReader.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "FeatureSetReader.h"
 
 #define CHECK_FEATURESET_COUNT(pointer, methodname)        \

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureSourceCacheItem.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/FeatureSourceCacheItem.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureSourceCacheItem.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "FeatureSourceCacheItem.h"
 
 ///////////////////////////////////////////////////////////////////////////////

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureStringFunctions.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/FeatureStringFunctions.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureStringFunctions.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "FeatureDefs.h"
 #include "FeatureUtil.h"
 #include "FeatureDistribution.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureUtil.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/FeatureUtil.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/FeatureUtil.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_FEATURE_UTIL
 #define DESKTOP_FEATURE_UTIL
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "Fdo.h"
 
 #define EQUAL_CATEGORY      0

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/MgCSTrans.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/MgCSTrans.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/MgCSTrans.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_CS_TRANS_H
 #define DESKTOP_CS_TRANS_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "CSysTransformer.h"
 
 class MgCoordinateSystem;

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/ProjectedFeatureReader.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/ProjectedFeatureReader.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/ProjectedFeatureReader.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 MgdProjectedFeatureReader::MgdProjectedFeatureReader(MgFeatureReader* reader, MgCoordinateSystemTransform* trans)
 {

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/ProxyDataReader.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/ProxyDataReader.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/ProxyDataReader.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef _MG_PROXY_DATA_READER_H
 #define _MG_PROXY_DATA_READER_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 class MgDataReader;
 

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/RasterHelper.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/RasterHelper.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/RasterHelper.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "RasterHelper.h"
 
 MgdRasterHelper::MgdRasterHelper(MgdFeatureReader* reader) : MgFeatureService() 

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/RdbmsFeatureSourceParams.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/RdbmsFeatureSourceParams.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/RdbmsFeatureSourceParams.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_RDBMS_FEATURE_SOURCE_PARAMS_H
 #define DESKTOP_RDBMS_FEATURE_SOURCE_PARAMS_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 // Parameter class for creating RDBMS data stores
 //

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/SpatialContextCacheItem.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/SpatialContextCacheItem.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/SpatialContextCacheItem.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -16,7 +16,7 @@
 //
 
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "SpatialContextCacheItem.h"
 
 ///////////////////////////////////////////////////////////////////////////////

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/TransformCache.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Feature/TransformCache.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Feature/TransformCache.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_TRANSFORM_CACHE
 #define DESKTOP_TRANSFORM_CACHE
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "MgCSTrans.h"
 
 class MgdTransformCache;

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/FeatureReader.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/FeatureReader.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/FeatureReader.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_FEATURE_READER_H
 #define DESKTOP_FEATURE_READER_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 class FdoIFeatureReader;
 class MgCoordinateSystemTransform;

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/FeatureService.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/FeatureService.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/FeatureService.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -1,7 +1,7 @@
 #ifndef DESKTOP_FEATURE_SERVICE_H
 #define DESKTOP_FEATURE_SERVICE_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "System/XmlDefs.h"
 #include "System/XmlUtil.h"
 

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/ImageFormats.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/ImageFormats.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/ImageFormats.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_IMAGE_FORMATS_H
 #define DESKTOP_IMAGE_FORMATS_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 /// \ingroup Desktop_Misc_Module
 /// \{
 class MG_DESKTOP_API MgdImageFormats

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/MappingService.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/MappingService.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/MappingService.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -1,7 +1,7 @@
 #ifndef DESKTOP_MAPPING_SERVICE_H
 #define DESKTOP_MAPPING_SERVICE_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 class MgdLayout;
 class MgdMapPlotCollection;

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/ProfilingService.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/ProfilingService.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/ProfilingService.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -1,7 +1,7 @@
 #ifndef DESKTOP_PROFILING_SERVICE_H
 #define DESKTOP_PROFILING_SERVICE_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 class MgdRenderingOptions;
 class MgdRenderingService;

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/CustomLogoInfo.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Rendering/CustomLogoInfo.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/CustomLogoInfo.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "CustomLogoInfo.h"
 
 ///----------------------------------------------------------------------------

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/CustomTextInfo.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Rendering/CustomTextInfo.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/CustomTextInfo.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "CustomTextInfo.h"
 
 ///----------------------------------------------------------------------------

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/DwfVersion.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Rendering/DwfVersion.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/DwfVersion.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 MG_IMPL_DYNCREATE(MgdDwfVersion)
 

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/FeatureInformation.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Rendering/FeatureInformation.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/FeatureInformation.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 MG_IMPL_DYNCREATE(MgdFeatureInformation)
 

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/Layout.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Rendering/Layout.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/Layout.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 MG_IMPL_DYNCREATE(MgdLayout)
 

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/MapPlot.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Rendering/MapPlot.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/MapPlot.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "MapPlotInstruction.h"
 
 

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/MapPlotCollection.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Rendering/MapPlotCollection.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/MapPlotCollection.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 MG_IMPL_DYNCREATE(MgdMapPlotCollection)
 

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/MappingDefs.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Rendering/MappingDefs.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/MappingDefs.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_MAPPING_DEFS_H
 #define DESKTOP_MAPPING_DEFS_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include <assert.h>
 
 ///////////////////////////////////////////////////////////////////////////////

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/MappingUtil.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Rendering/MappingUtil.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/MappingUtil.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_MAPPING_UTIL_H
 #define DESKTOP_MAPPING_UTIL_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "MapLayer/Layer.h"
 #include "MapLayer/Map.h"
 #include "RendererStyles.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/PlotSpecification.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Rendering/PlotSpecification.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/PlotSpecification.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_PLOT_SPECIFICATION_H
 #define DESKTOP_PLOT_SPECIFICATION_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 /// \ingroup Desktop_Misc_Module
 /// \{

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/PrintLayout.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Rendering/PrintLayout.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/PrintLayout.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 #include "System/XmlDefs.h"
 #include "System/XmlUtil.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/RSMgFeatureReader.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Rendering/RSMgFeatureReader.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/RSMgFeatureReader.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_RS_FEATURE_READER_H
 #define DESKTOP_RS_FEATURE_READER_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "RS_FeatureReader.h"
 
 struct PropertyStub

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/RSMgRaster.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Rendering/RSMgRaster.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/RSMgRaster.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_RS_RASTER_H
 #define DESKTOP_RS_RASTER_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "RS_Raster.h"
 #include "RendererStyles.h"
 

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/RSMgSymbolManager.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Rendering/RSMgSymbolManager.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/RSMgSymbolManager.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_RS_SYMBOL_MANAGER_H
 #define DESKTOP_RS_SYMBOL_MANAGER_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "RS_SymbolManager.h"
 
 // MappingService specific implementation of the RS_SymbolManager interface.

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/RenderingOptions.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Rendering/RenderingOptions.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/RenderingOptions.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_RENDERING_OPTIONS_H
 #define DESKTOP_RENDERING_OPTIONS_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 /// \ingroup Desktop_Misc_Module
 /// \{

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/UnitType.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Rendering/UnitType.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Rendering/UnitType.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "UnitType.h"
 
 ///////////////////////////////////////////////////////////////////////////////

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Resource/ResourceContentCache.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Resource/ResourceContentCache.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Resource/ResourceContentCache.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "ResourceContentCache.h"
 
 Ptr<MgdResourceContentCache> MgdResourceContentCache::smInstance = (MgdResourceContentCache*)NULL;

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Resource/ResourceContentCache.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Resource/ResourceContentCache.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Resource/ResourceContentCache.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_RESOURCE_CONTENT_CACHE_H
 #define DESKTOP_RESOURCE_CONTENT_CACHE_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 class MG_DESKTOP_API MgdResourceContentCache : public MgGuardDisposable
 {

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Resource/UnmanagedDataManager.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Resource/UnmanagedDataManager.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Resource/UnmanagedDataManager.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "UnmanagedDataManager.h"
 
 

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/ResourceService.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/ResourceService.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/ResourceService.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_RESOURCE_SERVICE_H
 #define DESKTOP_RESOURCE_SERVICE_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 /// \ingroup Desktop_Service_Module
 /// \{
 class MG_DESKTOP_API MgdResourceService : public MgResourceService

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/ScrollableFeatureReader.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/ScrollableFeatureReader.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/ScrollableFeatureReader.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_SCROLLABLE_FEATURE_READER_H
 #define DESKTOP_SCROLLABLE_FEATURE_READER_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 class FdoIScrollableFeatureReader;
 class MgdFeatureConnection;

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/SqlReader.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/SqlReader.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/SqlReader.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_SQL_READER_H
 #define DESKTOP_SQL_READER_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 class FdoISQLDataReader;
 class MgdFeatureConnection;

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Stylization/SEMgSymbolManager.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Stylization/SEMgSymbolManager.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Stylization/SEMgSymbolManager.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_SE_SYMBOL_MANAGER_H
 #define DESKTOP_SE_SYMBOL_MANAGER_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "SE_SymbolManager.h"
 
 class MgResourceService;

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Tile/TileCache.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Tile/TileCache.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Tile/TileCache.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -16,7 +16,7 @@
 //
 
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "TileDefs.h"
 #include "TileCache.h"
 

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Tile/TileDefs.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Tile/TileDefs.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Tile/TileDefs.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_TILE_DEFS_H
 #define DESKTOP_TILE_DEFS_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 class MG_DESKTOP_API MgdTileParameters
 {

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/TileService.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/TileService.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/TileService.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -16,7 +16,7 @@
 //
 
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "TileService.h"
 
 ACE_Recursive_Thread_Mutex MgdTileService::sm_mutex;

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Transaction.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/Services/Transaction.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/Services/Transaction.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_TRANSACTION_H
 #define DESKTOP_TRANSACTION_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 class MgdFeatureConnection;
 class FdoITransaction;

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/System/ConfigProperties.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/System/ConfigProperties.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/System/ConfigProperties.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef DESKTOP_CONFIG_PROPERTIES_H
 #define DESKTOP_CONFIG_PROPERTIES_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 //TODO: Remove un-used config properties
 

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/System/PlatformInit.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/System/PlatformInit.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/System/PlatformInit.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "Log/LogManager.h"
 #include "Fdo.h"
 #include "Services/Rendering/MappingUtil.h"

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/System/ThreadBase.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/System/ThreadBase.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/System/ThreadBase.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef MgdThreadBase_H
 #define MgdThreadBase_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "Foundation.h"
 
 class MG_DESKTOP_API MgdThreadBase : public ACE_Task<ACE_MT_SYNCH>

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/System/TimerUtil.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/System/TimerUtil.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/System/TimerUtil.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -16,7 +16,7 @@
 //
 
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "TimerUtil.h"
 
 #ifdef WIN32

Modified: sandbox/jng/vanilla_swig/Portable/MgPortable/changelog.txt
===================================================================
--- sandbox/jng/vanilla_swig/Portable/MgDesktop/changelog.txt	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/MgPortable/changelog.txt	2020-11-28 13:10:51 UTC (rev 9813)
@@ -230,7 +230,7 @@
    - MgQuitComponent for exiting the application.
  - MgLoadPackageComponent now accepts a MgLoadMapComponent that will be invoked when the package has been loaded
  - Allow deferred map loading (initialize viewer with MgMapViewerProvider, load the map later on)
- - Simplified constructor for MgDesktopMapViewerProvider
+ - Simplified constructor for MgPortableMapViewerProvider
  - MgComponent subclasses can indicate whether they can operate without a loaded map.
  - IMapViewer.ViewerInitialized event changed to IMapViewer.MapLoaded
 
@@ -280,7 +280,7 @@
  - OSGeo.MapGuide.Desktop.dll is no longer monolithic. It is modular, and now references the existing .net platform assemblies (OSGeo.MapGuide.Foundation.dll, OSGeo.MapGuide.Geometry.dll and OSGeo.MapGuide.PlatformBase.dll). Thus these assemblies also need to be referenced in addition to OSGeo.MapGuide.Desktop.dll
 
 Viewer Changelog:
- - Viewer now operates against MgPlatformBase. Instead of initializing the viewer with a MgdMap, you now initialize it with a MgMapViewerProvider (which currently has one implementation: MgDesktopMapViewerProvider). This is to allow for other MgPlatformBase derived libraries to work with the viewer in the future (eg. The official MapGuide API)
+ - Viewer now operates against MgPlatformBase. Instead of initializing the viewer with a MgdMap, you now initialize it with a MgMapViewerProvider (which currently has one implementation: MgPortableMapViewerProvider). This is to allow for other MgPlatformBase derived libraries to work with the viewer in the future (eg. The official MapGuide API)
  - Fix exceptions when querying for tooltips over visible layers that are initially not visible.
 
 NOTE: All OSGeo.MapGuide.* assemblies used by mg-desktop are signed. Take note of this when building libraries on top of these assemblies.

Copied: sandbox/jng/vanilla_swig/Portable/Portable.sln (from rev 9812, sandbox/jng/vanilla_swig/Portable/MgDesktopApi.sln)
===================================================================
--- sandbox/jng/vanilla_swig/Portable/Portable.sln	                        (rev 0)
+++ sandbox/jng/vanilla_swig/Portable/Portable.sln	2020-11-28 13:10:51 UTC (rev 9813)
@@ -0,0 +1,178 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30717.126
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "..\Common\Foundation\Foundation.vcxproj", "{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Geometry", "..\Common\Geometry\Geometry.vcxproj", "{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PlatformBase", "..\Common\PlatformBase\PlatformBase.vcxproj", "{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MdfModel", "..\Common\MdfModel\MdfModel.vcxproj", "{C50254F2-654A-48DE-AF5B-20605AEF8D10}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MdfParser", "..\Common\MdfParser\MdfParser.vcxproj", "{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Renderers", "..\Common\Renderers\Renderers.vcxproj", "{38161685-88ED-415E-A545-CCC17BE069AE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Stylization", "..\Common\Stylization\Stylization.vcxproj", "{341D5463-186E-49BA-B942-3D3BE28D65C0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GwsCommon", "..\Server\src\Gws\GwsCommon\GwsCommon.vcxproj", "{DB2CC2E3-4754-4932-B865-424A44E58FD0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GwsQueryEngine", "..\Server\src\Gws\GwsQueryEngine\GwsQueryEngine.vcxproj", "{8D947123-A12C-45DA-BD00-8B62DD5A0459}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GwsResource", "..\Server\src\Gws\GwsResource\GwsResource.vcxproj", "{8F654896-85DC-4F32-99B2-670D66B0FBF1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GwsInclude", "..\Server\src\Gws\Include\GwsInclude.vcxproj", "{E6B0012F-58F6-42F4-8F02-065C35829569}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MgPortable", "MgPortable\MgPortable.vcxproj", "{CBC0339F-E68B-48BA-9059-945483BEBDCA}"
+	ProjectSection(ProjectDependencies) = postProject
+		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4} = {F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}
+		{8D947123-A12C-45DA-BD00-8B62DD5A0459} = {8D947123-A12C-45DA-BD00-8B62DD5A0459}
+		{E6B0012F-58F6-42F4-8F02-065C35829569} = {E6B0012F-58F6-42F4-8F02-065C35829569}
+		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7} = {85882748-DD71-4D2B-9E5A-03AF8C8D91B7}
+		{341D5463-186E-49BA-B942-3D3BE28D65C0} = {341D5463-186E-49BA-B942-3D3BE28D65C0}
+		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425} = {A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}
+		{38161685-88ED-415E-A545-CCC17BE069AE} = {38161685-88ED-415E-A545-CCC17BE069AE}
+		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B} = {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}
+		{8F654896-85DC-4F32-99B2-670D66B0FBF1} = {8F654896-85DC-4F32-99B2-670D66B0FBF1}
+		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0} = {D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}
+		{DB2CC2E3-4754-4932-B865-424A44E58FD0} = {DB2CC2E3-4754-4932-B865-424A44E58FD0}
+		{C50254F2-654A-48DE-AF5B-20605AEF8D10} = {C50254F2-654A-48DE-AF5B-20605AEF8D10}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTest", "UnitTest\UnitTest.vcxproj", "{67505883-F667-4C18-BCCA-63F3B76C64FF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CBC0339F-E68B-48BA-9059-945483BEBDCA} = {CBC0339F-E68B-48BA-9059-945483BEBDCA}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Security", "..\Common\Security\Security.vcxproj", "{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Debug|Win32.Build.0 = Debug|Win32
+		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Debug|x64.ActiveCfg = Debug|x64
+		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Debug|x64.Build.0 = Debug|x64
+		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Release|Win32.ActiveCfg = Release|Win32
+		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Release|Win32.Build.0 = Release|Win32
+		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Release|x64.ActiveCfg = Release|x64
+		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Release|x64.Build.0 = Release|x64
+		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Debug|Win32.Build.0 = Debug|Win32
+		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Debug|x64.ActiveCfg = Debug|x64
+		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Debug|x64.Build.0 = Debug|x64
+		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Release|Win32.ActiveCfg = Release|Win32
+		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Release|Win32.Build.0 = Release|Win32
+		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Release|x64.ActiveCfg = Release|x64
+		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Release|x64.Build.0 = Release|x64
+		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Debug|Win32.Build.0 = Debug|Win32
+		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Debug|x64.ActiveCfg = Debug|x64
+		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Debug|x64.Build.0 = Debug|x64
+		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Release|Win32.ActiveCfg = Release|Win32
+		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Release|Win32.Build.0 = Release|Win32
+		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Release|x64.ActiveCfg = Release|x64
+		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Release|x64.Build.0 = Release|x64
+		{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Debug|Win32.Build.0 = Debug|Win32
+		{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Debug|x64.ActiveCfg = Debug|x64
+		{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Debug|x64.Build.0 = Debug|x64
+		{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Release|Win32.ActiveCfg = Release|Win32
+		{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Release|Win32.Build.0 = Release|Win32
+		{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Release|x64.ActiveCfg = Release|x64
+		{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Release|x64.Build.0 = Release|x64
+		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Debug|Win32.Build.0 = Debug|Win32
+		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Debug|x64.ActiveCfg = Debug|x64
+		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Debug|x64.Build.0 = Debug|x64
+		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Release|Win32.ActiveCfg = Release|Win32
+		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Release|Win32.Build.0 = Release|Win32
+		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Release|x64.ActiveCfg = Release|x64
+		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Release|x64.Build.0 = Release|x64
+		{38161685-88ED-415E-A545-CCC17BE069AE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{38161685-88ED-415E-A545-CCC17BE069AE}.Debug|Win32.Build.0 = Debug|Win32
+		{38161685-88ED-415E-A545-CCC17BE069AE}.Debug|x64.ActiveCfg = Debug|x64
+		{38161685-88ED-415E-A545-CCC17BE069AE}.Debug|x64.Build.0 = Debug|x64
+		{38161685-88ED-415E-A545-CCC17BE069AE}.Release|Win32.ActiveCfg = Release|Win32
+		{38161685-88ED-415E-A545-CCC17BE069AE}.Release|Win32.Build.0 = Release|Win32
+		{38161685-88ED-415E-A545-CCC17BE069AE}.Release|x64.ActiveCfg = Release|x64
+		{38161685-88ED-415E-A545-CCC17BE069AE}.Release|x64.Build.0 = Release|x64
+		{341D5463-186E-49BA-B942-3D3BE28D65C0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{341D5463-186E-49BA-B942-3D3BE28D65C0}.Debug|Win32.Build.0 = Debug|Win32
+		{341D5463-186E-49BA-B942-3D3BE28D65C0}.Debug|x64.ActiveCfg = Debug|x64
+		{341D5463-186E-49BA-B942-3D3BE28D65C0}.Debug|x64.Build.0 = Debug|x64
+		{341D5463-186E-49BA-B942-3D3BE28D65C0}.Release|Win32.ActiveCfg = Release|Win32
+		{341D5463-186E-49BA-B942-3D3BE28D65C0}.Release|Win32.Build.0 = Release|Win32
+		{341D5463-186E-49BA-B942-3D3BE28D65C0}.Release|x64.ActiveCfg = Release|x64
+		{341D5463-186E-49BA-B942-3D3BE28D65C0}.Release|x64.Build.0 = Release|x64
+		{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Debug|Win32.Build.0 = Debug|Win32
+		{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Debug|x64.ActiveCfg = Debug|x64
+		{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Debug|x64.Build.0 = Debug|x64
+		{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Release|Win32.ActiveCfg = Release|Win32
+		{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Release|Win32.Build.0 = Release|Win32
+		{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Release|x64.ActiveCfg = Release|x64
+		{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Release|x64.Build.0 = Release|x64
+		{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Debug|Win32.Build.0 = Debug|Win32
+		{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Debug|x64.ActiveCfg = Debug|x64
+		{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Debug|x64.Build.0 = Debug|x64
+		{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Release|Win32.ActiveCfg = Release|Win32
+		{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Release|Win32.Build.0 = Release|Win32
+		{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Release|x64.ActiveCfg = Release|x64
+		{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Release|x64.Build.0 = Release|x64
+		{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Debug|Win32.Build.0 = Debug|Win32
+		{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Debug|x64.ActiveCfg = Debug|x64
+		{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Debug|x64.Build.0 = Debug|x64
+		{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Release|Win32.ActiveCfg = Release|Win32
+		{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Release|Win32.Build.0 = Release|Win32
+		{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Release|x64.ActiveCfg = Release|x64
+		{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Release|x64.Build.0 = Release|x64
+		{E6B0012F-58F6-42F4-8F02-065C35829569}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E6B0012F-58F6-42F4-8F02-065C35829569}.Debug|Win32.Build.0 = Debug|Win32
+		{E6B0012F-58F6-42F4-8F02-065C35829569}.Debug|x64.ActiveCfg = Debug|x64
+		{E6B0012F-58F6-42F4-8F02-065C35829569}.Debug|x64.Build.0 = Debug|x64
+		{E6B0012F-58F6-42F4-8F02-065C35829569}.Release|Win32.ActiveCfg = Release|Win32
+		{E6B0012F-58F6-42F4-8F02-065C35829569}.Release|Win32.Build.0 = Release|Win32
+		{E6B0012F-58F6-42F4-8F02-065C35829569}.Release|x64.ActiveCfg = Release|x64
+		{E6B0012F-58F6-42F4-8F02-065C35829569}.Release|x64.Build.0 = Release|x64
+		{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Debug|Win32.Build.0 = Debug|Win32
+		{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Debug|x64.ActiveCfg = Debug|x64
+		{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Debug|x64.Build.0 = Debug|x64
+		{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Release|Win32.ActiveCfg = Release|Win32
+		{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Release|Win32.Build.0 = Release|Win32
+		{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Release|x64.ActiveCfg = Release|x64
+		{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Release|x64.Build.0 = Release|x64
+		{67505883-F667-4C18-BCCA-63F3B76C64FF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{67505883-F667-4C18-BCCA-63F3B76C64FF}.Debug|Win32.Build.0 = Debug|Win32
+		{67505883-F667-4C18-BCCA-63F3B76C64FF}.Debug|x64.ActiveCfg = Debug|x64
+		{67505883-F667-4C18-BCCA-63F3B76C64FF}.Debug|x64.Build.0 = Debug|x64
+		{67505883-F667-4C18-BCCA-63F3B76C64FF}.Release|Win32.ActiveCfg = Release|Win32
+		{67505883-F667-4C18-BCCA-63F3B76C64FF}.Release|Win32.Build.0 = Release|Win32
+		{67505883-F667-4C18-BCCA-63F3B76C64FF}.Release|x64.ActiveCfg = Release|x64
+		{67505883-F667-4C18-BCCA-63F3B76C64FF}.Release|x64.Build.0 = Release|x64
+		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|Win32.Build.0 = Debug|Win32
+		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|x64.ActiveCfg = Debug|x64
+		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|x64.Build.0 = Debug|x64
+		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|Win32.ActiveCfg = Release|Win32
+		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|Win32.Build.0 = Release|Win32
+		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|x64.ActiveCfg = Release|x64
+		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {0313274F-0C94-4CDC-AEB2-1A1F4E23E4DB}
+	EndGlobalSection
+EndGlobal

Copied: sandbox/jng/vanilla_swig/Portable/PortableDotNet.sln (from rev 9812, sandbox/jng/vanilla_swig/Portable/MgDesktopDotNet.sln)
===================================================================
--- sandbox/jng/vanilla_swig/Portable/PortableDotNet.sln	                        (rev 0)
+++ sandbox/jng/vanilla_swig/Portable/PortableDotNet.sln	2020-11-28 13:10:51 UTC (rev 9813)
@@ -0,0 +1,76 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Express 2012 for Windows Desktop
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetHarness", "DotNetHarness\DotNetHarness.csproj", "{A5881D59-BD24-4A3A-A707-F18A25724D29}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetUnitTest", "DotNetUnitTest\DotNetUnitTest.csproj", "{FDA196F0-3C55-4360-B207-BA5EF6D746F8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapViewer", "MapViewer\MapViewer.csproj", "{D46ED17B-329B-4D80-9181-FEF8307EFCBB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapViewer.Desktop", "MapViewer.Desktop\MapViewer.Desktop.csproj", "{E2001B46-F226-4F7B-911E-252B9644236E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapViewerTest", "MapViewerTest\MapViewerTest.csproj", "{E2FC8B99-0638-4C01-86C4-1B625D966981}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MgAppLayout", "MgAppLayout\MgAppLayout.csproj", "{F6054D81-E857-49FB-945F-AC2ECD9BB27A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A5881D59-BD24-4A3A-A707-F18A25724D29}.Debug|x64.ActiveCfg = Debug|x64
+		{A5881D59-BD24-4A3A-A707-F18A25724D29}.Debug|x64.Build.0 = Debug|x64
+		{A5881D59-BD24-4A3A-A707-F18A25724D29}.Debug|x86.ActiveCfg = Debug|x86
+		{A5881D59-BD24-4A3A-A707-F18A25724D29}.Debug|x86.Build.0 = Debug|x86
+		{A5881D59-BD24-4A3A-A707-F18A25724D29}.Release|x64.ActiveCfg = Release|x64
+		{A5881D59-BD24-4A3A-A707-F18A25724D29}.Release|x64.Build.0 = Release|x64
+		{A5881D59-BD24-4A3A-A707-F18A25724D29}.Release|x86.ActiveCfg = Release|x86
+		{A5881D59-BD24-4A3A-A707-F18A25724D29}.Release|x86.Build.0 = Release|x86
+		{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Debug|x64.ActiveCfg = Debug|x64
+		{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Debug|x64.Build.0 = Debug|x64
+		{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Debug|x86.ActiveCfg = Debug|x86
+		{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Debug|x86.Build.0 = Debug|x86
+		{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Release|x64.ActiveCfg = Release|x64
+		{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Release|x64.Build.0 = Release|x64
+		{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Release|x86.ActiveCfg = Release|x86
+		{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Release|x86.Build.0 = Release|x86
+		{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Debug|x64.Build.0 = Debug|Any CPU
+		{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Debug|x86.Build.0 = Debug|Any CPU
+		{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Release|x64.ActiveCfg = Release|Any CPU
+		{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Release|x64.Build.0 = Release|Any CPU
+		{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Release|x86.ActiveCfg = Release|Any CPU
+		{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Release|x86.Build.0 = Release|Any CPU
+		{E2001B46-F226-4F7B-911E-252B9644236E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E2001B46-F226-4F7B-911E-252B9644236E}.Debug|x64.Build.0 = Debug|Any CPU
+		{E2001B46-F226-4F7B-911E-252B9644236E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E2001B46-F226-4F7B-911E-252B9644236E}.Debug|x86.Build.0 = Debug|Any CPU
+		{E2001B46-F226-4F7B-911E-252B9644236E}.Release|x64.ActiveCfg = Release|Any CPU
+		{E2001B46-F226-4F7B-911E-252B9644236E}.Release|x64.Build.0 = Release|Any CPU
+		{E2001B46-F226-4F7B-911E-252B9644236E}.Release|x86.ActiveCfg = Release|Any CPU
+		{E2001B46-F226-4F7B-911E-252B9644236E}.Release|x86.Build.0 = Release|Any CPU
+		{E2FC8B99-0638-4C01-86C4-1B625D966981}.Debug|x64.ActiveCfg = Debug|x64
+		{E2FC8B99-0638-4C01-86C4-1B625D966981}.Debug|x64.Build.0 = Debug|x64
+		{E2FC8B99-0638-4C01-86C4-1B625D966981}.Debug|x86.ActiveCfg = Debug|x86
+		{E2FC8B99-0638-4C01-86C4-1B625D966981}.Debug|x86.Build.0 = Debug|x86
+		{E2FC8B99-0638-4C01-86C4-1B625D966981}.Release|x64.ActiveCfg = Release|x64
+		{E2FC8B99-0638-4C01-86C4-1B625D966981}.Release|x64.Build.0 = Release|x64
+		{E2FC8B99-0638-4C01-86C4-1B625D966981}.Release|x86.ActiveCfg = Release|x86
+		{E2FC8B99-0638-4C01-86C4-1B625D966981}.Release|x86.Build.0 = Release|x86
+		{F6054D81-E857-49FB-945F-AC2ECD9BB27A}.Debug|x64.ActiveCfg = Debug|x64
+		{F6054D81-E857-49FB-945F-AC2ECD9BB27A}.Debug|x64.Build.0 = Debug|x64
+		{F6054D81-E857-49FB-945F-AC2ECD9BB27A}.Debug|x86.ActiveCfg = Debug|x86
+		{F6054D81-E857-49FB-945F-AC2ECD9BB27A}.Debug|x86.Build.0 = Debug|x86
+		{F6054D81-E857-49FB-945F-AC2ECD9BB27A}.Release|x64.ActiveCfg = Release|x64
+		{F6054D81-E857-49FB-945F-AC2ECD9BB27A}.Release|x64.Build.0 = Release|x64
+		{F6054D81-E857-49FB-945F-AC2ECD9BB27A}.Release|x86.ActiveCfg = Release|x86
+		{F6054D81-E857-49FB-945F-AC2ECD9BB27A}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Modified: sandbox/jng/vanilla_swig/Portable/Samples/AdvancedSample/MainForm.cs
===================================================================
--- sandbox/jng/vanilla_swig/Portable/Samples/AdvancedSample/MainForm.cs	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/Samples/AdvancedSample/MainForm.cs	2020-11-28 13:10:51 UTC (rev 9813)
@@ -54,7 +54,7 @@
             //Create our runtime map
             MgdMap map = new MgdMap(mapDefId);
             //Create our viewer provider
-            MgMapViewerProvider provider = new MgDesktopMapViewerProvider(map);
+            MgMapViewerProvider provider = new MgPortableMapViewerProvider(map);
             //Initialize our viewer with this provider
             mgMapViewer1.Init(provider);
         }

Modified: sandbox/jng/vanilla_swig/Portable/Samples/AdvancedSample/Properties/AssemblyInfo.cs
===================================================================
--- sandbox/jng/vanilla_swig/Portable/Samples/AdvancedSample/Properties/AssemblyInfo.cs	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/Samples/AdvancedSample/Properties/AssemblyInfo.cs	2020-11-28 13:10:51 UTC (rev 9813)
@@ -5,11 +5,11 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("MgDesktopSample")]
+[assembly: AssemblyTitle("MgPortableSample")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("MgDesktopSample")]
+[assembly: AssemblyProduct("MgPortableSample")]
 [assembly: AssemblyCopyright("Copyright ©  2012")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

Modified: sandbox/jng/vanilla_swig/Portable/Samples/BasicSample/MainForm.cs
===================================================================
--- sandbox/jng/vanilla_swig/Portable/Samples/BasicSample/MainForm.cs	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/Samples/BasicSample/MainForm.cs	2020-11-28 13:10:51 UTC (rev 9813)
@@ -53,7 +53,7 @@
             //Create our runtime map
             MgdMap map = new MgdMap(mapDefId);
             //Create our viewer provider
-            MgMapViewerProvider provider = new MgDesktopMapViewerProvider(map);
+            MgMapViewerProvider provider = new MgPortableMapViewerProvider(map);
             //Initialize our viewer with this provider
             mgMapViewer1.Init(provider);
         }

Modified: sandbox/jng/vanilla_swig/Portable/Samples/FreeFormExample/MainForm.cs
===================================================================
--- sandbox/jng/vanilla_swig/Portable/Samples/FreeFormExample/MainForm.cs	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/Samples/FreeFormExample/MainForm.cs	2020-11-28 13:10:51 UTC (rev 9813)
@@ -58,7 +58,7 @@
             //Create our runtime map
             MgdMap map = new MgdMap(mapDefId);
             //Create our viewer provider
-            MgMapViewerProvider provider = new MgDesktopMapViewerProvider(map);
+            MgMapViewerProvider provider = new MgPortableMapViewerProvider(map);
             //Initialize our viewer with this provider
             mgMapViewer1.Init(provider);
             UpdateButtonCheckedState();

Modified: sandbox/jng/vanilla_swig/Portable/Samples/SampleExtension/SamplesTaskPane.cs
===================================================================
--- sandbox/jng/vanilla_swig/Portable/Samples/SampleExtension/SamplesTaskPane.cs	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/Samples/SampleExtension/SamplesTaskPane.cs	2020-11-28 13:10:51 UTC (rev 9813)
@@ -39,7 +39,7 @@
             _viewer.ClearSelection();
             MgResourceIdentifier mdfId = new MgResourceIdentifier("Library://Samples/Sheboygan/Maps/Sheboygan.MapDefinition");
             MgdMap map = new MgdMap(mdfId);
-            MgDesktopMapViewerProvider provider = new MgDesktopMapViewerProvider(map);
+            MgPortableMapViewerProvider provider = new MgPortableMapViewerProvider(map);
             Shell.Instance.ReloadViewer(provider);
         }
     }

Modified: sandbox/jng/vanilla_swig/Portable/Samples/samples_readme.txt
===================================================================
--- sandbox/jng/vanilla_swig/Portable/Samples/samples_readme.txt	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/Samples/samples_readme.txt	2020-11-28 13:10:51 UTC (rev 9813)
@@ -3,7 +3,7 @@
 
 The following samples all require the Sheboygan sample dataset. For these samples to build, copy your mg-desktop files (and its subfolders) into the Lib directory, you must use the correct build of mg-desktop for the version of VS you are using to open this solution file:
 
- - MgDesktopSamples.sln: mg-desktop .net Framework 4.0, VC11 build
+ - MgPortableSamples.sln: mg-desktop .net Framework 4.0, VC11 build
 
 Note that in order to use mg-desktop, your main executable must have CPU architecture set to x86 (because these are .net wrappers to 32-bit unmanaged dlls). All the executable projects in this solution have their CPU architecture set to x86
 

Modified: sandbox/jng/vanilla_swig/Portable/UnitTest/CMakeLists.txt
===================================================================
--- sandbox/jng/vanilla_swig/Portable/UnitTest/CMakeLists.txt	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/UnitTest/CMakeLists.txt	2020-11-28 13:10:51 UTC (rev 9813)
@@ -2,8 +2,8 @@
     ${XERCESC_INCLUDE_DIR}
     ${FDO_INCLUDE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/../MgDesktop
-    ${CMAKE_CURRENT_SOURCE_DIR}/../MgDesktop/Services
+    ${CMAKE_CURRENT_SOURCE_DIR}/../MgPortable
+    ${CMAKE_CURRENT_SOURCE_DIR}/../MgPortable/Services
     ${CPPUNIT_INCLUDE_DIR}
     ${MG_COMMON_DIR}/PlatformBase
     ${MG_COMMON_DIR}/CoordinateSystem
@@ -15,7 +15,7 @@
     ${MG_COMMON_DIR}/Stylization
 )
 
-set (MgDesktopUnitTest_SRCS
+set (MgPortableUnitTest_SRCS
     main.cpp
     TestFeatureService.cpp
     #TestKmlService.cpp
@@ -30,12 +30,12 @@
     TestTileService.cpp
 )
 
-add_executable(MgDesktopUnitTest ${MgDesktopUnitTest_SRCS})
-add_sanitizers(MgDesktopUnitTest)
-set_target_properties( MgDesktopUnitTest
+add_executable(MgPortableUnitTest ${MgPortableUnitTest_SRCS})
+add_sanitizers(MgPortableUnitTest)
+set_target_properties( MgPortableUnitTest
     PROPERTIES OUTPUT_NAME "UnitTest" )
 
-target_link_libraries(MgDesktopUnitTest
+target_link_libraries(MgPortableUnitTest
     ${ACE_LIBRARY}
     ${FDO_LIBRARY}
     ${XERCESC_LIBRARIES}
@@ -45,5 +45,5 @@
     MgFoundation${MG_VERSION_SUFFIX}
     MgPlatformBase${MG_VERSION_SUFFIX}
     MgSecurity${MG_VERSION_SUFFIX}
-    MgDesktop${MG_VERSION_SUFFIX}
+    MgPortable${MG_VERSION_SUFFIX}
 )
\ No newline at end of file

Modified: sandbox/jng/vanilla_swig/Portable/UnitTest/TestFeatureService.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/UnitTest/TestFeatureService.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/UnitTest/TestFeatureService.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -16,7 +16,7 @@
 //
 
 #include "Services/Feature/FeatureUtil.h"
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "CppUnitExtensions.h"
 #include "Fdo.h"
 #include <ctime>

Modified: sandbox/jng/vanilla_swig/Portable/UnitTest/TestKmlService.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/UnitTest/TestKmlService.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/UnitTest/TestKmlService.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "TestKmlService.h"
 #include "ServiceManager.h"
 #include "ServerResourceService.h"

Modified: sandbox/jng/vanilla_swig/Portable/UnitTest/TestLogManager.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/UnitTest/TestLogManager.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/UnitTest/TestLogManager.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "Log/LogManager.h"
 #include "TestLogManagerThread.h"
 #include "FoundationDefs.h"

Modified: sandbox/jng/vanilla_swig/Portable/UnitTest/TestLogManagerThread.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/UnitTest/TestLogManagerThread.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/UnitTest/TestLogManagerThread.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "TestLogManagerThread.h"
 //#include "ServerManager.h"
 #include "Log/LogType.h"

Modified: sandbox/jng/vanilla_swig/Portable/UnitTest/TestMappingService.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/UnitTest/TestMappingService.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/UnitTest/TestMappingService.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 #include "CatchHelperMacros.h"
 #include "TestServiceFactory.h"

Modified: sandbox/jng/vanilla_swig/Portable/UnitTest/TestPerformance.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/UnitTest/TestPerformance.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/UnitTest/TestPerformance.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "TestPerformance.h"
 #include "CppUnitExtensions.h"
 #include "ServiceManager.h"

Modified: sandbox/jng/vanilla_swig/Portable/UnitTest/TestProfilingService.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/UnitTest/TestProfilingService.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/UnitTest/TestProfilingService.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "StylizationDefs.h"
 
 #include "CatchHelperMacros.h"

Modified: sandbox/jng/vanilla_swig/Portable/UnitTest/TestRenderingService.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/UnitTest/TestRenderingService.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/UnitTest/TestRenderingService.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "StylizationDefs.h"
 
 #include "CatchHelperMacros.h"

Modified: sandbox/jng/vanilla_swig/Portable/UnitTest/TestResourceService.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/UnitTest/TestResourceService.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/UnitTest/TestResourceService.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "Services/Resource/ResourceContentCache.h"
 #include "Fdo.h"
 #include <ctime>

Modified: sandbox/jng/vanilla_swig/Portable/UnitTest/TestServiceFactory.h
===================================================================
--- sandbox/jng/vanilla_swig/Portable/UnitTest/TestServiceFactory.h	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/UnitTest/TestServiceFactory.h	2020-11-28 13:10:51 UTC (rev 9813)
@@ -18,7 +18,7 @@
 #ifndef _TESTSERVICEFACTORY_H
 #define _TESTSERVICEFACTORY_H
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 #include <string>
 #include <set>

Modified: sandbox/jng/vanilla_swig/Portable/UnitTest/TestTileService.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/UnitTest/TestTileService.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/UnitTest/TestTileService.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -15,7 +15,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#include "MgDesktop.h"
+#include "MgPortable.h"
 
 #include "CatchHelperMacros.h"
 #include "TestServiceFactory.h"

Modified: sandbox/jng/vanilla_swig/Portable/UnitTest/UnitTest.vcxproj
===================================================================
--- sandbox/jng/vanilla_swig/Portable/UnitTest/UnitTest.vcxproj	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/UnitTest/UnitTest.vcxproj	2020-11-28 13:10:51 UTC (rev 9813)
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\catch2;..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\catch2;..\MgPortable;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -85,7 +85,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>MgDesktopd.lib;FDO.lib;FDOCommon.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MgPortabled.lib;FDO.lib;FDOCommon.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\FDO\Lib;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration);..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);..\..\Common\lib\$(Configuration);..\Lib\debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <TargetMachine>MachineX86</TargetMachine>
@@ -99,7 +99,7 @@
 xcopy /S /Y /I ..\..\Oem\gd\build\win32\gd\Debug\gd.dll $(OutDir)
 xcopy /S /Y /I ..\..\Oem\FDO\Bin\Debug\*.* $(OutDir)FDO\
 xcopy /S /Y /I ..\..\Server\bin\Debug\MgGws*.* $(OutDir)
-xcopy /Y ..\MgDesktop\bin\$(Configuration)\*.* $(OutDir)
+xcopy /Y ..\MgPortable\bin\$(Configuration)\*.* $(OutDir)
 xcopy /S /Y /I ..\..\UnitTest\TestData\DrawingService\*.* $(OutDir)..\UnitTestFiles\
 xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\*.* $(OutDir)..\UnitTestFiles\
 xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\SDF\*.* $(OutDir)..\UnitTestFiles\
@@ -124,7 +124,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\catch2;..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\catch2;..\MgPortable;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -133,7 +133,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>MgDesktopd.lib;FDO.lib;FDOCommon.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MgPortabled.lib;FDO.lib;FDOCommon.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\FDO\Lib64;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)64;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;..\..\Common\lib\$(Configuration)64;..\Lib\debug64</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <TargetMachine>MachineX64</TargetMachine>
@@ -147,7 +147,7 @@
 xcopy /S /Y /I ..\..\Oem\gd\build\win32\gd\Debug64\gd.dll $(OutDir)
 xcopy /S /Y /I ..\..\Oem\FDO\Bin\Debug64\*.* $(OutDir)FDO\
 xcopy /S /Y /I ..\..\Server\bin\Debug64\MgGws*.* $(OutDir)
-xcopy /Y ..\MgDesktop\bin\Debug64\*.* $(OutDir)
+xcopy /Y ..\MgPortable\bin\Debug64\*.* $(OutDir)
 xcopy /S /Y /I ..\..\UnitTest\TestData\DrawingService\*.* $(OutDir)..\UnitTestFiles\
 xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\*.* $(OutDir)..\UnitTestFiles\
 xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\SDF\*.* $(OutDir)..\UnitTestFiles\
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\catch2;..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\catch2;..\MgPortable;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -178,7 +178,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>MgDesktop.lib;FDO.lib;FDOCommon.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MgPortable.lib;FDO.lib;FDOCommon.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\FDO\Lib;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration);..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);..\..\Common\lib\$(Configuration);..\Lib\release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>FDO.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -195,7 +195,7 @@
 xcopy /S /Y /I ..\..\Oem\gd\build\win32\gd\Release\gd.dll $(OutDir)
 xcopy /S /Y /I ..\..\Oem\FDO\Bin\Release\*.* $(OutDir)FDO\
 xcopy /S /Y /I ..\..\Server\bin\Release\MgGws*.* $(OutDir)
-xcopy /Y ..\MgDesktop\bin\$(Configuration)\*.* $(OutDir)
+xcopy /Y ..\MgPortable\bin\$(Configuration)\*.* $(OutDir)
 xcopy /S /Y /I ..\..\UnitTest\TestData\DrawingService\*.* $(OutDir)..\UnitTestFiles\
 xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\*.* $(OutDir)..\UnitTestFiles\
 xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\SDF\*.* $(OutDir)..\UnitTestFiles\
@@ -222,7 +222,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\catch2;..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\catch2;..\MgPortable;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -230,7 +230,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>MgDesktop.lib;FDO.lib;FDOCommon.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MgPortable.lib;FDO.lib;FDOCommon.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\FDO\Lib64;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)64;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;..\..\Common\lib\$(Configuration)64;..\Lib\release64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>FDO.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -247,7 +247,7 @@
 xcopy /S /Y /I ..\..\Oem\gd\build\win32\gd\Release64\gd.dll $(OutDir)
 xcopy /S /Y /I ..\..\Oem\FDO\Bin\Release64\*.* $(OutDir)FDO\
 xcopy /S /Y /I ..\..\Server\bin\Release64\MgGws*.* $(OutDir)
-xcopy /Y ..\MgDesktop\bin\release64\*.* $(OutDir)
+xcopy /Y ..\MgPortable\bin\release64\*.* $(OutDir)
 xcopy /S /Y /I ..\..\UnitTest\TestData\DrawingService\*.* $(OutDir)..\UnitTestFiles\
 xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\*.* $(OutDir)..\UnitTestFiles\
 xcopy /Y /I ..\..\UnitTest\TestData\FeatureService\SDF\*.* $(OutDir)..\UnitTestFiles\

Modified: sandbox/jng/vanilla_swig/Portable/UnitTest/main.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Portable/UnitTest/main.cpp	2020-11-28 12:53:47 UTC (rev 9812)
+++ sandbox/jng/vanilla_swig/Portable/UnitTest/main.cpp	2020-11-28 13:10:51 UTC (rev 9813)
@@ -17,7 +17,7 @@
 
 #define CATCH_CONFIG_RUNNER
 #include "catch.hpp"
-#include "MgDesktop.h"
+#include "MgPortable.h"
 #include "TestServiceFactory.h"
 #include <fstream>
 



More information about the mapguide-commits mailing list