Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Deltares.Maps.csproj
===================================================================
diff -u -r3445 -r3836
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Deltares.Maps.csproj	(.../Deltares.Maps.csproj)	(revision 3445)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Deltares.Maps.csproj	(.../Deltares.Maps.csproj)	(revision 3836)
@@ -84,30 +84,33 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
     </Reference>
-    <Reference Include="GeoAPI, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\GeoAPI.1.7.1.1\lib\net403-client\GeoAPI.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="GeoAPI, Version=1.7.4.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\GeoAPI.1.7.4\lib\net45\GeoAPI.dll</HintPath>
     </Reference>
-    <Reference Include="NetTopologySuite, Version=1.13.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NetTopologySuite.1.13.1\lib\net403-client\NetTopologySuite.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="NetTopologySuite, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.1.14\lib\net45\NetTopologySuite.dll</HintPath>
     </Reference>
-    <Reference Include="NetTopologySuite.IO.GeoTools, Version=1.13.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NetTopologySuite.IO.1.13.1\lib\net403-client\NetTopologySuite.IO.GeoTools.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="NetTopologySuite.IO, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.dll</HintPath>
     </Reference>
-    <Reference Include="NetTopologySuite.IO.MsSqlSpatial, Version=1.13.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NetTopologySuite.IO.1.13.1\lib\net403-client\NetTopologySuite.IO.MsSqlSpatial.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="NetTopologySuite.IO.GeoTools, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.GeoTools.dll</HintPath>
     </Reference>
-    <Reference Include="NetTopologySuite.IO.PostGis, Version=1.13.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NetTopologySuite.IO.1.13.1\lib\net403-client\NetTopologySuite.IO.PostGis.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="NetTopologySuite.IO.MsSqlSpatial, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.MsSqlSpatial.dll</HintPath>
     </Reference>
-    <Reference Include="PowerCollections, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NetTopologySuite.1.13.1\lib\net403-client\PowerCollections.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="NetTopologySuite.IO.PostGis, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.PostGis.dll</HintPath>
     </Reference>
+    <Reference Include="NetTopologySuite.IO.ShapeFile, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.ShapeFile.dll</HintPath>
+    </Reference>
+    <Reference Include="NetTopologySuite.IO.ShapeFile.Extended, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.ShapeFile.Extended.dll</HintPath>
+    </Reference>
+    <Reference Include="PowerCollections, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2573bf8a1bdddcd5, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.1.14\lib\net45\PowerCollections.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -146,6 +149,7 @@
     <None Include="..\Copying.GPL.licenseheader">
       <Link>Copying.GPL.licenseheader</Link>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Translations.xml" />
Index: DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj
===================================================================
diff -u -r3835 -r3836
--- DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj	(.../Deltares.Dam.IntegrationTests.csproj)	(revision 3835)
+++ DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj	(.../Deltares.Dam.IntegrationTests.csproj)	(revision 3836)
@@ -87,19 +87,36 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\DotSpatial\DotSpatial.Topology.dll</HintPath>
     </Reference>
-    <Reference Include="GeoAPI, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\GeoAPI.1.7.1.1\lib\net40-client\GeoAPI.dll</HintPath>
+    <Reference Include="GeoAPI, Version=1.7.4.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\GeoAPI.1.7.4\lib\net45\GeoAPI.dll</HintPath>
     </Reference>
-    <Reference Include="NetTopologySuite">
-      <HintPath>..\..\..\packages\NetTopologySuite.1.13.1\lib\net40-client\NetTopologySuite.dll</HintPath>
+    <Reference Include="NetTopologySuite, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.1.14\lib\net45\NetTopologySuite.dll</HintPath>
     </Reference>
-    <Reference Include="NetTopologySuite.IO.GeoTools">
-      <HintPath>..\..\..\packages\NetTopologySuite.IO.1.13.1\lib\net40-client\NetTopologySuite.IO.GeoTools.dll</HintPath>
+    <Reference Include="NetTopologySuite.IO, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.dll</HintPath>
     </Reference>
