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>