Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Data.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/Riskeer.Common.Data.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r2451cb4d1637ed930c35e88b3bcfc220dca045d4
--- Riskeer/Common/test/Riskeer.Common.Data.Test/Riskeer.Common.Data.Test.csproj	(.../Riskeer.Common.Data.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/Riskeer.Common.Data.Test.csproj	(.../Riskeer.Common.Data.Test.csproj)	(revision 2451cb4d1637ed930c35e88b3bcfc220dca045d4)
@@ -1,167 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{7BABA02F-4809-43D2-93E5-DA9ED69BDDE2}</ProjectGuid>
-    <RootNamespace>Riskeer.Common.Data.Test</RootNamespace>
-    <AssemblyName>Riskeer.Common.Data.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssemblyTool\FailureMechanismAssemblyResultFactoryTest.cs" />
-    <Compile Include="AssemblyTool\AssemblyCategoriesInputFactoryTest.cs" />
-    <Compile Include="AssemblyTool\AssemblyToolCategoriesFactoryTest.cs" />
-    <Compile Include="AssemblyTool\ManualFailureMechanismSectionAssemblyCategoryGroupConverterTest.cs" />
-    <Compile Include="AssessmentSection\AssessmentSectionCategoryTypeTest.cs" />
-    <Compile Include="AssessmentSection\AssessmentSectionCompositionTest.cs" />
-    <Compile Include="AssessmentSection\AssessmentSectionExtensionsTest.cs" />
-    <Compile Include="AssessmentSection\BackgroundDataTest.cs" />
-    <Compile Include="AssessmentSection\ReferenceLineMetaTest.cs" />
-    <Compile Include="AssessmentSection\ReferenceLineTest.cs" />
-    <Compile Include="AssessmentSection\RiskeerWellKnownTileSourceExtensionTest.cs" />
-    <Compile Include="AssessmentSection\RiskeerWellKnownTileSourceTest.cs" />
-    <Compile Include="AssessmentSection\WellKnownBackgroundDataConfigurationTest.cs" />
-    <Compile Include="AssessmentSection\WMTSBackgroundDataConfigurationTest.cs" />
-    <Compile Include="CommentTest.cs" />
-    <Compile Include="Contribution\NormTypeTest.cs" />
-    <Compile Include="DikeProfiles\BreakWaterTest.cs" />
-    <Compile Include="Calculation\CalculationGroupTest.cs" />
-    <Compile Include="DikeProfiles\BreakWaterTypeTest.cs" />
-    <Compile Include="DikeProfiles\DikeProfileCollectionTest.cs" />
-    <Compile Include="DikeProfiles\DikeProfileTest.cs" />
-    <Compile Include="DikeProfiles\ForeshoreProfileCollectionTest.cs" />
-    <Compile Include="DikeProfiles\ForeshoreProfileTest.cs" />
-    <Compile Include="Exceptions\AssemblyExceptionTest.cs" />
-    <Compile Include="Exceptions\IllustrationPointConversionExceptionTest.cs" />
-    <Compile Include="Exceptions\MechanismSurfaceLineExceptionTest.cs" />
-    <Compile Include="FailureMechanism\FailureMechanismCategoryTypeTest.cs" />
-    <Compile Include="FailureMechanism\FailureMechanismSectionCollectionTest.cs" />
-    <Compile Include="HasSectionResultsHelperTest.cs" />
-    <Compile Include="Helpers\SoilLayerDataHelperTest.cs" />
-    <Compile Include="Hydraulics\CalculationConvergenceTest.cs" />
-    <Compile Include="Hydraulics\HydraulicBoundaryCalculationSettingsFactoryTest.cs" />
-    <Compile Include="Hydraulics\HydraulicBoundaryCalculationSettingsTest.cs" />
-    <Compile Include="Hydraulics\HydraulicBoundaryDatabaseExtensionsTest.cs" />
-    <Compile Include="Hydraulics\HydraulicBoundaryDatabaseTest.cs" />
-    <Compile Include="Hydraulics\HydraulicBoundaryLocationCalculationInputTest.cs" />
-    <Compile Include="Hydraulics\HydraulicBoundaryLocationCalculationTest.cs" />
-    <Compile Include="Hydraulics\HydraulicBoundaryLocationCalculationOutputTest.cs" />
-    <Compile Include="Hydraulics\HydraulicBoundaryLocationTest.cs" />
-    <Compile Include="Hydraulics\HydraulicLocationConfigurationSettingsTest.cs" />
-    <Compile Include="IllustrationPoints\TopLevelSubMechanismIllustrationPointExtensionsTest.cs" />
-    <Compile Include="IllustrationPoints\TopLevelFaultTreeIllustrationPointExtensionsTest.cs" />
-    <Compile Include="IllustrationPoints\IllustrationPointNodeExtensionsTest.cs" />
-    <Compile Include="IllustrationPoints\SubMechanismIllustrationPointExtensionsTest.cs" />
-    <Compile Include="IllustrationPoints\FaultTreeIllustrationPointExtensionsTest.cs" />
-    <Compile Include="IllustrationPoints\IllustrationPointNodeTest.cs" />
-    <Compile Include="IllustrationPoints\FaultTreeIllustrationPointTest.cs" />
-    <Compile Include="IllustrationPoints\GeneralResultTest.cs" />
-    <Compile Include="IllustrationPoints\IllustrationPointBaseTest.cs" />
-    <Compile Include="IllustrationPoints\IllustrationPointResultTest.cs" />
-    <Compile Include="IllustrationPoints\StochastValidatorTest.cs" />
-    <Compile Include="IllustrationPoints\SubMechanismIllustrationPointTest.cs" />
-    <Compile Include="IllustrationPoints\SubMechanismIllustrationPointStochastTest.cs" />
-    <Compile Include="IllustrationPoints\StochastTest.cs" />
-    <Compile Include="IllustrationPoints\TopLevelFaultTreeIllustrationPointTest.cs" />
-    <Compile Include="IllustrationPoints\TopLevelIllustrationPointBaseTest.cs" />
-    <Compile Include="IllustrationPoints\TopLevelSubMechanismIllustrationPointTest.cs" />
-    <Compile Include="IllustrationPoints\WindDirectionTest.cs" />
-    <Compile Include="MechanismSurfaceLineBaseTest.cs" />
-    <Compile Include="Probabilistics\LogNormalDistributionDesignVariableCalculatorTest.cs" />
-    <Compile Include="Probabilistics\NormalDistributionDesignVariableCalculatorTest.cs" />
-    <Compile Include="Probabilistics\PercentileBasedDesignVariableCalculatorTest.cs" />
-    <Compile Include="Probabilistics\VariationCoefficientLogNormalDistributionDesignVariableTest.cs" />
-    <Compile Include="Probabilistics\VariationCoefficientDesignVariableTest.cs" />
-    <Compile Include="Probabilistics\DeterministicDesignVariableTest.cs" />
-    <Compile Include="Probabilistics\DesignVariableTest.cs" />
-    <Compile Include="Probabilistics\TruncatedNormalDistributionTest.cs" />
-    <Compile Include="Probabilistics\VariationCoefficientLogNormalDistributionTest.cs" />
-    <Compile Include="Probabilistics\VariationCoefficientNormalDistributionTest.cs" />
-    <Compile Include="Probability\ProbabilityAssessmentInputTest.cs" />
-    <Compile Include="Probability\ProbabilityAssessmentInputExtensionsTest.cs" />
-    <Compile Include="Probability\ProbabilityAssessmentOutputFactoryTest.cs" />
-    <Compile Include="Probability\ProbabilityAssessmentOutputTest.cs" />
-    <Compile Include="Contribution\FailureMechanismContributionTest.cs" />
-    <Compile Include="Contribution\OtherFailureMechanismTest.cs" />
-    <Compile Include="FailureMechanism\FailureMechanismBaseTest.cs" />
-    <Compile Include="FailureMechanism\FailureMechanismSectionResultTest.cs" />
-    <Compile Include="FailureMechanism\FailureMechanismSectionTest.cs" />
-    <Compile Include="Calculation\CalculationGroupExtensionsTest.cs" />
-    <Compile Include="Probabilistics\PercentileBasedDesignVariableTest.cs" />
-    <Compile Include="Probabilistics\LogNormalDistributionDesignVariableTest.cs" />
-    <Compile Include="Probabilistics\LogNormalDistributionTest.cs" />
-    <Compile Include="Probabilistics\NormalDistributionDesignVariableTest.cs" />
-    <Compile Include="Probabilistics\NormalDistributionTest.cs" />
-    <Compile Include="Probability\ProbabilityHelperTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="DikeProfiles\RoughnessPointTest.cs" />
-    <Compile Include="StructureBaseTest.cs" />
-    <Compile Include="StructureCollectionTest.cs" />
-    <Compile Include="Structures\StructuresCalculationTest.cs" />
-    <Compile Include="Structures\StructuresInputBaseTest.cs" />
-    <Compile Include="Exceptions\UpdateDataExceptionTest.cs" />
-    <Compile Include="Structures\StructuresOutputTest.cs" />
-    <Compile Include="UpdateDataStrategies\ReplaceDataStrategyBaseTest.cs" />
-    <Compile Include="UpdateDataStrategies\UpdateDataStrategyBaseTest.cs" />
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.Data.TestUtil\Core.Common.Data.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj"/>
+    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.KernelWrapper\Riskeer.AssemblyTool.KernelWrapper.csproj"/>
+    <ProjectReference Include="..\..\..\AssemblyTool\test\Riskeer.AssemblyTool.KernelWrapper.TestUtil\Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj"/>
+    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj"/>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj">
-      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
-      <Name>Core.Common.Util</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.Data.TestUtil\Core.Common.Data.TestUtil.csproj">
-      <Project>{0B0D2DFF-7E7E-4BB0-A007-61800C85809A}</Project>
-      <Name>Core.Common.Data.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj">
-      <Project>{420ED9C3-0C33-47EA-B893-121A9C0DB4F1}</Project>
-      <Name>Riskeer.AssemblyTool.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.KernelWrapper\Riskeer.AssemblyTool.KernelWrapper.csproj">
-      <Project>{358B6DA2-A1DF-477F-B6AC-C30204265CB0}</Project>
-      <Name>Riskeer.AssemblyTool.KernelWrapper</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\AssemblyTool\test\Riskeer.AssemblyTool.KernelWrapper.TestUtil\Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj">
-      <Project>{0AB432BB-E2CC-42EA-A72C-7AFEF7536B38}</Project>
-      <Name>Riskeer.AssemblyTool.KernelWrapper.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj">
-      <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
-      <Name>Riskeer.Common.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj">
-      <Project>{78AA56F5-431D-465C-AC50-3173D7E90AC1}</Project>
-      <Name>Riskeer.Common.Primitives</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj">
-      <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
-      <Name>Riskeer.Common.Data.TestUtil</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+    <PackageReference Include="RhinoMocks">
+      <Version>3.6.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Data.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Data.TestUtil.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil.Test/Riskeer.Common.Data.TestUtil.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r2451cb4d1637ed930c35e88b3bcfc220dca045d4
--- Riskeer/Common/test/Riskeer.Common.Data.TestUtil.Test/Riskeer.Common.Data.TestUtil.Test.csproj	(.../Riskeer.Common.Data.TestUtil.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil.Test/Riskeer.Common.Data.TestUtil.Test.csproj	(.../Riskeer.Common.Data.TestUtil.Test.csproj)	(revision 2451cb4d1637ed930c35e88b3bcfc220dca045d4)
@@ -1,84 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{7C78463D-09B1-455C-B58E-B8EDC9FBCB60}</ProjectGuid>
-    <RootNamespace>Riskeer.Common.Data.TestUtil.Test</RootNamespace>
-    <AssemblyName>Riskeer.Common.Data.TestUtil.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssessmentSectionTestHelperTest.cs" />
-    <Compile Include="CalculationTestDataFactoryTest.cs" />
-    <Compile Include="FailureMechanismContributionTestFactoryTest.cs" />
-    <Compile Include="FailureMechanismSectionResultTestFactoryTest.cs" />
-    <Compile Include="FailureMechanismSectionTestFactoryTest.cs" />
-    <Compile Include="ForeshoreProfilePermutationHelperTest.cs" />
-    <Compile Include="HydraulicBoundaryDatabaseTestHelperTest.cs" />
-    <Compile Include="IllustrationPoints\FaultTreeIllustrationPointTestFactoryTest.cs" />
-    <Compile Include="IllustrationPoints\TestGeneralResultFaultTreeIllustrationPointTest.cs" />
-    <Compile Include="IllustrationPoints\TestGeneralResultSubMechanismIllustrationPointTest.cs" />
-    <Compile Include="IllustrationPoints\TestIllustrationPointTest.cs" />
-    <Compile Include="IllustrationPoints\TestSubMechanismIllustrationPointStochastTest.cs" />
-    <Compile Include="IllustrationPoints\TestFaultTreeIllustrationPointTest.cs" />
-    <Compile Include="IllustrationPoints\TestTopLevelIllustrationPointTest.cs" />
-    <Compile Include="IllustrationPoints\WindDirectionTestFactoryTest.cs" />
-    <Compile Include="FailureMechanismTestHelperTest.cs" />
-    <Compile Include="LimitedPrecisionHelperTest.cs" />
-    <Compile Include="AssessmentSectionStubTest.cs" />
-    <Compile Include="Probability\TestProbabilityAssessmentInputTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ReferenceLineTestFactoryTest.cs" />
-    <Compile Include="TestBackgroundDataConfigurationTest.cs" />
-    <Compile Include="TestCalculationTest.cs" />
-    <Compile Include="TestCalculationWithForeshoreProfileTest.cs" />
-    <Compile Include="DikeProfileTestFactoryTest.cs" />
-    <Compile Include="TestFailureMechanismSectionResultTest.cs" />
-    <Compile Include="TestFailureMechanismTest.cs" />
-    <Compile Include="DistributionAssertTest.cs" />
-    <Compile Include="TestForeshoreProfileTest.cs" />
-    <Compile Include="TestHydraulicBoundaryLocationCalculationOutputTest.cs" />
-    <Compile Include="TestHydraulicBoundaryLocationTest.cs" />
-    <Compile Include="IllustrationPoints\TestSubMechanismIllustrationPointTest.cs" />
-    <Compile Include="TestProbabilityAssessmentOutputTest.cs" />
-    <Compile Include="TestStructuresCalculationTest.cs" />
-    <Compile Include="TestStructuresInputTest.cs" />
-    <Compile Include="TestStructuresOutputTest.cs" />
-    <Compile Include="TestStructureTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj">
-      <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
-      <Name>Riskeer.Common.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj">
-      <Project>{4843d6e5-066f-4795-94f5-1d53932dd03c}</Project>
-      <Name>Riskeer.Common.Data.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj"/>
+    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+    <PackageReference Include="RhinoMocks">
+      <Version>3.6.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Data.TestUtil.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Data.TestUtil/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/Riskeer.Common.Data.TestUtil.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r2451cb4d1637ed930c35e88b3bcfc220dca045d4
--- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/Riskeer.Common.Data.TestUtil.csproj	(.../Riskeer.Common.Data.TestUtil.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/Riskeer.Common.Data.TestUtil.csproj	(.../Riskeer.Common.Data.TestUtil.csproj)	(revision 2451cb4d1637ed930c35e88b3bcfc220dca045d4)
@@ -1,90 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{4843D6E5-066F-4795-94F5-1D53932DD03C}</ProjectGuid>
-    <RootNamespace>Riskeer.Common.Data.TestUtil</RootNamespace>
-    <AssemblyName>Riskeer.Common.Data.TestUtil</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_TestUtil.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\TestUtil.targets" />
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssessmentSectionTestHelper.cs" />
-    <Compile Include="BackgroundDataTestHelper.cs" />
-    <Compile Include="CalculationTestDataFactory.cs" />
-    <Compile Include="CalculationType.cs" />
-    <Compile Include="CommonCloneAssert.cs" />
-    <Compile Include="CommonTestDataGenerator.cs" />
-    <Compile Include="CustomObservableUniqueItemCollectionWithSourcePathTestFixtureBase.cs" />
-    <Compile Include="FailureMechanismTestHelper.cs" />
-    <Compile Include="DistributionTestHelper.cs" />
-    <Compile Include="FailureMechanismContributionTestFactory.cs" />
-    <Compile Include="FailureMechanismSectionResultTestFactory.cs" />
-    <Compile Include="FailureMechanismSectionTestFactory.cs" />
-    <Compile Include="ForeshoreProfilePermutationHelper.cs" />
-    <Compile Include="HydraulicBoundaryDatabaseTestHelper.cs" />
-    <Compile Include="IllustrationPoints\FaultTreeIllustrationPointTestFactory.cs" />
-    <Compile Include="IllustrationPoints\TestGeneralResultFaultTreeIllustrationPoint.cs" />
-    <Compile Include="IllustrationPoints\TestIllustrationPoint.cs" />
-    <Compile Include="IllustrationPoints\TestFaultTreeIllustrationPoint.cs" />
-    <Compile Include="IllustrationPoints\TestSubMechanismIllustrationPoint.cs" />
-    <Compile Include="IllustrationPoints\TestGeneralResultSubMechanismIllustrationPoint.cs" />
-    <Compile Include="IllustrationPoints\TestSubMechanismIllustrationPointStochast.cs" />
-    <Compile Include="LimitedPrecisionHelper.cs" />
-    <Compile Include="DistributionAssert.cs" />
-    <Compile Include="AssessmentSectionStub.cs" />
-    <Compile Include="Probability\TestProbabilityAssessmentInput.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ReferenceLineTestFactory.cs" />
-    <Compile Include="TestBackgroundDataConfiguration.cs" />
-    <Compile Include="TestCalculation.cs" />
-    <Compile Include="TestCalculationWithForeshoreProfile.cs" />
-    <Compile Include="DikeProfileTestFactory.cs" />
-    <Compile Include="TestFailureMechanism.cs" />
-    <Compile Include="TestFailureMechanismSectionResult.cs" />
-    <Compile Include="TestForeshoreProfile.cs" />
-    <Compile Include="TestHydraulicBoundaryLocation.cs" />
-    <Compile Include="TestHydraulicBoundaryLocationCalculationOutput.cs" />
-    <Compile Include="TestProbabilityAssessmentOutput.cs" />
-    <Compile Include="TestStructure.cs" />
-    <Compile Include="TestStructuresCalculation.cs" />
-    <Compile Include="TestStructuresInput.cs" />
-    <Compile Include="TestStructuresOutput.cs" />
-    <Compile Include="IllustrationPoints\WindDirectionTestFactory.cs" />
-    <Compile Include="IllustrationPoints\TestTopLevelIllustrationPoint.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.Data.TestUtil\Core.Common.Data.TestUtil.csproj">
-      <Project>{0b0d2dff-7e7e-4bb0-a007-61800c85809a}</Project>
-      <Name>Core.Common.Data.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj">
-      <Project>{D4200F43-3F72-4F42-AF0A-8CED416A38EC}</Project>
-      <Name>Riskeer.Common.Data</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.Data.TestUtil\Core.Common.Data.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+    <PackageReference Include="RhinoMocks">
+      <Version>3.6.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Data.TestUtil/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Forms.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Riskeer.Common.Forms.Test.csproj
===================================================================
diff -u -r4d5c509a48826a3fbaef76104139cc17d9705464 -r2451cb4d1637ed930c35e88b3bcfc220dca045d4
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Riskeer.Common.Forms.Test.csproj	(.../Riskeer.Common.Forms.Test.csproj)	(revision 4d5c509a48826a3fbaef76104139cc17d9705464)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Riskeer.Common.Forms.Test.csproj	(.../Riskeer.Common.Forms.Test.csproj)	(revision 2451cb4d1637ed930c35e88b3bcfc220dca045d4)
@@ -1,345 +1,67 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{886FDBE5-7065-4AB9-A894-869DBFD4E440}</ProjectGuid>
-    <RootNamespace>Riskeer.Common.Forms.Test</RootNamespace>
-    <AssemblyName>Riskeer.Common.Forms.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="NUnitForms">
       <HintPath>..\..\..\..\lib\NUnitForms.dll</HintPath>
     </Reference>
-    <Reference Include="QuickGraph, Version=3.6.61114.0, Culture=neutral, PublicKeyToken=f3fb40175eec2af3, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="QuickGraph.Data, Version=3.6.61114.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Data.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="QuickGraph.Graphviz, Version=3.6.61114.0, Culture=neutral, PublicKeyToken=f3fb40175eec2af3, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Graphviz.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="QuickGraph.Serialization, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Serialization.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite, Version=1.0.109.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Data.SQLite.Core.1.0.109.2\lib\net45\System.Data.SQLite.dll</HintPath>
-    </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Builders\FailureMechanismSectionResultViewColumnBuilderTest.cs" />
-    <Compile Include="ChangeHandlers\ClearIllustrationPointsOfCalculationChangeHandlerBaseTest.cs" />
-    <Compile Include="ChangeHandlers\ClearIllustrationPointsOfCalculationCollectionChangeHandlerBaseTest.cs" />
-    <Compile Include="ChangeHandlers\ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandlerTest.cs" />
-    <Compile Include="ChangeHandlers\ClearIllustrationPointsOfStructuresCalculationHandlerTest.cs" />
-    <Compile Include="ChangeHandlers\ClearIllustrationPointsOfStructureCalculationCollectionChangeHandlerTest.cs" />
-    <Compile Include="ChangeHandlers\FailureMechanismCalculationChangeHandlerTest.cs" />
-    <Compile Include="ChangeHandlers\ObservablePropertyChangeHandlerTest.cs" />
-    <Compile Include="ChangeHandlers\FailureMechanismPropertyChangeHandlerTest.cs" />
-    <Compile Include="ChangeHandlers\PropertyChangeHelperTest.cs" />
-    <Compile Include="ChangeHandlers\CalculationChangeHandlerTest.cs" />
-    <Compile Include="Controls\AssemblyResultControlTest.cs" />
-    <Compile Include="Controls\AssemblyResultWithProbabilityControlTest.cs" />
-    <Compile Include="Controls\FailureMechanismAssemblyControlTest.cs" />
-    <Compile Include="Controls\FailureMechanismAssemblyCategoryGroupControlTest.cs" />
-    <Compile Include="ExportInfos\RiskeerExportInfoFactoryTest.cs" />
-    <Compile Include="Factories\AssemblyMapDataFeaturesFactoryTest.cs" />
-    <Compile Include="Factories\MapThemeFactoryTest.cs" />
-    <Compile Include="Factories\RiskeerGraphNodeFactoryTest.cs" />
-    <Compile Include="Factories\AssemblyMapDataFactoryTest.cs" />
-    <Compile Include="Factories\RiskeerStackChartDataFactoryTest.cs" />
-    <Compile Include="GuiServices\HydraulicBoundaryLocationCalculationGuiServiceTest.cs" />
-    <Compile Include="Helpers\AssemblyCategoryGroupColorHelperTest.cs" />
-    <Compile Include="Helpers\FailureMechanismSectionAssemblyCategoryGroupHelperTest.cs" />
-    <Compile Include="Helpers\FailureMechanismSectionPresentationHelperTest.cs" />
-    <Compile Include="Helpers\NamingHelperTest.cs" />
-    <Compile Include="Helpers\ObserverHelperTest.cs" />
-    <Compile Include="Helpers\ProbabilityFormattingHelperTest.cs" />
-    <Compile Include="Helpers\SelectableHydraulicBoundaryLocationHelperTest.cs" />
-    <Compile Include="ImportInfos\RiskeerImportInfoFactoryTest.cs" />
-    <Compile Include="Observers\CalculatableFailureMechanismResultObserverTest.cs" />
-    <Compile Include="Observers\FailureMechanismResultObserverTest.cs" />
-    <Compile Include="PresentationObjects\DesignWaterLevelCalculationContextTest.cs" />
-    <Compile Include="PresentationObjects\DesignWaterLevelCalculationsContextTest.cs" />
-    <Compile Include="PresentationObjects\DesignWaterLevelCalculationsGroupContextTest.cs" />
-    <Compile Include="PresentationObjects\FailureMechanismAssemblyCategoriesContextBaseTest.cs" />
-    <Compile Include="PresentationObjects\FailureMechanismAssemblyCategoriesContextTest.cs" />
-    <Compile Include="PresentationObjects\NormContextTest.cs" />
-    <Compile Include="PresentationObjects\HydraulicBoundaryLocationCalculationContextTest.cs" />
-    <Compile Include="PresentationObjects\IllustrationPointContextTest.cs" />
-    <Compile Include="PresentationObjects\InputContextBaseTest.cs" />
-    <Compile Include="PresentationObjects\FailureMechanismContextTest.cs" />
-    <Compile Include="PresentationObjects\CategoryTreeFolderTest.cs" />
-    <Compile Include="PresentationObjects\FailureMechanismContributionContextTest.cs" />
-    <Compile Include="PresentationObjects\FailureMechanismSectionResultContextTest.cs" />
-    <Compile Include="PresentationObjects\FailureMechanismSectionsContextTest.cs" />
-    <Compile Include="PresentationObjects\ForeshoreProfilesContextTest.cs" />
-    <Compile Include="PresentationObjects\MapCalculationDataTest.cs" />
-    <Compile Include="PresentationObjects\ProbabilityFailureMechanismSectionResultContextTest.cs" />
-    <Compile Include="PresentationObjects\ReferenceLineContextTest.cs" />
-    <Compile Include="PresentationObjects\FailureMechanismItemContextBaseTest.cs" />
-    <Compile Include="PresentationObjects\SelectedTopLevelFaultTreeIllustrationPointTest.cs" />
-    <Compile Include="PresentationObjects\SelectedTopLevelSubMechanismIllustrationPointTest.cs" />
-    <Compile Include="PresentationObjects\StructuresCalculationContextTest.cs" />
-    <Compile Include="PresentationObjects\StructuresOutputContextTest.cs" />
-    <Compile Include="PresentationObjects\WaveHeightCalculationContextTest.cs" />
-    <Compile Include="PresentationObjects\WaveHeightCalculationsContextTest.cs" />
-    <Compile Include="PresentationObjects\WaveHeightCalculationsGroupContextTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PropertyClasses\BreakWaterPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\DesignVariablePropertiesTest.cs" />
-    <Compile Include="PropertyClasses\HydraulicBoundaryLocationCalculationsGroupBasePropertiesTest.cs" />
-    <Compile Include="PropertyClasses\WaveHeightHydraulicBoundaryLocationPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\DesignWaterLevelHydraulicBoundaryLocationPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\WaveHeightCalculationsGroupPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\WaveHeightCalculationCategoryBoundaryPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\DesignWaterLevelCalculationCategoryBoundaryPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\DesignWaterLevelCalculationPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\DesignWaterLevelCalculationsGroupPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\DesignWaterLevelCalculationsPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\FailureMechanismSectionProbabilityAssessmentPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\FailureMechanismSectionPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\FailureMechanismSectionsProbabilityAssessmentPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\FailureMechanismSectionsPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\HydraulicBoundaryLocationCalculationBasePropertiesTest.cs" />
-    <Compile Include="PropertyClasses\HydraulicBoundaryLocationCalculationCategoryBoundaryPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\HydraulicBoundaryLocationCalculationPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\HydraulicBoundaryLocationCalculationsPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\HydraulicBoundaryLocationBasePropertiesTest.cs" />
-    <Compile Include="PropertyClasses\SubMechanismIllustrationPointValuesPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\SubMechanismIllustrationPointPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\IllustrationPointPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\FaultTreeIllustrationPointPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\TopLevelFaultTreeIllustrationPointPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\ForeshoreProfileCollectionPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\StructureCollectionPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\StructuresOutputPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\VariationCoefficientDesignVariablePropertiesTest.cs" />
-    <Compile Include="PropertyClasses\VariationCoefficientDistributionPropertiesBaseTest.cs" />
-    <Compile Include="PropertyClasses\DistributionPropertiesBaseTest.cs" />
-    <Compile Include="PropertyClasses\VariationCoefficientLogNormalDistributionDesignVariablePropertiesTest.cs" />
-    <Compile Include="PropertyClasses\VariationCoefficientNormalDistributionPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\VariationCoefficientLogNormalDistributionPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\NormalDistributionPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\ForeshoreGeometryPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\ForeshoreProfilePropertiesTest.cs" />
-    <Compile Include="PropertyClasses\LogNormalDistributionPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\StructuresInputBasePropertiesTest.cs" />
-    <Compile Include="PropertyClasses\TruncatedNormalDistributionPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\UseBreakWaterPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\UseForeshorePropertiesTest.cs" />
-    <Compile Include="PropertyClasses\TopLevelSubMechanismIllustrationPointPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\WaveHeightCalculationPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\WaveHeightCalculationsPropertiesTest.cs" />
-    <Compile Include="ScenarioSelectionControlTest.cs" />
-    <Compile Include="SelectionDialogBaseTest.cs" />
-    <Compile Include="HydraulicBoundaryLocationSelectionDialogTest.cs" />
-    <Compile Include="StructureIdEqualityComparerTest.cs" />
-    <Compile Include="StructureSelectionDialogTest.cs" />
-    <Compile Include="TreeNodeInfos\RiskeerContextMenuBuilderTest.cs" />
-    <Compile Include="TreeNodeInfos\RiskeerTreeNodeInfoFactoryTest.cs" />
-    <Compile Include="TreeNodeInfos\RiskeerContextMenuItemFactoryTest.cs" />
-    <Compile Include="TypeConverters\NoProbabilityValueDoubleConverterTest.cs" />
-    <Compile Include="TypeConverters\NoValueRoundedDoubleConverterTest.cs" />
-    <Compile Include="PresentationObjects\SelectableHydraulicBoundaryLocationTest.cs" />
-    <Compile Include="UITypeEditors\HydraulicBoundaryLocationEditorTest.cs" />
-    <Compile Include="UITypeEditors\ForeshoreProfileEditorTest.cs" />
-    <Compile Include="UITypeEditors\StructureEditorTest.cs" />
-    <Compile Include="UpdateInfos\RiskeerUpdateInfoFactoryTest.cs" />
-    <Compile Include="Views\CalculatableRowTest.cs" />
-    <Compile Include="Views\DesignWaterLevelCalculationsViewTest.cs" />
-    <Compile Include="Views\FailureMechanismSectionProbabilityAssessmentRowTest.cs" />
-    <Compile Include="Views\FailureMechanismSectionRowTest.cs" />
-    <Compile Include="Views\FailureMechanismSectionsProbabilityAssessmentViewTest.cs" />
-    <Compile Include="Views\FailureMechanismSectionsViewTest.cs" />
-    <Compile Include="Views\CloseForFailureMechanismViewTest.cs" />
-    <Compile Include="Views\IllustrationPointsFaultTreeControlTest.cs" />
-    <Compile Include="Views\IllustrationPointControlItemTest.cs" />
-    <Compile Include="Views\IllustrationPointRowTest.cs" />
-    <Compile Include="Views\IllustrationPointsChartControlTest.cs" />
-    <Compile Include="Views\IllustrationPointsControlTest.cs" />
-    <Compile Include="Views\IllustrationPointsTableControlTest.cs" />
-    <Compile Include="Views\CalculationsViewTest.cs" />
-    <Compile Include="Views\CommentViewTest.cs" />
-    <Compile Include="Views\FailureMechanismResultViewTest.cs" />
-    <Compile Include="Helpers\FailureMechanismSectionResultRowHelperTest.cs" />
-    <Compile Include="Views\FailureMechanismSectionResultRowTest.cs" />
-    <Compile Include="Views\HydraulicBoundaryLocationCalculationRowTest.cs" />
-    <Compile Include="Views\HydraulicBoundaryCalculationsViewTest.cs" />
-    <Compile Include="Factories\RiskeerChartDataFactoryTest.cs" />
-    <Compile Include="Views\RiskeerMapControlTest.cs" />
-    <Compile Include="Factories\RiskeerMapDataFactoryTest.cs" />
-    <Compile Include="Factories\RiskeerMapDataFeaturesFactoryTest.cs" />
-    <Compile Include="Views\SelectableRowTest.cs" />
-    <Compile Include="Views\GeneralResultFaultTreeIllustrationPointViewTest.cs" />
-    <Compile Include="Views\WaveHeightCalculationsViewTest.cs" />
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls.TreeView\Core.Common.Controls.TreeView.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Gui\Core.Common.Gui.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.Util.TestUtil\Core.Common.Util.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.BruTile\Core.Components.BruTile.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Chart\Core.Components.Chart.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.GraphSharp.Forms\Core.Components.GraphSharp.Forms.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.GraphSharp\Core.Components.GraphSharp.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.OxyPlot.Forms\Core.Components.OxyPlot.Forms.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.PointedTree\Core.Components.PointedTree.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Stack.Forms\Core.Components.Stack.Forms.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Stack\Core.Components.Stack.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Components\test\Core.Components.BruTile.TestUtil\Core.Components.BruTile.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Components\test\Core.Components.Gis.TestUtil\Core.Components.Gis.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Components\test\Core.Components.GraphSharp.TestUtil\Core.Components.GraphSharp.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj"/>
+    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Forms\Riskeer.AssemblyTool.Forms.csproj"/>
+    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.KernelWrapper\Riskeer.AssemblyTool.KernelWrapper.csproj"/>
+    <ProjectReference Include="..\..\..\AssemblyTool\test\Riskeer.AssemblyTool.KernelWrapper.TestUtil\Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\HydraRing\src\Riskeer.HydraRing.Calculation\Riskeer.HydraRing.Calculation.csproj"/>
+    <ProjectReference Include="..\..\..\HydraRing\test\Riskeer.HydraRing.Calculation.TestUtil\Riskeer.HydraRing.Calculation.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.IO\Riskeer.Common.IO.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Util\Riskeer.Common.Util.csproj"/>
+    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj"/>
+    <ProjectReference Include="..\Riskeer.Common.Forms.TestUtil\Riskeer.Common.Forms.TestUtil.csproj"/>
+    <ProjectReference Include="..\Riskeer.Common.Service.TestUtil\Riskeer.Common.Service.TestUtil.csproj"/>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls.TreeView\Core.Common.Controls.TreeView.csproj">
-      <Project>{1d27f91f-4e62-4eaf-a0a8-a32708b9a9b1}</Project>
-      <Name>Core.Common.Controls.TreeView</Name>
-      <Private>True</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
-      <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
-      <Name>Core.Common.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Gui\Core.Common.Gui.csproj">
-      <Project>{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}</Project>
-      <Name>Core.Common.Gui</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj">
-      <Project>{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}</Project>
-      <Name>Core.Common.Util</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{d749ee4c-ce50-4c17-bf01-9a953028c126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.Util.TestUtil\Core.Common.Util.TestUtil.csproj">
-      <Project>{45193749-ECE8-40C4-8C4B-0C783AFFACB5}</Project>
-      <Name>Core.Common.Util.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.BruTile\Core.Components.BruTile.csproj">
-      <Project>{e02482c7-f12b-42f0-bb2b-c7ec17503a72}</Project>
-      <Name>Core.Components.BruTile</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Chart\Core.Components.Chart.csproj">
-      <Project>{516EBC95-B8F2-428C-B7F6-733F01BF8FDD}</Project>
-      <Name>Core.Components.Chart</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj">
-      <Project>{4A06DF0D-5D75-4BAD-A95A-A3DB9B7C4AD5}</Project>
-      <Name>Core.Components.Gis.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.csproj">
-      <Project>{318BA582-88C9-4816-A54A-A7E431461DE3}</Project>
-      <Name>Core.Components.Gis</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.GraphSharp.Forms\Core.Components.GraphSharp.Forms.csproj">
-      <Project>{4E575459-AD64-4F5F-B313-9F8E0EC8C03F}</Project>
-      <Name>Core.Components.GraphSharp.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.GraphSharp\Core.Components.GraphSharp.csproj">
-      <Project>{32358941-77C5-48A7-AD8B-DFB4F23B12A5}</Project>
-      <Name>Core.Components.GraphSharp</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.OxyPlot.Forms\Core.Components.OxyPlot.Forms.csproj">
-      <Project>{DADAA0A5-288C-49CB-9F08-337F16832C86}</Project>
-      <Name>Core.Components.OxyPlot.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.PointedTree\Core.Components.PointedTree.csproj">
-      <Project>{AD3B1634-C435-4618-9971-2EA0817F5DE2}</Project>
-      <Name>Core.Components.PointedTree</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Stack.Forms\Core.Components.Stack.Forms.csproj">
-      <Project>{72109e33-6518-4632-accf-6cbf2a312711}</Project>
-      <Name>Core.Components.Stack.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Stack\Core.Components.Stack.csproj">
-      <Project>{6a146889-a3c4-48bf-af53-c0b0cd355be4}</Project>
-      <Name>Core.Components.Stack</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\test\Core.Components.BruTile.TestUtil\Core.Components.BruTile.TestUtil.csproj">
-      <Project>{1081336C-D919-4249-AB33-9AF15F4D19EC}</Project>
-      <Name>Core.Components.BruTile.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\test\Core.Components.Gis.TestUtil\Core.Components.Gis.TestUtil.csproj">
-      <Project>{F0FB401A-3494-4237-9E6D-02CDF77912A8}</Project>
-      <Name>Core.Components.Gis.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\test\Core.Components.GraphSharp.TestUtil\Core.Components.GraphSharp.TestUtil.csproj">
-      <Project>{0500CA45-1791-4C91-9243-EF95567068A3}</Project>
-      <Name>Core.Components.GraphSharp.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj">
-      <Project>{420ED9C3-0C33-47EA-B893-121A9C0DB4F1}</Project>
-      <Name>Riskeer.AssemblyTool.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Forms\Riskeer.AssemblyTool.Forms.csproj">
-      <Project>{22C5DDB8-2491-4BC6-BDC6-2A7B7EBF40C1}</Project>
-      <Name>Riskeer.AssemblyTool.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.KernelWrapper\Riskeer.AssemblyTool.KernelWrapper.csproj">
-      <Project>{358B6DA2-A1DF-477F-B6AC-C30204265CB0}</Project>
-      <Name>Riskeer.AssemblyTool.KernelWrapper</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\AssemblyTool\test\Riskeer.AssemblyTool.KernelWrapper.TestUtil\Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj">
-      <Project>{0AB432BB-E2CC-42EA-A72C-7AFEF7536B38}</Project>
-      <Name>Riskeer.AssemblyTool.KernelWrapper.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\HydraRing\src\Riskeer.HydraRing.Calculation\Riskeer.HydraRing.Calculation.csproj">
-      <Project>{888D4097-8BC2-4703-9FB1-8744C94D525E}</Project>
-      <Name>Riskeer.HydraRing.Calculation</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\HydraRing\test\Riskeer.HydraRing.Calculation.TestUtil\Riskeer.HydraRing.Calculation.TestUtil.csproj">
-      <Project>{74CBA865-9338-447F-BAD9-28312446AE84}</Project>
-      <Name>Riskeer.HydraRing.Calculation.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj">
-      <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
-      <Name>Riskeer.Common.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj">
-      <Project>{4d840673-3812-4338-a352-84854e32b8a0}</Project>
-      <Name>Riskeer.Common.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.IO\Riskeer.Common.IO.csproj">
-      <Project>{52BA7627-CBAB-4209-BE77-3B5F31378277}</Project>
-      <Name>Riskeer.Common.IO</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj">
-      <Project>{78AA56F5-431D-465C-AC50-3173D7E90AC1}</Project>
-      <Name>Riskeer.Common.Primitives</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Util\Riskeer.Common.Util.csproj">
-      <Project>{6A074D65-A81C-4C1C-8E24-F36C916E4ED7}</Project>
-      <Name>Riskeer.Common.Util</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj">
-      <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
-      <Name>Riskeer.Common.Data.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Forms.TestUtil\Riskeer.Common.Forms.TestUtil.csproj">
-      <Project>{D24FA2F7-28A7-413B-AFD3-EE10E985630B}</Project>
-      <Name>Riskeer.Common.Forms.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Service.TestUtil\Riskeer.Common.Service.TestUtil.csproj">
-      <Project>{52093DA6-D545-476A-ADFD-12F56625E36B}</Project>
-      <Name>Riskeer.Common.Service.TestUtil</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="..\..\..\..\packages\System.Data.SQLite.Core.1.0.109.2\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('..\..\..\..\packages\System.Data.SQLite.Core.1.0.109.2\build\net45\System.Data.SQLite.Core.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use 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\System.Data.SQLite.Core.1.0.109.2\build\net45\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\System.Data.SQLite.Core.1.0.109.2\build\net45\System.Data.SQLite.Core.targets'))" />
-  </Target>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+    <PackageReference Include="QuickGraph">
+      <Version>3.6.61119.7</Version>
+    </PackageReference>
+    <PackageReference Include="RhinoMocks">
+      <Version>3.6.1</Version>
+    </PackageReference>
+    <PackageReference Include="System.Data.SQLite.Core">
+      <Version>1.0.109.2</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Forms.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Forms.TestUtil.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/test/Riskeer.Common.Forms.TestUtil.Test/Riskeer.Common.Forms.TestUtil.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r2451cb4d1637ed930c35e88b3bcfc220dca045d4
--- Riskeer/Common/test/Riskeer.Common.Forms.TestUtil.Test/Riskeer.Common.Forms.TestUtil.Test.csproj	(.../Riskeer.Common.Forms.TestUtil.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Riskeer/Common/test/Riskeer.Common.Forms.TestUtil.Test/Riskeer.Common.Forms.TestUtil.Test.csproj	(.../Riskeer.Common.Forms.TestUtil.Test.csproj)	(revision 2451cb4d1637ed930c35e88b3bcfc220dca045d4)
@@ -1,87 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{659D7F4A-18FD-4999-9886-C8BA5017955D}</ProjectGuid>
-    <RootNamespace>Riskeer.Common.Forms.TestUtil.Test</RootNamespace>
-    <AssemblyName>Riskeer.Common.Forms.TestUtil.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="MapViewTestHelperTest.cs" />
-    <Compile Include="AssemblyCategoryColorTestHelperTest.cs" />
-    <Compile Include="SetPropertyValueAfterConfirmationParameterTesterTest.cs" />
-    <Compile Include="ControlTestHelperTest.cs" />
-    <Compile Include="DistributionPropertiesTestHelperTest.cs" />
-    <Compile Include="FailureMechanismSetPropertyValueAfterConfirmationParameterTesterTest.cs" />
-    <Compile Include="IllustrationPointControlItemComparerTest.cs" />
-    <Compile Include="MapDataTestHelperTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestCalculationInputTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
-      <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
-      <Name>Core.Common.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Gui\Core.Common.Gui.csproj">
-      <Project>{30e4c2ae-719e-4d70-9fa9-668a9767fbfa}</Project>
-      <Name>Core.Common.Gui</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.csproj">
-      <Project>{318BA582-88C9-4816-A54A-A7E431461DE3}</Project>
-      <Name>Core.Components.Gis</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\test\Core.Components.Gis.TestUtil\Core.Components.Gis.TestUtil.csproj">
-      <Project>{F0FB401A-3494-4237-9E6D-02CDF77912A8}</Project>
-      <Name>Core.Components.Gis.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj">
-      <Project>{420ED9C3-0C33-47EA-B893-121A9C0DB4F1}</Project>
-      <Name>Riskeer.AssemblyTool.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj">
-      <Project>{D4200F43-3F72-4F42-AF0A-8CED416A38EC}</Project>
-      <Name>Riskeer.Common.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj">
-      <Project>{4d840673-3812-4338-a352-84854e32b8a0}</Project>
-      <Name>Riskeer.Common.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Util\Riskeer.Common.Util.csproj">
-      <Project>{6A074D65-A81C-4C1C-8E24-F36C916E4ED7}</Project>
-      <Name>Riskeer.Common.Util</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj">
-      <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
-      <Name>Riskeer.Common.Data.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Forms.TestUtil\Riskeer.Common.Forms.TestUtil.csproj">
-      <Project>{D24FA2F7-28A7-413B-AFD3-EE10E985630B}</Project>
-      <Name>Riskeer.Common.Forms.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Gui\Core.Common.Gui.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Components\test\Core.Components.Gis.TestUtil\Core.Components.Gis.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Util\Riskeer.Common.Util.csproj"/>
+    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj"/>
+    <ProjectReference Include="..\Riskeer.Common.Forms.TestUtil\Riskeer.Common.Forms.TestUtil.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Forms.TestUtil.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/Riskeer.Common.Forms.TestUtil.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r2451cb4d1637ed930c35e88b3bcfc220dca045d4
--- Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/Riskeer.Common.Forms.TestUtil.csproj	(.../Riskeer.Common.Forms.TestUtil.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/Riskeer.Common.Forms.TestUtil.csproj	(.../Riskeer.Common.Forms.TestUtil.csproj)	(revision 2451cb4d1637ed930c35e88b3bcfc220dca045d4)
@@ -1,16 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{D24FA2F7-28A7-413B-AFD3-EE10E985630B}</ProjectGuid>
-    <RootNamespace>Riskeer.Common.Forms.TestUtil</RootNamespace>
-    <AssemblyName>Riskeer.Common.Forms.TestUtil</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_TestUtil.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\TestUtil.targets" />
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="NUnitForms, Version=2.0.6471.16266, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\NUnitForms.dll</HintPath>
@@ -21,85 +11,29 @@
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssemblyCategoryColorTestHelper.cs" />
-    <Compile Include="FailureMechanismAssemblyCategoryGroupControlTestFixture.cs" />
-    <Compile Include="FailureMechanismAssemblyResultWithProbabilityControlTestFixture.cs" />
-    <Compile Include="DataGridViewControlColumnStateDefinitionTestHelper.cs" />
-    <Compile Include="CalculationsViewSynchronizationTester.cs" />
-    <Compile Include="MapFeaturesTestHelper.cs" />
-    <Compile Include="MapThemeTestHelper.cs" />
-    <Compile Include="MapViewTestHelper.cs" />
-    <Compile Include="SetPropertyValueAfterConfirmationParameterTester.cs" />
-    <Compile Include="ControlTestHelper.cs" />
-    <Compile Include="DistributionPropertiesTestHelper.cs" />
-    <Compile Include="FailureMechanismSetPropertyValueAfterConfirmationParameterTester.cs" />
-    <Compile Include="IllustrationPointControlItemComparer.cs" />
-    <Compile Include="MapDataTestHelper.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestCalculationInput.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
-      <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
-      <Name>Core.Common.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Geometry\Core.Common.Geometry.csproj">
-      <Project>{88665510-CE20-4EF5-BE4A-39800720AA2C}</Project>
-      <Name>Core.Common.Geometry</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj">
-      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
-      <Name>Core.Common.Util</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.csproj">
-      <Project>{318BA582-88C9-4816-A54A-A7E431461DE3}</Project>
-      <Name>Core.Components.Gis</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj">
-      <Project>{420ED9C3-0C33-47EA-B893-121A9C0DB4F1}</Project>
-      <Name>Riskeer.AssemblyTool.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Forms\Riskeer.AssemblyTool.Forms.csproj">
-      <Project>{22C5DDB8-2491-4BC6-BDC6-2A7B7EBF40C1}</Project>
-      <Name>Riskeer.AssemblyTool.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.KernelWrapper\Riskeer.AssemblyTool.KernelWrapper.csproj">
-      <Project>{358B6DA2-A1DF-477F-B6AC-C30204265CB0}</Project>
-      <Name>Riskeer.AssemblyTool.KernelWrapper</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\AssemblyTool\test\Riskeer.AssemblyTool.KernelWrapper.TestUtil\Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj">
-      <Project>{0AB432BB-E2CC-42EA-A72C-7AFEF7536B38}</Project>
-      <Name>Riskeer.AssemblyTool.KernelWrapper.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj">
-      <Project>{D4200F43-3F72-4F42-AF0A-8CED416A38EC}</Project>
-      <Name>Riskeer.Common.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj">
-      <Project>{4D840673-3812-4338-A352-84854E32B8A0}</Project>
-      <Name>Riskeer.Common.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj">
-      <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
-      <Name>Riskeer.Common.Data.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Util.TestUtil\Riskeer.Common.Util.TestUtil.csproj">
-      <Project>{54DF6303-BF9A-4AE9-BE09-4AF50EF27412}</Project>
-      <Name>Riskeer.Common.Util.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Geometry\Core.Common.Geometry.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.csproj"/>
+    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj"/>
+    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Forms\Riskeer.AssemblyTool.Forms.csproj"/>
+    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.KernelWrapper\Riskeer.AssemblyTool.KernelWrapper.csproj"/>
+    <ProjectReference Include="..\..\..\AssemblyTool\test\Riskeer.AssemblyTool.KernelWrapper.TestUtil\Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj"/>
+    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj"/>
+    <ProjectReference Include="..\Riskeer.Common.Util.TestUtil\Riskeer.Common.Util.TestUtil.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.IO.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/test/Riskeer.Common.IO.Test/Riskeer.Common.IO.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r2451cb4d1637ed930c35e88b3bcfc220dca045d4
--- Riskeer/Common/test/Riskeer.Common.IO.Test/Riskeer.Common.IO.Test.csproj	(.../Riskeer.Common.IO.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Riskeer/Common/test/Riskeer.Common.IO.Test/Riskeer.Common.IO.Test.csproj	(.../Riskeer.Common.IO.Test.csproj)	(revision 2451cb4d1637ed930c35e88b3bcfc220dca045d4)
@@ -1,198 +1,48 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{7537DE22-3330-4F21-ABA2-FCEF117B4223}</ProjectGuid>
-    <RootNamespace>Riskeer.Common.IO.Test</RootNamespace>
-    <AssemblyName>Riskeer.Common.IO.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
+    <Compile Remove="test-data\**" />
+    <EmbeddedResource Remove="test-data\**" />
+    <None Remove="test-data\**" />
+  </ItemGroup>
+  <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite, Version=1.0.109.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Data.SQLite.Core.1.0.109.2\lib\net45\System.Data.SQLite.dll</HintPath>
-    </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssessmentSectionSettingsReaderTest.cs" />
-    <Compile Include="AssessmentSectionSettingsTest.cs" />
-    <Compile Include="Configurations\Helpers\CalculationScenarioConversionExtensionsTest.cs" />
-    <Compile Include="Configurations\Helpers\WaveReductionConversionExtensionsTest.cs" />
-    <Compile Include="Configurations\Helpers\ConfigurationValidationExtensionsTest.cs" />
-    <Compile Include="Configurations\Helpers\DistributionConversionExtensionsTest.cs" />
-    <Compile Include="Configurations\Helpers\LogExtensionsTest.cs" />
-    <Compile Include="Configurations\Import\ConfigurationImportHelperTest.cs" />
-    <Compile Include="Configurations\StochastConfigurationTest.cs" />
-    <Compile Include="Configurations\ScenarioConfigurationTest.cs" />
-    <Compile Include="Configurations\StructuresCalculationStochastAssignerTest.cs" />
-    <Compile Include="Configurations\WaveReductionConfigurationTest.cs" />
-    <Compile Include="Configurations\Export\CalculationConfigurationExporterTest.cs" />
-    <Compile Include="Configurations\Helpers\ConfigurationBreakWaterTypeConverterTest.cs" />
-    <Compile Include="DikeProfiles\DikeProfileDataReaderTest.cs" />
-    <Compile Include="DikeProfiles\DikeProfileDataTest.cs" />
-    <Compile Include="DikeProfiles\ProfileLocationReaderTest.cs" />
-    <Compile Include="DikeProfiles\ProfileLocationTest.cs" />
-    <Compile Include="Exceptions\CriticalFileValidationExceptionTest.cs" />
-    <Compile Include="Configurations\Import\CalculationConfigurationImporterTest.cs" />
-    <Compile Include="Exceptions\DistributionValidationExceptionTest.cs" />
-    <Compile Include="FileImporters\DikeProfilesImporterTest.cs" />
-    <Compile Include="FileImporters\FailureMechanismSectionUpdateStrategyTest.cs" />
-    <Compile Include="FileImporters\FailureMechanismSectionReplaceStrategyTest.cs" />
-    <Compile Include="FileImporters\FailureMechanismSectionsImporterTest.cs" />
-    <Compile Include="FileImporters\ForeshoreProfilesImporterTest.cs" />
-    <Compile Include="FileImporters\MessageProviders\ImportMessageProviderTest.cs" />
-    <Compile Include="FileImporters\MessageProviders\UpdateMessageProviderTest.cs" />
-    <Compile Include="HydraRing\DesignTablesSettingsProviderTest.cs" />
-    <Compile Include="HydraRing\HydraRingSettingsDatabaseValidatorTest.cs" />
-    <Compile Include="FileImporters\ProfilesImporterTest.cs" />
-    <Compile Include="FileImporters\StructuresImporterTest.cs" />
-    <Compile Include="HydraRing\HydraRingSettingsDatabaseReaderTest.cs" />
-    <Compile Include="HydraRing\HydraulicBoundaryDatabaseHelperTest.cs" />
-    <Compile Include="HydraRing\PreprocessorSettingsProviderTest.cs" />
-    <Compile Include="HydraRing\ReadPreprocessorSettingTest.cs" />
-    <Compile Include="HydraRing\TimeIntegrationSettingsProviderTest.cs" />
-    <Compile Include="HydraRing\NumericsSettingsProviderTest.cs" />
-    <Compile Include="Configurations\Import\CombinedXmlSchemaDefinitionTest.cs" />
-    <Compile Include="Configurations\Helpers\XElementExtensionsTest.cs" />
-    <Compile Include="Configurations\Import\CalculationConfigurationReaderTest.cs" />
-    <Compile Include="Configurations\CalculationGroupConfigurationTest.cs" />
-    <Compile Include="ReferenceLines\ReferenceLineExporterTest.cs" />
-    <Compile Include="ReferenceLines\ReferenceLineMetaImporterTest.cs" />
-    <Compile Include="ReferenceLines\ReferenceLinesMetaReaderTest.cs" />
-    <Compile Include="FailureMechanismSectionReaderTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ReferenceLines\ReferenceLineImporterTest.cs" />
-    <Compile Include="ReferenceLines\ReferenceLineReaderTest.cs" />
-    <Compile Include="ReferenceLines\ReferenceLineWriterTest.cs" />
-    <Compile Include="Configurations\ConfigurationSchemaIdentifiersTest.cs" />
-    <Compile Include="Configurations\StructureCalculationConfigurationTest.cs" />
-    <Compile Include="SoilProfile\CriticalProfilePropertiesTest.cs" />
-    <Compile Include="SoilProfile\LayerPropertiesTest.cs" />
-    <Compile Include="SoilProfile\PreconsolidationStressReadValuesTest.cs" />
-    <Compile Include="SoilProfile\PreconsolidationStressReaderTest.cs" />
-    <Compile Include="SoilProfile\PreconsolidationStressTest.cs" />
-    <Compile Include="SoilProfile\Schema\PreconsolidationStressTableDefinitionsTest.cs" />
-    <Compile Include="SoilProfile\SegmentPointReaderTest.cs" />
-    <Compile Include="SoilProfile\SoilDatabaseConstraintsReaderTest.cs" />
-    <Compile Include="SoilProfile\SoilDatabaseQueryBuilderTest.cs" />
-    <Compile Include="SoilProfile\SoilDatabaseVersionReaderTest.cs" />
-    <Compile Include="SoilProfile\SoilLayer1DTest.cs" />
-    <Compile Include="SoilProfile\SoilLayer2DGeometryReaderTest.cs" />
-    <Compile Include="SoilProfile\SoilLayer2DGeometryTest.cs" />
-    <Compile Include="SoilProfile\SoilLayer2DLoopTest.cs" />
-    <Compile Include="SoilProfile\SoilLayer2DTest.cs" />
-    <Compile Include="SoilProfile\SoilLayerBaseTest.cs" />
-    <Compile Include="SoilProfile\SoilLayerColorConverterTest.cs" />
-    <Compile Include="Exceptions\SoilLayerConversionExceptionTest.cs" />
-    <Compile Include="SoilProfile\DistributionHelperTest.cs" />
-    <Compile Include="SoilProfile\SoilLayerIsAquiferConverterTest.cs" />
-    <Compile Include="SoilProfile\SoilProfile1DReaderTest.cs" />
-    <Compile Include="SoilProfile\SoilProfile1DTest.cs" />
-    <Compile Include="SoilProfile\SoilProfile2DReaderTest.cs" />
-    <Compile Include="SoilProfile\SoilProfile2DTest.cs" />
-    <Compile Include="Exceptions\SoilProfileReadExceptionTest.cs" />
-    <Compile Include="Exceptions\StochasticSoilModelExceptionTest.cs" />
-    <Compile Include="SoilProfile\SoilLayerHelperTest.cs" />
-    <Compile Include="SoilProfile\Schema\SoilProfileTableDefinitionsTest.cs" />
-    <Compile Include="SoilProfile\StochasticSoilModelImporterConfigurationTest.cs" />
-    <Compile Include="SoilProfile\StochasticSoilModelImporterTest.cs" />
-    <Compile Include="SoilProfile\StochasticSoilModelReaderTest.cs" />
-    <Compile Include="SoilProfile\StochasticSoilModelTest.cs" />
-    <Compile Include="SoilProfile\StochasticSoilProfileHelperTest.cs" />
-    <Compile Include="SoilProfile\StochasticSoilProfileTest.cs" />
-    <Compile Include="Structures\StructureLocationReaderTest.cs" />
-    <Compile Include="Structures\StructureLocationTest.cs" />
-    <Compile Include="Structures\StructuresCharacteristicsCsvReaderTest.cs" />
-    <Compile Include="Structures\StructuresParameterRowsValidatorTest.cs" />
-    <Compile Include="Structures\StructuresParameterRowTest.cs" />
-    <Compile Include="Structures\ValidationResultTest.cs" />
-    <Compile Include="Configurations\Export\CalculationConfigurationWriterTest.cs" />
-    <Compile Include="Configurations\Export\StructureCalculationConfigurationWriterTest.cs" />
-    <Compile Include="Configurations\Helpers\XmlWriterExtensionsTest.cs" />
-    <Compile Include="SurfaceLines\CharacteristicPointsCsvReaderTest.cs" />
-    <Compile Include="SurfaceLines\CharacteristicPointsTest.cs" />
-    <Compile Include="SurfaceLines\SurfaceLinesCsvImporterConfigurationTest.cs" />
-    <Compile Include="Exceptions\ImportedDataTransformExceptionTest.cs" />
-    <Compile Include="SurfaceLines\SurfaceLineExtensionsTest.cs" />
-    <Compile Include="SurfaceLines\SurfaceLinesCsvImporterTest.cs" />
-    <Compile Include="SurfaceLines\SurfaceLinesCsvReaderTest.cs" />
-    <Compile Include="SurfaceLines\SurfaceLineTest.cs" />
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.IO\Core.Common.IO.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.Base.TestUtil\Core.Common.Base.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\HydraRing\src\Riskeer.HydraRing.Calculation\Riskeer.HydraRing.Calculation.csproj" />
+    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj" />
+    <ProjectReference Include="..\..\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj" />
+    <ProjectReference Include="..\..\src\Riskeer.Common.IO\Riskeer.Common.IO.csproj" />
+    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj" />
+    <ProjectReference Include="..\Riskeer.Common.IO.TestUtil\Riskeer.Common.IO.TestUtil.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
-      <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
-      <Name>Core.Common.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.IO\Core.Common.IO.csproj">
-      <Project>{e344867e-9ac9-44c8-88a5-8185681679a9}</Project>
-      <Name>Core.Common.IO</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj">
-      <Project>{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}</Project>
-      <Name>Core.Common.Util</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.Base.TestUtil\Core.Common.Base.TestUtil.csproj">
-      <Project>{8E2FAB92-51AA-47B0-B18A-9AC0455EF77D}</Project>
-      <Name>Core.Common.Base.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{d749ee4c-ce50-4c17-bf01-9a953028c126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\HydraRing\src\Riskeer.HydraRing.Calculation\Riskeer.HydraRing.Calculation.csproj">
-      <Project>{888D4097-8BC2-4703-9FB1-8744C94D525E}</Project>
-      <Name>Riskeer.HydraRing.Calculation</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj">
-      <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
-      <Name>Riskeer.Common.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj">
-      <Project>{4d840673-3812-4338-a352-84854e32b8a0}</Project>
-      <Name>Riskeer.Common.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.IO\Riskeer.Common.IO.csproj">
-      <Project>{52ba7627-cbab-4209-be77-3b5f31378277}</Project>
-      <Name>Riskeer.Common.IO</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj">
-      <Project>{4843d6e5-066f-4795-94f5-1d53932dd03c}</Project>
-      <Name>Riskeer.Common.Data.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.IO.TestUtil\Riskeer.Common.IO.TestUtil.csproj">
-      <Project>{33508D7C-1602-4C0D-8503-73AAE98C19E5}</Project>
-      <Name>Riskeer.Common.IO.TestUtil</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="..\..\..\..\packages\System.Data.SQLite.Core.1.0.109.2\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('..\..\..\..\packages\System.Data.SQLite.Core.1.0.109.2\build\net45\System.Data.SQLite.Core.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use 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\System.Data.SQLite.Core.1.0.109.2\build\net45\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\System.Data.SQLite.Core.1.0.109.2\build\net45\System.Data.SQLite.Core.targets'))" />
-  </Target>
+  <ItemGroup>
+    <PackageReference Include="log4net">
+      <Version>2.0.8</Version>
+    </PackageReference>
+    <PackageReference Include="System.Data.SQLite.Core">
+      <Version>1.0.109.2</Version>
+    </PackageReference>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+    <PackageReference Include="RhinoMocks">
+      <Version>3.6.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.IO.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.IO.TestUtil.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/test/Riskeer.Common.IO.TestUtil.Test/Riskeer.Common.IO.TestUtil.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r2451cb4d1637ed930c35e88b3bcfc220dca045d4
--- Riskeer/Common/test/Riskeer.Common.IO.TestUtil.Test/Riskeer.Common.IO.TestUtil.Test.csproj	(.../Riskeer.Common.IO.TestUtil.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Riskeer/Common/test/Riskeer.Common.IO.TestUtil.Test/Riskeer.Common.IO.TestUtil.Test.csproj	(.../Riskeer.Common.IO.TestUtil.Test.csproj)	(revision 2451cb4d1637ed930c35e88b3bcfc220dca045d4)
@@ -1,62 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{516E7E2A-83F6-43EB-895A-A1F4F90FA531}</ProjectGuid>
-    <RootNamespace>Riskeer.Common.IO.TestUtil.Test</RootNamespace>
-    <AssemblyName>Riskeer.Common.IO.TestUtil.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ProgressNotificationTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SoilLayer1DTestFactoryTest.cs" />
-    <Compile Include="SoilLayer2DTestFactoryTest.cs" />
-    <Compile Include="StochasticSoilModelTestFactoryTest.cs" />
-    <Compile Include="StochasticSoilProfileTestFactoryTest.cs" />
-    <Compile Include="TestDikeProfileUpdateStrategyTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj">
-      <Project>{D4200F43-3F72-4F42-AF0A-8CED416A38EC}</Project>
-      <Name>Riskeer.Common.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.IO\Riskeer.Common.IO.csproj">
-      <Project>{52BA7627-CBAB-4209-BE77-3B5F31378277}</Project>
-      <Name>Riskeer.Common.IO</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj">
-      <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
-      <Name>Riskeer.Common.Data.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.IO.TestUtil\Riskeer.Common.IO.TestUtil.csproj">
-      <Project>{33508D7C-1602-4C0D-8503-73AAE98C19E5}</Project>
-      <Name>Riskeer.Common.IO.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.IO\Riskeer.Common.IO.csproj"/>
+    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj"/>
+    <ProjectReference Include="..\Riskeer.Common.IO.TestUtil\Riskeer.Common.IO.TestUtil.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+    <PackageReference Include="RhinoMocks">
+      <Version>3.6.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.IO.TestUtil.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.IO.TestUtil/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/test/Riskeer.Common.IO.TestUtil/Riskeer.Common.IO.TestUtil.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r2451cb4d1637ed930c35e88b3bcfc220dca045d4
--- Riskeer/Common/test/Riskeer.Common.IO.TestUtil/Riskeer.Common.IO.TestUtil.csproj	(.../Riskeer.Common.IO.TestUtil.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Riskeer/Common/test/Riskeer.Common.IO.TestUtil/Riskeer.Common.IO.TestUtil.csproj	(.../Riskeer.Common.IO.TestUtil.csproj)	(revision 2451cb4d1637ed930c35e88b3bcfc220dca045d4)
@@ -1,65 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{33508D7C-1602-4C0D-8503-73AAE98C19E5}</ProjectGuid>
-    <RootNamespace>Riskeer.Common.IO.TestUtil</RootNamespace>
-    <AssemblyName>Riskeer.Common.IO.TestUtil</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_TestUtil.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\TestUtil.targets" />
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CustomCalculationConfigurationExporterDesignGuidelinesTestFixture.cs" />
-    <Compile Include="CustomCalculationConfigurationWriterDesignGuidelinesTestFixture.cs" />
-    <Compile Include="FileTestHelper.cs" />
-    <Compile Include="ProgressNotification.cs" />
-    <Compile Include="ProgressNotificationTestHelper.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SoilLayer1DTestFactory.cs" />
-    <Compile Include="SoilLayer2DTestFactory.cs" />
-    <Compile Include="StochasticSoilModelTestFactory.cs" />
-    <Compile Include="StochasticSoilProfileTestFactory.cs" />
-    <Compile Include="TestConfigurationItem.cs" />
-    <Compile Include="TestDikeProfileUpdateStrategy.cs" />
-    <Compile Include="TestCalculationConfigurationWriter.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.IO\Core.Common.IO.csproj">
-      <Project>{E344867E-9AC9-44C8-88A5-8185681679A9}</Project>
-      <Name>Core.Common.IO</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj">
-      <Project>{D4200F43-3F72-4F42-AF0A-8CED416A38EC}</Project>
-      <Name>Riskeer.Common.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.IO\Riskeer.Common.IO.csproj">
-      <Project>{52BA7627-CBAB-4209-BE77-3B5F31378277}</Project>
-      <Name>Riskeer.Common.IO</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.IO\Core.Common.IO.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.IO\Riskeer.Common.IO.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+    <PackageReference Include="RhinoMocks">
+      <Version>3.6.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.IO.TestUtil/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Plugin.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/test/Riskeer.Common.Plugin.Test/Riskeer.Common.Plugin.Test.csproj
===================================================================
diff -u -rd98a49035ddfbdd477bb48870cee4c3ec18c80f7 -r2451cb4d1637ed930c35e88b3bcfc220dca045d4
--- Riskeer/Common/test/Riskeer.Common.Plugin.Test/Riskeer.Common.Plugin.Test.csproj	(.../Riskeer.Common.Plugin.Test.csproj)	(revision d98a49035ddfbdd477bb48870cee4c3ec18c80f7)
+++ Riskeer/Common/test/Riskeer.Common.Plugin.Test/Riskeer.Common.Plugin.Test.csproj	(.../Riskeer.Common.Plugin.Test.csproj)	(revision 2451cb4d1637ed930c35e88b3bcfc220dca045d4)
@@ -1,65 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{17312C88-D2FC-4354-8A70-8CDEA6EC906A}</ProjectGuid>
-    <RootNamespace>Riskeer.Common.Service.Test</RootNamespace>
-    <AssemblyName>Riskeer.Common.Service.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RiskeerPluginHelperTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
-      <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
-      <Name>Core.Common.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj">
-      <Project>{D4200F43-3F72-4F42-AF0A-8CED416A38EC}</Project>
-      <Name>Riskeer.Common.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj">
-      <Project>{4D840673-3812-4338-A352-84854E32B8A0}</Project>
-      <Name>Riskeer.Common.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Plugin\Riskeer.Common.Plugin.csproj">
-      <Project>{8513B8D6-79C8-4173-B663-59C91AC65E5F}</Project>
-      <Name>Riskeer.Common.Plugin</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj">
-      <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
-      <Name>Riskeer.Common.Data.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Plugin.TestUtil\Riskeer.Common.Plugin.TestUtil.csproj">
-      <Project>{6346BADF-D331-4948-9772-08E8CD1E1FC9}</Project>
-      <Name>Riskeer.Common.Plugin.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Plugin\Riskeer.Common.Plugin.csproj"/>
+    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj"/>
+    <ProjectReference Include="..\Riskeer.Common.Plugin.TestUtil\Riskeer.Common.Plugin.TestUtil.csproj"/>
   </ItemGroup>
-  <Import Project="..\..\..\..\packages\System.Data.SQLite.Core.1.0.109.2\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('..\..\..\..\packages\System.Data.SQLite.Core.1.0.109.2\build\net45\System.Data.SQLite.Core.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use 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\System.Data.SQLite.Core.1.0.109.2\build\net45\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\System.Data.SQLite.Core.1.0.109.2\build\net45\System.Data.SQLite.Core.targets'))" />
-  </Target>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Plugin.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/Riskeer.Common.Plugin.TestUtil.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r2451cb4d1637ed930c35e88b3bcfc220dca045d4
--- Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/Riskeer.Common.Plugin.TestUtil.csproj	(.../Riskeer.Common.Plugin.TestUtil.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/Riskeer.Common.Plugin.TestUtil.csproj	(.../Riskeer.Common.Plugin.TestUtil.csproj)	(revision 2451cb4d1637ed930c35e88b3bcfc220dca045d4)
@@ -1,64 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{6346BADF-D331-4948-9772-08E8CD1E1FC9}</ProjectGuid>
-    <RootNamespace>Riskeer.Common.Plugin.TestUtil</RootNamespace>
-    <AssemblyName>Riskeer.Common.Plugin.TestUtil</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_TestUtil.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\TestUtil.targets" />
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="FileImporters\FailureMechanismSectionResultUpdateStrategyTestFixture.cs" />
-    <Compile Include="HydraulicBoundaryLocationCalculationActivityLogTestHelper.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ShouldCloseViewWithFailureMechanismTester.cs" />
-    <Compile Include="ShouldCloseViewWithCalculationDataTester.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
-      <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
-      <Name>Core.Common.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj">
-      <Project>{D4200F43-3F72-4F42-AF0A-8CED416A38EC}</Project>
-      <Name>Riskeer.Common.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj">
-      <Project>{4D840673-3812-4338-A352-84854E32B8A0}</Project>
-      <Name>Riskeer.Common.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.IO\Riskeer.Common.IO.csproj">
-      <Project>{52BA7627-CBAB-4209-BE77-3B5F31378277}</Project>
-      <Name>Riskeer.Common.IO</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj">
-      <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
-      <Name>Riskeer.Common.Data.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Service.TestUtil\Riskeer.Common.Service.TestUtil.csproj">
-      <Project>{52093DA6-D545-476A-ADFD-12F56625E36B}</Project>
-      <Name>Riskeer.Common.Service.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.IO\Riskeer.Common.IO.csproj"/>
+    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj"/>
+    <ProjectReference Include="..\Riskeer.Common.Service.TestUtil\Riskeer.Common.Service.TestUtil.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+    <PackageReference Include="RhinoMocks">
+      <Version>3.6.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Primitives.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/test/Riskeer.Common.Primitives.Test/Riskeer.Common.Primitives.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r2451cb4d1637ed930c35e88b3bcfc220dca045d4
--- Riskeer/Common/test/Riskeer.Common.Primitives.Test/Riskeer.Common.Primitives.Test.csproj	(.../Riskeer.Common.Primitives.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Riskeer/Common/test/Riskeer.Common.Primitives.Test/Riskeer.Common.Primitives.Test.csproj	(.../Riskeer.Common.Primitives.Test.csproj)	(revision 2451cb4d1637ed930c35e88b3bcfc220dca045d4)
@@ -1,48 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{1EB0FA74-14AA-4863-95DD-B48CFE907BD9}</ProjectGuid>
-    <RootNamespace>Riskeer.Common.Primitives.Test</RootNamespace>
-    <AssemblyName>Riskeer.Common.Primitives.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ManualFailureMechanismSectionAssemblyCategoryGroupTest.cs" />
-    <Compile Include="TailorMadeAssessmentCategoryGroupResultTypeTest.cs" />
-    <Compile Include="TailorMadeAssessmentResultTypeTest.cs" />
-    <Compile Include="DetailedAssessmentResultTypeTest.cs" />
-    <Compile Include="TailorMadeAssessmentProbabilityAndDetailedCalculationResultTypeTest.cs" />
-    <Compile Include="TailorMadeAssessmentProbabilityCalculationResultTypeTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="DetailedAssessmentProbabilityOnlyResultTypeTest.cs" />
-    <Compile Include="SimpleAssessmentResultTypeTest.cs" />
-    <Compile Include="SimpleAssessmentValidityOnlyResultTypeTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj">
-      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
-      <Name>Core.Common.Util</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj">
-      <Project>{78AA56F5-431D-465C-AC50-3173D7E90AC1}</Project>
-      <Name>Riskeer.Common.Primitives</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Primitives.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Service.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/test/Riskeer.Common.Service.Test/Riskeer.Common.Service.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r2451cb4d1637ed930c35e88b3bcfc220dca045d4
--- Riskeer/Common/test/Riskeer.Common.Service.Test/Riskeer.Common.Service.Test.csproj	(.../Riskeer.Common.Service.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/Riskeer.Common.Service.Test.csproj	(.../Riskeer.Common.Service.Test.csproj)	(revision 2451cb4d1637ed930c35e88b3bcfc220dca045d4)
@@ -1,119 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{915A3B93-38F6-4D8B-8204-BE7F4FB0043F}</ProjectGuid>
-    <RootNamespace>Riskeer.Common.Service.Test</RootNamespace>
-    <AssemblyName>Riskeer.Common.Service.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
+    <Compile Remove="test-data\**" />
+    <EmbeddedResource Remove="test-data\**" />
+    <None Remove="test-data\**" />
+  </ItemGroup>
+  <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite, Version=1.0.109.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Data.SQLite.Core.1.0.109.2\lib\net45\System.Data.SQLite.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CalculatableActivityTest.cs" />
-    <Compile Include="ClearResultsTest.cs" />
-    <Compile Include="HydraRingCalculationSettingsFactoryTest.cs" />
-    <Compile Include="HydraRingInputParserTest.cs" />
-    <Compile Include="CalculationServiceHelperTest.cs" />
-    <Compile Include="DesignWaterLevelCalculationActivityTest.cs" />
-    <Compile Include="DesignWaterLevelCalculationServiceTest.cs" />
-    <Compile Include="HydraRingSettingsDatabaseHelperTest.cs" />
-    <Compile Include="HydraulicBoundaryDatabaseConnectionValidatorTest.cs" />
-    <Compile Include="HydraulicBoundaryLocationCalculationActivityFactoryTest.cs" />
-    <Compile Include="IllustrationPoints\IllustrationPointNodeConverterTest.cs" />
-    <Compile Include="IllustrationPoints\CombinationTypeConverterTest.cs" />
-    <Compile Include="IllustrationPoints\GeneralResultConverterTest.cs" />
-    <Compile Include="IllustrationPoints\FaultTreeIllustrationPointConverterTest.cs" />
-    <Compile Include="IllustrationPoints\SubMechanismIllustrationPointConverterTest.cs" />
-    <Compile Include="IllustrationPoints\IllustrationPointResultConverterTest.cs" />
-    <Compile Include="IllustrationPoints\StochastConverterTest.cs" />
-    <Compile Include="IllustrationPoints\TopLevelFaultTreeIllustrationPointConverterTest.cs" />
-    <Compile Include="IllustrationPoints\TopLevelSubMechanismIllustrationPointConverterTest.cs" />
-    <Compile Include="IllustrationPoints\WindDirectionConverterTest.cs" />
-    <Compile Include="MessageProviders\DesignWaterLevelCalculationMessageProviderTest.cs" />
-    <Compile Include="MessageProviders\WaveHeightCalculationMessageProviderTest.cs" />
-    <Compile Include="ParameterNameExtractorTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RiskeerCommonDataCalculationServiceTest.cs" />
-    <Compile Include="RiskeerCommonDataSynchronizationServiceTest.cs" />
-    <Compile Include="Structures\StructuresCalculationServiceBaseTest.cs" />
-    <Compile Include="SynchronizeCalculationWithForeshoreProfileHelperTest.cs" />
-    <Compile Include="TargetProbabilityCalculationServiceHelperTest.cs" />
-    <Compile Include="TargetProbabilityCalculationServiceTest.cs" />
-    <Compile Include="ValidationRules\NumericInputRuleTest.cs" />
-    <Compile Include="ValidationRules\UseBreakWaterRuleTest.cs" />
-    <Compile Include="ValidationRules\VariationCoefficientLogNormalDistributionRuleTest.cs" />
-    <Compile Include="ValidationRules\VariationCoefficientNormalDistributionRuleTest.cs" />
-    <Compile Include="ValidationRules\LogNormalDistributionRuleTest.cs" />
-    <Compile Include="ValidationRules\NormalDistributionRuleTest.cs" />
-    <Compile Include="ValidationRules\ValidationRuleTest.cs" />
-    <Compile Include="WaveHeightCalculationActivityTest.cs" />
-    <Compile Include="WaveHeightCalculationServiceTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj">
-      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
-      <Name>Core.Common.Util</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\HydraRing\src\Riskeer.HydraRing.Calculation\Riskeer.HydraRing.Calculation.csproj">
-      <Project>{888D4097-8BC2-4703-9FB1-8744C94D525E}</Project>
-      <Name>Riskeer.HydraRing.Calculation</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\HydraRing\test\Riskeer.HydraRing.Calculation.TestUtil\Riskeer.HydraRing.Calculation.TestUtil.csproj">
-      <Project>{74CBA865-9338-447F-BAD9-28312446AE84}</Project>
-      <Name>Riskeer.HydraRing.Calculation.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj">
-      <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
-      <Name>Riskeer.Common.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Service\Riskeer.Common.Service.csproj">
-      <Project>{D951D6DA-FE83-4920-9FDB-63BF96480B54}</Project>
-      <Name>Riskeer.Common.Service</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj">
-      <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
-      <Name>Riskeer.Common.Data.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Service.TestUtil\Riskeer.Common.Service.TestUtil.csproj">
-      <Project>{52093DA6-D545-476A-ADFD-12F56625E36B}</Project>
-      <Name>Riskeer.Common.Service.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\HydraRing\src\Riskeer.HydraRing.Calculation\Riskeer.HydraRing.Calculation.csproj" />
+    <ProjectReference Include="..\..\..\HydraRing\test\Riskeer.HydraRing.Calculation.TestUtil\Riskeer.HydraRing.Calculation.TestUtil.csproj" />
+    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj" />
+    <ProjectReference Include="..\..\src\Riskeer.Common.Service\Riskeer.Common.Service.csproj" />
+    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj" />
+    <ProjectReference Include="..\Riskeer.Common.Service.TestUtil\Riskeer.Common.Service.TestUtil.csproj" />
   </ItemGroup>
-  <Import Project="..\..\..\..\packages\System.Data.SQLite.Core.1.0.109.2\build\net45\System.Data.SQLite.Core.targets" Condition="Exists('..\..\..\..\packages\System.Data.SQLite.Core.1.0.109.2\build\net45\System.Data.SQLite.Core.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use 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\System.Data.SQLite.Core.1.0.109.2\build\net45\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\System.Data.SQLite.Core.1.0.109.2\build\net45\System.Data.SQLite.Core.targets'))" />
-  </Target>
+  <ItemGroup>
+    <PackageReference Include="log4net">
+      <Version>2.0.8</Version>
+    </PackageReference>
+    <PackageReference Include="System.Data.SQLite.Core">
+      <Version>1.0.109.2</Version>
+    </PackageReference>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+    <PackageReference Include="RhinoMocks">
+      <Version>3.6.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Service.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Service.TestUtil.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/test/Riskeer.Common.Service.TestUtil.Test/Riskeer.Common.Service.TestUtil.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r2451cb4d1637ed930c35e88b3bcfc220dca045d4
--- Riskeer/Common/test/Riskeer.Common.Service.TestUtil.Test/Riskeer.Common.Service.TestUtil.Test.csproj	(.../Riskeer.Common.Service.TestUtil.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Riskeer/Common/test/Riskeer.Common.Service.TestUtil.Test/Riskeer.Common.Service.TestUtil.Test.csproj	(.../Riskeer.Common.Service.TestUtil.Test.csproj)	(revision 2451cb4d1637ed930c35e88b3bcfc220dca045d4)
@@ -1,47 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{78E175F5-19D3-4F8E-87F1-A38880C51C03}</ProjectGuid>
-    <RootNamespace>Riskeer.Common.Service.TestUtil.Test</RootNamespace>
-    <AssemblyName>Riskeer.Common.Service.TestUtil.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BreakWaterTypeHelperTest.cs" />
-    <Compile Include="CalculationServiceTestHelperTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestStructureValidationRulesRegistryTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj">
-      <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
-      <Name>Riskeer.Common.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Service\Riskeer.Common.Service.csproj">
-      <Project>{d951d6da-fe83-4920-9fdb-63bf96480b54}</Project>
-      <Name>Riskeer.Common.Service</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj">
-      <Project>{4843d6e5-066f-4795-94f5-1d53932dd03c}</Project>
-      <Name>Riskeer.Common.Data.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Service.TestUtil\Riskeer.Common.Service.TestUtil.csproj">
-      <Project>{52093DA6-D545-476A-ADFD-12F56625E36B}</Project>
-      <Name>Riskeer.Common.Service.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Service\Riskeer.Common.Service.csproj"/>
+    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj"/>
+    <ProjectReference Include="..\Riskeer.Common.Service.TestUtil\Riskeer.Common.Service.TestUtil.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Service.TestUtil.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Service.TestUtil/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/test/Riskeer.Common.Service.TestUtil/Riskeer.Common.Service.TestUtil.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r2451cb4d1637ed930c35e88b3bcfc220dca045d4
--- Riskeer/Common/test/Riskeer.Common.Service.TestUtil/Riskeer.Common.Service.TestUtil.csproj	(.../Riskeer.Common.Service.TestUtil.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Riskeer/Common/test/Riskeer.Common.Service.TestUtil/Riskeer.Common.Service.TestUtil.csproj	(.../Riskeer.Common.Service.TestUtil.csproj)	(revision 2451cb4d1637ed930c35e88b3bcfc220dca045d4)
@@ -1,52 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{52093DA6-D545-476A-ADFD-12F56625E36B}</ProjectGuid>
-    <RootNamespace>Riskeer.Common.Service.TestUtil</RootNamespace>
-    <AssemblyName>Riskeer.Common.Service.TestUtil</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_TestUtil.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\TestUtil.targets" />
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BreakWaterTypeHelper.cs" />
-    <Compile Include="CalculationServiceTestHelper.cs" />
-    <Compile Include="HydraRingCalculationSettingsTestHelper.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestStructureValidationRulesRegistry.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\HydraRing\src\Riskeer.HydraRing.Calculation\Riskeer.HydraRing.Calculation.csproj">
-      <Project>{888D4097-8BC2-4703-9FB1-8744C94D525E}</Project>
-      <Name>Riskeer.HydraRing.Calculation</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj">
-      <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
-      <Name>Riskeer.Common.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Service\Riskeer.Common.Service.csproj">
-      <Project>{d951d6da-fe83-4920-9fdb-63bf96480b54}</Project>
-      <Name>Riskeer.Common.Service</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj">
-      <Project>{4843d6e5-066f-4795-94f5-1d53932dd03c}</Project>
-      <Name>Riskeer.Common.Data.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\..\HydraRing\src\Riskeer.HydraRing.Calculation\Riskeer.HydraRing.Calculation.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Service\Riskeer.Common.Service.csproj"/>
+    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Service.TestUtil/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Util.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/test/Riskeer.Common.Util.Test/Riskeer.Common.Util.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r2451cb4d1637ed930c35e88b3bcfc220dca045d4
--- Riskeer/Common/test/Riskeer.Common.Util.Test/Riskeer.Common.Util.Test.csproj	(.../Riskeer.Common.Util.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Riskeer/Common/test/Riskeer.Common.Util.Test/Riskeer.Common.Util.Test.csproj	(.../Riskeer.Common.Util.Test.csproj)	(revision 2451cb4d1637ed930c35e88b3bcfc220dca045d4)
@@ -1,83 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{DEC38676-268F-4A45-BB45-D705FDF5541E}</ProjectGuid>
-    <RootNamespace>Riskeer.Common.Util.Test</RootNamespace>
-    <AssemblyName>Riskeer.Common.Util.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AggregatedHydraulicBoundaryLocationFactoryTest.cs" />
-    <Compile Include="AggregatedHydraulicBoundaryLocationTest.cs" />
-    <Compile Include="AssignUnassignCalculationsTest.cs" />
-    <Compile Include="CalculationWithLocationTest.cs" />
-    <Compile Include="FailureMechanismNormHelperTest.cs" />
-    <Compile Include="HydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs" />
-    <Compile Include="IllustrationPointsHelperTest.cs" />
-    <Compile Include="RiskeerMapDataFeaturesFactoryHelperTest.cs" />
-    <Compile Include="ProjectVersionComparerTest.cs" />
-    <Compile Include="StructuresHelperTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SectionResultWithCalculationAssignmentTest.cs" />
-    <Compile Include="SectionSegmentsHelperTest.cs" />
-    <Compile Include="SectionSegmentsTest.cs" />
-    <Compile Include="ProjectVersionHelperTest.cs" />
-    <Compile Include="TypeConverters\BackgroundDataConverterTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.csproj">
-      <Project>{318BA582-88C9-4816-A54A-A7E431461DE3}</Project>
-      <Name>Core.Components.Gis</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\test\Core.Components.Gis.TestUtil\Core.Components.Gis.TestUtil.csproj">
-      <Project>{F0FB401A-3494-4237-9E6D-02CDF77912A8}</Project>
-      <Name>Core.Components.Gis.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj">
-      <Project>{D4200F43-3F72-4F42-AF0A-8CED416A38EC}</Project>
-      <Name>Riskeer.Common.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Util\Riskeer.Common.Util.csproj">
-      <Project>{6A074D65-A81C-4C1C-8E24-F36C916E4ED7}</Project>
-      <Name>Riskeer.Common.Util</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj">
-      <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
-      <Name>Riskeer.Common.Data.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Forms.TestUtil\Riskeer.Common.Forms.TestUtil.csproj">
-      <Project>{D24FA2F7-28A7-413B-AFD3-EE10E985630B}</Project>
-      <Name>Riskeer.Common.Forms.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Util.TestUtil\Riskeer.Common.Util.TestUtil.csproj">
-      <Project>{54DF6303-BF9A-4AE9-BE09-4AF50EF27412}</Project>
-      <Name>Riskeer.Common.Util.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Components\test\Core.Components.Gis.TestUtil\Core.Components.Gis.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Util\Riskeer.Common.Util.csproj"/>
+    <ProjectReference Include="..\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj"/>
+    <ProjectReference Include="..\Riskeer.Common.Forms.TestUtil\Riskeer.Common.Forms.TestUtil.csproj"/>
+    <ProjectReference Include="..\Riskeer.Common.Util.TestUtil\Riskeer.Common.Util.TestUtil.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+    <PackageReference Include="RhinoMocks">
+      <Version>3.6.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Util.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Util.TestUtil.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/test/Riskeer.Common.Util.TestUtil.Test/Riskeer.Common.Util.TestUtil.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r2451cb4d1637ed930c35e88b3bcfc220dca045d4
--- Riskeer/Common/test/Riskeer.Common.Util.TestUtil.Test/Riskeer.Common.Util.TestUtil.Test.csproj	(.../Riskeer.Common.Util.TestUtil.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Riskeer/Common/test/Riskeer.Common.Util.TestUtil.Test/Riskeer.Common.Util.TestUtil.Test.csproj	(.../Riskeer.Common.Util.TestUtil.Test.csproj)	(revision 2451cb4d1637ed930c35e88b3bcfc220dca045d4)
@@ -1,44 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{B8CE6045-5831-47C1-B02C-BAABD53D7407}</ProjectGuid>
-    <RootNamespace>Riskeer.Common.Util.TestUtil.Test</RootNamespace>
-    <AssemblyName>Riskeer.Common.Util.TestUtil.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AggregatedHydraulicBoundaryLocationTestHelperTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Util\Riskeer.Common.Util.csproj">
-      <Project>{6A074D65-A81C-4C1C-8E24-F36C916E4ED7}</Project>
-      <Name>Riskeer.Common.Util</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.Common.Util.TestUtil\Riskeer.Common.Util.TestUtil.csproj">
-      <Project>{54DF6303-BF9A-4AE9-BE09-4AF50EF27412}</Project>
-      <Name>Riskeer.Common.Util.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Util\Riskeer.Common.Util.csproj"/>
+    <ProjectReference Include="..\Riskeer.Common.Util.TestUtil\Riskeer.Common.Util.TestUtil.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Util.TestUtil.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Util.TestUtil/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/test/Riskeer.Common.Util.TestUtil/Riskeer.Common.Util.TestUtil.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r2451cb4d1637ed930c35e88b3bcfc220dca045d4
--- Riskeer/Common/test/Riskeer.Common.Util.TestUtil/Riskeer.Common.Util.TestUtil.csproj	(.../Riskeer.Common.Util.TestUtil.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Riskeer/Common/test/Riskeer.Common.Util.TestUtil/Riskeer.Common.Util.TestUtil.csproj	(.../Riskeer.Common.Util.TestUtil.csproj)	(revision 2451cb4d1637ed930c35e88b3bcfc220dca045d4)
@@ -1,45 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{54DF6303-BF9A-4AE9-BE09-4AF50EF27412}</ProjectGuid>
-    <RootNamespace>Riskeer.Common.Util.TestUtil</RootNamespace>
-    <AssemblyName>Riskeer.Common.Util.TestUtil</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_TestUtil.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\TestUtil.targets" />
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AggregatedHydraulicBoundaryLocationTestHelper.cs" />
-    <Compile Include="MapFeaturesMetaDataTestHelper.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.csproj">
-      <Project>{318BA582-88C9-4816-A54A-A7E431461DE3}</Project>
-      <Name>Core.Components.Gis</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.Common.Util\Riskeer.Common.Util.csproj">
-      <Project>{6A074D65-A81C-4C1C-8E24-F36C916E4ED7}</Project>
-      <Name>Riskeer.Common.Util</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.Common.Util\Riskeer.Common.Util.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 2451cb4d1637ed930c35e88b3bcfc220dca045d4 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Util.TestUtil/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?