Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/Deltares.Dam.BenchmarkTests.csproj
===================================================================
diff -u -r4102 -r4778
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/Deltares.Dam.BenchmarkTests.csproj	(.../Deltares.Dam.BenchmarkTests.csproj)	(revision 4102)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/Deltares.Dam.BenchmarkTests.csproj	(.../Deltares.Dam.BenchmarkTests.csproj)	(revision 4778)
@@ -29,4 +29,9 @@
         <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj"/>
         <ProjectReference Include="..\Deltares.Dam.TestHelper\Deltares.Dam.TestHelper.csproj"/>
     </ItemGroup>
+    <ItemGroup>
+      <PackageReference Include="System.Data.Odbc" Version="8.0.0" />
+      <PackageReference Include="System.Data.OleDb" Version="8.0.0" />
+      <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
+    </ItemGroup>
 </Project>
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/Deltares.Dam.IntegrationTests.csproj
===================================================================
diff -u -r4701 -r4778
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/Deltares.Dam.IntegrationTests.csproj	(.../Deltares.Dam.IntegrationTests.csproj)	(revision 4701)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/Deltares.Dam.IntegrationTests.csproj	(.../Deltares.Dam.IntegrationTests.csproj)	(revision 4778)
@@ -93,5 +93,8 @@
         <PackageReference Remove="System.Threading.Tasks.Extensions"/>
         <PackageReference Include="CompareNETObjects" Version="3.3.0"/>
         <PackageReference Include="GeoAPI" Version="1.7.4"/>
+        <PackageReference Include="System.Data.Odbc" Version="8.0.0" />
+        <PackageReference Include="System.Data.OleDb" Version="8.0.0" />
+        <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
     </ItemGroup>
 </Project>
\ No newline at end of file
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader/Deltares.Dam.StixFileReader.csproj
===================================================================
diff -u -r4610 -r4778
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader/Deltares.Dam.StixFileReader.csproj	(.../Deltares.Dam.StixFileReader.csproj)	(revision 4610)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader/Deltares.Dam.StixFileReader.csproj	(.../Deltares.Dam.StixFileReader.csproj)	(revision 4778)
@@ -27,5 +27,8 @@
         <PackageReference Include="GeoAPI" Version="1.7.4"/>
         <PackageReference Include="NetTopologySuite" Version="1.14.0"/>
         <PackageReference Include="NetTopologySuite.IO" Version="1.14.0.1"/>
+        <PackageReference Include="System.Data.Odbc" Version="8.0.0" />
+        <PackageReference Include="System.Data.OleDb" Version="8.0.0" />
+        <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
     </ItemGroup>
 </Project>
\ No newline at end of file
Index: DamClients/DamUI/trunk/src/Dam/Application/Deltares.Dam.Application.csproj
===================================================================
diff -u -r4539 -r4778
--- DamClients/DamUI/trunk/src/Dam/Application/Deltares.Dam.Application.csproj	(.../Deltares.Dam.Application.csproj)	(revision 4539)
+++ DamClients/DamUI/trunk/src/Dam/Application/Deltares.Dam.Application.csproj	(.../Deltares.Dam.Application.csproj)	(revision 4778)
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
+        <UseWindowsForms>true</UseWindowsForms>
     </PropertyGroup>
     <Import Project="$(SolutionDir)build\Source.targets"/>
     <ItemGroup>
@@ -97,7 +98,6 @@
         <Reference Include="System"/>
         <Reference Include="System.Core"/>
         <Reference Include="System.Drawing"/>
-        <Reference Include="System.Windows.Forms"/>
     </ItemGroup>
     <ItemGroup>
         <None Include="..\..\..\lib\Authorization\x86\dauth.dll">
@@ -113,4 +113,9 @@
         <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj"/>
         <ProjectReference Include="..\Forms\Deltares.Dam.Forms.csproj"/>
     </ItemGroup>
