Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/app.config
===================================================================
diff -u -r3977 -r3991
--- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/app.config	(.../app.config)	(revision 3977)
+++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/app.config	(.../app.config)	(revision 3991)
@@ -24,9 +24,9 @@
 <configuration>
     <configSections>
         <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="Deltares.Dam.Application.Live.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+            <section name="Deltares.Dam.Application.Live.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
         </sectionGroup>
-      <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
+      <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
     </configSections>
   <applicationSettings>
         <Deltares.Dam.Application.Live.Properties.Settings>
@@ -100,33 +100,33 @@
     </applicationSettings>
     <log4net>
       <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-        <param name="File" value="..\Logs\damlive.log"/>
-        <param name="AppendToFile" value="true"/>
+        <param name="File" value="..\Logs\damlive.log" />
+        <param name="AppendToFile" value="true" />
         <layout type="log4net.Layout.PatternLayout">
-          <param name="Header" value="[Begin Log]\r\n"/>
-          <param name="Footer" value="[End Log]\r\n\r\n"/>
-          <param name="ConversionPattern" value="%d [%t] %-5p %c %m%n"/>
+          <param name="Header" value="[Begin Log]\r\n" />
+          <param name="Footer" value="[End Log]\r\n\r\n" />
+          <param name="ConversionPattern" value="%d [%t] %-5p %c %m%n" />
         </layout>
       </appender>
       <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
         <layout type="log4net.Layout.PatternLayout">
-          <param name="Header" value="[Begin Log]\r\n"/>
-          <param name="Footer" value="[End Log]\r\n\r\n"/>
-          <param name="ConversionPattern" value="%d [%t] %-5p %c %m%n"/>
+          <param name="Header" value="[Begin Log]\r\n" />
+          <param name="Footer" value="[End Log]\r\n\r\n" />
+          <param name="ConversionPattern" value="%d [%t] %-5p %c %m%n" />
         </layout>
       </appender>
       <root>
