Index: Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9
--- Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj	(.../Core.Common.Base.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj	(.../Core.Common.Base.Test.csproj)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
@@ -1,82 +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>{FAFDB463-9612-41F4-B3DD-FF9C6E7023BA}</ProjectGuid>
-    <RootNamespace>Core.Common.Base.Test</RootNamespace>
-    <AssemblyName>Core.Common.Base.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <Reference Include="MathNet.Numerics, Version=3.19.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\MathNet.Numerics.3.19.0\lib\net40\MathNet.Numerics.dll</HintPath>
-      <Private>True</Private>
-    </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>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Data\RangeTest.cs" />
-    <Compile Include="Data\RoundedDoubleTest.cs" />
-    <Compile Include="Data\RoundedPoint2DCollectionTest.cs" />
-    <Compile Include="FormattableConstantsTest.cs" />
-    <Compile Include="Geometry\Math2DTest.cs" />
-    <Compile Include="Geometry\Point2DTest.cs" />
-    <Compile Include="Geometry\Point2DCollectionExtensionsTest.cs" />
-    <Compile Include="Geometry\Point3DCollectionExtensionsTest.cs" />
-    <Compile Include="Geometry\Point3DExtensionsTest.cs" />
-    <Compile Include="Geometry\Point3DTest.cs" />
-    <Compile Include="Geometry\Segment2DCollectionExtensionsTest.cs" />
-    <Compile Include="Geometry\Segment2DExtensionsTest.cs" />
-    <Compile Include="Geometry\Segment2DIntersectSegment2DResultTest.cs" />
-    <Compile Include="Geometry\Segment2DTest.cs" />
-    <Compile Include="IO\CriticalFileReadExceptionTest.cs" />
-    <Compile Include="IO\FileImporterBaseTest.cs" />
-    <Compile Include="CloneableObservableTest.cs" />
-    <Compile Include="CloneableObservableListTest.cs" />
-    <Compile Include="ObservableTest.cs" />
-    <Compile Include="ObserverTest.cs" />
-    <Compile Include="RecursiveObserverTest.cs" />
-    <Compile Include="Service\ActivityTest.cs" />
-    <Compile Include="ObservableListTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Service\FileImportActivityTest.cs" />
-    <Compile Include="ObservableUniqueItemCollectionWithSourcePathTest.cs" />
-    <Compile Include="Storage\StorageExceptionTest.cs" />
-    <Compile Include="Storage\StorageValidationExceptionTest.cs" />
-    <Compile Include="Storage\CouldNotConnectExceptionTest.cs" />
-    <Compile Include="Storage\UpdateStorageExceptionTest.cs" />
-    <Compile Include="TypeConverters\RoundedDoubleConverterTest.cs" />
+    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\Core.Common.Base.TestUtil\Core.Common.Base.TestUtil.csproj"/>
+    <ProjectReference Include="..\Core.Common.Data.TestUtil\Core.Common.Data.TestUtil.csproj"/>
+    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\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.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.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.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="MathNet.Numerics">
+      <Version>3.19.0</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 fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Base.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Base.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Base.TestUtil.Test/Core.Common.Base.TestUtil.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9
--- Core/Common/test/Core.Common.Base.TestUtil.Test/Core.Common.Base.TestUtil.Test.csproj	(.../Core.Common.Base.TestUtil.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Core/Common/test/Core.Common.Base.TestUtil.Test/Core.Common.Base.TestUtil.Test.csproj	(.../Core.Common.Base.TestUtil.Test.csproj)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
@@ -1,37 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{0B1AECB4-109F-4301-AC33-902AA3554803}</ProjectGuid>
-    <RootNamespace>Core.Common.Base.TestUtil.Test</RootNamespace>
-    <AssemblyName>Core.Common.Base.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="Geometry\Point2DComparerWithToleranceTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\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.Base.TestUtil\Core.Common.Base.TestUtil.csproj">
-      <Project>{8E2FAB92-51AA-47B0-B18A-9AC0455EF77D}</Project>
-      <Name>Core.Common.Base.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\Core.Common.Base.TestUtil\Core.Common.Base.TestUtil.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Base.TestUtil.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Base.TestUtil.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Base.TestUtil/Core.Common.Base.TestUtil.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9
--- Core/Common/test/Core.Common.Base.TestUtil/Core.Common.Base.TestUtil.csproj	(.../Core.Common.Base.TestUtil.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Core/Common/test/Core.Common.Base.TestUtil/Core.Common.Base.TestUtil.csproj	(.../Core.Common.Base.TestUtil.csproj)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
@@ -1,34 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{8E2FAB92-51AA-47B0-B18A-9AC0455EF77D}</ProjectGuid>
-    <RootNamespace>Core.Common.Base.TestUtil</RootNamespace>
-    <AssemblyName>Core.Common.Base.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="Geometry\GeometryCloneAssert.cs" />
-    <Compile Include="Geometry\Point2DComparerWithTolerance.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Base.TestUtil/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Base.TestUtil/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Controls.Test/Core.Common.Controls.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9
--- Core/Common/test/Core.Common.Controls.Test/Core.Common.Controls.Test.csproj	(.../Core.Common.Controls.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Core/Common/test/Core.Common.Controls.Test/Core.Common.Controls.Test.csproj	(.../Core.Common.Controls.Test.csproj)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
@@ -1,77 +1,44 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{A8CE1456-1880-4FC8-84B3-D618EA88F384}</ProjectGuid>
-    <RootNamespace>Core.Common.Controls.Test</RootNamespace>
-    <AssemblyName>Core.Common.Controls.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="Rhino.Mocks">
-      <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BorderedLabelTest.cs" />
-    <Compile Include="DataGrid\CellStyleTest.cs" />
-    <Compile Include="DataGrid\DataGridViewColorCellTest.cs" />
-    <Compile Include="DataGrid\DataGridViewColorColumnTest.cs" />
-    <Compile Include="DataGrid\DataGridViewColumnStateDefinitionFactoryTest.cs" />
-    <Compile Include="DataGrid\DataGridViewColumnStateDefinitionTest.cs" />
-    <Compile Include="DataGrid\DataGridViewComboBoxItemWrapperTest.cs" />
-    <Compile Include="DataGrid\DataGridViewControlCellFormatExtensionsTest.cs" />
-    <Compile Include="DataGrid\DataGridViewControlTest.cs" />
-    <Compile Include="DataGrid\EnhancedDataGridViewTest.cs" />
-    <Compile Include="Dialogs\DialogBaseTest.cs" />
-    <Compile Include="PresentationObjects\ObservableWrappedObjectContextBaseTest.cs" />
-    <Compile Include="PresentationObjects\WrappedObjectContextBaseTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <DependentUpon>Resources.resx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="TextEditor\RichTextBoxControlTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Core.Common.Controls\Core.Common.Controls.csproj">
-      <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
-      <Name>Core.Common.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\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.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Common.Controls\Core.Common.Controls.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Common.Util\Core.Common.Util.csproj"/>
+    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </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 fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Controls.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Controls.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Controls.TreeView.Test/Core.Common.Controls.TreeView.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9
--- Core/Common/test/Core.Common.Controls.TreeView.Test/Core.Common.Controls.TreeView.Test.csproj	(.../Core.Common.Controls.TreeView.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Core/Common/test/Core.Common.Controls.TreeView.Test/Core.Common.Controls.TreeView.Test.csproj	(.../Core.Common.Controls.TreeView.Test.csproj)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
@@ -1,57 +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>{0EDC6D7D-E9CD-408A-9EA9-3E7D426809C8}</ProjectGuid>
-    <RootNamespace>Core.Common.Controls.TreeView.Test</RootNamespace>
-    <AssemblyName>Core.Common.Controls.TreeView.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="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" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DragDropHandlerTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TreeNodeCheckedStateTest.cs" />
-    <Compile Include="TreeNodeInfoTest.cs" />
-    <Compile Include="TreeViewControlTest.cs" />
+    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Common.Controls.TreeView\Core.Common.Controls.TreeView.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Common.Util\Core.Common.Util.csproj"/>
+    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Core.Common.Controls.TreeView\Core.Common.Controls.TreeView.csproj">
-      <Project>{1d27f91f-4e62-4eaf-a0a8-a32708b9a9b1}</Project>
-      <Name>Core.Common.Controls.TreeView</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\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.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{d749ee4c-ce50-4c17-bf01-9a953028c126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.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 fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Controls.TreeView.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Controls.TreeView.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Data.TestUtil.Test/Core.Common.Data.TestUtil.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9
--- Core/Common/test/Core.Common.Data.TestUtil.Test/Core.Common.Data.TestUtil.Test.csproj	(.../Core.Common.Data.TestUtil.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Core/Common/test/Core.Common.Data.TestUtil.Test/Core.Common.Data.TestUtil.Test.csproj	(.../Core.Common.Data.TestUtil.Test.csproj)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
@@ -1,37 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{AE665B65-7370-4DAE-9CAD-BBB8D1706C6B}</ProjectGuid>
-    <RootNamespace>Core.Common.Data.TestUtil.Test</RootNamespace>
-    <AssemblyName>Core.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="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CoreCloneAssertTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\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.Data.TestUtil\Core.Common.Data.TestUtil.csproj">
-      <Project>{0B0D2DFF-7E7E-4BB0-A007-61800C85809A}</Project>
-      <Name>Core.Common.Data.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\Core.Common.Data.TestUtil\Core.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 fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Data.TestUtil.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Data.TestUtil.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Data.TestUtil/Core.Common.Data.TestUtil.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9
--- Core/Common/test/Core.Common.Data.TestUtil/Core.Common.Data.TestUtil.csproj	(.../Core.Common.Data.TestUtil.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Core/Common/test/Core.Common.Data.TestUtil/Core.Common.Data.TestUtil.csproj	(.../Core.Common.Data.TestUtil.csproj)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
@@ -1,33 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{0B0D2DFF-7E7E-4BB0-A007-61800C85809A}</ProjectGuid>
-    <RootNamespace>Core.Common.Data.TestUtil</RootNamespace>
-    <AssemblyName>Core.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="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CoreCloneAssert.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Data.TestUtil/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Data.TestUtil/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Geometry.Test/Core.Common.Geometry.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9
--- Core/Common/test/Core.Common.Geometry.Test/Core.Common.Geometry.Test.csproj	(.../Core.Common.Geometry.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Core/Common/test/Core.Common.Geometry.Test/Core.Common.Geometry.Test.csproj	(.../Core.Common.Geometry.Test.csproj)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
@@ -1,42 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{E23513DE-B7D0-4415-BCDF-5A33CD084388}</ProjectGuid>
-    <RootNamespace>Core.Common.Geometry.Test</RootNamespace>
-    <AssemblyName>Core.Common.Geometry.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="AdvancedMath2DTest.cs" />
-    <Compile Include="InvalidPolygonExceptionTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\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.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Common.Geometry\Core.Common.Geometry.csproj"/>
+    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Geometry.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Geometry.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj
===================================================================
diff -u -r4f8fe77259027be8c5fc5af2a6641f3a0d0f6e21 -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9
--- Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj	(.../Core.Common.Gui.Test.csproj)	(revision 4f8fe77259027be8c5fc5af2a6641f3a0d0f6e21)
+++ Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj	(.../Core.Common.Gui.Test.csproj)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
@@ -1,31 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{D5EC1DF2-03C9-467B-B6AF-BE5AC83417F8}</ProjectGuid>
-    <RootNamespace>Core.Common.Gui.Test</RootNamespace>
-    <AssemblyName>Core.Common.Gui.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <Reference Include="Fluent, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e436e32a8c5546f, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net45\Fluent.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <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="NUnitForms">
       <HintPath>..\..\..\..\lib\NUnitForms.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="Rhino.Mocks">
-      <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -34,130 +14,51 @@
     <Reference Include="System.XML" />
     <Reference Include="WindowsBase" />
     <Reference Include="WindowsFormsIntegration" />
-    <Reference Include="Xceed.Wpf.AvalonDock, Version=2.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\AvalonDock.2.0.2000\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Appenders\RiskeerUserDataFolderConverterTest.cs" />
-    <Compile Include="Attributes\DynamicPropertyOrderEvaluationMethodAttributeTest.cs" />
-    <Compile Include="Attributes\DynamicPropertyOrderAttributeTest.cs" />
-    <Compile Include="Attributes\DynamicReadOnlyAttributeTest.cs" />
-    <Compile Include="Attributes\DynamicReadOnlyValidationMethodAttributeTest.cs" />
-    <Compile Include="Attributes\DynamicVisibleAttributeTest.cs" />
-    <Compile Include="Attributes\DynamicVisibleValidationMethodAttributeTest.cs" />
-    <Compile Include="Attributes\PropertyOrderAttributeTest.cs" />
-    <Compile Include="Attributes\TestCaseClasses\DynamicPropertyOrderTestCases.cs" />
-    <Compile Include="Attributes\TestCaseClasses\DynamicReadOnlyTestCases.cs" />
-    <Compile Include="Attributes\TestCaseClasses\DynamicVisibilityTestCases.cs" />
-    <Compile Include="Commands\ApplicationFeatureCommandHandlerTest.cs" />
-    <Compile Include="Commands\GuiExportHandlerTest.cs" />
-    <Compile Include="Commands\GuiUpdateHandlerTest.cs" />
-    <Compile Include="Commands\GuiImportHandlerTest.cs" />
-    <Compile Include="Commands\StorageCommandHandlerTest.cs" />
-    <Compile Include="Commands\ViewCommandHandlerTest.cs" />
-    <Compile Include="ContextMenu\ContextMenuBuilderExceptionTest.cs" />
-    <Compile Include="ContextMenu\ContextMenuBuilderTest.cs" />
-    <Compile Include="ContextMenu\StrictContextMenuItemTest.cs" />
-    <Compile Include="ContextMenu\TreeViewContextMenuItemFactoryTest.cs" />
-    <Compile Include="ContextMenu\GuiContextMenuItemFactoryTest.cs" />
-    <Compile Include="Converters\KeyValueAsRoundedDoubleWithoutTrailingZeroesElementAttributeTest.cs" />
-    <Compile Include="Converters\KeyValueElementAttributeTest.cs" />
-    <Compile Include="Converters\KeyValueExpandableArrayConverterTest.cs" />
-    <Compile Include="Converters\ExpandableArrayConverterTest.cs" />
-    <Compile Include="Converters\ExpandableReadOnlyArrayConverterTest.cs" />
-    <Compile Include="Converters\ColorTypeConverterTest.cs" />
-    <Compile Include="Converters\PngToIconConverterTest.cs" />
-    <Compile Include="ExceptionDialogTest.cs" />
-    <Compile Include="Forms\MainWindow\MainWindowTest.cs" />
-    <Compile Include="Forms\MessageWindow\MessageWindowDialogTest.cs" />
-    <Compile Include="Forms\MessageWindow\MessageWindowLogAppenderTest.cs" />
-    <Compile Include="Forms\MessageWindow\MessageWindowTest.cs" />
-    <Compile Include="Forms\ProgressDialog\ActivityProgressDialogTest.cs" />
-    <Compile Include="Forms\PropertyGridView\PropertyGridViewTest.cs" />
-    <Compile Include="Forms\PropertyGridView\PropertyResolverTest.cs" />
-    <Compile Include="Forms\RichTextFileTest.cs" />
-    <Compile Include="Forms\RichTextViewTest.cs" />
-    <Compile Include="Forms\SelectItemDialogTest.cs" />
-    <Compile Include="Forms\SelectViewDialogTest.cs" />
-    <Compile Include="Forms\SplashScreen\SplashScreenTest.cs" />
-    <Compile Include="Forms\ViewHost\AvalonDockViewHostTest.cs" />
-    <Compile Include="Forms\ViewHost\TestView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Forms\ViewHost\TestView.Designer.cs">
-      <DependentUpon>TestView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\ViewHost\DocumentViewControllerTest.cs" />
-    <Compile Include="DialogBasedInquiryHelperTest.cs" />
-    <Compile Include="OpenProjectActivityTest.cs" />
-    <Compile Include="Plugin\ExportInfoTest.cs" />
-    <Compile Include="Forms\ViewHost\ViewChangeEventArgsTest.cs" />
-    <Compile Include="Plugin\UpdateInfoTest.cs" />
-    <Compile Include="Plugin\ImportInfoTest.cs" />
-    <Compile Include="Plugin\PluginBaseTest.cs" />
-    <Compile Include="Plugin\PropertyInfoTest.cs" />
-    <Compile Include="Plugin\ViewInfoTest.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="PropertyBag\DynamicPropertyBagTest.cs" />
-    <Compile Include="PropertyBag\ObjectPropertiesTest.cs" />
-    <Compile Include="PropertyBag\PropertySpecDescriptorTest.cs" />
-    <Compile Include="PropertyBag\PropertySpecTest.cs" />
-    <Compile Include="GuiCoreTest.cs" />
-    <Compile Include="PropertyBag\ReadOnlyPropertyDescriptorDecoratorTest.cs" />
-    <Compile Include="SaveProjectActivityTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UITypeEditors\ColorEditorTest.cs" />
-    <Compile Include="UITypeEditors\SelectionEditorTest.cs" />
-    <Compile Include="ViewPropertyEditorTest.cs" />
+    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Common.Controls.TreeView\Core.Common.Controls.TreeView.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Common.Controls\Core.Common.Controls.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Common.Gui\Core.Common.Gui.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Common.Util\Core.Common.Util.csproj"/>
+    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Core.Common.Controls.TreeView\Core.Common.Controls.TreeView.csproj">
-      <Project>{1d27f91f-4e62-4eaf-a0a8-a32708b9a9b1}</Project>
-      <Name>Core.Common.Controls.TreeView</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Core.Common.Controls\Core.Common.Controls.csproj">
-      <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
-      <Name>Core.Common.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Core.Common.Gui\Core.Common.Gui.csproj">
-      <Project>{30e4c2ae-719e-4d70-9fa9-668a9767fbfa}</Project>
-      <Name>Core.Common.Gui</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\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.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
+ <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Forms\ViewHost\TestView.resx">
-      <DependentUpon>TestView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
+    <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\abacus.png" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Fluent.Ribbon">
+      <Version>3.4.0</Version>
+    </PackageReference>
+    <PackageReference Include="log4net">
+      <Version>2.0.8</Version>
+    </PackageReference>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+    <PackageReference Include="RhinoMocks">
+      <Version>3.6.1</Version>
+    </PackageReference>
+    <PackageReference Include="AvalonDock">
+      <Version>2.0.2000</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Gui.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Gui.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Gui.TestUtil.Test/Core.Common.Gui.TestUtil.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9
--- Core/Common/test/Core.Common.Gui.TestUtil.Test/Core.Common.Gui.TestUtil.Test.csproj	(.../Core.Common.Gui.TestUtil.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Core/Common/test/Core.Common.Gui.TestUtil.Test/Core.Common.Gui.TestUtil.Test.csproj	(.../Core.Common.Gui.TestUtil.Test.csproj)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
@@ -1,48 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{10BD4C80-F871-4604-9EBB-29C4CD1E1716}</ProjectGuid>
-    <RootNamespace>Core.Common.Gui.TestUtil.Test</RootNamespace>
-    <AssemblyName>Core.Common.Gui.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="ContextMenu\CustomItemsOnlyContextMenuBuilderTest.cs" />
-    <Compile Include="PluginTestHelperTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Core.Common.Controls\Core.Common.Controls.csproj">
-      <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
-      <Name>Core.Common.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\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.Gui.TestUtil\Core.Common.Gui.TestUtil.csproj">
-      <Project>{26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}</Project>
-      <Name>Core.Common.Gui.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Common.Controls\Core.Common.Controls.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Common.Gui\Core.Common.Gui.csproj"/>
+    <ProjectReference Include="..\Core.Common.Gui.TestUtil\Core.Common.Gui.TestUtil.csproj"/>
+    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Gui.TestUtil.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Gui.TestUtil.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Gui.TestUtil/Core.Common.Gui.TestUtil.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9
--- Core/Common/test/Core.Common.Gui.TestUtil/Core.Common.Gui.TestUtil.csproj	(.../Core.Common.Gui.TestUtil.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Core/Common/test/Core.Common.Gui.TestUtil/Core.Common.Gui.TestUtil.csproj	(.../Core.Common.Gui.TestUtil.csproj)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
@@ -1,15 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}</ProjectGuid>
-    <RootNamespace>Core.Common.Gui.TestUtil</RootNamespace>
-    <AssemblyName>Core.Common.Gui.TestUtil</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_TestUtil.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\TestUtil.targets" />
   <ItemGroup>
-    <Compile Include="ContextMenu\CustomItemsOnlyContextMenuBuilder.cs" />
-    <Compile Include="PluginTestHelper.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Reference Include="System" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Core.Common.Gui\Core.Common.Gui.csproj">
@@ -18,18 +12,13 @@
     </ProjectReference>
   </ItemGroup>
   <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.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Gui.TestUtil/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Gui.TestUtil/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.IO.Test/Core.Common.IO.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9
--- Core/Common/test/Core.Common.IO.Test/Core.Common.IO.Test.csproj	(.../Core.Common.IO.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Core/Common/test/Core.Common.IO.Test/Core.Common.IO.Test.csproj	(.../Core.Common.IO.Test.csproj)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
@@ -1,67 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{06EAFA1E-707B-488A-B360-ECE0F870CACF}</ProjectGuid>
-    <RootNamespace>Core.Common.IO.Test</RootNamespace>
-    <AssemblyName>Core.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="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.Data" />
-    <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="Exceptions\ConversionExceptionTest.cs" />
-    <Compile Include="Exceptions\CriticalFileWriteExceptionTest.cs" />
-    <Compile Include="Exceptions\LineParseExceptionTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Readers\SqLiteDatabaseReaderBaseTest.cs" />
-    <Compile Include="Readers\ReadResultTest.cs" />
-    <Compile Include="Readers\IDataReaderExtensionsTest.cs" />
-    <Compile Include="Readers\StreamReaderHelperTest.cs" />
-    <Compile Include="SqLiteConnectionStringBuilderTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Core.Common.IO\Core.Common.IO.csproj">
-      <Project>{E344867E-9AC9-44C8-88A5-8185681679A9}</Project>
-      <Name>Core.Common.IO</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\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.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Common.IO\Core.Common.IO.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Common.Util\Core.Common.Util.csproj"/>
+    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.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>
+    <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 fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.IO.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.IO.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Integration.Test/Core.Common.Integration.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9
--- Core/Common/test/Core.Common.Integration.Test/Core.Common.Integration.Test.csproj	(.../Core.Common.Integration.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Core/Common/test/Core.Common.Integration.Test/Core.Common.Integration.Test.csproj	(.../Core.Common.Integration.Test.csproj)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
@@ -1,62 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{A6A434E0-AE5A-4D5B-97D7-532B00FBDFE9}</ProjectGuid>
-    <RootNamespace>Core.Common.Integration.Test</RootNamespace>
-    <AssemblyName>Core.Common.Integration.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
-    <Reference Include="Fluent, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e436e32a8c5546f, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net45\Fluent.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="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <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.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Riskeer\Application.Riskeer\GuiCoreIntegrationTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <ProjectReference Include="..\..\..\..\Riskeer\Integration\src\Riskeer.Integration.Plugin\Riskeer.Integration.Plugin.csproj"/>
+    <ProjectReference Include="..\..\..\Plugins\src\Core.Plugins.ProjectExplorer\Core.Plugins.ProjectExplorer.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Common.Gui\Core.Common.Gui.csproj"/>
+    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Riskeer\Integration\src\Riskeer.Integration.Plugin\Riskeer.Integration.Plugin.csproj">
-      <Project>{C8383B76-B3F1-4E6E-B56C-527B469FA20A}</Project>
-      <Name>Riskeer.Integration.Plugin</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Plugins\src\Core.Plugins.ProjectExplorer\Core.Plugins.ProjectExplorer.csproj">
-      <Project>{ed20dba9-d577-423f-a68d-a0a8130fb10b}</Project>
-      <Name>Core.Plugins.ProjectExplorer</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\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.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Fluent.Ribbon">
+      <Version>3.4.0</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 fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Integration.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/GuiCoreIntegrationTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Integration.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.TestUtil.Test/Core.Common.TestUtil.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9
--- Core/Common/test/Core.Common.TestUtil.Test/Core.Common.TestUtil.Test.csproj	(.../Core.Common.TestUtil.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Core/Common/test/Core.Common.TestUtil.Test/Core.Common.TestUtil.Test.csproj	(.../Core.Common.TestUtil.Test.csproj)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
@@ -1,86 +1,49 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{FAF691DE-EAF5-44E0-A865-5A03FB395ED1}</ProjectGuid>
-    <RootNamespace>Core.Common.TestUtil.Test</RootNamespace>
-    <AssemblyName>Core.Common.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="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>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ChangePropertyDataTest.cs" />
-    <Compile Include="ControlsTestHelperTest.cs" />
-    <Compile Include="DirectoryDisposeHelperTest.cs" />
-    <Compile Include="DoubleWithToleranceComparerTest.cs" />
-    <Compile Include="FileDisposeHelperTest.cs" />
-    <Compile Include="DirectoryPermissionsRevokerTest.cs" />
-    <Compile Include="InvalidPathHelperTest.cs" />
-    <Compile Include="LogLevelConstantExtensionsTest.cs" />
-    <Compile Include="PropertiesTestHelperTest.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="RandomExtensionsTest.cs" />
-    <Compile Include="SerializationTestHelperTest.cs" />
-    <Compile Include="TestHelperTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="WindowsFormsTestHelperTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Core.Common.Gui\Core.Common.Gui.csproj">
-      <Project>{30e4c2ae-719e-4d70-9fa9-668a9767fbfa}</Project>
-      <Name>Core.Common.Gui</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\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.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Common.Gui\Core.Common.Gui.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Common.Util\Core.Common.Util.csproj"/>
+    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\abacus.png" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="Resources\acorn.png" />
+    <None Include="Resources\double-abacus.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\double-abacus.png" />
+    <PackageReference Include="log4net">
+      <Version>2.0.8</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 fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtil.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtil.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj
===================================================================
diff -u -r56d072b8342f3e54ba89124ab918bd1529e257a3 -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9
--- Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj	(.../Core.Common.TestUtil.csproj)	(revision 56d072b8342f3e54ba89124ab918bd1529e257a3)
+++ Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj	(.../Core.Common.TestUtil.csproj)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
@@ -1,19 +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>{D749EE4C-CE50-4C17-BF01-9A953028C126}</ProjectGuid>
-    <RootNamespace>Core.Common.TestUtil</RootNamespace>
-    <AssemblyName>Core.Common.TestUtil</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_TestUtil.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\TestUtil.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="NUnitForms">
       <HintPath>..\..\..\..\lib\NUnitForms.dll</HintPath>
     </Reference>
@@ -28,80 +15,16 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ChangePropertyData.cs" />
-    <Compile Include="ControlsTestHelper.cs" />
-    <Compile Include="CustomExceptionDesignGuidelinesTestFixture.cs" />
-    <Compile Include="DataGridViewTestHelper.cs" />
-    <Compile Include="DirectoryDisposeHelper.cs" />
-    <Compile Include="DoubleWithToleranceComparer.cs" />
-    <Compile Include="EnumValuesTestFixture.cs" />
-    <Compile Include="EnumWithNameTestFixture.cs" />
-    <Compile Include="EnumWithXmlEnumNameTestFixture.cs" />
-    <Compile Include="EnumWithResourcesDisplayNameTestFixture.cs" />
-    <Compile Include="EqualsTestFixture.cs" />
-    <Compile Include="FileDisposeHelper.cs" />
-    <Compile Include="DirectoryPermissionsRevoker.cs" />
-    <Compile Include="GuiTestHelper.cs" />
-    <Compile Include="InvalidPathHelper.cs" />
-    <Compile Include="LogHelper.cs" />
-    <Compile Include="LogLevelConstant.cs" />
-    <Compile Include="PropertiesTestHelper.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <DependentUpon>Resources.resx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="RandomExtensions.cs" />
-    <Compile Include="SerializationTestHelper.cs" />
-    <Compile Include="TestDataPath.cs" />
-    <Compile Include="TestHelper.cs" />
-    <Compile Include="WindowsFormsTestHelper.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="WindowsFormsTestHelper.Designer.cs">
-      <DependentUpon>WindowsFormsTestHelper.cs</DependentUpon>
-    </Compile>
-    <Compile Include="WpfTestHelper.xaml.cs">
-      <DependentUpon>WpfTestHelper.xaml</DependentUpon>
-    </Compile>
+    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Common.Gui\Core.Common.Gui.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Common.Util\Core.Common.Util.csproj"/>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Core.Common.Gui\Core.Common.Gui.csproj">
-      <Project>{30e4c2ae-719e-4d70-9fa9-668a9767fbfa}</Project>
-      <Name>Core.Common.Gui</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Core.Common.Util\Core.Common.Util.csproj">
-      <Project>{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}</Project>
-      <Name>Core.Common.Util</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="WindowsFormsTestHelper.resx">
-      <DependentUpon>WindowsFormsTestHelper.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
     <None Include="Resources\database.png" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="Resources\application_form.png" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="Resources\table.png" />
   </ItemGroup>
   <ItemGroup>
@@ -110,4 +33,25 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="log4net">
+      <Version>2.0.8</Version>
+    </PackageReference>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtil/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtil/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Util.Test/Core.Common.Util.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9
--- Core/Common/test/Core.Common.Util.Test/Core.Common.Util.Test.csproj	(.../Core.Common.Util.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Core/Common/test/Core.Common.Util.Test/Core.Common.Util.Test.csproj	(.../Core.Common.Util.Test.csproj)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
@@ -1,105 +1,56 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{7F937E31-02CA-41D9-B7D4-1079CF452C72}</ProjectGuid>
-    <RootNamespace>Core.Common.Util.Test</RootNamespace>
-    <AssemblyName>Core.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="PresentationCore" />
-    <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" />
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Attributes\ResourcesDisplayNameAttributeTest.cs" />
-    <Compile Include="Attributes\ResourcesDescriptionAttributeTest.cs" />
-    <Compile Include="Attributes\ResourcesCategoryAttributeTest.cs" />
-    <Compile Include="Builders\DirectoryWriterErrorMessageBuilderTest.cs" />
-    <Compile Include="Builders\FileWriterErrorMessageBuilderTest.cs" />
-    <Compile Include="Builders\FileReaderErrorMessageBuilderTest.cs" />
-    <Compile Include="Drawing\ColorAccessTest.cs" />
-    <Compile Include="Drawing\GraphicsExtensionsTest.cs" />
-    <Compile Include="Drawing\ImageExtensionsTest.cs" />
-    <Compile Include="EnumDisplayWrapperTest.cs" />
-    <Compile Include="EnumTypeConverterTest.cs" />
-    <Compile Include="Events\EventArgsTest.cs" />
-    <Compile Include="Exceptions\InvalidTypeParameterExceptionTest.cs" />
-    <Compile Include="Extensions\CollectionExtensionsTest.cs" />
-    <Compile Include="Extensions\ComparableExtensionsTest.cs" />
-    <Compile Include="Extensions\EnumerableExtensionsTest.cs" />
-    <Compile Include="Extensions\StringExtensionsTest.cs" />
-    <Compile Include="FileFilterGeneratorTest.cs" />
-    <Compile Include="IOUtilsTest.cs" />
-    <Compile Include="IO\EmbeddedResourceFileWriterTest.cs" />
-    <Compile Include="NullableEnumConverterTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="ReferenceEqualityComparerTest.cs" />
-    <Compile Include="Reflection\AssemblyUtilsTest.cs" />
-    <Compile Include="Reflection\TypeUtilsTest.cs" />
-    <Compile Include="Settings\SettingsHelperTest.cs" />
-    <Compile Include="StatisticsConverterTest.cs" />
+    <ProjectReference Include="..\..\src\Core.Common.Util\Core.Common.Util.csproj"/>
+    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\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.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="Resources\abacus.png" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="Resources\acorn.png" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="Resources\TestImage.png" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="Resources\Black2x2.png" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="Resources\TestImageWithBlack.png" />
+    <None Include="Resources\acornWithCross.png" />
+    <None Include="Resources\TestImageHalfOpacityOnBlack2x2.bmp" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="EmbeddedResources\EmbeddedResource1.txt" />
     <EmbeddedResource Include="EmbeddedResources\EmbeddedResource2.txt" />
     <None Include="EmbeddedResources\NonEmbeddedResource.txt" />
     <EmbeddedResource Include="EmbeddedResources\testFile.txt" />
-    <None Include="Resources\acornWithCross.png" />
-    <None Include="Resources\TestImageHalfOpacityOnBlack2x2.bmp" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </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 fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Util.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Util.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Util.TestUtil.Test/Core.Common.Util.TestUtil.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9
--- Core/Common/test/Core.Common.Util.TestUtil.Test/Core.Common.Util.TestUtil.Test.csproj	(.../Core.Common.Util.TestUtil.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Core/Common/test/Core.Common.Util.TestUtil.Test/Core.Common.Util.TestUtil.Test.csproj	(.../Core.Common.Util.TestUtil.Test.csproj)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
@@ -1,46 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{D2979692-0AF0-49D2-92BB-88696AB76F7B}</ProjectGuid>
-    <RootNamespace>Core.Common.Util.TestUtil.Test</RootNamespace>
-    <AssemblyName>Core.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>
-      <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="Properties\AssemblyInfo.cs" />
-    <Compile Include="Settings\TestSettingsHelperTest.cs" />
-    <Compile Include="Settings\UseCustomSettingsHelperTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\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.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\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="..\..\src\Core.Common.Util\Core.Common.Util.csproj"/>
+    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\Core.Common.Util.TestUtil\Core.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 fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Util.TestUtil.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Util.TestUtil.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Util.TestUtil/Core.Common.Util.TestUtil.csproj
===================================================================
diff -u -r9bba38e3ebe3fe261e7c97c338b016681e07c140 -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9
--- Core/Common/test/Core.Common.Util.TestUtil/Core.Common.Util.TestUtil.csproj	(.../Core.Common.Util.TestUtil.csproj)	(revision 9bba38e3ebe3fe261e7c97c338b016681e07c140)
+++ Core/Common/test/Core.Common.Util.TestUtil/Core.Common.Util.TestUtil.csproj	(.../Core.Common.Util.TestUtil.csproj)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
@@ -1,33 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{45193749-ECE8-40C4-8C4B-0C783AFFACB5}</ProjectGuid>
-    <RootNamespace>Core.Common.Util.TestUtil</RootNamespace>
-    <AssemblyName>Core.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="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Settings\TestSettingsHelper.cs" />
-    <Compile Include="Settings\UseCustomSettingsHelper.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\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.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Common.Util\Core.Common.Util.csproj"/>
+    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
   </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Util.TestUtil/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: build/Source.targets
===================================================================
diff -u -r3daf515badf32c085a355ce388bc0d3d9900a100 -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9
--- build/Source.targets	(.../Source.targets)	(revision 3daf515badf32c085a355ce388bc0d3d9900a100)
+++ build/Source.targets	(.../Source.targets)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
@@ -4,6 +4,7 @@
     <OutDir>$(OutputPath)</OutDir>
     <Platforms>x86</Platforms>
     <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <TargetFramework>net45</TargetFramework>
     <LangVersion>6.0</LangVersion>
     <FileAlignment>512</FileAlignment>