Index: DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj
===================================================================
diff -u -r4006 -r4020
--- DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj	(.../Deltares.Dam.Tests.csproj)	(revision 4006)
+++ DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.Tests.csproj	(.../Deltares.Dam.Tests.csproj)	(revision 4020)
@@ -1,776 +1,59 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\NUnit.3.13.3\build\NUnit.props" Condition="Exists('..\..\packages\NUnit.3.13.3\build\NUnit.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{15503BE5-7148-4DA6-BDD0-5880266E79D4}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Deltares.Dam.Tests</RootNamespace>
-    <AssemblyName>Deltares.Dam.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>..\..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)build\Test.targets" />
   <ItemGroup>
-    <Reference Include="Deltares.Authorization, Version=7.21.5431.21796, Culture=neutral, PublicKeyToken=379d563066715186, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
+    <Folder Include="Properties" />
+    <Folder Include="WTI\Deltares.Dam.DamWti.Tests" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Deltares.Authorization">
       <HintPath>..\..\..\lib\Authorization\x86\Deltares.Authorization.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.DamEngine.Data, Version=18.1.0.1432, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Deltares.DamEngine.Data">
       <HintPath>..\..\..\lib\DamEngine\Deltares.DamEngine.Data.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.DamEngine.Interface, Version=17.1.0.452, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Deltares.DamEngine.Interface">
       <HintPath>..\..\..\lib\DamEngine\Deltares.DamEngine.Interface.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.DamEngine.Io, Version=17.1.0.452, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Deltares.DamEngine.Io">
       <HintPath>..\..\..\lib\DamEngine\Deltares.DamEngine.Io.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.Geographic, Version=16.1.0.0, Culture=neutral, PublicKeyToken=d4f3dcd34f9b7bc2, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Deltares.Geographic">
       <HintPath>..\..\..\lib\DSL-Geographic\Deltares.Geographic.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.Geometry, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Deltares.Geometry">
       <HintPath>..\..\..\lib\DSL-Geo\Deltares.Geometry.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.Geotechnics, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Deltares.Geotechnics">
       <HintPath>..\..\..\lib\DSL-Geo\Deltares.Geotechnics.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.Geotechnics.IO, Version=16.1.3.0, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Deltares.Geotechnics.IO">
       <HintPath>..\..\..\lib\DSL-GeoIO\Deltares.Geotechnics.IO.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.Mathematics, Version=1.0.0.0, Culture=neutral, PublicKeyToken=582f89ef4e0ea16b, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\DSL-Core\Deltares.Mathematics.dll</HintPath>
-    </Reference>
-    <Reference Include="Deltares.Probabilistic">
-      <HintPath>..\..\..\lib\DSL-Probabilistic\Deltares.Probabilistic.dll</HintPath>
-    </Reference>
-    <Reference Include="Deltares.Soilbase, Version=16.1.0.0, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Deltares.Soilbase">
       <HintPath>..\..\..\lib\DSL-GeoIO\Deltares.Soilbase.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.Standard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31fe100197c68040, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Deltares.Standard">
       <HintPath>..\..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.Standard.Forms, Version=19.1.1.2200, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\DSL-FormsGeo\Deltares.Standard.Forms.dll</HintPath>
+    <Reference Include="Deltares.Standard.Forms">
+      <HintPath>..\..\..\lib\DSL-FormsStandard\Deltares.Standard.Forms.dll</HintPath>
     </Reference>
