Mon Oct 10 03:58:26 PDT 2022

Author: jng
Date: 2022-10-10 03:58:26 -0700 (Mon, 10 Oct 2022)
New Revision: 9976

Modified:
   trunk/MgDev/
   trunk/MgDev/Bindings/TODO.txt
   trunk/MgDev/Bindings/src/Bindings/Bindings.sln
   trunk/MgDev/Bindings/src/Bindings/DotNet/DotNetUnmanagedApi.vcxproj
   trunk/MgDev/Bindings/src/Bindings/DotNet/Foundation/FoundationApi.vcxproj
   trunk/MgDev/Bindings/src/Bindings/DotNet/Geometry/GeometryApi.vcxproj
   trunk/MgDev/Bindings/src/Bindings/DotNet/MapGuideCommon/MapGuideCommonApi.vcxproj
   trunk/MgDev/Bindings/src/Bindings/DotNet/PlatformBase/PlatformBaseApi.vcxproj
   trunk/MgDev/Bindings/src/Bindings/DotNet/Web/WebApi.vcxproj
   trunk/MgDev/Bindings/src/Bindings/Java/JavaApi.vcxproj
   trunk/MgDev/Bindings/src/Bindings/Php/PhpApi.vcxproj
   trunk/MgDev/Bindings/src/IMake/IMake.vcxproj
   trunk/MgDev/Oem/oem.sln
   trunk/MgDev/Portable/
   trunk/MgDev/Portable/MgPortable/MgPortable.vcxproj
   trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp
   trunk/MgDev/UnitTest/TestData/Samples/Sheboygan/Library/Samples/Sheboygan/Layers/Parcels.LayerDefinition_HEADER.xml
   trunk/MgDev/Web/src/mapviewerjava/mainframe.jsp
Log:
Merged revision(s) 9825-9915 from sandbox/jng/vanilla_swig:
Merged revision(s) 9824 from trunk/MgDev:
Add a CMakeLists.txt to jsoncpp so we can build it with CMake instead of relying on scons, which it and/or Python has to be in a particular version range for the build to work. Also speed up common libs subset build by using the (undiscovered until now) --build-one flag in dbxml's buildall.sh to only build xerces and skip everything else
........

........
TODO update
........
Merged revision(s) 9825-9863 from trunk/MgDev: Synchronize sandbox branch against latest trunk
........
Merged revision(s) 9874-9897 from trunk/MgDev:
#2842: Update httpd to 2.4.49 and update apr to 1.7.0
........
Merged revision(s) 9866-9867, 9871-9873 from sandbox/adsk/trunk:
Fix an issue that the offset of the ghost text is not proper if the font size is very small, for example, the font size is 0.4mm. 
By default, the offset of the ghost text is 0.25mm.
If the height of the font is very small, for example, 0.4mm. The 0.25mm offset is relatively big. 
And after the 0.25mm offset is converted to the value of the screen unit, 
the value is much bigger than 1 if the user zooms to see the text. In this case, 1/10 of the font height 
is used instead of 0.25mm.
........
Update transform grid file format according to CsMap changes.
........
Fix towlower / toupper to towlower / towupper for wchar_t
........
Revert copyright to LGPL 2.1
........
CS: Update method CCoordinateSystemTransform::GetExplicitGeodeticPath().
If it is an implicitly constructed path, we'll now create a [GeodeticPathDefinition] on-the-fly
........

........
#2842: Update HTTPD_VER
........
Update svn ignore list
........
Fix up IMake for Debug|x64
........
Update source file list for CS-Map
........
Merged revision(s) 9875-9881 from sandbox/adsk/trunk:
Update method CCoordinateSystemGeodeticTransformGridFile::IsValid() to add OST15 format.
........
Pass the 'geometry' argument to ProcessSELabelGroup, so the renderer can get the centroid of the geometry.
........

........
Merged revision(s) 9884-9896 from sandbox/jng/msvc2019:

#2843: Migrate to use MSVC 2019 as the default windows compiler
........

........
Update PlatformToolset target for MgPortable. Missed in previous merge because SVN sucks at tracking directory/file renames
........
Merged revision(s) 9902 from trunk/MgDev:
#2843: Missed a spot. Update CS-Map lib path
........

........
DevGuide doc: Remove unused pngmath extension
........
Use v142 toolset for bindings
........
Fix up Windows SDK references
........
Update TODO
........
Merged revision(s) 9909-9914 from trunk/MgDev:
devguide: Remove pngmath extension from sphinx-doc config
........
#2842: Update httpd to 2.4.52
........
#2842: Update httpd to 2.4.52
........
#2842: Update httpd windows headers/libs to 2.4.52
........
Merged revision(s) 9908 from sandbox/adsk/trunk:
If the font height is very small, like 3mm or less. The calculated offset is large relatively to the font height. 
For this case, a limitation of the offset is added. A flag - limitMaxOffset is added. It indicates the font height is very small and the limitation is needed. The maximum offset is set to 6 * screenUnitsPerPixel.
........

........

........


Index: trunk/MgDev
===================================================================

--- trunk/MgDev	2022-10-10 10:22:05 UTC (rev 9975)
+++ trunk/MgDev	2022-10-10 10:58:26 UTC (rev 9976)

Property changes on: trunk/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
## -41,6 +41,6 ##
 /sandbox/jng/utfgrid:9179-9212
 /sandbox/jng/v30:8212-8227
 /sandbox/jng/v4:9511-9519
-/sandbox/jng/vanilla_swig:9757-9823
+/sandbox/jng/vanilla_swig:9757-9823,9825-9915
 /sandbox/jng/wfs_hits:9569-9577
 /sandbox/rfc94:5099-5163
\ No newline at end of property
Modified: trunk/MgDev/Bindings/TODO.txt
===================================================================
--- trunk/MgDev/Bindings/TODO.txt	2022-10-10 10:22:05 UTC (rev 9975)
+++ trunk/MgDev/Bindings/TODO.txt	2022-10-10 10:58:26 UTC (rev 9976)
@@ -3,12 +3,13 @@
  - [x] Generate XML documentation for our .net wrapper binding projects
  - [ ] Make sure we can build debug bindings
  - [x] Fix up inconsistent stack direction in C# exceptions (C++ call stack are printed downwards, C# call stack is printed upwards)
