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>