-    <Reference Include="GeoAPI">
-      <HintPath>..\..\packages\GeoAPI.1.7.4\lib\net45\GeoAPI.dll</HintPath>
+    <Reference Include="DotSpatial.Data">
+      <HintPath>..\..\..\lib\DotSpatial\DotSpatial.Data.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\net451\KellermanSoftware.Compare-NET-Objects.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="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="Rhino.Mocks">
-      <HintPath>..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Drawing" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Windows" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AuthorizationTestBase.cs" />
-    <Compile Include="DamEngineIo\ConversionHelperTests.cs" />
-    <Compile Include="DamEngineIo\FillDamUiFromXmlOutputTests.cs" />
-    <Compile Include="DamEngineIo\FillXmlInputFromDamUiTests.cs" />
-    <Compile Include="DamEngineIo\XmlSoilProfile2DConverterTest.cs" />
-    <Compile Include="DamFailureMechanismeCalculationSpecificationTest.cs" />
-    <Compile Include="DamHelperFunctionsTest.cs" />
-    <Compile Include="DamLiveAuthorizationTest.cs" />
-    <Compile Include="CsvImporterTestsNew.cs" />
-    <Compile Include="DamAuthorizationTest.cs" />
-    <Compile Include="DamProjectTest.cs" />
-    <Compile Include="Forms\DamContextTest.cs" />
-    <Compile Include="Forms\DamSpatialEditorDecoratorTest.cs" />
-    <Compile Include="IO\CombineImportedDataTest.cs" />
-    <Compile Include="IO\DamProjectVersionXmlHandlerTests.cs" />
-    <Compile Include="IO\FailureMechanismeParamatersMStabXmlHandlerTest.cs" />
-    <Compile Include="License\LicenseTest.cs" />
-    <Compile Include="Memoryleaks\DamMemoryLeakTests.cs" />
-    <Compile Include="MStabParametersTest.cs" />
-    <Compile Include="ScenarioTest.cs" />
-    <Compile Include="Sensors\SensorImportFromExcelSheetTest.cs" />
-    <Compile Include="StiImporter\SoilProfile2DImporterTest.cs" />
-    <Compile Include="StiImporter\StiFileReaderTest.cs" />
-    <Compile Include="StiImporter\StiFileValidatorTest.cs" />
-    <Compile Include="WaterBoardPostProcessRelativeProfilesTest.cs" />
-    <Compile Include="Importers\LineAttributeImporterTest.cs" />
-    <Compile Include="Importers\LocationImportHelperTest.cs" />
-    <Compile Include="Importers\LocationShapeFileImporterDotSpatialTests.cs" />
-    <Compile Include="Importers\LocationShapeFileImporterTest.cs" />
-    <Compile Include="LoadCompatiblityTest.cs" />
-    <Compile Include="LocationTest.cs" />
-    <Compile Include="MGeobaseDBTest.cs" />
-    <Compile Include="Sensors\GroupTest.cs" />
-    <Compile Include="Sensors\SensorTest.cs" />
-    <Compile Include="Sensors\SensorRepositoryTest.cs" />
-    <Compile Include="Sensors\SensorLocationTests.cs" />
-    <Compile Include="Sensors\SensorTimeSeriesProcessorTest.cs" />
-    <Compile Include="SoilGeometryTests.cs" />
-    <Compile Include="IO\ExportTextFileTest.cs" />
-    <Compile Include="IO\ShapeFileExporterTest.cs" />
-    <Compile Include="Importers\LocationPropertyImporterTest.cs" />
-    <Compile Include="Importers\LocationCharacteristicPointImporterTest.cs" />
-    <Compile Include="DataPluginDataSourceXmlSerializerTests.cs" />
-    <Compile Include="DataPluginImporterBackgroundTests.cs" />
-    <Compile Include="DataPluginImporterCsvTests.cs" />
-    <Compile Include="DataPluginImporterDataShapeFilesTests.cs" />
-    <Compile Include="DataPluginImporterIrisTests.cs" />
-    <Compile Include="DataPluginImporterMGeobaseTests.cs" />
-    <Compile Include="DataPluginImporterTests.cs" />
-    <Compile Include="Forms\LocationJobSymbolTest.cs" />
-    <Compile Include="Geometry.cs" />
-    <Compile Include="Geometry2DDataTests.cs" />
-    <Compile Include="GeometryFileTest.cs" />
-    <Compile Include="TimeSeries\TimeSeriesProcessorTest.cs" />
-    <Compile Include="UISupport\ConfigurationManagerTest.cs" />
-    <Compile Include="WaterBoardImporterTests.cs" />
-    <Compile Include="WaterBoardJobImporterTest.cs" />
-    <Compile Include="DamJobTest.cs" />
-    <Compile Include="CsvExportCharacteristicPointsTest.cs" />
-    <Compile Include="CsvExportSurfaceLineTest.cs" />
-    <Compile Include="DikeCoordinateSystemConverterTest.cs" />
-    <Compile Include="CoordinateSystemConverterTest.cs" />
-    <Compile Include="GaugePLLineTest.cs" />
-    <Compile Include="CsvExporterTest.cs" />
-    <Compile Include="CsvImporterTest.cs" />
-    <Compile Include="CsvParserTest.cs" />
-    <Compile Include="EntityFactoryTest.cs" />
-    <Compile Include="ObjectMaterializerTest.cs" />
-    <Compile Include="PLLinesTest.cs" />
-    <Compile Include="PLLineTest.cs" />
-    <Compile Include="DikeTest.cs" />
-    <Compile Include="PointTest.cs" />
-    <Compile Include="PolyLineTest.cs" />
-    <Compile Include="RdToLatLngConverterTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="DikeJobTest.cs" />
-    <Compile Include="WaterBoardJobTest.cs" />
-    <Compile Include="TimeSerieCollectionTest.cs" />
-    <Compile Include="TimeSeriesAssemblerTest.cs" />
-    <Compile Include="UpliftFactorToBetaCalculatorTest.cs" />
+    <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj" />
+    <ProjectReference Include="..\Forms\Deltares.Dam.Forms.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj">
-      <Project>{F1CD9620-15CF-41F8-AF70-5AE004A50F60}</Project>
-      <Name>Deltares.Dam.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Maps\Deltares.Maps.csproj">
-      <Project>{17f76a8e-c9f4-415f-8d4b-0e8a3b36e665}</Project>
-      <Name>Deltares.Maps</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Forms\Deltares.Dam.Forms.csproj">
-      <Project>{1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60}</Project>
-      <Name>Deltares.Dam.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="TestHelper\Deltares.Dam.TestHelper.csproj">
-      <Project>{D312A703-F6CF-4BEC-B5C5-4E9C161D2010}</Project>
-      <Name>Deltares.Dam.TestHelper</Name>
-    </ProjectReference>
+    <PackageReference Include="CompareNETObjects" Version="3.3.0" />
+    <PackageReference Include="RhinoMocks" Version="3.6.1" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="DamProjectTest\DamProjectTestMSoilbaseRead.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\Case A15.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <None Include="..\..\Copying.GPL.licenseheader">
-      <Link>Copying.GPL.licenseheader</Link>
-    </None>
-    <None Include="packages.config" />
-    <None Include="TestData\Base2DForCombination2DAndSurfaceLine.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\DataWithoutPl3AndPl4\csvfiles\characteristicpoints.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\DataWithoutPl3AndPl4\csvfiles\locations.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\DataWithoutPl3AndPl4\csvfiles\modelparameters.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\DataWithoutPl3AndPl4\csvfiles\ResultsPipingDesign.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\DataWithoutPl3AndPl4\csvfiles\scenarios.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\DataWithoutPl3AndPl4\csvfiles\segments.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\DataWithoutPl3AndPl4\csvfiles\soilprofiles.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\DataWithoutPl3AndPl4\csvfiles\surfacelines.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\DataWithoutPl3AndPl4\Import.defx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full1DProject\csvfiles\characteristicpoints.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full1DProject\csvfiles\locations.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full1DProject\csvfiles\modelparameters.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full1DProject\csvfiles\ResultsPipingDesign.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full1DProject\csvfiles\scenarios.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full1DProject\csvfiles\segments.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full1DProject\csvfiles\soilprofiles.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full1DProject\csvfiles\surfacelines.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full1DProject\Import relative soilprofiles.defx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full1DProject\Import.defx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\characteristicpoints.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_005_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_024_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_041_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_054_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_066_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_090_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_102_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_117_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_117_STBI_dcb_diep.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_117_STBI_dcb_diep.sts">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_130_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_130_STBI_dcb.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_130_STBI_dcb.sts">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Y_149_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_157_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_165_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_165_STBI_dcb.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_165_STBI_dcb.sts">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_181_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_186_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_199_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_228_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_258_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_258_STBI.sts">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_275_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_282_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_286_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_311_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_327_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_352_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_358_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_369_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_380_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_390_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_390_STBI_dcb.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_390_STBI_dcb.sts">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_400_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_400_STBI_dcb.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_421_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_432_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_460_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\Geometries\10Z_475_STBI.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\locations.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\modelparameters.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\scenarios.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\segments.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\csvfiles\surfacelines.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\Full2DProject\Import.defx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\ImporterTest\LocationID.shp.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\ImporterTest\soilmaterials.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <Content Include="TestData\CSVData\DataWithoutPl3AndPl4\csvfiles\soilmaterials.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\CSVData\Full1DProject\csvfiles\soilmaterials.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\CSVData\Full2DProject\csvfiles\soilmaterials.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\CSVData\ProjectZoneType\csvfiles\soilmaterials.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\DeltaDijkSmall\Gemeenten.shp.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\DeltaDijkSmall\soilmaterials.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\FrieslandIJsselmeer\input_dam.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\FrieslandIJsselmeer\input_dam_shortversion.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\FrieslandIJsselmeer\input_dam_veryshortversion.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\Geometry2DDataOutput.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\HoekscheWaardCsv\Description import files.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\HoekscheWaardCsv\soilmaterials.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\HoekscheWaard\input_dam.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\HoekscheWaard\input_dam_shortversion.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\IJkdijk\ijkdijkpointdata_fews2dam.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\LiveDijk\input_dam.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\LiveDijk\input_dam_shortversion.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\LiveDijk\SampleCalculationParameters.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\LocationImportData\LocationProperties.txt" />
-    <Content Include="TestData\PLLineCreation.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\ProfileOutput.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\Sensors\csvfiles\soilmaterials.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\Soilmaterials - 18_4_94.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\soilmaterials.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="TestData\18_4_94.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\1D1.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\bm4-3a.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\ImporterTest\characteristicpoints.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\ImporterTest\LocationID.dbf">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\ImporterTest\LocationID.shp">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\ImporterTest\LocationID.shx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\ImporterTest\scenarios.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\ImporterTest\segments.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\ImporterTest\soilprofiles.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\ImporterTest\surfacelines.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\ProjectZoneType\csvfiles\characteristicpoints.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\ProjectZoneType\csvfiles\locations.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\ProjectZoneType\csvfiles\modelparameters.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\ProjectZoneType\csvfiles\ResultsPipingDesign.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\ProjectZoneType\csvfiles\scenarios.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\ProjectZoneType\csvfiles\segments.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\ProjectZoneType\csvfiles\soilprofiles.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\ProjectZoneType\csvfiles\surfacelines.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\CSVData\ProjectZoneType\Import.defx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DeltaDijkSmall\characteristicpoints.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DeltaDijkSmall\Dam.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DeltaDijkSmall\Gemeenten.dbf">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DeltaDijkSmall\Gemeenten.fix">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DeltaDijkSmall\Gemeenten.prj">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DeltaDijkSmall\Gemeenten.qix">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DeltaDijkSmall\Gemeenten.sbn">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DeltaDijkSmall\Gemeenten.sbx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DeltaDijkSmall\Gemeenten.shp">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DeltaDijkSmall\Gemeenten.shx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DeltaDijkSmall\locations.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DeltaDijkSmall\modelparameters.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DeltaDijkSmall\Results Stability Design.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DeltaDijkSmall\Results Stability Normal.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DeltaDijkSmall\scenarios.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DeltaDijkSmall\segments.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DeltaDijkSmall\soilprofiles.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DeltaDijkSmall\surfacelines.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DWP_17.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\FillXMLInputFromDamUI\Profile2D 1.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\FillXMLInputFromDamUI\Profile2D 2.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\HoekscheWaardCsv\characteristicpoints.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\HoekscheWaardCsv\locations.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\HoekscheWaardCsv\locations_pluslatLong.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\HoekscheWaardCsv\modelparameters.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\HoekscheWaardCsv\scenarios.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\HoekscheWaardCsv\segments.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\HoekscheWaardCsv\soilprofiles.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\HoekscheWaardCsv\stabsoilparameters.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\HoekscheWaardCsv\surfacelines.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\HoekscheWaardCsv\surfacelines_vertical.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\LocationImportData\locations.csv" />
-    <None Include="TestData\PLLineCreation.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\Sensors\csvfiles\characteristicpoints.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\Sensors\Geometries\DP29_9.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\Sensors\Geometries\DP30_1.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\Sensors\Geometries\DP30_2.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\Sensors\Geometries\DP31_5.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\Sensors\Geometries\DP33_4.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\Sensors\Geometries\DP35_5.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\Sensors\Geometries\DP37_0.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\Sensors\csvfiles\locations.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\Sensors\csvfiles\modelparameters.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\Sensors\csvfiles\scenarios.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\Sensors\csvfiles\segments.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\Sensors\Import.defx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\Sensors\Sensordata.xls">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\Sensors\csvfiles\surfacelines.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\StiImporter\InvalidGeometryVersion.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\StiImporter\InvalidSoilVersion.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\StiImporter\SeepFile.SEI">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\StiImporter\SimpleProfile.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\StiImporter\SimpleProfileWithException.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\StiImporter\Tutorial-1a 10.1.4.3.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\StiImporter\Tutorial-1a 14.1.2.1.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\StiImporter\Tutorial-1a 16.1.2.1.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\StiImporter\GeoFile.geo">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\top50_dijkring10.dbf">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\top50_dijkring10.shp">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\top50_dijkring10.shx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="DataPlugins\" />
-    <Folder Include="Readers\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-    <Error Condition="!Exists('..\..\packages\NUnit.3.13.3\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit.3.13.3\build\NUnit.props'))" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+</Project>
Index: DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj
===================================================================
diff -u -r4006 -r4020
--- DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj	(.../Deltares.Dam.IntegrationTests.csproj)	(revision 4006)
+++ DamClients/DamUI/trunk/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj	(.../Deltares.Dam.IntegrationTests.csproj)	(revision 4020)
@@ -1,333 +1,64 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\NUnit.3.13.3\build\NUnit.props" Condition="Exists('..\..\packages\NUnit.3.13.3\build\NUnit.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{3929C2AB-5F5B-40A1-8D77-6303AEE7976B}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Deltares.Dam.Tests</RootNamespace>
-    <AssemblyName>Deltares.Dam.IntegrationTests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <CodeAnalysisFailOnMissingRules>true</CodeAnalysisFailOnMissingRules>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>..\..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)build\Test.targets" />
   <ItemGroup>
