[mapguide-commits] r6034 - in trunk/Tools/Maestro: Maestro.Base/UI OSGeo.MapGuide.MaestroAPI Thirdparty/NTS

[svn_mapguide at osgeo.org]

Author: jng
Date: 2011-08-04 07:03:12 -0700 (Thu, 04 Aug 2011)
New Revision: 6034

Modified:
   trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.cs
   trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.resx
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/BindingListExtensions.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
   trunk/Tools/Maestro/Thirdparty/NTS/NetTopologySuite.Merged.dll
   trunk/Tools/Maestro/Thirdparty/NTS/readme.txt
Log:
Update NTS with a freshly built and ilmerged copy from the v1.8 source. Our custom copy of NTS is rebuilt from source to target framework 2.0 and references LinqBridge (http://code.google.com/p/linqbridge) to provide a framework 3.5 compatibility layer for the 3.5 types used in NTS

Modified: trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.cs	2011-08-04 13:07:52 UTC (rev 6033)
+++ trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.cs	2011-08-04 14:03:12 UTC (rev 6034)
@@ -336,7 +336,7 @@
 
         private void tfnetLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
-            _launcher.OpenUrl("http://code.google.com/p/tf-net/");
+            _launcher.OpenUrl("http://code.google.com/p/nettopologysuite/");
         }
 
         private void ziplibLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)

Modified: trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.resx	2011-08-04 13:07:52 UTC (rev 6033)
+++ trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.resx	2011-08-04 14:03:12 UTC (rev 6034)
@@ -1460,13 +1460,13 @@
     <value>8, 52</value>
   </data>
   <data name="tfnetLinkLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>181, 13</value>
+    <value>99, 13</value>
   </data>
   <data name="tfnetLinkLabel.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
   </data>
   <data name="tfnetLinkLabel.Text" xml:space="preserve">
-    <value>Topology Framework .NET (TF.NET)</value>
+    <value>.net Topology Suite</value>
   </data>
   <data name="&gt;&gt;tfnetLinkLabel.Name" xml:space="preserve">
     <value>tfnetLinkLabel</value>

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/BindingListExtensions.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/BindingListExtensions.cs	2011-08-04 13:07:52 UTC (rev 6033)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/BindingListExtensions.cs	2011-08-04 14:03:12 UTC (rev 6034)
@@ -50,7 +50,7 @@
         }
     }
 }
-
+/*
 //A well known hack to get extension methods working in .net framework 2.0
 
 namespace System.Runtime.CompilerServices
@@ -62,4 +62,4 @@
     {
 
     }
-}
+}*/

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj	2011-08-04 13:07:52 UTC (rev 6033)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj	2011-08-04 14:03:12 UTC (rev 6034)
@@ -39,7 +39,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Thirdparty\Flee\lib\Ciloci.Flee.dll</HintPath>
     </Reference>
-    <Reference Include="NetTopologySuite.Merged, Version=1.8.0.0, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
+    <Reference Include="NetTopologySuite.Merged, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Thirdparty\NTS\NetTopologySuite.Merged.dll</HintPath>
     </Reference>

Modified: trunk/Tools/Maestro/Thirdparty/NTS/NetTopologySuite.Merged.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Thirdparty/NTS/readme.txt
===================================================================
--- trunk/Tools/Maestro/Thirdparty/NTS/readme.txt	2011-08-04 13:07:52 UTC (rev 6033)
+++ trunk/Tools/Maestro/Thirdparty/NTS/readme.txt	2011-08-04 14:03:12 UTC (rev 6034)
@@ -1,3 +1,6 @@
-This is a monolithic version of NetTopologySuite 1.8. 
+This is a monolithic version of NetTopologySuite 1.8.
 
-NetTopologySuite and its dependent assemblies were combined with ILMerge
\ No newline at end of file
+The v1.8 source and binaries was modified in the following way:
+
+ - The NetTopologySuite project was changed to target .net framework 2.0 and references LinqBridge 1.2 to provide a FX 3.5 compatibility layer. Existing unit tests still pass with this change.
+ - NetTopologySuite and its dependent assemblies (GeoAPI, LinqBridge, NetTopologySuite, PowerCollections, ProjNet) were combined with ILMerge-GUI (http://ilmerge-gui.devv.com)
\ No newline at end of file