- - [ ] Add memory leak test (ref: http://osgeo-org.1560.x6.nabble.com/Memory-Leak-in-Java-td5425579.html) and see if this still happens
+ - [ ] Add memory leak test (ref: https://www.mail-archive.com/mapguide-users@lists.osgeo.org/msg26357.html) and see if this still happens
  - [x] Check in test case admin tool
  - [x] Consolidate Tools.sln into Bindings.sln
  - [ ] Relocate/remove existing test code
  - [x] Move packages dir up to to top-level MgDev subdirectory and make sure nuget.config sources from this dir
  - [ ] Update build batch files to build bindings/portable
+ - [ ] Fix binding pre-build events to copy ACE/GEOS/lib_json dlls from their respective Oem directories
  - Split .net binding into the Foundation/Geometry/PlatformBase/MapGuideCommon/Web layout (https://github.com/jumpinjackie/mapguide-api-bindings/issues/18)
    - [x] Add .targets files to each C# project so that native dlls are copied properly when consumed by legacy .net framework applications/libraries
    - [x] Consolidate TestCommon and TestMapGuideApi .net projects to unified netstandard2.0 libraries
@@ -39,11 +40,11 @@
    - [ ] Running javadoc against the generated sources produces many errors. See if we can fix them
    - [x] Verify test suite still passes (Windows)
    - [ ] Verify test suite still passes (Linux)
- - [x] Migrate to SWIG 4.0.2 (https://github.com/jumpinjackie/mapguide-api-bindings/issues/36)
+ - [ ] Migrate to SWIG 4.1.0 (https://github.com/jumpinjackie/mapguide-api-bindings/issues/36)
+   - [ ] SWIG 4.1 has not been released yet, so migrate to swig git master
    - [ ] Check if we can get rid of custom .net wstring marshaler (presumably SWIG 4.0 has better support in this area)
- - PHP 7 binding (https://github.com/jumpinjackie/mapguide-api-bindings/issues/21)
-   - [ ] Re-base work against PHP 7.4
-      - [ ] If this means we have to upgrade VS compiler from 2015, just upgrade this one project
+ - PHP 8 binding (https://github.com/jumpinjackie/mapguide-api-bindings/issues/21)
+   - [ ] Re-base work against PHP 8.1
    - [ ] Make sure downcasting still works (eg. MgSiteConnection::CreateService returns an appropriate MgService-derived subclass and not MgService)
    - [ ] Make sure that our byte typemaps still work (test APIs that deal with MgByteReader)
    - [ ] Make sure we can throw MgException
@@ -62,9 +63,7 @@
    - [ ] mapadmin
    - [ ] fusion
    - [ ] mapviewernet
-     - If raw .aspx files cannot consume our netstandard2.0 package, convert this to a legacy ASP.net web forms project
-        - Will require installer changes to properly register this ASP.net application
-     - If the above is untenable, rewrite mapviewernet as a Razor Pages application
+     - If raw .aspx files cannot consume our netstandard2.0 package, retian Oem/SwigEx for the purpose of building "legacy" .net bindings
    - [ ] MapGuide Developer's Guide
    - [ ] viewer samples (PHP)
    - [ ] viewer samples (Java)
@@ -82,8 +81,8 @@
    - [ ] Add new OSGeo.MapGuide.Portable .net project for the .net portion of the SWIG glue
    - [ ] Implement a sample asp.net core application that confirms the feasibility of using mg-portable for web applications in addition to desktop applications
    - Either: 
-     - ( ) Migrate the viewer winforms library to target .net 5.0
-     - ( ) Or maintain 2 versions of this library, a new .net 5.0 version of the library and a legacy full framework version
+     - ( ) Migrate the viewer winforms library to target .net 6.0
+     - ( ) Or maintain 2 versions of this library, a new .net 6.0 version of the library and a legacy full framework version
    - [ ] Port over Java binding
  - Old code cleanup/consolidation
    - [ ] Remove old IMake

Modified: trunk/MgDev/Bindings/src/Bindings/Bindings.sln
===================================================================
--- trunk/MgDev/Bindings/src/Bindings/Bindings.sln	2022-10-10 10:22:05 UTC (rev 9975)
+++ trunk/MgDev/Bindings/src/Bindings/Bindings.sln	2022-10-10 10:58:26 UTC (rev 9976)
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30611.23
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31912.275
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DotNetUnmanagedApi", "DotNet\DotNetUnmanagedApi.vcxproj", "{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -141,306 +141,224 @@
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug|x64.ActiveCfg = Debug|x64
 		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug|x64.Build.0 = Debug|x64
 		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug|x86.ActiveCfg = Debug|x64
-		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release|Any CPU.ActiveCfg = Release|x64
 		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release|x64.ActiveCfg = Release|x64
 		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release|x64.Build.0 = Release|x64
 		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release|x86.ActiveCfg = Release|x64
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x64.ActiveCfg = Debug|x64
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x86.ActiveCfg = Debug|x64
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|Any CPU.ActiveCfg = Release|x64
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.ActiveCfg = Release|x64
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.Build.0 = Release|x64
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.Deploy.0 = Release|x64
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x86.ActiveCfg = Release|x64
-		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{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}.Debug|x86.ActiveCfg = Debug|x64
-		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|Any CPU.ActiveCfg = Release|x64
 		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|x64.ActiveCfg = Release|x64
 		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|x64.Build.0 = Release|x64
 		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|x86.ActiveCfg = Release|x64
-		{4A3F2DA2-F53F-48EE-9505-8285F3E089D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A3F2DA2-F53F-48EE-9505-8285F3E089D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4A3F2DA2-F53F-48EE-9505-8285F3E089D4}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{4A3F2DA2-F53F-48EE-9505-8285F3E089D4}.Debug|x64.Build.0 = Debug|Any CPU
 		{4A3F2DA2-F53F-48EE-9505-8285F3E089D4}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{4A3F2DA2-F53F-48EE-9505-8285F3E089D4}.Debug|x86.Build.0 = Debug|Any CPU
-		{4A3F2DA2-F53F-48EE-9505-8285F3E089D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4A3F2DA2-F53F-48EE-9505-8285F3E089D4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4A3F2DA2-F53F-48EE-9505-8285F3E089D4}.Release|x64.ActiveCfg = Release|Any CPU
 		{4A3F2DA2-F53F-48EE-9505-8285F3E089D4}.Release|x64.Build.0 = Release|Any CPU
 		{4A3F2DA2-F53F-48EE-9505-8285F3E089D4}.Release|x86.ActiveCfg = Release|Any CPU
 		{4A3F2DA2-F53F-48EE-9505-8285F3E089D4}.Release|x86.Build.0 = Release|Any CPU
-		{73C62FF2-C188-4A61-929E-2F112D7E17AA}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{73C62FF2-C188-4A61-929E-2F112D7E17AA}.Debug|x64.ActiveCfg = Debug|x64
 		{73C62FF2-C188-4A61-929E-2F112D7E17AA}.Debug|x64.Build.0 = Debug|x64
 		{73C62FF2-C188-4A61-929E-2F112D7E17AA}.Debug|x86.ActiveCfg = Debug|x64
-		{73C62FF2-C188-4A61-929E-2F112D7E17AA}.Release|Any CPU.ActiveCfg = Release|x64
 		{73C62FF2-C188-4A61-929E-2F112D7E17AA}.Release|x64.ActiveCfg = Release|x64
 		{73C62FF2-C188-4A61-929E-2F112D7E17AA}.Release|x64.Build.0 = Release|x64
 		{73C62FF2-C188-4A61-929E-2F112D7E17AA}.Release|x86.ActiveCfg = Release|x64
-		{120AC2A9-5EBE-4512-9FF7-54EA04192196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{120AC2A9-5EBE-4512-9FF7-54EA04192196}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{120AC2A9-5EBE-4512-9FF7-54EA04192196}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{120AC2A9-5EBE-4512-9FF7-54EA04192196}.Debug|x64.Build.0 = Debug|Any CPU
 		{120AC2A9-5EBE-4512-9FF7-54EA04192196}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{120AC2A9-5EBE-4512-9FF7-54EA04192196}.Debug|x86.Build.0 = Debug|Any CPU
-		{120AC2A9-5EBE-4512-9FF7-54EA04192196}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{120AC2A9-5EBE-4512-9FF7-54EA04192196}.Release|Any CPU.Build.0 = Release|Any CPU
 		{120AC2A9-5EBE-4512-9FF7-54EA04192196}.Release|x64.ActiveCfg = Release|Any CPU
 		{120AC2A9-5EBE-4512-9FF7-54EA04192196}.Release|x64.Build.0 = Release|Any CPU
 		{120AC2A9-5EBE-4512-9FF7-54EA04192196}.Release|x86.ActiveCfg = Release|Any CPU
 		{120AC2A9-5EBE-4512-9FF7-54EA04192196}.Release|x86.Build.0 = Release|Any CPU
-		{B994F673-EB8E-4C65-8884-B56AB8783115}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{B994F673-EB8E-4C65-8884-B56AB8783115}.Debug|x64.ActiveCfg = Debug|x64
 		{B994F673-EB8E-4C65-8884-B56AB8783115}.Debug|x64.Build.0 = Debug|x64
 		{B994F673-EB8E-4C65-8884-B56AB8783115}.Debug|x86.ActiveCfg = Debug|x64
-		{B994F673-EB8E-4C65-8884-B56AB8783115}.Release|Any CPU.ActiveCfg = Release|x64
 		{B994F673-EB8E-4C65-8884-B56AB8783115}.Release|x64.ActiveCfg = Release|x64
 		{B994F673-EB8E-4C65-8884-B56AB8783115}.Release|x64.Build.0 = Release|x64
 		{B994F673-EB8E-4C65-8884-B56AB8783115}.Release|x86.ActiveCfg = Release|x64
-		{15A784CC-1DA1-4AF2-81EA-D9EABCD4B760}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{15A784CC-1DA1-4AF2-81EA-D9EABCD4B760}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{15A784CC-1DA1-4AF2-81EA-D9EABCD4B760}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{15A784CC-1DA1-4AF2-81EA-D9EABCD4B760}.Debug|x64.Build.0 = Debug|Any CPU
 		{15A784CC-1DA1-4AF2-81EA-D9EABCD4B760}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{15A784CC-1DA1-4AF2-81EA-D9EABCD4B760}.Debug|x86.Build.0 = Debug|Any CPU
-		{15A784CC-1DA1-4AF2-81EA-D9EABCD4B760}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{15A784CC-1DA1-4AF2-81EA-D9EABCD4B760}.Release|Any CPU.Build.0 = Release|Any CPU
 		{15A784CC-1DA1-4AF2-81EA-D9EABCD4B760}.Release|x64.ActiveCfg = Release|Any CPU
 		{15A784CC-1DA1-4AF2-81EA-D9EABCD4B760}.Release|x64.Build.0 = Release|Any CPU
 		{15A784CC-1DA1-4AF2-81EA-D9EABCD4B760}.Release|x86.ActiveCfg = Release|Any CPU
 		{15A784CC-1DA1-4AF2-81EA-D9EABCD4B760}.Release|x86.Build.0 = Release|Any CPU
-		{3BAE3F0E-8F3F-404B-B29B-5881C16BD33B}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{3BAE3F0E-8F3F-404B-B29B-5881C16BD33B}.Debug|x64.ActiveCfg = Debug|x64
 		{3BAE3F0E-8F3F-404B-B29B-5881C16BD33B}.Debug|x64.Build.0 = Debug|x64
 		{3BAE3F0E-8F3F-404B-B29B-5881C16BD33B}.Debug|x86.ActiveCfg = Debug|x64
-		{3BAE3F0E-8F3F-404B-B29B-5881C16BD33B}.Release|Any CPU.ActiveCfg = Release|x64
 		{3BAE3F0E-8F3F-404B-B29B-5881C16BD33B}.Release|x64.ActiveCfg = Release|x64
 		{3BAE3F0E-8F3F-404B-B29B-5881C16BD33B}.Release|x64.Build.0 = Release|x64
 		{3BAE3F0E-8F3F-404B-B29B-5881C16BD33B}.Release|x86.ActiveCfg = Release|x64
-		{80D0D30B-A9E1-464B-93ED-0EFEAD4EE102}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{80D0D30B-A9E1-464B-93ED-0EFEAD4EE102}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{80D0D30B-A9E1-464B-93ED-0EFEAD4EE102}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{80D0D30B-A9E1-464B-93ED-0EFEAD4EE102}.Debug|x64.Build.0 = Debug|Any CPU
 		{80D0D30B-A9E1-464B-93ED-0EFEAD4EE102}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{80D0D30B-A9E1-464B-93ED-0EFEAD4EE102}.Debug|x86.Build.0 = Debug|Any CPU
-		{80D0D30B-A9E1-464B-93ED-0EFEAD4EE102}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{80D0D30B-A9E1-464B-93ED-0EFEAD4EE102}.Release|Any CPU.Build.0 = Release|Any CPU
 		{80D0D30B-A9E1-464B-93ED-0EFEAD4EE102}.Release|x64.ActiveCfg = Release|Any CPU
 		{80D0D30B-A9E1-464B-93ED-0EFEAD4EE102}.Release|x64.Build.0 = Release|Any CPU
 		{80D0D30B-A9E1-464B-93ED-0EFEAD4EE102}.Release|x86.ActiveCfg = Release|Any CPU
 		{80D0D30B-A9E1-464B-93ED-0EFEAD4EE102}.Release|x86.Build.0 = Release|Any CPU
-		{42FC41FD-742B-4AED-816E-C211F1B07F3F}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{42FC41FD-742B-4AED-816E-C211F1B07F3F}.Debug|x64.ActiveCfg = Debug|x64
 		{42FC41FD-742B-4AED-816E-C211F1B07F3F}.Debug|x64.Build.0 = Debug|x64
 		{42FC41FD-742B-4AED-816E-C211F1B07F3F}.Debug|x86.ActiveCfg = Debug|x64
-		{42FC41FD-742B-4AED-816E-C211F1B07F3F}.Release|Any CPU.ActiveCfg = Release|x64
 		{42FC41FD-742B-4AED-816E-C211F1B07F3F}.Release|x64.ActiveCfg = Release|x64
 		{42FC41FD-742B-4AED-816E-C211F1B07F3F}.Release|x64.Build.0 = Release|x64
 		{42FC41FD-742B-4AED-816E-C211F1B07F3F}.Release|x86.ActiveCfg = Release|x64
-		{B4C52243-CBA3-4FB7-BB22-4D44331D6058}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B4C52243-CBA3-4FB7-BB22-4D44331D6058}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B4C52243-CBA3-4FB7-BB22-4D44331D6058}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{B4C52243-CBA3-4FB7-BB22-4D44331D6058}.Debug|x64.Build.0 = Debug|Any CPU
 		{B4C52243-CBA3-4FB7-BB22-4D44331D6058}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{B4C52243-CBA3-4FB7-BB22-4D44331D6058}.Debug|x86.Build.0 = Debug|Any CPU
-		{B4C52243-CBA3-4FB7-BB22-4D44331D6058}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B4C52243-CBA3-4FB7-BB22-4D44331D6058}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B4C52243-CBA3-4FB7-BB22-4D44331D6058}.Release|x64.ActiveCfg = Release|Any CPU
 		{B4C52243-CBA3-4FB7-BB22-4D44331D6058}.Release|x64.Build.0 = Release|Any CPU
 		{B4C52243-CBA3-4FB7-BB22-4D44331D6058}.Release|x86.ActiveCfg = Release|Any CPU
 		{B4C52243-CBA3-4FB7-BB22-4D44331D6058}.Release|x86.Build.0 = Release|Any CPU
-		{0B90819D-4066-4D6C-87E6-3BE4D8F595DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B90819D-4066-4D6C-87E6-3BE4D8F595DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0B90819D-4066-4D6C-87E6-3BE4D8F595DE}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{0B90819D-4066-4D6C-87E6-3BE4D8F595DE}.Debug|x64.Build.0 = Debug|Any CPU
 		{0B90819D-4066-4D6C-87E6-3BE4D8F595DE}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{0B90819D-4066-4D6C-87E6-3BE4D8F595DE}.Debug|x86.Build.0 = Debug|Any CPU
-		{0B90819D-4066-4D6C-87E6-3BE4D8F595DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0B90819D-4066-4D6C-87E6-3BE4D8F595DE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0B90819D-4066-4D6C-87E6-3BE4D8F595DE}.Release|x64.ActiveCfg = Release|Any CPU
 		{0B90819D-4066-4D6C-87E6-3BE4D8F595DE}.Release|x64.Build.0 = Release|Any CPU
 		{0B90819D-4066-4D6C-87E6-3BE4D8F595DE}.Release|x86.ActiveCfg = Release|Any CPU
 		{0B90819D-4066-4D6C-87E6-3BE4D8F595DE}.Release|x86.Build.0 = Release|Any CPU
-		{C83BF842-ABB1-4870-8003-11EF860E6741}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{C83BF842-ABB1-4870-8003-11EF860E6741}.Debug|x64.ActiveCfg = Debug|x64
 		{C83BF842-ABB1-4870-8003-11EF860E6741}.Debug|x64.Build.0 = Debug|x64
 		{C83BF842-ABB1-4870-8003-11EF860E6741}.Debug|x86.ActiveCfg = Debug|x64
-		{C83BF842-ABB1-4870-8003-11EF860E6741}.Release|Any CPU.ActiveCfg = Release|x64
 		{C83BF842-ABB1-4870-8003-11EF860E6741}.Release|x64.ActiveCfg = Release|x64
 		{C83BF842-ABB1-4870-8003-11EF860E6741}.Release|x64.Build.0 = Release|x64
 		{C83BF842-ABB1-4870-8003-11EF860E6741}.Release|x86.ActiveCfg = Release|x64
-		{C266761B-BC19-4BD7-9EE8-3AE2CE7DE7A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C266761B-BC19-4BD7-9EE8-3AE2CE7DE7A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C266761B-BC19-4BD7-9EE8-3AE2CE7DE7A4}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{C266761B-BC19-4BD7-9EE8-3AE2CE7DE7A4}.Debug|x64.Build.0 = Debug|Any CPU
 		{C266761B-BC19-4BD7-9EE8-3AE2CE7DE7A4}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{C266761B-BC19-4BD7-9EE8-3AE2CE7DE7A4}.Debug|x86.Build.0 = Debug|Any CPU
-		{C266761B-BC19-4BD7-9EE8-3AE2CE7DE7A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C266761B-BC19-4BD7-9EE8-3AE2CE7DE7A4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C266761B-BC19-4BD7-9EE8-3AE2CE7DE7A4}.Release|x64.ActiveCfg = Release|Any CPU
 		{C266761B-BC19-4BD7-9EE8-3AE2CE7DE7A4}.Release|x64.Build.0 = Release|Any CPU
 		{C266761B-BC19-4BD7-9EE8-3AE2CE7DE7A4}.Release|x86.ActiveCfg = Release|Any CPU
 		{C266761B-BC19-4BD7-9EE8-3AE2CE7DE7A4}.Release|x86.Build.0 = Release|Any CPU
-		{42199427-9825-4A45-A3D1-5C3090C57035}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{42199427-9825-4A45-A3D1-5C3090C57035}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{42199427-9825-4A45-A3D1-5C3090C57035}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{42199427-9825-4A45-A3D1-5C3090C57035}.Debug|x64.Build.0 = Debug|Any CPU
 		{42199427-9825-4A45-A3D1-5C3090C57035}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{42199427-9825-4A45-A3D1-5C3090C57035}.Debug|x86.Build.0 = Debug|Any CPU
-		{42199427-9825-4A45-A3D1-5C3090C57035}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{42199427-9825-4A45-A3D1-5C3090C57035}.Release|Any CPU.Build.0 = Release|Any CPU
 		{42199427-9825-4A45-A3D1-5C3090C57035}.Release|x64.ActiveCfg = Release|Any CPU
 		{42199427-9825-4A45-A3D1-5C3090C57035}.Release|x64.Build.0 = Release|Any CPU
 		{42199427-9825-4A45-A3D1-5C3090C57035}.Release|x86.ActiveCfg = Release|Any CPU
 		{42199427-9825-4A45-A3D1-5C3090C57035}.Release|x86.Build.0 = Release|Any CPU
-		{7A73A95F-DCCC-4880-BA8C-AE8D9D48FA59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7A73A95F-DCCC-4880-BA8C-AE8D9D48FA59}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7A73A95F-DCCC-4880-BA8C-AE8D9D48FA59}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{7A73A95F-DCCC-4880-BA8C-AE8D9D48FA59}.Debug|x64.Build.0 = Debug|Any CPU
 		{7A73A95F-DCCC-4880-BA8C-AE8D9D48FA59}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{7A73A95F-DCCC-4880-BA8C-AE8D9D48FA59}.Debug|x86.Build.0 = Debug|Any CPU
-		{7A73A95F-DCCC-4880-BA8C-AE8D9D48FA59}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7A73A95F-DCCC-4880-BA8C-AE8D9D48FA59}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7A73A95F-DCCC-4880-BA8C-AE8D9D48FA59}.Release|x64.ActiveCfg = Release|Any CPU
 		{7A73A95F-DCCC-4880-BA8C-AE8D9D48FA59}.Release|x64.Build.0 = Release|Any CPU
 		{7A73A95F-DCCC-4880-BA8C-AE8D9D48FA59}.Release|x86.ActiveCfg = Release|Any CPU
 		{7A73A95F-DCCC-4880-BA8C-AE8D9D48FA59}.Release|x86.Build.0 = Release|Any CPU
-		{27210DB6-811B-4D4E-A7E0-6488E5AFA733}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{27210DB6-811B-4D4E-A7E0-6488E5AFA733}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{27210DB6-811B-4D4E-A7E0-6488E5AFA733}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{27210DB6-811B-4D4E-A7E0-6488E5AFA733}.Debug|x64.Build.0 = Debug|Any CPU
 		{27210DB6-811B-4D4E-A7E0-6488E5AFA733}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{27210DB6-811B-4D4E-A7E0-6488E5AFA733}.Debug|x86.Build.0 = Debug|Any CPU
-		{27210DB6-811B-4D4E-A7E0-6488E5AFA733}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{27210DB6-811B-4D4E-A7E0-6488E5AFA733}.Release|Any CPU.Build.0 = Release|Any CPU
 		{27210DB6-811B-4D4E-A7E0-6488E5AFA733}.Release|x64.ActiveCfg = Release|Any CPU
 		{27210DB6-811B-4D4E-A7E0-6488E5AFA733}.Release|x64.Build.0 = Release|Any CPU
 		{27210DB6-811B-4D4E-A7E0-6488E5AFA733}.Release|x86.ActiveCfg = Release|Any CPU
 		{27210DB6-811B-4D4E-A7E0-6488E5AFA733}.Release|x86.Build.0 = Release|Any CPU
-		{096D661F-DEA7-4EAB-95BB-F6A0E0AF59FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{096D661F-DEA7-4EAB-95BB-F6A0E0AF59FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{096D661F-DEA7-4EAB-95BB-F6A0E0AF59FF}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{096D661F-DEA7-4EAB-95BB-F6A0E0AF59FF}.Debug|x64.Build.0 = Debug|Any CPU
 		{096D661F-DEA7-4EAB-95BB-F6A0E0AF59FF}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{096D661F-DEA7-4EAB-95BB-F6A0E0AF59FF}.Debug|x86.Build.0 = Debug|Any CPU
-		{096D661F-DEA7-4EAB-95BB-F6A0E0AF59FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{096D661F-DEA7-4EAB-95BB-F6A0E0AF59FF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{096D661F-DEA7-4EAB-95BB-F6A0E0AF59FF}.Release|x64.ActiveCfg = Release|Any CPU
 		{096D661F-DEA7-4EAB-95BB-F6A0E0AF59FF}.Release|x64.Build.0 = Release|Any CPU
 		{096D661F-DEA7-4EAB-95BB-F6A0E0AF59FF}.Release|x86.ActiveCfg = Release|Any CPU
 		{096D661F-DEA7-4EAB-95BB-F6A0E0AF59FF}.Release|x86.Build.0 = Release|Any CPU
-		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Debug|Any CPU.ActiveCfg = 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}.Debug|x86.ActiveCfg = Debug|Win32
 		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Debug|x86.Build.0 = Debug|Win32
-		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Release|Any CPU.ActiveCfg = Release|Win32
 		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Release|x64.ActiveCfg = Release|x64
 		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Release|x64.Build.0 = Release|x64
 		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Release|x86.ActiveCfg = Release|Win32
 		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Release|x86.Build.0 = Release|Win32
-		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Debug|Any CPU.ActiveCfg = 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}.Debug|x86.ActiveCfg = Debug|Win32
 		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Debug|x86.Build.0 = Debug|Win32
-		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Release|Any CPU.ActiveCfg = Release|Win32
 		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Release|x64.ActiveCfg = Release|x64
 		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Release|x64.Build.0 = Release|x64
 		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Release|x86.ActiveCfg = Release|Win32
 		{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Release|x86.Build.0 = Release|Win32
-		{5287A594-4D4F-43FE-A281-E279AB708CF1}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{5287A594-4D4F-43FE-A281-E279AB708CF1}.Debug|x64.ActiveCfg = Debug|x64
 		{5287A594-4D4F-43FE-A281-E279AB708CF1}.Debug|x64.Build.0 = Debug|x64
 		{5287A594-4D4F-43FE-A281-E279AB708CF1}.Debug|x86.ActiveCfg = Debug|Win32
 		{5287A594-4D4F-43FE-A281-E279AB708CF1}.Debug|x86.Build.0 = Debug|Win32
-		{5287A594-4D4F-43FE-A281-E279AB708CF1}.Release|Any CPU.ActiveCfg = Release|Win32
 		{5287A594-4D4F-43FE-A281-E279AB708CF1}.Release|x64.ActiveCfg = Release|x64
 		{5287A594-4D4F-43FE-A281-E279AB708CF1}.Release|x64.Build.0 = Release|x64
 		{5287A594-4D4F-43FE-A281-E279AB708CF1}.Release|x86.ActiveCfg = Release|Win32
 		{5287A594-4D4F-43FE-A281-E279AB708CF1}.Release|x86.Build.0 = Release|Win32
-		{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Debug|Any CPU.ActiveCfg = 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}.Debug|x86.ActiveCfg = Debug|Win32
 		{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Debug|x86.Build.0 = Debug|Win32
-		{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Release|Any CPU.ActiveCfg = Release|Win32
 		{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Release|x64.ActiveCfg = Release|x64
 		{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Release|x64.Build.0 = Release|x64
 		{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Release|x86.ActiveCfg = Release|Win32
 		{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Release|x86.Build.0 = Release|Win32
-		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Debug|Any CPU.ActiveCfg = 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}.Debug|x86.ActiveCfg = Debug|Win32
 		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Debug|x86.Build.0 = Debug|Win32
-		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Release|Any CPU.ActiveCfg = Release|Win32
 		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Release|x64.ActiveCfg = Release|x64
 		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Release|x64.Build.0 = Release|x64
 		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Release|x86.ActiveCfg = Release|Win32
 		{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Release|x86.Build.0 = Release|Win32
-		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Debug|Any CPU.ActiveCfg = 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}.Debug|x86.ActiveCfg = Debug|Win32
 		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Debug|x86.Build.0 = Debug|Win32
-		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Release|Any CPU.ActiveCfg = Release|Win32
 		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Release|x64.ActiveCfg = Release|x64
 		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Release|x64.Build.0 = Release|x64
 		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Release|x86.ActiveCfg = Release|Win32
 		{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Release|x86.Build.0 = Release|Win32
-		{78619D0E-D3F9-4DDF-B90E-F99CB03DFC44}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{78619D0E-D3F9-4DDF-B90E-F99CB03DFC44}.Debug|x64.ActiveCfg = Debug|x64
 		{78619D0E-D3F9-4DDF-B90E-F99CB03DFC44}.Debug|x64.Build.0 = Debug|x64
 		{78619D0E-D3F9-4DDF-B90E-F99CB03DFC44}.Debug|x86.ActiveCfg = Debug|Win32
 		{78619D0E-D3F9-4DDF-B90E-F99CB03DFC44}.Debug|x86.Build.0 = Debug|Win32
-		{78619D0E-D3F9-4DDF-B90E-F99CB03DFC44}.Release|Any CPU.ActiveCfg = Release|Win32
 		{78619D0E-D3F9-4DDF-B90E-F99CB03DFC44}.Release|x64.ActiveCfg = Release|x64
 		{78619D0E-D3F9-4DDF-B90E-F99CB03DFC44}.Release|x64.Build.0 = Release|x64
 		{78619D0E-D3F9-4DDF-B90E-F99CB03DFC44}.Release|x86.ActiveCfg = Release|Win32
 		{78619D0E-D3F9-4DDF-B90E-F99CB03DFC44}.Release|x86.Build.0 = Release|Win32
-		{B797917B-6842-467C-8B14-E00B76A91247}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{B797917B-6842-467C-8B14-E00B76A91247}.Debug|x64.ActiveCfg = Debug|x64
 		{B797917B-6842-467C-8B14-E00B76A91247}.Debug|x64.Build.0 = Debug|x64
 		{B797917B-6842-467C-8B14-E00B76A91247}.Debug|x86.ActiveCfg = Debug|Win32
 		{B797917B-6842-467C-8B14-E00B76A91247}.Debug|x86.Build.0 = Debug|Win32
-		{B797917B-6842-467C-8B14-E00B76A91247}.Release|Any CPU.ActiveCfg = Release|Win32
 		{B797917B-6842-467C-8B14-E00B76A91247}.Release|x64.ActiveCfg = Release|x64
 		{B797917B-6842-467C-8B14-E00B76A91247}.Release|x64.Build.0 = Release|x64
 		{B797917B-6842-467C-8B14-E00B76A91247}.Release|x86.ActiveCfg = Release|Win32
 		{B797917B-6842-467C-8B14-E00B76A91247}.Release|x86.Build.0 = Release|Win32
-		{795B1B0E-4EC8-469D-B641-E26324266FBF}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{795B1B0E-4EC8-469D-B641-E26324266FBF}.Debug|x64.ActiveCfg = Debug|x64
 		{795B1B0E-4EC8-469D-B641-E26324266FBF}.Debug|x64.Build.0 = Debug|x64
 		{795B1B0E-4EC8-469D-B641-E26324266FBF}.Debug|x86.ActiveCfg = Debug|Win32
 		{795B1B0E-4EC8-469D-B641-E26324266FBF}.Debug|x86.Build.0 = Debug|Win32
-		{795B1B0E-4EC8-469D-B641-E26324266FBF}.Release|Any CPU.ActiveCfg = Release|Win32
 		{795B1B0E-4EC8-469D-B641-E26324266FBF}.Release|x64.ActiveCfg = Release|x64
 		{795B1B0E-4EC8-469D-B641-E26324266FBF}.Release|x64.Build.0 = Release|x64
 		{795B1B0E-4EC8-469D-B641-E26324266FBF}.Release|x86.ActiveCfg = Release|Win32
 		{795B1B0E-4EC8-469D-B641-E26324266FBF}.Release|x86.Build.0 = Release|Win32
-		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|Any CPU.ActiveCfg = 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}.Debug|x86.ActiveCfg = Debug|Win32
 		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|x86.Build.0 = Debug|Win32
-		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|Any CPU.ActiveCfg = Release|Win32
 		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|x64.ActiveCfg = Release|x64
 		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|x64.Build.0 = Release|x64
 		{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|x86.ActiveCfg = Release|Win32

Modified: trunk/MgDev/Bindings/src/Bindings/DotNet/DotNetUnmanagedApi.vcxproj
===================================================================
--- trunk/MgDev/Bindings/src/Bindings/DotNet/DotNetUnmanagedApi.vcxproj	2022-10-10 10:22:05 UTC (rev 9975)
+++ trunk/MgDev/Bindings/src/Bindings/DotNet/DotNetUnmanagedApi.vcxproj	2022-10-10 10:58:26 UTC (rev 9976)
@@ -19,12 +19,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: trunk/MgDev/Bindings/src/Bindings/DotNet/Foundation/FoundationApi.vcxproj
===================================================================
--- trunk/MgDev/Bindings/src/Bindings/DotNet/Foundation/FoundationApi.vcxproj	2022-10-10 10:22:05 UTC (rev 9975)
+++ trunk/MgDev/Bindings/src/Bindings/DotNet/Foundation/FoundationApi.vcxproj	2022-10-10 10:58:26 UTC (rev 9976)
@@ -19,12 +19,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: trunk/MgDev/Bindings/src/Bindings/DotNet/Geometry/GeometryApi.vcxproj
===================================================================
--- trunk/MgDev/Bindings/src/Bindings/DotNet/Geometry/GeometryApi.vcxproj	2022-10-10 10:22:05 UTC (rev 9975)
+++ trunk/MgDev/Bindings/src/Bindings/DotNet/Geometry/GeometryApi.vcxproj	2022-10-10 10:58:26 UTC (rev 9976)
@@ -19,12 +19,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: trunk/MgDev/Bindings/src/Bindings/DotNet/MapGuideCommon/MapGuideCommonApi.vcxproj
===================================================================
--- trunk/MgDev/Bindings/src/Bindings/DotNet/MapGuideCommon/MapGuideCommonApi.vcxproj	2022-10-10 10:22:05 UTC (rev 9975)
+++ trunk/MgDev/Bindings/src/Bindings/DotNet/MapGuideCommon/MapGuideCommonApi.vcxproj	2022-10-10 10:58:26 UTC (rev 9976)
@@ -19,12 +19,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: trunk/MgDev/Bindings/src/Bindings/DotNet/PlatformBase/PlatformBaseApi.vcxproj
===================================================================
--- trunk/MgDev/Bindings/src/Bindings/DotNet/PlatformBase/PlatformBaseApi.vcxproj	2022-10-10 10:22:05 UTC (rev 9975)
+++ trunk/MgDev/Bindings/src/Bindings/DotNet/PlatformBase/PlatformBaseApi.vcxproj	2022-10-10 10:58:26 UTC (rev 9976)
@@ -19,12 +19,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: trunk/MgDev/Bindings/src/Bindings/DotNet/Web/WebApi.vcxproj
===================================================================
--- trunk/MgDev/Bindings/src/Bindings/DotNet/Web/WebApi.vcxproj	2022-10-10 10:22:05 UTC (rev 9975)
+++ trunk/MgDev/Bindings/src/Bindings/DotNet/Web/WebApi.vcxproj	2022-10-10 10:58:26 UTC (rev 9976)
@@ -19,12 +19,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: trunk/MgDev/Bindings/src/Bindings/Java/JavaApi.vcxproj
===================================================================
--- trunk/MgDev/Bindings/src/Bindings/Java/JavaApi.vcxproj	2022-10-10 10:22:05 UTC (rev 9975)
+++ trunk/MgDev/Bindings/src/Bindings/Java/JavaApi.vcxproj	2022-10-10 10:58:26 UTC (rev 9976)
@@ -19,12 +19,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: trunk/MgDev/Bindings/src/Bindings/Php/PhpApi.vcxproj
===================================================================
--- trunk/MgDev/Bindings/src/Bindings/Php/PhpApi.vcxproj	2022-10-10 10:22:05 UTC (rev 9975)
+++ trunk/MgDev/Bindings/src/Bindings/Php/PhpApi.vcxproj	2022-10-10 10:58:26 UTC (rev 9976)
@@ -19,12 +19,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: trunk/MgDev/Bindings/src/IMake/IMake.vcxproj
===================================================================
--- trunk/MgDev/Bindings/src/IMake/IMake.vcxproj	2022-10-10 10:22:05 UTC (rev 9975)
+++ trunk/MgDev/Bindings/src/IMake/IMake.vcxproj	2022-10-10 10:58:26 UTC (rev 9976)
@@ -13,17 +13,17 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{B601F04C-0D42-4AFC-A092-B31185E2EA8C}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Modified: trunk/MgDev/Oem/oem.sln
===================================================================
--- trunk/MgDev/Oem/oem.sln	2022-10-10 10:22:05 UTC (rev 9975)
+++ trunk/MgDev/Oem/oem.sln	2022-10-10 10:58:26 UTC (rev 9976)
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30709.132
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "ACE\ACE_wrappers\ace\ACE.vcxproj", "{BD537C9A-FECA-1BAD-6757-8A6363336A1C}"
 EndProject
@@ -314,6 +314,14 @@
 		{9415DE9A-E01E-47C1-A159-EB1E1D4E518C}.Release|Win32.Build.0 = Release (Read-Write WChar LIB)|Win32
 		{9415DE9A-E01E-47C1-A159-EB1E1D4E518C}.Release|x64.ActiveCfg = Release (Read-Write WChar LIB)|x64
 		{9415DE9A-E01E-47C1-A159-EB1E1D4E518C}.Release|x64.Build.0 = Release (Read-Write WChar LIB)|x64
+		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|Win32.Build.0 = Debug|Win32
+		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x64.ActiveCfg = Debug|x64
+		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x64.Build.0 = Debug|x64
+		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|Win32.ActiveCfg = Release|Win32
+		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|Win32.Build.0 = Release|Win32
+		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.ActiveCfg = Release|x64
+		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.Build.0 = Release|x64
 		{DB542A13-DE6E-3E82-BA87-7AE2885324B1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{DB542A13-DE6E-3E82-BA87-7AE2885324B1}.Debug|Win32.Build.0 = Debug|Win32
 		{DB542A13-DE6E-3E82-BA87-7AE2885324B1}.Debug|x64.ActiveCfg = Debug|x64

Index: trunk/MgDev/Portable
===================================================================
--- trunk/MgDev/Portable	2022-10-10 10:22:05 UTC (rev 9975)
+++ trunk/MgDev/Portable	2022-10-10 10:58:26 UTC (rev 9976)

Property changes on: trunk/MgDev/Portable
___________________________________________________________________
Modified: svn:mergeinfo
## -14,5 +14,5 ##
 /sandbox/jng/msvc2019/Desktop:9884-9896
 /sandbox/jng/v30/Desktop:8215-8216,8218-8219
 /sandbox/jng/vanilla_swig/Desktop:9812-9814
-/sandbox/jng/vanilla_swig/Portable:9815-9823
+/sandbox/jng/vanilla_swig/Portable:9815-9823,9825-9915
 /sandbox/rfc94/Desktop:5099-5163
\ No newline at end of property
Modified: trunk/MgDev/Portable/MgPortable/MgPortable.vcxproj
===================================================================
--- trunk/MgDev/Portable/MgPortable/MgPortable.vcxproj	2022-10-10 10:22:05 UTC (rev 9975)
+++ trunk/MgDev/Portable/MgPortable/MgPortable.vcxproj	2022-10-10 10:58:26 UTC (rev 9976)
@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{CBC0339F-E68B-48BA-9059-945483BEBDCA}</ProjectGuid>
     <RootNamespace>MgPortable</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -28,25 +28,25 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Index: trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp	2022-10-10 10:22:05 UTC (rev 9975)
+++ trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp	2022-10-10 10:58:26 UTC (rev 9976)

Property changes on: trunk/MgDev/Server/src/Services/Mapping/MappingUtil.cpp
___________________________________________________________________
Modified: svn:mergeinfo
## -6,4 +6,5 ##
 /sandbox/jng/createruntimemap/Server/src/Services/Mapping/MappingUtil.cpp:7486-7555
 /sandbox/jng/flatten_exceptions/Server/src/Services/Mapping/MappingUtil.cpp:9743-9755
 /sandbox/jng/ogc/Server/src/Services/Mapping/MappingUtil.cpp:9240-9255
+/sandbox/jng/vanilla_swig/Server/src/Services/Mapping/MappingUtil.cpp:9825-9915
 /sandbox/rfc94/Server/src/Services/Mapping/MappingUtil.cpp:5099-5163
\ No newline at end of property
Modified: trunk/MgDev/UnitTest/TestData/Samples/Sheboygan/Library/Samples/Sheboygan/Layers/Parcels.LayerDefinition_HEADER.xml
===================================================================
--- trunk/MgDev/UnitTest/TestData/Samples/Sheboygan/Library/Samples/Sheboygan/Layers/Parcels.LayerDefinition_HEADER.xml	2022-10-10 10:22:05 UTC (rev 9975)
+++ trunk/MgDev/UnitTest/TestData/Samples/Sheboygan/Library/Samples/Sheboygan/Layers/Parcels.LayerDefinition_HEADER.xml	2022-10-10 10:58:26 UTC (rev 9976)
@@ -3,28 +3,28 @@
   <General>
     <IconName>LayerDefinitionVector</IconName>
   </General>
-  <Security xsi:noNamespaceSchemaLocation="ResourceSecurity-1.0.0.xsd">
+  <Security>
     <Inherited>true</Inherited>
   </Security>
   <Metadata>
     <Simple>
-      <Property xsi:noNamespaceSchemaLocation="Property-1.0.0.xsd">
+      <Property>
         <Name>_Queryable</Name>
         <Value>1</Value>
       </Property>
-      <Property xsi:noNamespaceSchemaLocation="Property-1.0.0.xsd">
+      <Property>
         <Name>_Bounds</Name>
         <Value><Bounds SRS="EPSG:4326" west="-87.74" south="43.68" east="-87.69" north="43.815"/></Value>
       </Property>
-      <Property xsi:noNamespaceSchemaLocation="Property-1.0.0.xsd">
+      <Property>
         <Name>_Title</Name>
         <Value>Parcels</Value>
       </Property>
-      <Property xsi:noNamespaceSchemaLocation="Property-1.0.0.xsd">
+      <Property>
         <Name>_Opaque</Name>
         <Value>0</Value>
       </Property>
-      <Property xsi:noNamespaceSchemaLocation="Property-1.0.0.xsd">
+      <Property>
         <Name>_IsPublished</Name>
         <Value>1</Value>
       </Property>

Modified: trunk/MgDev/Web/src/mapviewerjava/mainframe.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/mainframe.jsp	2022-10-10 10:22:05 UTC (rev 9975)
+++ trunk/MgDev/Web/src/mapviewerjava/mainframe.jsp	2022-10-10 10:58:26 UTC (rev 9976)
@@ -549,21 +549,26 @@
     response.getWriter().write(templ);
     response.setContentLength(templ.length());
 }
+catch(MgUserNotFoundException e)
+{
+    RequestAuthentication(response);
+    return;
+}
+catch(MgUnauthorizedAccessException e)
+{
+    RequestAuthentication(response);
+    return;
+}
+catch(MgAuthenticationFailedException e)
+{
+    RequestAuthentication(response);
+    return;
+}
 catch(MgException e)
 {
-    if (e.GetExceptionCode() == MgExceptionCodes.MgUnauthorizedAccessException ||
-        e.GetExceptionCode() == MgExceptionCodes.MgUserNotFoundException ||
-        e.GetExceptionCode() == MgExceptionCodes.MgAuthenticationFailedException)
-    {
-        RequestAuthentication(response);
-        return;
-    }
-    else
-    {
-        String msg = EscapeForHtml(e.GetExceptionMessage());
-        response.getWriter().write(msg);
-        response.setContentLength(msg.length());
-    }
+    String msg = EscapeForHtml(e.getExceptionMessage());
+    response.getWriter().write(msg);
+    response.setContentLength(msg.length());
 }
 catch(Exception ne)
 {