-    <Reference Include="Deltares.DamEngine.Data, Version=18.1.0.1432, Culture=neutral, processorArchitecture=x86">
+    <Folder Include="Properties" />
+  </ItemGroup>  <ItemGroup>
+    <Reference Include="Deltares.Authorization">
+      <HintPath>..\..\..\lib\Authorization\x86\Deltares.Authorization.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.DamEngine.Data">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\DamEngine\Deltares.DamEngine.Data.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.DamEngine.Interface, Version=18.1.0.1001, Culture=neutral, processorArchitecture=x86">
+    <Reference Include="Deltares.DamEngine.Interface">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\DamEngine\Deltares.DamEngine.Interface.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.DamEngine.Io, Version=18.1.0.1001, Culture=neutral, processorArchitecture=x86">
+    <Reference Include="Deltares.DamEngine.Io">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\DamEngine\Deltares.DamEngine.Io.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.Geographic, Version=16.1.0.0, Culture=neutral, PublicKeyToken=d4f3dcd34f9b7bc2, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Deltares.Geographic">
       <HintPath>..\..\..\lib\DSL-Geographic\Deltares.Geographic.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.Geotechnics, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Deltares.Geotechnics">
       <HintPath>..\..\..\lib\DSL-Geo\Deltares.Geotechnics.dll</HintPath>
     </Reference>