+    <ItemGroup>
+      <PackageReference Include="System.Data.Odbc" Version="8.0.0" />
+      <PackageReference Include="System.Data.OleDb" Version="8.0.0" />
+      <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
+    </ItemGroup>
 </Project>
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Deltares.Dam.Tests.csproj
===================================================================
diff -u -r4615 -r4778
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Deltares.Dam.Tests.csproj	(.../Deltares.Dam.Tests.csproj)	(revision 4615)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Deltares.Dam.Tests.csproj	(.../Deltares.Dam.Tests.csproj)	(revision 4778)
@@ -1322,6 +1322,9 @@
         <PackageReference Include="GeoAPI" Version="1.7.4"/>
         <PackageReference Include="NetTopologySuite" Version="1.14.0"/>
         <PackageReference Include="RhinoMocks" Version="3.6.1"/>
+        <PackageReference Include="System.Data.Odbc" Version="8.0.0" />
+        <PackageReference Include="System.Data.OleDb" Version="8.0.0" />
+        <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
     </ItemGroup>
     <ItemGroup>
     </ItemGroup>
Index: DamClients/DamUI/trunk/src/Dam/Tools/GeoXY2LatLong/app.config
===================================================================
diff -u -r4070 -r4778
--- DamClients/DamUI/trunk/src/Dam/Tools/GeoXY2LatLong/app.config	(.../app.config)	(revision 4070)
+++ DamClients/DamUI/trunk/src/Dam/Tools/GeoXY2LatLong/app.config	(.../app.config)	(revision 4778)
@@ -22,7 +22,4 @@
 All rights reserved.
 -->
 <configuration>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
-    </startup>
 </configuration>
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Deltares.Maps.csproj
===================================================================
diff -u -r4055 -r4778
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Deltares.Maps.csproj	(.../Deltares.Maps.csproj)	(revision 4055)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Deltares.Maps.csproj	(.../Deltares.Maps.csproj)	(revision 4778)
@@ -12,5 +12,8 @@
         <PackageReference Include="GeoAPI" Version="1.7.4"/>
         <PackageReference Include="NetTopologySuite" Version="1.14.0"/>
         <PackageReference Include="NetTopologySuite.IO" Version="1.14.0.1"/>
+        <PackageReference Include="System.Data.Odbc" Version="8.0.0" />
+        <PackageReference Include="System.Data.OleDb" Version="8.0.0" />
+        <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
     </ItemGroup>
 </Project>
\ No newline at end of file
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Deltares.Maps.Tests.csproj
===================================================================
diff -u -r4070 -r4778
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Deltares.Maps.Tests.csproj	(.../Deltares.Maps.Tests.csproj)	(revision 4070)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Deltares.Maps.Tests.csproj	(.../Deltares.Maps.Tests.csproj)	(revision 4778)
@@ -28,6 +28,15 @@
         <PackageReference Include="RhinoMocks">
             <Version>3.6.1</Version>
         </PackageReference>
+        <PackageReference Include="System.Data.Odbc">
+          <Version>8.0.0</Version>
+        </PackageReference>
+        <PackageReference Include="System.Data.OleDb">
+          <Version>8.0.0</Version>
+        </PackageReference>
+        <PackageReference Include="System.Drawing.Common">
+          <Version>8.0.8</Version>
+        </PackageReference>
     </ItemGroup>
     <ItemGroup>
         <None Update="TestData\Gemeenten.dbf">
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/App.config
===================================================================
diff -u -r4112 -r4778
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/App.config	(.../App.config)	(revision 4112)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/App.config	(.../App.config)	(revision 4778)
@@ -56,7 +56,4 @@
 
     </log4net>
 
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
-    </startup>
 </configuration>
Index: DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/CsvToDamxConverter.csproj
===================================================================
diff -u -r4070 -r4778
--- DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/CsvToDamxConverter.csproj	(.../CsvToDamxConverter.csproj)	(revision 4070)
+++ DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/CsvToDamxConverter.csproj	(.../CsvToDamxConverter.csproj)	(revision 4778)
@@ -17,6 +17,9 @@
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="CommandLineParser" Version="1.9.3.19"/>
+        <PackageReference Include="System.Data.Odbc" Version="8.0.0" />
+        <PackageReference Include="System.Data.OleDb" Version="8.0.0" />
+        <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj"/>
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/Deltares.Dam.TestHelper.csproj
===================================================================
diff -u -r4648 -r4778
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/Deltares.Dam.TestHelper.csproj	(.../Deltares.Dam.TestHelper.csproj)	(revision 4648)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/Deltares.Dam.TestHelper.csproj	(.../Deltares.Dam.TestHelper.csproj)	(revision 4778)
@@ -35,4 +35,9 @@
         <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj"/>
         <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Maps\Deltares.Maps.csproj"/>
     </ItemGroup>
