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>