-    <Reference Include="Deltares.Standard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31fe100197c68040, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Deltares.Standard">
       <HintPath>..\..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
     </Reference>
-    <Reference Include="DevExpress.XtraGauges.v12.2.Core, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Deltares.Standard">
+      <HintPath>..\..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.XtraGauges.v12.2.Core">
       <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraGauges.v12.2.Core.dll</HintPath>
     </Reference>
-    <Reference Include="DevExpress.XtraGauges.v12.2.Win, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="DevExpress.XtraGauges.v12.2.Win">
       <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraGauges.v12.2.Win.dll</HintPath>
     </Reference>
-    <Reference Include="DevExpress.XtraReports.v12.2, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="DevExpress.XtraReports.v12.2">
       <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraReports.v12.2.dll</HintPath>
     </Reference>
-    <Reference Include="DotSpatial.Data, Version=1.6.0.0, Culture=neutral, PublicKeyToken=c29dbf30e059ca9d, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="DotSpatial.Data">
       <HintPath>..\..\..\lib\DotSpatial\DotSpatial.Data.dll</HintPath>
     </Reference>
-    <Reference Include="DotSpatial.Topology, Version=1.6.0.0, Culture=neutral, PublicKeyToken=a66b5e9434ca3671, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="DotSpatial.Topology">
       <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="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="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>
     </Reference>
     <Reference Include="System.Data" />
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
-    <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj">
-      <Project>{F1CD9620-15CF-41F8-AF70-5AE004A50F60}</Project>
-      <Name>Deltares.Dam.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="TestHelper\Deltares.Dam.TestHelper.csproj">
-      <Project>{d312a703-f6cf-4bec-b5c5-4e9c161d2010}</Project>
-      <Name>Deltares.Dam.TestHelper</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj" />
+    <ProjectReference Include="TestHelper\Deltares.Dam.TestHelper.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DamIntegrationTestTolerance.cs" />
-    <Compile Include="FailureMechanismTests.cs" />
-    <Compile Include="IntersectionOnShapesTest.cs" />
-    <Compile Include="TestResultsWriter.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="TestData\Case A15.mdb">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <None Include="..\..\Copying.GPL.licenseheader">
-      <Link>Copying.GPL.licenseheader</Link>
-    </None>
-    <None Include="packages.config" />
-    <None Include="TestData\DamLive\Grebbedijk\input.Calc\_.tmp">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DamLive\Grebbedijk\input.damx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DamLive\Grebbedijk\input.Geometries\grebbedijk1a.sti">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DamLive\Grebbedijk\input.Geometries\grebbedijk3a.sti">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DamLive\Set3\output.Calc\_.tmp">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DamLive\Set3\output.damx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DamLive\Set3\output.Geometries\1C-31,5-bishop-binnen.sti">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DamLive\Set3\output.Geometries\1D-34-bishop-binnen.sti">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DamLive\Set3\output.Geometries\2A-37-bishop-binnen.sti">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <Content Include="TestData\DamLive\Grebbedijk\1ainput_dam_ksl.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\DamLive\Grebbedijk\3ainput_dam.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\DamLive\Grebbedijk\1aoutput_dam.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\DamLive\Grebbedijk\3ainput_dam_ksl.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="TestData\DamLive\Grebbedijk\3aoutput_dam.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <None Include="TestData\DamLive\Grebbedijk\live.ParametersFile.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <Content Include="TestData\DamLive\Grebbedijk\input0.soilmaterials.mdb">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\DamLive\Set3\live.FEWS.InputFile.1Step.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="TestData\DamLive\Set3\live.FEWS.InputFile.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\DamLive\Set3\live.FEWS.OutputFile.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <None Include="TestData\DamLive\Set3\live.ParametersFile.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <SubType>Designer</SubType>
-    </None>
-    <Content Include="TestData\DamLive\Set3\output0.soilmaterials.mdb">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\DamLive\Set2\live.FEWS.InputFile.1Step.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\DamLive\Set2\live.FEWS.InputFile.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\DamLive\Set2\live.FEWS.OutputFile.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\DamLive\Set2\output0.soilmaterials.mdb">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\FrieslandIJsselmeer\input_dam.xml" />
-    <Content Include="TestData\FrieslandIJsselmeer\input_dam_shortversion.xml" />
-    <Content Include="TestData\FrieslandIJsselmeer\SampleCalculationParameters.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\GrebbeDijk\CalculationParametersDGeoStability.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\GrebbeDijk\Input_dam.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\GrebbeDijk\input_dam_missingvalue_start.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\GrebbeDijk\Input_dam_withcrash.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\GrebbeDijk\Input_dam_withmissingvalues.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\GrebbeDijk\Results_dam.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\GrechtDijk\GDCalculationParameters.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\GrechtDijk\GDinput_dam.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\GrechtDijk\GDresults_dam.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\HoekscheWaard\input_dam.xml" />
-    <Content Include="TestData\HoekscheWaard\input_dam_shortversion.xml" />
-    <Content Include="TestData\IJkdijk Stability\input_DAM.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\IJkdijk Stability\SampleCalculationParameters.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\IJkdijk\ijkdijkpointdata_fews2dam.xml" />
-    <Content Include="TestData\IJkdijk\input_dam_correct.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\IJkdijk\input_dam_wild.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\LiveDijk\input_dam.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\LiveDijk\SampleCalculationParameters.xml" />
-    <Content Include="TestData\VoorhavenDijk\VDCalculationParameters.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\VoorhavenDijk\VDinput_dam.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\VoorhavenDijk\VDresults_dam.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\YRCC\CalculationParameters.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\YRCC\input_dam.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\YRCC\results_dam.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    <PackageReference Remove="System.Threading.Tasks.Extensions" />
+    <PackageReference Include="CompareNETObjects" Version="3.3.0" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="TestData\DamLive\Set2\output.Calc\_.tmp">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DamLive\Set2\output.damx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DamLive\Set2\output.Geometries\1C-31,5-bishop-binnen.sti">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DamLive\Set2\output.Geometries\1D-34-bishop-binnen.sti">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="TestData\DamLive\Set2\output.Geometries\2A-37-bishop-binnen.sti">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-    <Error Condition="!Exists('..\..\packages\NUnit.3.13.3\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit.3.13.3\build\NUnit.props'))" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
Fisheye: Tag 4020 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/Specifications/Specifications/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamClients/DamUI/trunk/src/Dam/Tests/Specifications/Specifications/Deltares.Dam.Specifications.Tests.csproj
===================================================================
diff -u -r4006 -r4020
--- DamClients/DamUI/trunk/src/Dam/Tests/Specifications/Specifications/Deltares.Dam.Specifications.Tests.csproj	(.../Deltares.Dam.Specifications.Tests.csproj)	(revision 4006)
+++ DamClients/DamUI/trunk/src/Dam/Tests/Specifications/Specifications/Deltares.Dam.Specifications.Tests.csproj	(.../Deltares.Dam.Specifications.Tests.csproj)	(revision 4020)
@@ -1,90 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\NUnit.3.13.3\build\NUnit.props" Condition="Exists('..\..\..\..\packages\NUnit.3.13.3\build\NUnit.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D092C06D-9CE6-48CF-8453-637FCCE8B371}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Deltares.Standard.Specifications.Tests</RootNamespace>
-    <AssemblyName>Deltares.Standard.Specifications.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\..\..\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>..\..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)build\Test.targets" />
   <ItemGroup>