+    <ItemGroup>
+      <PackageReference Include="System.Data.Odbc" Version="8.0.0" />
+      <PackageReference Include="System.Data.OleDb" Version="8.0.0" />
+      <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
+    </ItemGroup>
 </Project>
Index: DamClients/DamUI/trunk/src/build/Base.targets
===================================================================
diff -u -r4584 -r4778
--- DamClients/DamUI/trunk/src/build/Base.targets	(.../Base.targets)	(revision 4584)
+++ DamClients/DamUI/trunk/src/build/Base.targets	(.../Base.targets)	(revision 4778)
@@ -4,7 +4,7 @@
     <Platforms>x86</Platforms>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources> 
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>.net8.0-windows</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Company>Deltares</Company>
     <Copyright>Copyright © Deltares $([System.DateTime]::Today.ToString(yyyy))</Copyright>
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader.Tests/Deltares.Dam.StixFileReader.Tests.csproj
===================================================================
diff -u -r4539 -r4778
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader.Tests/Deltares.Dam.StixFileReader.Tests.csproj	(.../Deltares.Dam.StixFileReader.Tests.csproj)	(revision 4539)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader.Tests/Deltares.Dam.StixFileReader.Tests.csproj	(.../Deltares.Dam.StixFileReader.Tests.csproj)	(revision 4778)
@@ -28,4 +28,9 @@
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
     </ItemGroup>
+    <ItemGroup>
+      <PackageReference Include="System.Data.Odbc" Version="8.0.0" />
+      <PackageReference Include="System.Data.OleDb" Version="8.0.0" />
+      <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
+    </ItemGroup>
 </Project>
Index: DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/app.config
===================================================================
diff -u -r4539 -r4778
--- DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/app.config	(.../app.config)	(revision 4539)
+++ DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/app.config	(.../app.config)	(revision 4778)
@@ -57,9 +57,6 @@
             <appender-ref ref="ConsoleAppender"/>
         </root>
     </log4net>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
-    </startup>
     <applicationSettings>
         <Deltares.Dam.Tools.CsvToDamxConverter.Properties.Settings>
             <setting name="DamLiveDataFolderName" serializeAs="String">
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/build/Base.targets
===================================================================
diff -u -r4044 -r4778
--- DamClients/DamUI/trunk/src/DamClientsLibrary/build/Base.targets	(.../Base.targets)	(revision 4044)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/build/Base.targets	(.../Base.targets)	(revision 4778)
@@ -3,7 +3,7 @@
     <OutputPath>$(SolutionDir)\bin\$(Configuration)\</OutputPath>
     <Platforms>x86</Platforms>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>.net8.0-windows</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Company>Deltares</Company>
     <Copyright>Copyright © Deltares $([System.DateTime]::Today.ToString(yyyy))</Copyright>
Index: DamClients/DamUI/trunk/src/build/Test.targets
===================================================================
diff -u -r4638 -r4778
--- DamClients/DamUI/trunk/src/build/Test.targets	(.../Test.targets)	(revision 4638)
+++ DamClients/DamUI/trunk/src/build/Test.targets	(.../Test.targets)	(revision 4778)
@@ -5,7 +5,6 @@
         <OutDir>$(OutputPath)</OutDir>
         <IsPublishable>False</IsPublishable>
         <TestProjectType>UnitTest</TestProjectType>
-        <TargetFramework>net48</TargetFramework>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="NUnit">
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/build/Test.targets
===================================================================
diff -u -r4032 -r4778
--- DamClients/DamUI/trunk/src/DamClientsLibrary/build/Test.targets	(.../Test.targets)	(revision 4032)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/build/Test.targets	(.../Test.targets)	(revision 4778)
@@ -5,7 +5,6 @@
         <OutDir>$(OutputPath)</OutDir>
         <IsPublishable>False</IsPublishable>
         <TestProjectType>UnitTest</TestProjectType>