+    <Reference Include="NetTopologySuite.IO.GeoTools, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.GeoTools.dll</HintPath>
+    </Reference>
+    <Reference Include="NetTopologySuite.IO.MsSqlSpatial, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.MsSqlSpatial.dll</HintPath>
+    </Reference>
+    <Reference Include="NetTopologySuite.IO.PostGis, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.PostGis.dll</HintPath>
+    </Reference>
+    <Reference Include="NetTopologySuite.IO.ShapeFile, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.ShapeFile.dll</HintPath>
+    </Reference>
+    <Reference Include="NetTopologySuite.IO.ShapeFile.Extended, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.ShapeFile.Extended.dll</HintPath>
+    </Reference>
     <Reference Include="nunit.framework, Version=3.13.3.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
+    <Reference Include="PowerCollections, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2573bf8a1bdddcd5, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.1.14\lib\net45\PowerCollections.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/Deltares.Maps.Tests.csproj
===================================================================
diff -u -r3825 -r3836
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/Deltares.Maps.Tests.csproj	(.../Deltares.Maps.Tests.csproj)	(revision 3825)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/Deltares.Maps.Tests.csproj	(.../Deltares.Maps.Tests.csproj)	(revision 3836)
@@ -44,26 +44,35 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
     </Reference>
-    <Reference Include="GeoAPI">
-      <HintPath>..\..\..\packages\GeoAPI.1.7.1.1\lib\net40-client\GeoAPI.dll</HintPath>
+    <Reference Include="GeoAPI, Version=1.7.4.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\GeoAPI.1.7.4\lib\net45\GeoAPI.dll</HintPath>
     </Reference>
-    <Reference Include="NetTopologySuite">
-      <HintPath>..\..\..\packages\NetTopologySuite.1.13.1\lib\net40-client\NetTopologySuite.dll</HintPath>
+    <Reference Include="NetTopologySuite, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\NetTopologySuite.1.14\lib\net45\NetTopologySuite.dll</HintPath>
     </Reference>
-    <Reference Include="NetTopologySuite.IO.GeoTools">
-      <HintPath>..\..\..\packages\NetTopologySuite.IO.1.13.1\lib\net40-client\NetTopologySuite.IO.GeoTools.dll</HintPath>
+    <Reference Include="NetTopologySuite.IO, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.dll</HintPath>
     </Reference>
-    <Reference Include="NetTopologySuite.IO.MsSqlSpatial">
-      <HintPath>..\..\..\packages\NetTopologySuite.IO.1.13.1\lib\net40-client\NetTopologySuite.IO.MsSqlSpatial.dll</HintPath>
+    <Reference Include="NetTopologySuite.IO.GeoTools, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.GeoTools.dll</HintPath>
     </Reference>
-    <Reference Include="NetTopologySuite.IO.PostGis">
-      <HintPath>..\..\..\packages\NetTopologySuite.IO.1.13.1\lib\net40-client\NetTopologySuite.IO.PostGis.dll</HintPath>
+    <Reference Include="NetTopologySuite.IO.MsSqlSpatial, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.MsSqlSpatial.dll</HintPath>
     </Reference>
+    <Reference Include="NetTopologySuite.IO.PostGis, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.PostGis.dll</HintPath>
+    </Reference>
+    <Reference Include="NetTopologySuite.IO.ShapeFile, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.ShapeFile.dll</HintPath>
+    </Reference>
+    <Reference Include="NetTopologySuite.IO.ShapeFile.Extended, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.ShapeFile.Extended.dll</HintPath>
+    </Reference>
     <Reference Include="nunit.framework, Version=3.13.3.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="PowerCollections">
-      <HintPath>..\..\..\packages\NetTopologySuite.1.13.1\lib\net40-client\PowerCollections.dll</HintPath>
+    <Reference Include="PowerCollections, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2573bf8a1bdddcd5, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\NetTopologySuite.1.14\lib\net45\PowerCollections.dll</HintPath>
     </Reference>
     <Reference Include="Rhino.Mocks">
       <HintPath>..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/packages.config
===================================================================
diff -u -r3526 -r3836
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/packages.config	(.../packages.config)	(revision 3526)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/packages.config	(.../packages.config)	(revision 3836)
@@ -22,8 +22,8 @@
 All rights reserved.
 -->
 <packages>
-  <package id="GeoAPI" version="1.7.1.1" targetFramework="net45" />
+  <package id="GeoAPI" version="1.7.4" targetFramework="net461" />
   <package id="log4net" version="2.0.3" targetFramework="net45" />
   <package id="LumenWorks.Framework.IO" version="3.8.0" targetFramework="net45" />