-    <Reference Include="Deltares.Standard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31fe100197c68040, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\lib\DSL-Core\Deltares.Standard.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="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
+    <Folder Include="Properties" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DomainModel.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SpecifcationTest.cs" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\..\Copying.GPL.licenseheader">
-      <Link>Copying.GPL.licenseheader</Link>
-    </None>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\..\..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj">
-      <Project>{f1cd9620-15cf-41f8-af70-5ae004a50f60}</Project>
-      <Name>Deltares.Dam.Data</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\NUnit.3.13.3\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\NUnit.3.13.3\build\NUnit.props'))" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+</Project>
Index: DamClients/DamUI/trunk/src/build/Test.targets
===================================================================
diff -u -r4004 -r4020
--- DamClients/DamUI/trunk/src/build/Test.targets	(.../Test.targets)	(revision 4004)
+++ DamClients/DamUI/trunk/src/build/Test.targets	(.../Test.targets)	(revision 4020)
@@ -5,7 +5,7 @@
         <OutDir>$(OutputPath)</OutDir>
         <IsPublishable>False</IsPublishable>
         <TestProjectType>UnitTest</TestProjectType>
-        <TargetFramework>net48</TargetFramework>
+        <TargetFramework>net461</TargetFramework>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="NUnit">
Index: DamClients/DamUI/trunk/src/Dam.sln
===================================================================
diff -u -r4017 -r4020
--- DamClients/DamUI/trunk/src/Dam.sln	(.../Dam.sln)	(revision 4017)
+++ DamClients/DamUI/trunk/src/Dam.sln	(.../Dam.sln)	(revision 4020)
@@ -66,8 +66,6 @@
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Deltares.Dam.Setup", "Dam\Dam.Setup\Deltares.Dam.Setup.wixproj", "{5ACA0915-875D-4F5C-A5D1-7D6FE1E7B8CA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.Version", "Deltares.Dam.Version\Deltares.Dam.Version.csproj", "{E5FBE34E-740D-42AA-AD11-431A23EEF6CA}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Maps", "DamClientsLibrary\Deltares.Maps\Deltares.Maps.csproj", "{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}"
 	ProjectSection(ProjectDependencies) = postProject
 		{48691761-637B-4EFF-A04C-2047E5FA9843} = {48691761-637B-4EFF-A04C-2047E5FA9843}
@@ -80,8 +78,6 @@
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DamClientsLibrary", "DamClientsLibrary", "{F6A85256-50BA-4E97-8E3C-D8D488DFAF44}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.DamClientsLibrary.Version", "DamClientsLibrary\Deltares.DamClientsLibrary.Version\Deltares.DamClientsLibrary.Version.csproj", "{48691761-637B-4EFF-A04C-2047E5FA9843}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Maps.Tests", "DamClientsLibrary\Deltares.Maps.Tests\Deltares.Maps.Tests.csproj", "{E0820F33-3929-493D-821D-95E755F87D0B}"
 EndProject
 Global
@@ -132,10 +128,6 @@
 		{2C1BFE67-A106-4926-BA5A-0374EA6B99B6}.Release|x86.Build.0 = Release|x86
 		{5ACA0915-875D-4F5C-A5D1-7D6FE1E7B8CA}.Debug|x86.ActiveCfg = Debug|x86
 		{5ACA0915-875D-4F5C-A5D1-7D6FE1E7B8CA}.Release|x86.ActiveCfg = Release|x86
-		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA}.Debug|x86.ActiveCfg = Debug|x86
-		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA}.Debug|x86.Build.0 = Debug|x86
-		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA}.Release|x86.ActiveCfg = Release|x86
-		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA}.Release|x86.Build.0 = Release|x86
 		{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Debug|x86.ActiveCfg = Debug|x86
 		{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Debug|x86.Build.0 = Debug|x86
 		{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Release|x86.ActiveCfg = Release|x86
@@ -144,10 +136,6 @@
 		{F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Debug|x86.Build.0 = Debug|x86
 		{F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Release|x86.ActiveCfg = Release|x86
 		{F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Release|x86.Build.0 = Release|x86
-		{48691761-637B-4EFF-A04C-2047E5FA9843}.Debug|x86.ActiveCfg = Debug|x86
-		{48691761-637B-4EFF-A04C-2047E5FA9843}.Debug|x86.Build.0 = Debug|x86
-		{48691761-637B-4EFF-A04C-2047E5FA9843}.Release|x86.ActiveCfg = Release|x86
-		{48691761-637B-4EFF-A04C-2047E5FA9843}.Release|x86.Build.0 = Release|x86
 		{E0820F33-3929-493D-821D-95E755F87D0B}.Debug|x86.ActiveCfg = Debug|x86
 		{E0820F33-3929-493D-821D-95E755F87D0B}.Debug|x86.Build.0 = Debug|x86
 		{E0820F33-3929-493D-821D-95E755F87D0B}.Release|x86.ActiveCfg = Release|x86
@@ -169,11 +157,9 @@
 		{D8457286-3BD4-49FB-9FCB-22D7CB662F57} = {21ABEBA9-040B-4522-BD23-837E4FB5CD08}
 		{2C1BFE67-A106-4926-BA5A-0374EA6B99B6} = {21ABEBA9-040B-4522-BD23-837E4FB5CD08}
 		{5ACA0915-875D-4F5C-A5D1-7D6FE1E7B8CA} = {BE4E3A78-F55F-4DE7-BCA4-9BAB59C37549}
-		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA} = {31A32A36-649A-41A8-9F43-6A6193C04770}
 		{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665} = {F6A85256-50BA-4E97-8E3C-D8D488DFAF44}
 		{F1CD9620-15CF-41F8-AF70-5AE004A50F60} = {F6A85256-50BA-4E97-8E3C-D8D488DFAF44}
 		{F6A85256-50BA-4E97-8E3C-D8D488DFAF44} = {31A32A36-649A-41A8-9F43-6A6193C04770}
-		{48691761-637B-4EFF-A04C-2047E5FA9843} = {F6A85256-50BA-4E97-8E3C-D8D488DFAF44}
 		{E0820F33-3929-493D-821D-95E755F87D0B} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
Fisheye: Tag 4020 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tests/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4020 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Deltares.Dam.Version/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4020 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Deltares.Dam.Version/Deltares.Dam.Version.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4020 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Deltares.Dam.Version/GlobalAssembly.cs.svn'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4020 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.DamClientsLibrary.Version/Deltares.DamClientsLibrary.Version.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4020 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.DamClientsLibrary.Version/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4020 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.DamClientsLibrary.Version/GlobalAssembly.cs.svn'.
Fisheye: No comparison available.  Pass `N' to diff?