-        <level value="INFO"/>
-        <appender-ref ref="LogFileAppender"/>
-        <appender-ref ref="ConsoleAppender"/>
+        <level value="INFO" />
+        <appender-ref ref="LogFileAppender" />
+        <appender-ref ref="ConsoleAppender" />
       </root>
     </log4net>  
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.0.89.0" newVersion="1.0.89.0"/>
+        <assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.89.0" newVersion="1.0.89.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="mscorlib" publicKeyToken="b77a5c561934e089" culture="neutral" />
Fisheye: Tag 3991 refers to a dead (removed) revision in file `DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/app.config
===================================================================
diff -u -r3526 -r3991
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/app.config	(.../app.config)	(revision 3526)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/app.config	(.../app.config)	(revision 3991)
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 Copyright (C) Stichting Deltares 2021. All rights reserved.
 
@@ -24,7 +24,7 @@
 <configuration>
     <configSections>
         <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="Deltares.Dam.Data.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+            <section name="Deltares.Dam.Data.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
         </sectionGroup>
     </configSections>
     <applicationSettings>
@@ -121,5 +121,13 @@
             </setting>
         </Deltares.Dam.Data.Properties.Settings>      
     </applicationSettings>
-  <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup>
+  <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System" publicKeyToken="b77a5c561934e089" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Deltares.Maps.csproj
===================================================================
diff -u -r3979 -r3991
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Deltares.Maps.csproj	(.../Deltares.Maps.csproj)	(revision 3979)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Deltares.Maps.csproj	(.../Deltares.Maps.csproj)	(revision 3991)
@@ -84,33 +84,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
     </Reference>
-    <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.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NetTopologySuite.1.14\lib\net45\NetTopologySuite.dll</HintPath>
-    </Reference>
-    <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="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>
@@ -149,11 +122,15 @@
     <None Include="..\Copying.GPL.licenseheader">
       <Link>Copying.GPL.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Translations.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="GeoAPI" Version="1.7.4" />
+    <PackageReference Include="NetTopologySuite" Version="1.14.0" />
+    <PackageReference Include="NetTopologySuite.IO" Version="1.14.0.1" />
+  </ItemGroup>
   <Import Project="$(ProjectDir)..\build\Deltares.DamClientsLibrary.Version.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
===================================================================
diff -u -r3978 -r3991
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 3978)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 3991)
@@ -130,23 +130,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\DotSpatial\DotSpatial.Topology.dll</HintPath>
     </Reference>
-    <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>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="LumenWorks.Framework.IO, Version=3.8.0.0, Culture=neutral, PublicKeyToken=5ad3ea2f85776344, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\LumenWorks.Framework.IO.3.8.0\lib\net20\LumenWorks.Framework.IO.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <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, PublicKeyToken=2573bf8a1bdddcd5, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NetTopologySuite.1.14\lib\net45\PowerCollections.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Core">
@@ -384,7 +367,6 @@
     <None Include="app.config">
       <SubType>Designer</SubType>
     </None>
-    <None Include="packages.config" />
     <None Include="Properties\AssemblyInfo.cs.svn" />
     <EmbeddedResource Include="DtoAssembler\Xsd\FileIdentificationDefinition.xsd">
       <SubType>Designer</SubType>
@@ -448,6 +430,12 @@
     <Folder Include="DtoAssembler\Properties\" />
     <Folder Include="MetaInfo\" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="GeoAPI" Version="1.7.4" />
+    <PackageReference Include="log4net" Version="2.0.3" />
+    <PackageReference Include="LumenWorks.Framework.IO" Version="3.8.0" />
+    <PackageReference Include="NetTopologySuite" Version="1.14.0" />
+  </ItemGroup>
   <Import Project="$(ProjectDir)..\build\Deltares.DamClientsLibrary.Version.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/Deltares.Dam.Application.Live.csproj
===================================================================
diff -u -r3986 -r3991
--- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/Deltares.Dam.Application.Live.csproj	(.../Deltares.Dam.Application.Live.csproj)	(revision 3986)
+++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/Deltares.Dam.Application.Live.csproj	(.../Deltares.Dam.Application.Live.csproj)	(revision 3991)
@@ -54,9 +54,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CommandLine, Version=1.9.3.19, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\CommandLineParser.1.9.3.19\lib\CommandLine.dll</HintPath>
-    </Reference>
     <Reference Include="Deltares.Authorization, Version=7.21.5431.21796, Culture=neutral, PublicKeyToken=379d563066715186, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\Authorization\x86\Deltares.Authorization.dll</HintPath>
@@ -75,9 +72,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
     </Reference>
-    <Reference Include="log4net">
-      <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -110,7 +104,6 @@
     <None Include="DamLiveTest.cmd">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -150,6 +143,10 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="CommandLineParser" Version="1.9.3.19" />
+    <PackageReference Include="log4net" Version="2.0.3" />
+  </ItemGroup>
   <Import Project="$(ProjectDir)..\build\Deltares.DamLive.Version.targets" />
   <PropertyGroup>
     <PreBuildEvent>
Fisheye: Tag 3991 refers to a dead (removed) revision in file `DamClients/DamLive/trunk/src/packages/log4net.2.0.3/lib/net35-full/log4net.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 3991 refers to a dead (removed) revision in file `DamClients/DamLive/trunk/src/packages/log4net.2.0.3/lib/net11-full/log4net.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamClients/DamLive/trunk/src/packages/log4net.2.0.3/lib/net40-client/log4net.dll
===================================================================
diff -u -r1527 -r3991
Binary files differ
Index: DamClients/DamLive/trunk/src/packages/log4net.2.0.3/lib/net35-client/log4net.dll
===================================================================
diff -u -r1527 -r3991
Binary files differ
Fisheye: Tag 3991 refers to a dead (removed) revision in file `DamClients/DamLive/trunk/src/packages/log4net.2.0.3/lib/net35-client/log4net.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 3991 refers to a dead (removed) revision in file `DamClients/DamLive/trunk/src/packages/log4net.2.0.3/lib/net20-full/log4net.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 3991 refers to a dead (removed) revision in file `DamClients/DamLive/trunk/src/packages/log4net.2.0.3/lib/net40-full/log4net.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 3991 refers to a dead (removed) revision in file `DamClients/DamLive/trunk/src/packages/log4net.2.0.3/lib/net40-client/log4net.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 3991 refers to a dead (removed) revision in file `DamClients/DamLive/trunk/src/packages/log4net.2.0.3/lib/net10-full/log4net.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamClients/DamLive/trunk/src/packages/log4net.2.0.3/lib/net35-full/log4net.dll
===================================================================
diff -u -r1527 -r3991
Binary files differ
Index: DamClients/DamLive/trunk/src/packages/log4net.2.0.3/lib/net10-full/log4net.dll
===================================================================
diff -u -r1527 -r3991
Binary files differ
Index: DamClients/DamLive/trunk/src/packages/log4net.2.0.3/log4net.2.0.3.nupkg
===================================================================
diff -u -r1527 -r3991
Binary files differ
Index: DamClients/DamLive/trunk/src/packages/log4net.2.0.3/lib/net40-full/log4net.dll
===================================================================
diff -u -r1527 -r3991
Binary files differ
Index: DamClients/DamLive/trunk/src/packages/log4net.2.0.3/lib/net20-full/log4net.dll
===================================================================
diff -u -r1527 -r3991
Binary files differ
Index: DamClients/DamLive/trunk/src/packages/log4net.2.0.3/lib/net11-full/log4net.dll
===================================================================
diff -u -r1527 -r3991
Binary files differ
Index: DamClients/DamLive/trunk/src/packages/LumenWorks.Framework.IO.3.8.0/lib/net20/LumenWorks.Framework.IO.dll
===================================================================
diff -u -r1527 -r3991
Binary files differ
Fisheye: Tag 3991 refers to a dead (removed) revision in file `DamClients/DamLive/trunk/src/packages/LumenWorks.Framework.IO.3.8.0/COPYING.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 3991 refers to a dead (removed) revision in file `DamClients/DamLive/trunk/src/packages/LumenWorks.Framework.IO.3.8.0/lib/net20/LumenWorks.Framework.IO.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamClients/DamLive/trunk/src/packages/LumenWorks.Framework.IO.3.8.0/LumenWorks.Framework.IO.3.8.0.nupkg
===================================================================
diff -u -r1527 -r3991
Binary files differ