-  <package id="NetTopologySuite" version="1.13.1" targetFramework="net45" />
+  <package id="NetTopologySuite" version="1.14" targetFramework="net461" />
 </packages>
\ No newline at end of file
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/ShapeFileCreator.cs
===================================================================
diff -u -r3526 -r3836
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/ShapeFileCreator.cs	(.../ShapeFileCreator.cs)	(revision 3526)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/ShapeFileCreator.cs	(.../ShapeFileCreator.cs)	(revision 3836)
@@ -20,10 +20,8 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-
 using NetTopologySuite.IO;
 
 namespace Deltares.Maps
@@ -86,9 +84,8 @@
 
             IFeature firstFeature = repository.Features.First();
             var feature = new NetTopologySuite.Features.Feature(firstFeature.Geometry, firstFeature.Attributes);
-            List<NetTopologySuite.Features.Feature> coll = repository.Features
-                .Select(f => new NetTopologySuite.Features.Feature(f.Geometry, f.Attributes))
-                .ToList();
+            var coll = repository.Features.Select(f => new NetTopologySuite.Features.Feature(f.Geometry, f.Attributes))
+                .Cast<NetTopologySuite.Features.IFeature>().ToList();
 
             DbaseFileHeader header = ShapefileDataWriter.GetHeader(feature, repository.Count);
             var writer = new ShapefileDataWriter(path + name)
Index: DamClients/DamUI/trunk/src/Dam/Tests/packages.config
===================================================================
diff -u -r3825 -r3836
--- DamClients/DamUI/trunk/src/Dam/Tests/packages.config	(.../packages.config)	(revision 3825)
+++ DamClients/DamUI/trunk/src/Dam/Tests/packages.config	(.../packages.config)	(revision 3836)
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="GeoAPI" version="1.7.4" targetFramework="net461" />
   <package id="NUnit" version="3.13.3" targetFramework="net461" />
+  <package id="NetTopologySuite" version="1.14" targetFramework="net461" />
+  <package id="NetTopologySuite.IO" version="1.14.0.1" targetFramework="net461" />
 </packages>
\ No newline at end of file
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/IntersectionResult.cs
===================================================================
diff -u -r3526 -r3836
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/IntersectionResult.cs	(.../IntersectionResult.cs)	(revision 3526)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/IntersectionResult.cs	(.../IntersectionResult.cs)	(revision 3836)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System.Collections.Generic;
-
 using GeoAPI.Geometries;
 
 namespace Deltares.Maps
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
===================================================================
diff -u -r3821 -r3836
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 3821)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 3836)
@@ -127,9 +127,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\DotSpatial\DotSpatial.Topology.dll</HintPath>
     </Reference>
-    <Reference Include="GeoAPI, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\GeoAPI.1.7.1.1\lib\net403-client\GeoAPI.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="GeoAPI, Version=1.7.4.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\GeoAPI.1.7.4\lib\net45\GeoAPI.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
@@ -139,13 +138,11 @@
       <HintPath>..\..\packages\LumenWorks.Framework.IO.3.8.0\lib\net20\LumenWorks.Framework.IO.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NetTopologySuite, Version=1.13.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NetTopologySuite.1.13.1\lib\net403-client\NetTopologySuite.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="NetTopologySuite, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.1.14\lib\net45\NetTopologySuite.dll</HintPath>
     </Reference>
-    <Reference Include="PowerCollections, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NetTopologySuite.1.13.1\lib\net403-client\PowerCollections.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="PowerCollections, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2573bf8a1bdddcd5, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.1.14\lib\net45\PowerCollections.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/packages.config
===================================================================
diff -u -r3825 -r3836
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/packages.config	(.../packages.config)	(revision 3825)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/packages.config	(.../packages.config)	(revision 3836)
@@ -22,9 +22,9 @@
 All rights reserved.
 -->
 <packages>
-  <package id="GeoAPI" version="1.7.1.1" targetFramework="net40" requireReinstallation="true" />
-  <package id="NetTopologySuite" version="1.13.1" targetFramework="net40" requireReinstallation="true" />
-  <package id="NetTopologySuite.IO" version="1.13.1" targetFramework="net40" requireReinstallation="true" />
+  <package id="GeoAPI" version="1.7.4" targetFramework="net461" />
+  <package id="NetTopologySuite" version="1.14" targetFramework="net461" />
+  <package id="NetTopologySuite.IO" version="1.14.0.1" targetFramework="net461" />
   <package id="NUnit" version="3.13.3" targetFramework="net461" />
   <package id="RhinoMocks" version="3.6.1" targetFramework="net40" />
 </packages>