-        <TargetFramework>net48</TargetFramework>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="NUnit">
Index: DamClients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj
===================================================================
diff -u -r4640 -r4778
--- DamClients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj	(.../Deltares.Dam.Forms.csproj)	(revision 4640)
+++ DamClients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj	(.../Deltares.Dam.Forms.csproj)	(revision 4778)
@@ -1,5 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <Import Project="$(SolutionDir)build\Source.targets"/>
+    <PropertyGroup>
+        <UseWindowsForms>true</UseWindowsForms>
+    </PropertyGroup>
     <ItemGroup>
         <Folder Include="Properties"/>
     </ItemGroup>
@@ -163,13 +166,15 @@
         <Reference Include="System.Data"/>
         <Reference Include="System.Drawing"/>
         <Reference Include="System.IO.Compression.FileSystem"/>
-        <Reference Include="System.Windows.Forms"/>
         <Reference Include="System.Xml"/>
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj"/>
     </ItemGroup>
     <ItemGroup>
+        <PackageReference Include="System.Data.Odbc" Version="8.0.0" />
+        <PackageReference Include="System.Data.OleDb" Version="8.0.0" />
+        <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
         <PackageReference Include="System.IO.Compression" Version="4.3.0"/>
     </ItemGroup>
     <ItemGroup>
Index: DamClients/DamUI/trunk/src/Dam/Tools/GeoXY2LatLong/GeoXY2LatLong.csproj
===================================================================
diff -u -r4070 -r4778
--- DamClients/DamUI/trunk/src/Dam/Tools/GeoXY2LatLong/GeoXY2LatLong.csproj	(.../GeoXY2LatLong.csproj)	(revision 4070)
+++ DamClients/DamUI/trunk/src/Dam/Tools/GeoXY2LatLong/GeoXY2LatLong.csproj	(.../GeoXY2LatLong.csproj)	(revision 4778)
@@ -8,4 +8,9 @@
         <Reference Include="System.Core"/>
         <Reference Include="System.Xml"/>
     </ItemGroup>
+    <ItemGroup>
+      <PackageReference Include="System.Data.Odbc" Version="8.0.0" />
+      <PackageReference Include="System.Data.OleDb" Version="8.0.0" />
+      <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
+    </ItemGroup>
 </Project>
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/app.config
===================================================================
diff -u -r4216 -r4778
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/app.config	(.../app.config)	(revision 4216)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/app.config	(.../app.config)	(revision 4778)
@@ -115,7 +115,4 @@
             </setting>
         </Deltares.Dam.Data.Properties.Settings>
     </applicationSettings>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
-    </startup>
 </configuration>
\ No newline at end of file
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Specifications.Tests/Deltares.Dam.Specifications.Tests.csproj
===================================================================
diff -u -r4070 -r4778
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Specifications.Tests/Deltares.Dam.Specifications.Tests.csproj	(.../Deltares.Dam.Specifications.Tests.csproj)	(revision 4070)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Specifications.Tests/Deltares.Dam.Specifications.Tests.csproj	(.../Deltares.Dam.Specifications.Tests.csproj)	(revision 4778)
@@ -10,4 +10,9 @@
     <ItemGroup>
         <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj"/>
     </ItemGroup>
+    <ItemGroup>
+      <PackageReference Include="System.Data.Odbc" Version="8.0.0" />
+      <PackageReference Include="System.Data.OleDb" Version="8.0.0" />
+      <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
+    </ItemGroup>
 </Project>
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
===================================================================
diff -u -r4642 -r4778
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 4642)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 4778)
@@ -112,6 +112,9 @@
         <PackageReference Include="GeoAPI" Version="1.7.4"/>
         <PackageReference Include="LumenWorksCsvReader" Version="4.0.0" />
         <PackageReference Include="NetTopologySuite" Version="1.14.0"/>
+        <PackageReference Include="System.Data.Odbc" Version="8.0.0" />
+        <PackageReference Include="System.Data.OleDb" Version="8.0.0" />
+        <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
         <PackageReference Include="System.Resources.Extensions" Version="4.6.0"/>
         <PackageReference Include="log4net" Version="2.0.15"/>
     </ItemGroup>