Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj
===================================================================
diff -u -r3970 -r3987
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj	(.../Deltares.DamEngine.Data.csproj)	(revision 3970)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj	(.../Deltares.DamEngine.Data.csproj)	(revision 3987)
@@ -1,223 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{B7A49C1A-1C91-4D72-ABA9-9FBAC2509D8E}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Deltares.DamEngine.Data</RootNamespace>
-    <AssemblyName>Deltares.DamEngine.Data</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <SatelliteResourceLanguages>en;nl</SatelliteResourceLanguages>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(SolutionDir)\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>$(SolutionDir)\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="$(SolutionDir)build\Source.targets" />
+    <ItemGroup>
+        <Folder Include="Properties" />
+    </ItemGroup>
+    <ItemGroup>
+        <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+            <_Parameter1>Deltares.DamEngine.Calculators.Tests</_Parameter1>
+        </AssemblyAttribute>
+    </ItemGroup>
+    <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="General\ConversionHelper.cs" />
-    <Compile Include="General\DikeException.cs" />
-    <Compile Include="General\EmbankmentDesignParameters.cs" />
-    <Compile Include="General\LocationEnumerations.cs" />
-    <Compile Include="General\Physics.cs" />
-    <Compile Include="General\PipingEnumerations.cs" />
-    <Compile Include="General\PlLineEnumerations.cs" />
-    <Compile Include="General\PolyLineException.cs" />
-    <Compile Include="General\ProjectEnumerations.cs" />
-    <Compile Include="General\Results\DesignResult.cs" />
-    <Compile Include="Design\DesignScenario.cs" />
-    <Compile Include="General\DamFailureMechanismeCalculationSpecification.cs" />
-    <Compile Include="General\DamGlobalConstants.cs" />
-    <Compile Include="General\DamProjectCalculationSpecification.cs" />
-    <Compile Include="General\DamProjectData.cs" />
-    <Compile Include="General\Dike.cs" />
-    <Compile Include="General\FailureMechanismParametersMStab.cs" />
-    <Compile Include="General\Gauges\Gauge.cs" />
-    <Compile Include="General\Gauges\GaugePLLine.cs" />
-    <Compile Include="General\IAssignable.cs" />
-    <Compile Include="General\ModelFactors.cs" />
-    <Compile Include="General\ModelParametersForPlLines.cs" />
-    <Compile Include="General\MStabParameters.cs" />
-    <Compile Include="General\PlLines\Pl1Line.cs" />
-    <Compile Include="General\PlLines\PlLine.cs" />
-    <Compile Include="General\PlLines\PlLines.cs" />
-    <Compile Include="General\PolyLine.cs" />
-    <Compile Include="General\Results\PipingDesignResults.cs" />
-    <Compile Include="General\Results\StabilityDesignResults.cs" />
-    <Compile Include="General\Results\StabilityResultSlice.cs" />
-    <Compile Include="General\Segment.cs" />
-    <Compile Include="General\SegmentEnumerations.cs" />
-    <Compile Include="General\Sensors\SensorEnumerations.cs" />
-    <Compile Include="General\Sensors\SensorGroup.cs" />
-    <Compile Include="General\Sensors\Sensor.cs" />
-    <Compile Include="General\Sensors\SensorData.cs" />
-    <Compile Include="General\Sensors\SensorFactory.cs" />
-    <Compile Include="General\Sensors\SensorLocation.cs" />
-    <Compile Include="General\Sensors\SensorPlLineCreatorSettings.cs" />
-    <Compile Include="General\Sensors\SensorRepository.cs" />
-    <Compile Include="General\Sensors\Specifications\DitchWaterLevelSensorSpecification.cs" />
-    <Compile Include="General\Sensors\Specifications\PiezometricHeadSensorSpecification.cs" />
-    <Compile Include="General\Sensors\Specifications\PolderLevelSensorSpecification.cs" />
-    <Compile Include="General\Sensors\Specifications\UseLocationAsDataSource.cs" />
-    <Compile Include="General\Sensors\Specifications\WaterLevelSensorSpecification.cs" />
-    <Compile Include="General\SoilGeometry.cs" />
-    <Compile Include="General\SoilGeometryProbability.cs" />
-    <Compile Include="General\Specifications\AndSpecification.cs" />
-    <Compile Include="General\Specifications\CompositeSpecification.cs" />
-    <Compile Include="General\Specifications\Extensions\SpecificationExtensions.cs" />
-    <Compile Include="General\Specifications\ISpecification.cs" />
-    <Compile Include="General\Specifications\NotSpecification.cs" />
-    <Compile Include="General\Specifications\OrSpecification.cs" />
-    <Compile Include="General\Specifications\PredicateSpecification.cs" />
-    <Compile Include="General\Specifications\SpecificationBase.cs" />
-    <Compile Include="General\StabilityEnumerations.cs" />
-    <Compile Include="General\StabilityOptions.cs" />
-    <Compile Include="General\TimeSeries\Stochast.cs" />
-    <Compile Include="General\TimeSeries\TimeSerie.cs" />
-    <Compile Include="General\TimeSeries\TimeSerieCollection.cs" />
-    <Compile Include="General\TimeSeries\TimeSerieEntry.cs" />
-    <Compile Include="General\TimeSeries\TimeSerieEnumerations.cs" />
-    <Compile Include="General\TimeSeries\TimeStep.cs" />
-    <Compile Include="General\UpliftSituation.cs" />
-    <Compile Include="Geometry\CoordinateSystemConverter.cs" />
-    <Compile Include="Geometry\CoordinateSystemConverterException.cs" />
-    <Compile Include="Geometry\GeometryBounds.cs" />
-    <Compile Include="Geometry\GeometryConstants.cs" />
-    <Compile Include="Geometry\GeometryCurve.cs" />
-    <Compile Include="Geometry\GeometryData.cs" />
-    <Compile Include="Geometry\GeometryGenerator.cs" />
-    <Compile Include="Geometry\GeometryLoop.cs" />
-    <Compile Include="Geometry\GeometryObject.cs" />
-    <Compile Include="Geometry\GeometryPoint.cs" />
-    <Compile Include="Geometry\GeometryPointString.cs" />
-    <Compile Include="Geometry\GeometrySurface.cs" />
-    <Compile Include="Geometry\HeadLine.cs" />
-    <Compile Include="Geometry\IGeometryObject.cs" />
-    <Compile Include="Geometry\Line.cs" />
-    <Compile Include="Geometry\LineHelper.cs" />
-    <Compile Include="Geometry\PhreaticLine.cs" />
-    <Compile Include="Geometry\Point2D.cs" />
-    <Compile Include="Geometry\Routines2D.cs" />
-    <Compile Include="Geometry\Waternet.cs" />
-    <Compile Include="Geometry\WaternetLine.cs" />
-    <Compile Include="Geotechnics\CharacteristicPoint.cs" />
-    <Compile Include="Geotechnics\CharacteristicPointSet.cs" />
-    <Compile Include="Geotechnics\CharacteristicPointType.cs" />
-    <Compile Include="Geotechnics\SoilProfile1DAquiferLayerCombiner.cs" />
-    <Compile Include="Geotechnics\DilatancyType.cs" />
-    <Compile Include="Geotechnics\LandwardDirection.cs" />
-    <Compile Include="Geotechnics\Layer.cs" />
-    <Compile Include="Geotechnics\LayerDetector.cs" />
-    <Compile Include="Geotechnics\PreConsolidationStress.cs" />
-    <Compile Include="Geotechnics\ShearStrengthModel.cs" />
-    <Compile Include="General\Location.cs" />
-    <Compile Include="Geotechnics\SoilLayer.cs" />
-    <Compile Include="Geotechnics\SoilLayer1D.cs" />
-    <Compile Include="Geotechnics\SoilLayer2D.cs" />
-    <Compile Include="Geotechnics\SoilList.cs" />
-    <Compile Include="Geotechnics\SoilProfile.cs" />
-    <Compile Include="Geotechnics\SoilProfile1D.cs" />
-    <Compile Include="Geotechnics\SoilProfile1DAquiferLayerCombinerException.cs" />
-    <Compile Include="Geotechnics\SoilProfile2D.cs" />
-    <Compile Include="Geotechnics\SoilProfileHelper.cs" />
-    <Compile Include="Geotechnics\SoilSurfaceProfile.cs" />
-    <Compile Include="Geotechnics\SurfaceLine2.cs" />
-    <Compile Include="Geotechnics\SurfaceLine2Extensions.cs" />
-    <Compile Include="Geotechnics\SurfaceLine2Validator.cs" />
-    <Compile Include="Geotechnics\SurfaceLineException.cs" />
-    <Compile Include="Geotechnics\WaterpressureInterpolationModel.cs" />
-    <Compile Include="Probabilistic\Enumerations.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Geotechnics\Soil.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Standard\ArrayExtensions.cs" />
-    <Compile Include="Standard\Calculation\Delegates.cs" />
-    <Compile Include="Standard\Calculation\CalculationResult.cs" />
-    <Compile Include="Standard\ComputeDoubles.cs" />
-    <Compile Include="Standard\ConversionException.cs" />
-    <Compile Include="Standard\DelegatedList.cs" />
-    <Compile Include="Standard\GeneralMathRoutines.cs" />
-    <Compile Include="Standard\IClonable.cs" />
-    <Compile Include="Standard\IFindList.cs" />
-    <Compile Include="Standard\IName.cs" />
-    <Compile Include="Standard\ISortableList.cs" />
-    <Compile Include="Standard\Language\LanguageType.cs" />
-    <Compile Include="Standard\Language\LanguageTypeHelper.cs" />
-    <Compile Include="Standard\Language\LocalizationManager.cs" />
-    <Compile Include="Standard\Language\TranslateHelper.cs" />
-    <Compile Include="Standard\Language\TranslateInfo.cs" />
-    <Compile Include="Standard\Language\TranslationAttribute.cs" />
-    <Compile Include="Standard\ListExtension.cs" />
-    <Compile Include="Standard\Logging\LogMessage.cs" />
-    <Compile Include="Standard\Logging\LogMessageType.cs" />
-    <Compile Include="Standard\ObjectCopier.cs" />
-    <Compile Include="Standard\ObjectExtensions.cs" />
-    <Compile Include="Standard\ReferenceEqualityComparer.cs" />
-    <Compile Include="Standard\StaticReflection.cs" />
-    <Compile Include="Standard\ThrowHelper.cs" />
-    <Compile Include="Standard\TypeExtensions.cs" />
-    <Compile Include="Standard\TypeHelper.cs" />
-    <Compile Include="Standard\UniqueNameProvider.cs" />
-    <Compile Include="Standard\Validation\IValidationResult.cs" />
-    <Compile Include="Standard\Validation\ValidateAttribute.cs" />
-    <Compile Include="Standard\Validation\ValidationResult.cs" />
-    <Compile Include="Standard\Validation\ValidationResultType.cs" />
-    <Compile Include="Standard\VirtualList.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Copying.AGPL.licenseheader">
-      <Link>Copying.AGPL.licenseheader</Link>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.nl-NL.resx" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.Version.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-  </PropertyGroup>
-  <!-- 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
+</ItemGroup>
+</Project>
Fisheye: Tag 3987 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 3987 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.ConsoleRun/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
===================================================================
diff -u -r3974 -r3987
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj	(.../Deltares.DamEngine.IntegrationTests.csproj)	(revision 3974)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj	(.../Deltares.DamEngine.IntegrationTests.csproj)	(revision 3987)
@@ -1,40 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.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')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{5C949622-0C02-4EF9-B7BF-54C9F11662C0}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Deltares.DamEngine.IntegrationTests</RootNamespace>
-    <AssemblyName>Deltares.DamEngine.IntegrationTests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <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>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </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>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <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>
+<Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="$(SolutionDir)build\Test.targets" />
+    <ItemGroup>
+        <Folder Include="Properties" />
+    </ItemGroup>
+    <ItemGroup>
+    <Reference Include="KellermanSoftware.Compare-NET-Objects, Version=3.9.0.0, Culture=neutral, PublicKeyToken=d970ace04cc85217, processorArchitecture=MSIL">
+      <HintPath>..\packages\CompareNETObjects.3.09.0.0\lib\net46\KellermanSoftware.Compare-NET-Objects.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -44,338 +15,283 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="IntegrationTests\DebuggingTest.cs" />
-    <Compile Include="IntegrationTests\DesignCalculatorTests.cs" />
-    <Compile Include="IntegrationTests\MacroStabilityInwardsTests.cs" />
-    <Compile Include="IntegrationTests\MacroStabilityOutwardsTests.cs" />
-    <Compile Include="IntegrationTests\MultiCoreMacroStabilityTests.cs" />
-    <Compile Include="IntegrationTests\MultiCorePipingCalculationTests.cs" />
-    <Compile Include="IntegrationTests\OperationalGrebbedijkTests.cs" />
-    <Compile Include="IntegrationTests\OperationalIntegrationTests.cs" />
-    <Compile Include="IntegrationTests\OperationalPulauTekongTests.cs" />
-    <Compile Include="IntegrationTests\PipingBlighTests.cs" />
-    <Compile Include="IntegrationTests\PipingSellmeijer4ForcesTests.cs" />
-    <Compile Include="IntegrationTests\PipingSellmeijerVnkTests.cs" />
-    <Compile Include="IntegrationTests\WtiPipingSellmeijerRevisedTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="TestFiles\DAM Tutorial Design0.soilmaterials.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\DeltaDijk normal.geometries2D.0\DeltaDijk normal0.soilmaterials.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\DeltaDijk normal0.soilmaterials.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\DeltaDijkInputFile.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\DeltaDijkInvoer3VNKAdaptionShoulderLength.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\DeltaDijkBishopInwards.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\DesignInputFileWithRiverLevelAboveDikeTopButBelowDTH.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\ErrorInDGeoStabilityCalculation.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\GrebbedijkStability.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\InputFileForDGeoStability.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\InputFileForStabOutsideBishopAutomaticGrid.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\InputFileForStabOutsideBishopSpecifiedGrid.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\InputForDebugging.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\Invoer10.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\MacroStabilityNoProfilesInputFile.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\MacroStabilityRunFailedExpectCalculationMessage.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\MacroStabilityTutorialDesignInputFile.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\MacroStabilityTutorialDesignInputFile13.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\MacroStabilityTutorialDesignInputFile18.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\MacroStabilityTutorialDesignInputFile1LocationWithAdaption.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\MacroStabilityTutorialDesignInputFileMultipleLocations.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\OperationalSet2.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\Operational\Grebbedijk\1ainput_dam_ksl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\Operational\Grebbedijk\1aoutput_dam.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\Operational\Grebbedijk\3ainput_dam.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\Operational\Grebbedijk\3ainput_dam_ksl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\Operational\Grebbedijk\3aoutput_dam.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\Operational\Grebbedijk\input0.soilmaterials.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\Operational\Grebbedijk\live.ParametersFile.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\Operational\PulauTekong\PulauTekong.InputFile-NoValues.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\Operational\PulauTekong\PulauTekong.InputFile.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\Operational\PulauTekong\PulauTekong0.soilmaterials.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\output0.soilmaterials.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\PipingVoorbeeld1_BlighDesignInputFile.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\PipingVoorbeeld1_BlighInputFile.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\PipingVoorbeeld1_Sellmeijer4ForcesDesignHeightInputFile.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\PipingVoorbeeld1_Sellmeijer4ForcesDesignInputFile.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\PipingVoorbeeld1_Sellmeijer4ForcesInputFile.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\PipingVoorbeeld1_SellmeijerVNKDesignInputFile.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\PipingVoorbeeld1_SellmeijerVNKDesignInputFileFail.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\PipingVoorbeeld1_SellmeijerVNKInputFile.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\PipingVoorbeeld1_WtiSellmeijerRevisedDesignHeightInputFile.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\PipingVoorbeeld1_WtiSellmeijerRevisedDesignInputFile.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\PipingVoorbeeld1_WtiSellmeijerRevisedInputFile.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\PipingVoorbeeld1_WtiSellmeijerRevisedNoPipingInputFile.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\Rechter Diezedijk_BlighDesignInputFile.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\Rechter Diezedijk_BlighDesignInputFile_1Location.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\Rechter Diezedijk_BlighFailedDesignInputFile_1Location.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\Rechter Diezedijk_BlighInputFile.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\Rechter Diezedijk_NoStabilityInsideInputFile.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\Rechter Diezedijk_WtiSellmeijerRevisedFailedDesignInputFile_1Location.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\Rechter Diezedijk_WtiSellmeijerRevisedInputFile.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\RegionalAssessment.soilmaterials.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\RegionalAssessment.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\RegionalAssessment2.soilmaterials.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\RegionalAssessment2.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\RegionalAssessment3.soilmaterials.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\RegionalAssessment3.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\SlopeAdaption0.soilmaterials.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\ValidatieSlopeAdaption.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\ZoneType0.soilmaterials.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Deltares.DamEngine.Data\Deltares.DamEngine.Data.csproj">
-      <Project>{B7A49C1A-1C91-4D72-ABA9-9FBAC2509D8E}</Project>
-      <Name>Deltares.DamEngine.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Deltares.DamEngine.Interface\Deltares.DamEngine.Interface.csproj">
-      <Project>{750464A3-CBFA-429F-920E-B430867F1120}</Project>
-      <Name>Deltares.DamEngine.Interface</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Deltares.DamEngine.Io\Deltares.DamEngine.Io.csproj">
-      <Project>{1560A423-F338-4DEC-8583-1DFF7077F104}</Project>
-      <Name>Deltares.DamEngine.Io</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Deltares.DamEngine.TestHelpers\Deltares.DamEngine.TestHelpers.csproj">
-      <Project>{A41683F4-C3E0-4386-AEE7-FAACD535CF93}</Project>
-      <Name>Deltares.DamEngine.TestHelpers</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Copying.AGPL.licenseheader">
-      <Link>Copying.AGPL.licenseheader</Link>
-    </None>
-    <None Include="App.config" />
-    <None Include="packages.config" />
-    <None Include="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_1.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_10.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_11.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_12.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_13.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_18.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_2.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_3.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_4.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_5.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_6.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_7.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_8.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_9.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestFiles\DeltaDijk normal.geometries2D.0\DeltaDijk normal.damx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestFiles\DeltaDijk normal.geometries2D.0\DeltaDijk normal.defx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestFiles\Operational\Grebbedijk\input.damx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestFiles\Operational\Grebbedijk\input.Geometries\grebbedijk1a.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="TestFiles\Operational\Grebbedijk\input.Geometries\grebbedijk3a.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <Content Include="TestFiles\output.Geometries\1C-31,5-bishop-binnen.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\output.Geometries\1D-34-bishop-binnen.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\output.Geometries\2A-37-bishop-binnen.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\Operational\PulauTekong\PulauTekong.geometries2D.0\CD CS1 X1.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\Operational\PulauTekong\PulauTekong.geometries2D.0\CD CS2 X3.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\Operational\PulauTekong\PulauTekong.geometries2D.0\SD CS1 3-3.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\Operational\PulauTekong\PulauTekong.geometries2D.0\SD CS2 8-8.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\Operational\PulauTekong\PulauTekong.geometries2D.0\SD CS3 10-10.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <None Include="TestFiles\ZoneType.geometries2D.0\DWP_10.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="DGeoSuite.Components.Persistence">
-      <HintPath>..\..\lib\StixWriter\DGeoSuite.Components.Persistence.dll</HintPath>
-    </Reference>
-    <Reference Include="DGeoSuite.Common">
-      <HintPath>..\..\lib\StixWriter\DGeoSuite.Common.dll</HintPath>
-    </Reference>
-  </ItemGroup>  
-  <ItemGroup />
-  <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.Version.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('..\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
+</ItemGroup>
+    <ItemGroup>
+      <ProjectReference Include="..\Deltares.DamEngine.Data\Deltares.DamEngine.Data.csproj" />
+      <ProjectReference Include="..\Deltares.DamEngine.Interface\Deltares.DamEngine.Interface.csproj" />
+      <ProjectReference Include="..\Deltares.DamEngine.Io\Deltares.DamEngine.Io.csproj" />
+      <ProjectReference Include="..\Deltares.DamEngine.TestHelpers\Deltares.DamEngine.TestHelpers.csproj" />
+    </ItemGroup>
+    <ItemGroup>
+      <None Update="TestFiles\DAM Tutorial Design0.soilmaterials.mdb">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\DeltaDijk normal0.soilmaterials.mdb">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\DeltaDijkBishopInwards.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\DeltaDijkInputFile.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\DeltaDijkInvoer3VNKAdaptionShoulderLength.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\DesignInputFileWithRiverLevelAboveDikeTopButBelowDTH.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\ErrorInDGeoStabilityCalculation.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\GrebbedijkStability.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\InputFileForDGeoStability.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\InputFileForStabOutsideBishopAutomaticGrid.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\InputFileForStabOutsideBishopSpecifiedGrid.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\InputForDebugging.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Invoer10.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\MacroStabilityNoProfilesInputFile.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\MacroStabilityRunFailedExpectCalculationMessage.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\MacroStabilityTutorialDesignInputFile.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\MacroStabilityTutorialDesignInputFile1LocationWithAdaption.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\MacroStabilityTutorialDesignInputFile13.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\MacroStabilityTutorialDesignInputFile18.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\MacroStabilityTutorialDesignInputFileMultipleLocations.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\OperationalSet2.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\output0.soilmaterials.mdb">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\PipingVoorbeeld1_BlighDesignInputFile.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\PipingVoorbeeld1_BlighInputFile.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\PipingVoorbeeld1_Sellmeijer4ForcesDesignHeightInputFile.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\PipingVoorbeeld1_Sellmeijer4ForcesDesignInputFile.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\PipingVoorbeeld1_Sellmeijer4ForcesInputFile.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\PipingVoorbeeld1_SellmeijerVNKDesignInputFile.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\PipingVoorbeeld1_SellmeijerVNKDesignInputFileFail.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\PipingVoorbeeld1_SellmeijerVNKInputFile.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\PipingVoorbeeld1_WtiSellmeijerRevisedDesignHeightInputFile.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\PipingVoorbeeld1_WtiSellmeijerRevisedDesignInputFile.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\PipingVoorbeeld1_WtiSellmeijerRevisedInputFile.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\PipingVoorbeeld1_WtiSellmeijerRevisedNoPipingInputFile.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Rechter Diezedijk_BlighDesignInputFile.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Rechter Diezedijk_BlighDesignInputFile_1Location.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Rechter Diezedijk_BlighFailedDesignInputFile_1Location.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Rechter Diezedijk_BlighInputFile.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Rechter Diezedijk_NoStabilityInsideInputFile.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Rechter Diezedijk_WtiSellmeijerRevisedFailedDesignInputFile_1Location.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Rechter Diezedijk_WtiSellmeijerRevisedInputFile.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\RegionalAssessment.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\RegionalAssessment.soilmaterials.mdb">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\RegionalAssessment2.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\RegionalAssessment2.soilmaterials.mdb">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\RegionalAssessment3.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\RegionalAssessment3.soilmaterials.mdb">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\SlopeAdaption0.soilmaterials.mdb">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\StabilityDesign1Dbased.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\ValidatieSlopeAdaption.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\ZoneType0.soilmaterials.mdb">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\ZoneType.geometries2D.0\DWP_10.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_1.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_2.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_3.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_4.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_5.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_6.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_7.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_8.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_9.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_10.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_11.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_12.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_13.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_18.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\output.Geometries\1C-31,5-bishop-binnen.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\output.Geometries\1D-34-bishop-binnen.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\output.Geometries\2A-37-bishop-binnen.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Operational\PulauTekong\PulauTekong.InputFile.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Operational\PulauTekong\PulauTekong.InputFile-NoValues.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Operational\PulauTekong\PulauTekong0.soilmaterials.mdb">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Operational\PulauTekong\PulauTekong.geometries2D.0\CD CS1 X1.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Operational\PulauTekong\PulauTekong.geometries2D.0\CD CS2 X3.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Operational\PulauTekong\PulauTekong.geometries2D.0\SD CS1 3-3.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Operational\PulauTekong\PulauTekong.geometries2D.0\SD CS2 8-8.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Operational\PulauTekong\PulauTekong.geometries2D.0\SD CS3 10-10.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Operational\Grebbedijk\1ainput_dam_ksl.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Operational\Grebbedijk\1aoutput_dam.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Operational\Grebbedijk\3ainput_dam.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Operational\Grebbedijk\3ainput_dam_ksl.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Operational\Grebbedijk\3aoutput_dam.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Operational\Grebbedijk\input.damx">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Operational\Grebbedijk\input0.soilmaterials.mdb">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Operational\Grebbedijk\live.ParametersFile.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Operational\Grebbedijk\input.Geometries\grebbedijk1a.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\Operational\Grebbedijk\input.Geometries\grebbedijk3a.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\DeltaDijk normal.geometries2D.0\DeltaDijk normal.damx">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\DeltaDijk normal.geometries2D.0\DeltaDijk normal.defx">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="TestFiles\DeltaDijk normal.geometries2D.0\DeltaDijk normal0.soilmaterials.mdb">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+    </ItemGroup>
+</Project>
Fisheye: Tag 3987 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 3987 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj
===================================================================
diff -u -r3972 -r3987
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj	(.../Deltares.DamEngine.Calculators.Tests.csproj)	(revision 3972)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj	(.../Deltares.DamEngine.Calculators.Tests.csproj)	(revision 3987)
@@ -1,201 +1,81 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.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')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{783E7BC6-CD3F-4851-B5EF-46DE954AACD1}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Deltares.DamEngine.Calculators.Tests</RootNamespace>
-    <AssemblyName>Deltares.DamEngine.Calculators.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <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>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </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>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="$(SolutionDir)build\Test.targets" />
+    <ItemGroup>
+        <Folder Include="Properties" />
+    </ItemGroup>
+    <ItemGroup>
     <Reference Include="Deltares.MacroStability.CSharpWrapper">
       <HintPath>..\..\lib\FailureMechanisms\MacroStabilityCSharpWrapperDeterministicSigned\Deltares.MacroStability.CSharpWrapper.dll</HintPath>
     </Reference>
     <Reference Include="Deltares.WTIPiping.Merged">
       <HintPath>..\..\lib\FailureMechanisms\WtiPipingMerged\Deltares.WTIPiping.Merged.dll</HintPath>
     </Reference>
-    <Reference Include="KellermanSoftware.Compare-NET-Objects, Version=3.9.0.0, Culture=neutral, PublicKeyToken=d970ace04cc85217, processorArchitecture=MSIL">
-      <HintPath>..\packages\CompareNETObjects.3.09.0.0\lib\net46\KellermanSoftware.Compare-NET-Objects.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.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DikesDesign\SurfaceLineAdapterTest.cs" />
-    <Compile Include="DikesDesign\SurfaceLineHeightAdapterTest.cs" />
-    <Compile Include="DikesDesign\SurfaceLineShoulderAdapterTest.cs" />
-    <Compile Include="DikesDesign\SurfaceLineSlopeAdapterTest.cs" />
-    <Compile Include="KernelWrappers\Assemblers\Geometry2DSectionAssemblerTest.cs" />
-    <Compile Include="KernelWrappers\Common\UpliftHelperTests.cs" />
-    <Compile Include="KernelWrappers\TestHelpers\DamEngineDataTestFactory.cs" />
-    <Compile Include="KernelWrappers\MacroStabilityCommon\ConversionHelperTests.cs" />
-    <Compile Include="KernelWrappers\MacroStabilityCommon\MacroStabilityIoTests.cs" />
-    <Compile Include="KernelWrappers\MacroStabilityCommon\PlLinesToWaternetConverterTests.cs" />
-    <Compile Include="KernelWrappers\MacroStabilityInwards\MacroStabilityInwardsKernelWrapperTests.cs" />
-    <Compile Include="KernelWrappers\WtiPipingSellmeijerRevised\WtiPipingSellmeijerRevisedKernelWrapperTests.cs" />
-    <Compile Include="KernelWrappers\Common\DamPipingHelperTests.cs" />
-    <Compile Include="KernelWrappers\Common\PlLinesHelperTests.cs" />
-    <Compile Include="KernelWrappers\DamPipingBligh\DamPipingBlighKernelWrapperTests.cs" />
-    <Compile Include="KernelWrappers\DamPipingSellmeijer4Forces\DamPipingSellmeijer4ForcesKernelWrapperTests.cs" />
-    <Compile Include="KernelWrappers\DamPipingSellmeijerVnk\DamPipingSellmeijerVnkKernelWrapperTests.cs" />
-    <Compile Include="PlLinesCreator\PlLinesCreatorTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Sensors\SensorLocationTests.cs" />
-    <Compile Include="Sensors\SensorPLLineCreatorTest.cs" />
-    <Compile Include="Sensors\SensorTest.cs" />
-    <Compile Include="Uplift\SoilVolumeMassCalculatorEffectiveStressTest.cs" />
-    <Compile Include="Uplift\SoilVolumeMassCalculatorTest.cs" />
-    <Compile Include="Uplift\UpliftCalculatorTest.cs" />
-    <Compile Include="Uplift\UpliftLocationDeterminatorTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Deltares.DamEngine.Calculators\Deltares.DamEngine.Calculators.csproj">
-      <Project>{e943b1d5-fafa-4afe-9071-f8b22cf612ea}</Project>
-      <Name>Deltares.DamEngine.Calculators</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Deltares.DamEngine.Data\Deltares.DamEngine.Data.csproj">
-      <Project>{B7A49C1A-1C91-4D72-ABA9-9FBAC2509D8E}</Project>
-      <Name>Deltares.DamEngine.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Deltares.DamEngine.Interface\Deltares.DamEngine.Interface.csproj">
-      <Project>{750464A3-CBFA-429F-920E-B430867F1120}</Project>
-      <Name>Deltares.DamEngine.Interface</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Deltares.DamEngine.Io\Deltares.DamEngine.Io.csproj">
-      <Project>{1560A423-F338-4DEC-8583-1DFF7077F104}</Project>
-      <Name>Deltares.DamEngine.Io</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Deltares.DamEngine.TestHelpers\Deltares.DamEngine.TestHelpers.csproj">
-      <Project>{A41683F4-C3E0-4386-AEE7-FAACD535CF93}</Project>
-      <Name>Deltares.DamEngine.TestHelpers</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Copying.AGPL.licenseheader">
-      <Link>Copying.AGPL.licenseheader</Link>
-    </None>
-    <None Include="App.config" />
-    <None Include="KernelWrappers\Assemblers\TestData\18_4_94.sti" />
-    <None Include="KernelWrappers\Assemblers\TestData\1D1.sti" />
-    <None Include="KernelWrappers\Common\TestFiles\18_4_94.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="KernelWrappers\Common\TestFiles\1D1.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="KernelWrappers\Common\TestFiles\DWP_1.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="KernelWrappers\Common\TestFiles\OutwardsZones.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="KernelWrappers\Common\TestFiles\ProfileOutput.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="KernelWrappers\Common\TestFiles\SimpleGeometry.sti">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="KernelWrappers\Common\TestFiles\soilmaterials.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="KernelWrappers\Common\TestFiles\soilmaterialsOutwards.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="KernelWrappers\Common\TestFiles\test.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="AppReadme\Compare-NET-Objects-Help.txt" />
-    <Content Include="KernelWrappers\Assemblers\TestData\ProfileOutput.xml" />
-    <Content Include="KernelWrappers\Common\TestFiles\DAM Tutorial Design0.soilmaterials.mdb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="KernelWrappers\MacroStabilityInwards\TestFiles\Result1True.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="KernelWrappers\MacroStabilityInwards\TestFiles\Result3False.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="KernelWrappers\MacroStabilityInwards\TestFiles\Result2True.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="KernelWrappers\MacroStabilityInwards\TestFiles\ValidateError.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="KernelWrappers\MacroStabilityInwards\TestFiles\ValidateInfo.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="KernelWrappers\MacroStabilityInwards\TestFiles\ValidateOk.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="KernelWrappers\MacroStabilityInwards\TestFiles\ValidateWarning.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="KernelWrappers\MacroStabilityInwards\TestFiles\ValidateWrong.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="DGeoSuite.Components.Persistence">
-      <HintPath>..\..\lib\StixWriter\DGeoSuite.Components.Persistence.dll</HintPath>
-    </Reference>
-    <Reference Include="DGeoSuite.Common">
-      <HintPath>..\..\lib\StixWriter\DGeoSuite.Common.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="KernelWrappers\MacroStabilityCommon\TestFiles\" />
-  </ItemGroup>
-  <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.Version.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('..\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
+    <Reference Include="System.Core" />
+</ItemGroup>
+    <ItemGroup>
+        <Reference Include="KellermanSoftware.Compare-NET-Objects, Version=3.9.0.0, Culture=neutral, PublicKeyToken=d970ace04cc85217, processorArchitecture=MSIL">
+            <HintPath>..\packages\CompareNETObjects.3.09.0.0\lib\net46\KellermanSoftware.Compare-NET-Objects.dll</HintPath>
+        </Reference>      <ProjectReference Include="..\Deltares.DamEngine.Calculators\Deltares.DamEngine.Calculators.csproj" />
+      <ProjectReference Include="..\Deltares.DamEngine.Data\Deltares.DamEngine.Data.csproj" />
+      <ProjectReference Include="..\Deltares.DamEngine.Interface\Deltares.DamEngine.Interface.csproj" />
+      <ProjectReference Include="..\Deltares.DamEngine.Io\Deltares.DamEngine.Io.csproj" />
+      <ProjectReference Include="..\Deltares.DamEngine.TestHelpers\Deltares.DamEngine.TestHelpers.csproj" />
+    </ItemGroup>
+    <ItemGroup>
+      <None Update="KernelWrappers\Common\TestFiles\1D1.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="KernelWrappers\Common\TestFiles\18_4_94.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="KernelWrappers\Common\TestFiles\DAM Tutorial Design0.soilmaterials.mdb">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="KernelWrappers\Common\TestFiles\DWP_1.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="KernelWrappers\Common\TestFiles\OutwardsZones.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="KernelWrappers\Common\TestFiles\ProfileOutput.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="KernelWrappers\Common\TestFiles\SimpleGeometry.sti">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="KernelWrappers\Common\TestFiles\soilmaterials.mdb">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="KernelWrappers\Common\TestFiles\soilmaterialsOutwards.mdb">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="KernelWrappers\Common\TestFiles\test.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="KernelWrappers\MacroStabilityInwards\TestFiles\Result1True.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="KernelWrappers\MacroStabilityInwards\TestFiles\Result2True.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="KernelWrappers\MacroStabilityInwards\TestFiles\Result3False.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="KernelWrappers\MacroStabilityInwards\TestFiles\ValidateError.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="KernelWrappers\MacroStabilityInwards\TestFiles\ValidateInfo.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="KernelWrappers\MacroStabilityInwards\TestFiles\ValidateOk.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="KernelWrappers\MacroStabilityInwards\TestFiles\ValidateWarning.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="KernelWrappers\MacroStabilityInwards\TestFiles\ValidateWrong.xml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+    </ItemGroup>
+</Project>
Fisheye: Tag 3987 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 3987 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Deltares.DamEngine.Data.Tests.csproj
===================================================================
diff -u -r3972 -r3987
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Deltares.DamEngine.Data.Tests.csproj	(.../Deltares.DamEngine.Data.Tests.csproj)	(revision 3972)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Deltares.DamEngine.Data.Tests.csproj	(.../Deltares.DamEngine.Data.Tests.csproj)	(revision 3987)
@@ -1,101 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.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')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{B8BD3348-EE6E-4BAA-BC0F-2554A916EBB6}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Deltares.DamEngine.Data.Tests</RootNamespace>
-    <AssemblyName>Deltares.DamEngine.Data.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <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>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </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>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="$(SolutionDir)build\Test.targets" />
+    <ItemGroup>
+        <Folder Include="Properties" />
+    </ItemGroup>
+    <ItemGroup>
     <Reference Include="KellermanSoftware.Compare-NET-Objects, Version=3.9.0.0, Culture=neutral, PublicKeyToken=d970ace04cc85217, processorArchitecture=MSIL">
       <HintPath>..\packages\CompareNETObjects.3.09.0.0\lib\net46\KellermanSoftware.Compare-NET-Objects.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" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="General\ConversionHelperTests.cs" />
-    <Compile Include="General\GeometryDataTests.cs" />
-    <Compile Include="General\GeometryLoopTests.cs" />
-    <Compile Include="General\SegmentTests.cs" />
-    <Compile Include="General\SoilGeometryProbabilityTest.cs" />
-    <Compile Include="Geotechnics\SoilProfile1DAquiferLayerCombinerTests.cs" />
-    <Compile Include="Geotechnics\SoilSurfaceProfileTests.cs" />
-    <Compile Include="Geotechnics\SurfaceLine2Tests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Standard\ArrayExtensionsTest.cs" />
-    <Compile Include="Standard\ClassWithDifferentProperties.cs" />
-    <Compile Include="Standard\ObjectCopierTest.cs" />
-    <Compile Include="Standard\ReferenceEqualityComparerTest.cs" />
-    <Compile Include="Standard\TypeExtensionsTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Deltares.DamEngine.Data\Deltares.DamEngine.Data.csproj">
-      <Project>{b7a49c1a-1c91-4d72-aba9-9fbac2509d8e}</Project>
-      <Name>Deltares.DamEngine.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Deltares.DamEngine.TestHelpers\Deltares.DamEngine.TestHelpers.csproj">
-      <Project>{a41683f4-c3e0-4386-aee7-faacd535cf93}</Project>
-      <Name>Deltares.DamEngine.TestHelpers</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Copying.AGPL.licenseheader">
-      <Link>Copying.AGPL.licenseheader</Link>
-    </None>
-    <None Include="App.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="AppReadme\Compare-NET-Objects-Help.txt" />
-  </ItemGroup>
-  <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.Version.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('..\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
+        <Reference Include="System" />
+        <Reference Include="System.Core" />
+        <Reference Include="System.Xml.Linq" />
+        <Reference Include="System.Data.DataSetExtensions" />
+        <Reference Include="Microsoft.CSharp" />
+        <Reference Include="System.Data" />
+        <Reference Include="System.Net.Http" />
+        <Reference Include="System.Xml" />
+</ItemGroup>
+    <ItemGroup>
+      <ProjectReference Include="..\Deltares.DamEngine.Data\Deltares.DamEngine.Data.csproj" />
+      <ProjectReference Include="..\Deltares.DamEngine.TestHelpers\Deltares.DamEngine.TestHelpers.csproj" />
+    </ItemGroup>
+</Project>
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/Deltares.DamEngine.Interface.Tests.csproj
===================================================================
diff -u -r3970 -r3987
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/Deltares.DamEngine.Interface.Tests.csproj	(.../Deltares.DamEngine.Interface.Tests.csproj)	(revision 3970)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/Deltares.DamEngine.Interface.Tests.csproj	(.../Deltares.DamEngine.Interface.Tests.csproj)	(revision 3987)
@@ -1,102 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.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')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{968516F9-1B92-4ADB-AE4A-CFF54EE43126}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Deltares.DamEngine.Interface.Tests</RootNamespace>
-    <AssemblyName>Deltares.DamEngine.Interface.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <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>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </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>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)build\Test.targets" />
   <ItemGroup>
+    <Folder Include="Properties" />
+  </ItemGroup>
+  <ItemGroup>
     <Reference Include="KellermanSoftware.Compare-NET-Objects, Version=3.9.0.0, Culture=neutral, PublicKeyToken=d970ace04cc85217, processorArchitecture=MSIL">
-      <HintPath>..\packages\CompareNETObjects.3.09.0.0\lib\net45\KellermanSoftware.Compare-NET-Objects.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\CompareNETObjects.3.09.0.0\lib\net46\KellermanSoftware.Compare-NET-Objects.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" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="FillDamFromXmlInputTests.cs" />
-    <Compile Include="FillXmlOutputFromDamTests.cs" />
-    <Compile Include="EngineInterfaceTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <ProjectReference Include="..\Deltares.DamEngine.Data\Deltares.DamEngine.Data.csproj" />
+    <ProjectReference Include="..\Deltares.DamEngine.Interface\Deltares.DamEngine.Interface.csproj" />
+    <ProjectReference Include="..\Deltares.DamEngine.Io\Deltares.DamEngine.Io.csproj" />
+    <ProjectReference Include="..\Deltares.DamEngine.TestHelpers\Deltares.DamEngine.TestHelpers.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Deltares.DamEngine.Data\Deltares.DamEngine.Data.csproj">
-      <Project>{b7a49c1a-1c91-4d72-aba9-9fbac2509d8e}</Project>
-      <Name>Deltares.DamEngine.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Deltares.DamEngine.Interface\Deltares.DamEngine.Interface.csproj">
-      <Project>{750464a3-cbfa-429f-920e-b430867f1120}</Project>
-      <Name>Deltares.DamEngine.Interface</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Deltares.DamEngine.Io\Deltares.DamEngine.Io.csproj">
-      <Project>{1560a423-f338-4dec-8583-1dff7077f104}</Project>
-      <Name>Deltares.DamEngine.Io</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Deltares.DamEngine.TestHelpers\Deltares.DamEngine.TestHelpers.csproj">
-      <Project>{A41683F4-C3E0-4386-AEE7-FAACD535CF93}</Project>
-      <Name>Deltares.DamEngine.TestHelpers</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ConversionHelperTests.cs" />
-    <None Include="..\Copying.AGPL.licenseheader">
-      <Link>Copying.AGPL.licenseheader</Link>
+    <None Update="TestFiles\AquiferListInputFile.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="App.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="TestFiles\AquiferListInputFile.xml">
+    <None Update="TestFiles\Description.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestFiles\InputFile.xml">
+    </None>
+    <None Update="TestFiles\InputFile.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <SubType>Designer</SubType>
-    </Content>
+    </None>
   </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.Version.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('..\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>
Fisheye: Tag 3987 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/Deltares.DamEngine.Io.Tests.csproj
===================================================================
diff -u -r3970 -r3987
--- DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/Deltares.DamEngine.Io.Tests.csproj	(.../Deltares.DamEngine.Io.Tests.csproj)	(revision 3970)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/Deltares.DamEngine.Io.Tests.csproj	(.../Deltares.DamEngine.Io.Tests.csproj)	(revision 3987)
@@ -1,77 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.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')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{9CB1ECCE-2F86-418D-BBDC-166BD1FB7F57}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Deltares.DamEngine.Io.Tests</RootNamespace>
-    <AssemblyName>Deltares.DamEngine.Io.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <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>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </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>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)build\Test.targets" />
   <ItemGroup>
+    <Folder Include="Properties" />
+  </ItemGroup>
+  <ItemGroup>
     <Reference Include="KellermanSoftware.Compare-NET-Objects, Version=3.9.0.0, Culture=neutral, PublicKeyToken=d970ace04cc85217, processorArchitecture=MSIL">
-      <HintPath>..\packages\CompareNETObjects.3.09.0.0\lib\net45\KellermanSoftware.Compare-NET-Objects.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\CompareNETObjects.3.09.0.0\lib\net46\KellermanSoftware.Compare-NET-Objects.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" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DamXmlSerializationTests.cs" />
-    <Compile Include="IdValidatorTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <ProjectReference Include="..\Deltares.DamEngine.Io\Deltares.DamEngine.Io.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Deltares.DamEngine.Io\Deltares.DamEngine.Io.csproj">
-      <Project>{1560A423-F338-4DEC-8583-1DFF7077F104}</Project>
-      <Name>Deltares.DamEngine.Io</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Copying.AGPL.licenseheader">
-      <Link>Copying.AGPL.licenseheader</Link>
-    </None>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.Version.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('..\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>
Fisheye: Tag 3987 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Io/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 3987 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 3987 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Interface/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/Deltares.DamEngine.Interface.csproj
===================================================================
diff -u -r3970 -r3987
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/Deltares.DamEngine.Interface.csproj	(.../Deltares.DamEngine.Interface.csproj)	(revision 3970)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/Deltares.DamEngine.Interface.csproj	(.../Deltares.DamEngine.Interface.csproj)	(revision 3987)
@@ -1,95 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{750464A3-CBFA-429F-920E-B430867F1120}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Deltares.DamEngine.Interface</RootNamespace>
-    <AssemblyName>Deltares.DamEngine.Interface</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <SatelliteResourceLanguages>en;nl</SatelliteResourceLanguages>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(SolutionDir)\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>$(SolutionDir)\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="$(SolutionDir)build\Source.targets" />
+    <ItemGroup>
+        <Folder Include="Properties" />
+    </ItemGroup>
+    <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ConversionHelper.cs" />
-    <Compile Include="FillDamFromXmlInput.cs" />
-    <Compile Include="FillDamFromXmlOutput.cs" />
-    <Compile Include="FillXmlInputFromDam.cs" />
-    <Compile Include="FillXmlOutputFromDam.cs" />
-    <Compile Include="EngineInterface.cs" />
-    <Compile Include="EngineInterfaceException.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Copying.AGPL.licenseheader">
-      <Link>Copying.AGPL.licenseheader</Link>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Deltares.DamEngine.Calculators\Deltares.DamEngine.Calculators.csproj">
-      <Project>{E943B1D5-FAFA-4AFE-9071-F8B22CF612EA}</Project>
-      <Name>Deltares.DamEngine.Calculators</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Deltares.DamEngine.Data\Deltares.DamEngine.Data.csproj">
-      <Project>{b7a49c1a-1c91-4d72-aba9-9fbac2509d8e}</Project>
-      <Name>Deltares.DamEngine.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Deltares.DamEngine.Io\Deltares.DamEngine.Io.csproj">
-      <Project>{1560a423-f338-4dec-8583-1dff7077f104}</Project>
-      <Name>Deltares.DamEngine.Io</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.nl-NL.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.Version.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-  </PropertyGroup>
-  <!-- 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
+</ItemGroup>
+    <ItemGroup>
+      <ProjectReference Include="..\Deltares.DamEngine.Calculators\Deltares.DamEngine.Calculators.csproj" />
+      <ProjectReference Include="..\Deltares.DamEngine.Data\Deltares.DamEngine.Data.csproj" />
+      <ProjectReference Include="..\Deltares.DamEngine.Io\Deltares.DamEngine.Io.csproj" />
+    </ItemGroup>
+</Project>
Fisheye: Tag 3987 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.ConsoleRun/Deltares.DamEngine.ConsoleRun.csproj
===================================================================
diff -u -r3970 -r3987
--- DamEngine/trunk/src/Deltares.DamEngine.ConsoleRun/Deltares.DamEngine.ConsoleRun.csproj	(.../Deltares.DamEngine.ConsoleRun.csproj)	(revision 3970)
+++ DamEngine/trunk/src/Deltares.DamEngine.ConsoleRun/Deltares.DamEngine.ConsoleRun.csproj	(.../Deltares.DamEngine.ConsoleRun.csproj)	(revision 3987)
@@ -1,56 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{75D4440A-4E1F-4B15-8754-20C11EF3A222}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Deltares.DamEngine.ConsoleRun</RootNamespace>
-    <AssemblyName>DamConsoleRun</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <SatelliteResourceLanguages>en;nl</SatelliteResourceLanguages>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <Reference Include="CommandLine">
-      <HintPath>..\..\lib\CommandLineParser\CommandLine.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
+<Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="$(SolutionDir)build\Source.targets" />
+    <ItemGroup>
+        <Folder Include="Properties" />
+    </ItemGroup>
+    <ItemGroup>
+   <Reference Include="CommandLine">
+     <HintPath>..\..\lib\CommandLineParser\CommandLine.dll</HintPath>
+   </Reference>
+   <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CommandOptions.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Copying.AGPL.licenseheader">
-      <Link>Copying.AGPL.licenseheader</Link>
-    </None>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Deltares.DamEngine.Interface\Deltares.DamEngine.Interface.csproj">
-      <Project>{750464A3-CBFA-429F-920E-B430867F1120}</Project>
-      <Name>Deltares.DamEngine.Interface</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.Version.targets" />
-  <!-- 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
+</ItemGroup>
+    <ItemGroup>
+      <ProjectReference Include="..\Deltares.DamEngine.Interface\Deltares.DamEngine.Interface.csproj" />
+    </ItemGroup>
+</Project>
Index: DamEngine/trunk/src/Deltares.DamEngine.Io/Deltares.DamEngine.Io.csproj
===================================================================
diff -u -r3970 -r3987
--- DamEngine/trunk/src/Deltares.DamEngine.Io/Deltares.DamEngine.Io.csproj	(.../Deltares.DamEngine.Io.csproj)	(revision 3970)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/Deltares.DamEngine.Io.csproj	(.../Deltares.DamEngine.Io.csproj)	(revision 3987)
@@ -1,67 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{1560A423-F338-4DEC-8583-1DFF7077F104}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Deltares.DamEngine.Io</RootNamespace>
-    <AssemblyName>Deltares.DamEngine.Io</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SatelliteResourceLanguages>en;nl</SatelliteResourceLanguages>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(SolutionDir)\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>$(SolutionDir)\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="$(SolutionDir)build\Source.targets" />
+    <ItemGroup>
+        <Folder Include="Properties" />
+    </ItemGroup>
+    <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DamInput.cs" />
-    <Compile Include="DamOutput.cs" />
-    <Compile Include="DamXmlSerialization.cs" />
-    <Compile Include="IdValidator.cs" />
-    <Compile Include="IdValidatorException.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Copying.AGPL.licenseheader">
-      <Link>Copying.AGPL.licenseheader</Link>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Readme.txt" />
-  </ItemGroup>
-  <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.Version.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-  </PropertyGroup>
-  <!-- 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
+</ItemGroup>
+</Project>
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
===================================================================
diff -u -r3970 -r3987
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj	(.../Deltares.DamEngine.Calculators.csproj)	(revision 3970)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj	(.../Deltares.DamEngine.Calculators.csproj)	(revision 3987)
@@ -1,241 +1,51 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{E943B1D5-FAFA-4AFE-9071-F8B22CF612EA}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Deltares.DamEngine.Calculators</RootNamespace>
-    <AssemblyName>Deltares.DamEngine.Calculators</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <SatelliteResourceLanguages>en;nl</SatelliteResourceLanguages>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(SolutionDir)\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>$(SolutionDir)\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Deltares.DamPiping.BlighCalculator">
-      <HintPath>..\..\lib\FailureMechanisms\DamPiping\Deltares.DamPiping.BlighCalculator.dll</HintPath>
-    </Reference>
-    <Reference Include="Deltares.DamPiping.Sellmeijer4ForcesCalculator">
-      <HintPath>..\..\lib\FailureMechanisms\DamPiping\Deltares.DamPiping.Sellmeijer4ForcesCalculator.dll</HintPath>
-    </Reference>
-    <Reference Include="Deltares.DamPiping.SellmeijerVNKCalculator">
-      <HintPath>..\..\lib\FailureMechanisms\DamPiping\Deltares.DamPiping.SellmeijerVNKCalculator.dll</HintPath>
-    </Reference>
-    <Reference Include="Deltares.MacroStability.CSharpWrapper">
-      <HintPath>..\..\lib\FailureMechanisms\MacroStabilityCSharpWrapperDeterministicSigned\Deltares.MacroStability.CSharpWrapper.dll</HintPath>
-    </Reference>
-    <Reference Include="Deltares.StixFileWriter">
-      <HintPath>..\..\lib\StixWriter\Deltares.StixFileWriter.dll</HintPath>
-    </Reference>
-    <Reference Include="Deltares.WTIPiping.Merged, Version=16.2.1.4574, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\FailureMechanisms\WtiPipingMerged\Deltares.WTIPiping.Merged.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
+<Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="$(SolutionDir)build\Source.targets" />
+    <ItemGroup>
+        <Folder Include="Properties" />
+    </ItemGroup>
+    <ItemGroup>
+        <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+            <_Parameter1>Deltares.DamEngine.Calculators.Tests</_Parameter1>
+        </AssemblyAttribute>
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Deltares.DamEngine.Data\Deltares.DamEngine.Data.csproj" />
+    </ItemGroup>
+    <ItemGroup>
+      <Reference Include="Deltares.DamPiping.BlighCalculator">
+        <HintPath>..\..\lib\FailureMechanisms\DamPiping\Deltares.DamPiping.BlighCalculator.dll</HintPath>
+      </Reference>
+      <Reference Include="Deltares.DamPiping.Sellmeijer4ForcesCalculator">
+        <HintPath>..\..\lib\FailureMechanisms\DamPiping\Deltares.DamPiping.Sellmeijer4ForcesCalculator.dll</HintPath>
+      </Reference>
+      <Reference Include="Deltares.DamPiping.SellmeijerVNKCalculator">
+        <HintPath>..\..\lib\FailureMechanisms\DamPiping\Deltares.DamPiping.SellmeijerVNKCalculator.dll</HintPath>
+      </Reference>
+      <Reference Include="Deltares.MacroStability.CSharpWrapper">
+        <HintPath>..\..\lib\FailureMechanisms\MacroStabilityCSharpWrapperDeterministicSigned\Deltares.MacroStability.CSharpWrapper.dll</HintPath>
+      </Reference>
+      <Reference Include="Deltares.StixFileWriter">
+        <HintPath>..\..\lib\StixWriter\Deltares.StixFileWriter.dll</HintPath>
+      </Reference>
+      <Reference Include="Deltares.WTIPiping.Merged">
+        <HintPath>..\..\lib\FailureMechanisms\WtiPipingMerged\Deltares.WTIPiping.Merged.dll</HintPath>
+      </Reference>
+        <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-  </ItemGroup>
+</ItemGroup>
+    <ItemGroup>
+        <ContentWithTargetPath Include="..\..\lib\FailureMechanisms\DamPiping\MPipingCalc2.dll">
+            <Link>KernelWrappers\DamPipingSellmeijerVnk\MPipingCalc2.dll</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <TargetPath>MPipingCalc2.dll</TargetPath>
+        </ContentWithTargetPath>
+    </ItemGroup>
   <ItemGroup>
-    <Compile Include="DikesDesign\DesignCalculatorFirstSlopeAdaptionThenShoulderAdaption.cs" />
-    <Compile Include="DikesDesign\DesignCalculatorCombinedSlopeAndShoulderAdaption.cs" />
-    <Compile Include="DikesDesign\DesignCalculatorException.cs" />
-    <Compile Include="DikesDesign\DesignCalculatorShoulderPerPoint.cs" />
-    <Compile Include="DikesDesign\DesignCalculatorSingle.cs" />
-    <Compile Include="DikesDesign\DesignCalculatorTask.cs" />
-    <Compile Include="DikesDesign\DesignCalculatorUtils.cs" />
-    <Compile Include="DikesDesign\ShoulderDesignHelper.cs" />
-    <Compile Include="DikesOperational\OperationalCalculator.cs" />
-    <Compile Include="DikesOperational\OperationalCalculatorException.cs" />
-    <Compile Include="DikesOperational\OperationalCalculatorTask.cs" />
-    <Compile Include="DikesOperational\OperationalEnumerations.cs" />
-    <Compile Include="KernelWrappers\Assemblers\XMLAttributes.cs" />
-    <Compile Include="KernelWrappers\MacroStabilityCommon\BishopCalculationGrid.cs" />
-    <Compile Include="KernelWrappers\MacroStabilityCommon\MacroStabilityCommonHelper.cs" />
-    <Compile Include="KernelWrappers\MacroStabilityCommon\MacroStabilityIo\ConversionHelper.cs" />
-    <Compile Include="KernelWrappers\MacroStabilityCommon\MacroStabilityIo\FillEngineFromMacroStabilityWrapperInput.cs" />
-    <Compile Include="KernelWrappers\MacroStabilityCommon\MacroStabilityIo\FillEngineFromMacroStabilityWrapperOutput.cs" />
-    <Compile Include="KernelWrappers\MacroStabilityCommon\MacroStabilityIo\FillMacroStabilityWrapperInputFromEngine.cs" />
-    <Compile Include="KernelWrappers\MacroStabilityCommon\MacroStabilityIo\FillMacroStabilityWrapperOutputFromEngine.cs" />
-    <Compile Include="KernelWrappers\MacroStabilityCommon\TrafficLoad.cs" />
-    <Compile Include="KernelWrappers\MacroStabilityCommon\PlLinesToWaternetConverter.cs" />
-    <Compile Include="KernelWrappers\MacroStabilityCommon\UpliftVanCalculationGrid.cs" />
-    <Compile Include="KernelWrappers\MacroStabilityInwards\BishopGridCreator.cs" />
-    <Compile Include="KernelWrappers\MacroStabilityInwards\UpliftVanGridCreator.cs" />
-    <Compile Include="KernelWrappers\MacroStabilityInwards\MacroStabilityKernelDataInput.cs" />
-    <Compile Include="KernelWrappers\MacroStabilityInwards\MacroStabilityInwardsKernelWrapper.cs" />
-    <Compile Include="KernelWrappers\MacroStabilityInwards\MacroStabilityOutput.cs" />
-    <Compile Include="KernelWrappers\MacroStabilityInwards\MacroStabilityOutputItem.cs" />
-    <Compile Include="KernelWrappers\MacroStabilityOutwards\MacroStabilityOutwardsKernelWrapper.cs" />
-    <Compile Include="KernelWrappers\WtiPipingSellmeijerRevised\WtiPipingSellmeijerRevisedException.cs" />
-    <Compile Include="KernelWrappers\WtiPipingSellmeijerRevised\WtiPipingSellmeijerRevisedInput.cs" />
-    <Compile Include="PlLinesCreator\IPlLineCreator.cs" />
-    <Compile Include="KernelWrappers\WtiPipingSellmeijerRevised\WtiPipingSellmeijerRevisedKernelWrapper.cs" />
-    <Compile Include="KernelWrappers\WtiPipingSellmeijerRevised\WtiPipingSellmeijerRevisedOutput.cs" />
-    <Compile Include="PlLinesCreator\PLLineConstructor.cs" />
-    <Compile Include="PlLinesCreator\PlLinesCreatorException.cs" />
-    <Compile Include="PlLinesCreator\SensorPlLine1Creator.cs" />
-    <Compile Include="PlLinesCreator\SensorPlLine2Creator.cs" />
-    <Compile Include="PlLinesCreator\SensorPlLine3Creator.cs" />
-    <Compile Include="PlLinesCreator\SensorPlLine3Or4CreatorBase.cs" />
-    <Compile Include="PlLinesCreator\SensorPlLine4Creator.cs" />
-    <Compile Include="PlLinesCreator\SensorPlLineCreator.cs" />
-    <Compile Include="PlLinesCreator\SensorPlLineCreatorBase.cs" />
-    <Compile Include="PlLinesCreator\SensorPlLineCreatorException.cs" />
-    <Compile Include="DikesDesign\DesignCalculator.cs" />
-    <Compile Include="DikesDesign\SurfaceLineShoulderAdapter.cs" />
-    <Compile Include="DikesDesign\SurfaceLineSlopeAdapter.cs" />
-    <Compile Include="KernelWrappers\Common\UpliftHelper.cs" />
-    <Compile Include="DikesDesign\ShoulderDesign.cs" />
-    <Compile Include="General\Context.cs" />
-    <Compile Include="General\Geometry2DSectionParameters.cs" />
-    <Compile Include="General\IContext.cs" />
-    <Compile Include="General\Parallel.cs" />
-    <Compile Include="DikesDesign\SurfaceLineAdapter.cs" />
-    <Compile Include="DikesDesign\SurfaceLineAdapterException.cs" />
-    <Compile Include="DikesDesign\SurfaceLineHeightAdapter.cs" />
-    <Compile Include="KernelWrappers\Common\DamKernelInput.cs" />
-    <Compile Include="KernelWrappers\Common\DamPipingHelper.cs" />
-    <Compile Include="KernelWrappers\Common\KernelWrapperHelper.cs" />
-    <Compile Include="KernelWrappers\Common\PlLinesHelper.cs" />
-    <Compile Include="KernelWrappers\Assemblers\AssemblyExtensions.cs" />
-    <Compile Include="KernelWrappers\Assemblers\Common.cs" />
-    <Compile Include="KernelWrappers\Assemblers\Geometry2DSectionAssembler.cs" />
-    <Compile Include="KernelWrappers\Assemblers\DtoAssembler.cs" />
-    <Compile Include="KernelWrappers\Assemblers\DtoAssemblerConversionException.cs" />
-    <Compile Include="KernelWrappers\Assemblers\DtoAssemblerException.cs" />
-    <Compile Include="KernelWrappers\Assemblers\DtoDocumentAssembler.cs" />
-    <Compile Include="KernelWrappers\Assemblers\DtoHelperServices.cs" />
-    <Compile Include="KernelWrappers\Assemblers\DtoPropertyAttributeMap.cs" />
-    <Compile Include="KernelWrappers\Assemblers\DtoPropertyAttributeMapping.cs" />
-    <Compile Include="KernelWrappers\Assemblers\DtoPropertyMapException.cs" />
-    <Compile Include="KernelWrappers\Assemblers\EmbeddedResourceNotFoundException.cs" />
-    <Compile Include="KernelWrappers\Assemblers\FileIdentification.cs" />
-    <Compile Include="KernelWrappers\Assemblers\FileIdentificationAssembler.cs" />
-    <Compile Include="KernelWrappers\Assemblers\IDtoAssembler.cs" />
-    <Compile Include="KernelWrappers\Assemblers\MissingRequiredFieldValueException.cs" />
-    <Compile Include="KernelWrappers\Assemblers\SoilLayerAssembler.cs" />
-    <Compile Include="KernelWrappers\Assemblers\SoilProfileAssembler.cs" />
-    <Compile Include="KernelWrappers\MacroStabilityCommon\MacroStabilityException.cs" />
-    <Compile Include="KernelWrappers\DamPipingBligh\DamPipingBlighInput.cs" />
-    <Compile Include="KernelWrappers\DamPipingBligh\DamPipingBlighKernelWrapper.cs" />
-    <Compile Include="KernelWrappers\DamPipingBligh\DamPipingBlighOutput.cs" />
-    <Compile Include="KernelWrappers\DamPipingSellmeijer4Forces\DamPipingSellmeijer4ForcesInput.cs" />
-    <Compile Include="KernelWrappers\DamPipingSellmeijer4Forces\DamPipingSellmeijer4ForcesKernelWrapper.cs" />
-    <Compile Include="KernelWrappers\DamPipingSellmeijer4Forces\DamPipingSellmeijer4ForcesOutput.cs" />
-    <Compile Include="KernelWrappers\DamPipingSellmeijerVnk\DamPipingSellmeijerVnkInput.cs" />
-    <Compile Include="KernelWrappers\DamPipingSellmeijerVnk\DamPipingSellmeijerVnkKernelWrapper.cs" />
-    <Compile Include="KernelWrappers\DamPipingSellmeijerVnk\DamPipingSellmeijerVnkOutput.cs" />
-    <Compile Include="KernelWrappers\Interfaces\IKernelWrapper.cs" />
-    <Compile Include="KernelWrappers\Interfaces\IKernelDataInput.cs" />
-    <Compile Include="KernelWrappers\Interfaces\IKernelDataOutput.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="PlLinesCreator\PlLinesCreator.cs" />
-    <Compile Include="Uplift\SoilVolumicMassCalculator.cs" />
-    <Compile Include="Uplift\SoilVolumicMassCalculatorException.cs" />
-    <Compile Include="Uplift\UpliftCalculator.cs" />
-    <Compile Include="Uplift\UpliftLocationAndResult.cs" />
-    <Compile Include="Uplift\UpliftLocationDeterminator.cs" />
-    <Compile Include="Uplift\UpliftLocationDeterminatorException.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Deltares.DamEngine.Data\Deltares.DamEngine.Data.csproj">
-      <Project>{b7a49c1a-1c91-4d72-aba9-9fbac2509d8e}</Project>
-      <Name>Deltares.DamEngine.Data</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup />
-  <ItemGroup>
-    <None Include="..\Copying.AGPL.licenseheader">
-      <Link>Copying.AGPL.licenseheader</Link>
-    </None>
-    <EmbeddedResource Include="KernelWrappers\MacroStabilityCommon\MacroStabilityIo\Xsd\WTIGeometry.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="KernelWrappers\MacroStabilityCommon\MacroStabilityIo\Xsd\WTISoilModel.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="KernelWrappers\MacroStabilityCommon\MacroStabilityIo\Xsd\WTIStabilityModel.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="KernelWrappers\MacroStabilityCommon\MacroStabilityIo\Xsd\WTIStabilityModelResult.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="KernelWrappers\MacroStabilityCommon\MacroStabilityIo\Xsd\WTIStabilityModelValidation.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="KernelWrappers\MacroStabilityCommon\MacroStabilityIo\Xsd\WtiVersionInfo.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="KernelWrappers\MacroStabilityCommon\MacroStabilityIo\Xsd\WTIWaternet.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="KernelWrappers\MacroStabilityCommon\MacroStabilityIo\Xsd\WTIWaternetDefinition.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="KernelWrappers\MacroStabilityCommon\MacroStabilityIo\Xsd\WTIWaternetUsedDuringCalculation.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.nl-NL.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <ContentWithTargetPath Include="..\..\lib\FailureMechanisms\DamPiping\MPipingCalc2.dll">
-      <Link>KernelWrappers\DamPipingSellmeijerVnk\MPipingCalc2.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <TargetPath>MPipingCalc2.dll</TargetPath>
-    </ContentWithTargetPath>
-  </ItemGroup>
-  <ItemGroup>
     <PackageReference Include="DGeoSuite.Components.Persistence">
       <Version>2022.1.271</Version>
     </PackageReference>
   </ItemGroup>  
-  <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.Version.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-  </PropertyGroup>
-  <!-- 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: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Deltares.DamEngine.TestHelpers.csproj
===================================================================
diff -u -r3970 -r3987
--- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Deltares.DamEngine.TestHelpers.csproj	(.../Deltares.DamEngine.TestHelpers.csproj)	(revision 3970)
+++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Deltares.DamEngine.TestHelpers.csproj	(.../Deltares.DamEngine.TestHelpers.csproj)	(revision 3987)
@@ -1,72 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{A41683F4-C3E0-4386-AEE7-FAACD535CF93}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Deltares.DamEngine.TestHelpers</RootNamespace>
-    <AssemblyName>Deltares.DamEngine.TestHelpers</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <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>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </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>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="$(SolutionDir)build\Test.targets" />
+    <ItemGroup>
+        <Folder Include="Properties" />
+    </ItemGroup>
+    <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Categories.cs" />
-    <Compile Include="Factories\FactoryForPLLines.cs" />
-    <Compile Include="Factories\FactoryForSoilProfiles.cs" />
-    <Compile Include="Factories\FactoryForSurfaceLines.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Factories\FactoryForDamProjectData.cs" />
-    <Compile Include="XmlAdapter.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Copying.AGPL.licenseheader">
-      <Link>Copying.AGPL.licenseheader</Link>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Deltares.DamEngine.Data\Deltares.DamEngine.Data.csproj">
-      <Project>{B7A49C1A-1C91-4D72-ABA9-9FBAC2509D8E}</Project>
-      <Name>Deltares.DamEngine.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Deltares.DamEngine.Interface\Deltares.DamEngine.Interface.csproj">
-      <Project>{750464A3-CBFA-429F-920E-B430867F1120}</Project>
-      <Name>Deltares.DamEngine.Interface</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.Version.targets" />
-  <!-- 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
+</ItemGroup>
+    <ItemGroup>
+      <ProjectReference Include="..\Deltares.DamEngine.Data\Deltares.DamEngine.Data.csproj" />
+      <ProjectReference Include="..\Deltares.DamEngine.Interface\Deltares.DamEngine.Interface.csproj" />
+    </ItemGroup>
+</Project>
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs
===================================================================
diff -u -r3893 -r3987
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs	(.../DesignResult.cs)	(revision 3893)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs	(.../DesignResult.cs)	(revision 3987)
@@ -109,7 +109,7 @@
         /// Initializes a new instance of the <see cref="DesignResult"/> class.
         /// Is only to be used by this.Clone() and in FillDamFromXmlOutput (used in tests), nowhere else
         /// </summary>
-        internal DesignResult()
+        public DesignResult()
         {
             // only for Clone() method
         }
@@ -120,7 +120,7 @@
         /// </summary>
         /// <param name="locationName">Name of the location.</param>
         /// <param name="scenarioName">Name of the scenario.</param>
-        internal DesignResult(string locationName, string scenarioName)
+        public DesignResult(string locationName, string scenarioName)
         {
             this.locationName = locationName;
             this.scenarioName = scenarioName;
Fisheye: Tag 3987 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Version/Deltares.DamEngine.Version.csproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 3987 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Version/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 3987 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Version/GlobalAssembly.cs.svn'.
Fisheye: No comparison available.  Pass `N' to diff?