\ No newline at end of file
Index: DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj
===================================================================
diff -u -r3832 -r3836
--- DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj	(.../Deltares.Dam.Tests.csproj)	(revision 3832)
+++ DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj	(.../Deltares.Dam.Tests.csproj)	(revision 3836)
@@ -91,17 +91,15 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\DSL-FormsGeo\Deltares.Standard.Forms.dll</HintPath>
     </Reference>
-    <Reference Include="GeoAPI, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\GeoAPI.1.7.1.1\lib\net40-client\GeoAPI.dll</HintPath>
+    <Reference Include="GeoAPI">
+      <HintPath>..\..\packages\GeoAPI.1.7.4\lib\net45\GeoAPI.dll</HintPath>
     </Reference>
     <Reference Include="KellermanSoftware.Compare-NET-Objects, Version=3.3.0.0, Culture=neutral, PublicKeyToken=d970ace04cc85217, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\CompareNETObjects.3.03.0.0\lib\net40\KellermanSoftware.Compare-NET-Objects.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NetTopologySuite, Version=1.13.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\NetTopologySuite.1.13.1\lib\net40-client\NetTopologySuite.dll</HintPath>
+    <Reference Include="NetTopologySuite, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.1.14\lib\net45\NetTopologySuite.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=3.13.3.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll</HintPath>
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/Domain/FeatureTest.cs
===================================================================
diff -u -r3828 -r3836
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/Domain/FeatureTest.cs	(.../FeatureTest.cs)	(revision 3828)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Test/Domain/FeatureTest.cs	(.../FeatureTest.cs)	(revision 3836)
@@ -72,7 +72,7 @@
 
         [Test]
         // NB This test fails when you change the decimal separator to a point in Dutch regional settings on your computer
-        public void FeatueCreation_DutchCultureWktStringFormat_Throws()
+        public void FeatureCreation_DutchCultureWktStringFormat_Throws()
         {
             Action test =
                 () =>
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.IO.1.13.1/lib/net20/NetTopologySuite.IO.GeoTools.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.IO.1.13.1/lib/net403-client/NetTopologySuite.IO.PostGis.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.IO.1.13.1/lib/net35-client/NetTopologySuite.IO.PostGis.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.IO.1.13.1/lib/net40-client/NetTopologySuite.IO.PostGis.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.IO.1.13.1/NetTopologySuite.IO.1.13.1.nupkg
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.IO.1.13.1/lib/net403-client/NetTopologySuite.IO.GeoTools.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.IO.1.13.1/lib/net403-client/NetTopologySuite.IO.MsSqlSpatial.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.IO.1.13.1/lib/net20/NetTopologySuite.IO.PostGis.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.IO.1.13.1/lib/net20/NetTopologySuite.IO.MsSqlSpatial.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.IO.1.13.1/lib/net40-client/NetTopologySuite.IO.GeoTools.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.IO.1.13.1/lib/net35-client/NetTopologySuite.IO.MsSqlSpatial.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.IO.1.13.1/lib/net35-client/NetTopologySuite.IO.GeoTools.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.IO.1.13.1/lib/net40-client/NetTopologySuite.IO.MsSqlSpatial.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.IO.1.13.1/lib/net20/NetTopologySuite.IO.PostGis.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.IO.1.13.1/lib/net20/NetTopologySuite.IO.MsSqlSpatial.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Fisheye: Tag 3836 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/packages/NetTopologySuite.IO.1.13.1/NetTopologySuite.IO.1.13.1.nuspec'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.IO.1.13.1/lib/net40-client/NetTopologySuite.IO.GeoTools.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.IO.1.13.1/lib/net35-client/NetTopologySuite.IO.MsSqlSpatial.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.IO.1.13.1/lib/net35-client/NetTopologySuite.IO.GeoTools.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.IO.1.13.1/lib/net40-client/NetTopologySuite.IO.MsSqlSpatial.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.IO.1.13.1/lib/net20/NetTopologySuite.IO.GeoTools.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.IO.1.13.1/lib/net403-client/NetTopologySuite.IO.PostGis.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.IO.1.13.1/lib/net40-client/NetTopologySuite.IO.PostGis.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.IO.1.13.1/lib/net35-client/NetTopologySuite.IO.PostGis.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.IO.1.13.1/NetTopologySuite.IO.1.13.1.nupkg
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.IO.1.13.1/lib/net403-client/NetTopologySuite.IO.GeoTools.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.IO.1.13.1/lib/net403-client/NetTopologySuite.IO.MsSqlSpatial.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/GeoAPI.1.7.1.1/lib/sl40/GeoAPI.Silverlight.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/GeoAPI.1.7.1.1/lib/net20/GeoAPI.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/GeoAPI.1.7.1.1/GeoAPI.1.7.1.1.nupkg
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/GeoAPI.1.7.1.1/lib/net35-client/GeoAPI.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/GeoAPI.1.7.1.1/lib/net40-client/GeoAPI.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/GeoAPI.1.7.1.1/lib/net403-client/GeoAPI.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/GeoAPI.1.7.1.1/lib/sl40-wp/GeoAPI.WindowsPhone.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.1.13.1/lib/net35-client/NetTopologySuite.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.1.13.1/lib/net40-client/PowerCollections.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.1.13.1/lib/net20/PowerCollections.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.1.13.1/lib/sl40/NetTopologySuite.Silverlight.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.1.13.1/lib/sl40/NetTopologySuite.Data.Silverlight.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.1.13.1/lib/sl40/NetTopologySuite.Encodings.Silverlight.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.1.13.1/lib/net40-client/NetTopologySuite.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.1.13.1/lib/net35-client/PowerCollections.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.1.13.1/lib/sl40-wp/NetTopologySuite.WindowsPhone.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.1.13.1/lib/net403-client/PowerCollections.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.1.13.1/lib/sl40-wp/PowerCollections.WindowsPhone.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.1.13.1/lib/net20/NetTopologySuite.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.1.13.1/NetTopologySuite.1.13.1.nupkg
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.1.13.1/lib/net403-client/NetTopologySuite.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/src/packages/NetTopologySuite.1.13.1/lib/sl40/PowerCollections.SilverLight.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/GeoAPI.1.7.1.1/lib/net40-client/GeoAPI.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/GeoAPI.1.7.1.1/lib/sl40-wp/GeoAPI.WindowsPhone.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/GeoAPI.1.7.1.1/lib/net403-client/GeoAPI.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/GeoAPI.1.7.1.1/lib/net20/GeoAPI.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/GeoAPI.1.7.1.1/lib/sl40/GeoAPI.Silverlight.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Fisheye: Tag 3836 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/packages/GeoAPI.1.7.1.1/GeoAPI.1.7.1.1.nuspec'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamClients/DamUI/trunk/packages/GeoAPI.1.7.1.1/GeoAPI.1.7.1.1.nupkg
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/GeoAPI.1.7.1.1/lib/net35-client/GeoAPI.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.1.13.1/lib/net403-client/NetTopologySuite.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Fisheye: Tag 3836 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/packages/NetTopologySuite.1.13.1/NetTopologySuite.1.13.1.nuspec'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.1.13.1/lib/sl40-wp/PowerCollections.WindowsPhone.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.1.13.1/lib/sl40-wp/NetTopologySuite.WindowsPhone.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.1.13.1/lib/net403-client/PowerCollections.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.1.13.1/lib/net20/NetTopologySuite.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.1.13.1/NetTopologySuite.1.13.1.nupkg
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.1.13.1/lib/sl40/PowerCollections.SilverLight.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.1.13.1/lib/net35-client/NetTopologySuite.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.1.13.1/lib/net40-client/PowerCollections.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.1.13.1/lib/net20/PowerCollections.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.1.13.1/lib/sl40/NetTopologySuite.Data.Silverlight.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.1.13.1/lib/sl40/NetTopologySuite.Silverlight.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.1.13.1/lib/net40-client/NetTopologySuite.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.1.13.1/lib/net35-client/PowerCollections.dll
===================================================================
diff -u -r875 -r3836
Binary files differ
Index: DamClients/DamUI/trunk/packages/NetTopologySuite.1.13.1/lib/sl40/NetTopologySuite.Encodings.Silverlight.dll
===================================================================
diff -u -r875 -r3836
Binary files differ