Fisheye: Tag 085d7375fd23712963bacf46eb714eff35342f0c refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/Riskeer.AssemblyTool.Data.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r085d7375fd23712963bacf46eb714eff35342f0c
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/Riskeer.AssemblyTool.Data.Test.csproj	(.../Riskeer.AssemblyTool.Data.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/Riskeer.AssemblyTool.Data.Test.csproj	(.../Riskeer.AssemblyTool.Data.Test.csproj)	(revision 085d7375fd23712963bacf46eb714eff35342f0c)
@@ -1,51 +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>{980ADCAB-D8F7-4BE0-A2AF-EFB0A93AD277}</ProjectGuid>
-    <RootNamespace>Riskeer.AssemblyTool.Data.Test</RootNamespace>
-    <AssemblyName>Riskeer.AssemblyTool.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>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssemblyCategoriesInputTest.cs" />
-    <Compile Include="AssemblyCategoryTest.cs" />
-    <Compile Include="AssessmentSectionAssemblyCategoryGroupTest.cs" />
-    <Compile Include="AssessmentSectionAssemblyCategoryTest.cs" />
-    <Compile Include="CombinedAssemblyFailureMechanismSectionTest.cs" />
-    <Compile Include="CombinedFailureMechanismSectionAssemblyTest.cs" />
-    <Compile Include="FailureMechanismAssemblyCategoryGroupTest.cs" />
-    <Compile Include="FailureMechanismSectionAssemblyCategoryGroupTest.cs" />
-    <Compile Include="FailureMechanismAssemblyCategoryTest.cs" />
-    <Compile Include="FailureMechanismSectionAssemblyCategoryTest.cs" />
-    <Compile Include="FailureMechanismAssemblyTest.cs" />
-    <Compile Include="FailureMechanismSectionAssemblyTest.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.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.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj">
-      <Project>{420ED9C3-0C33-47EA-B893-121A9C0DB4F1}</Project>
-      <Name>Riskeer.AssemblyTool.Data</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.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 085d7375fd23712963bacf46eb714eff35342f0c refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 085d7375fd23712963bacf46eb714eff35342f0c refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.TestUtil/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.TestUtil/Riskeer.AssemblyTool.Data.TestUtil.csproj
===================================================================
diff -u -r76059c068a718d56ec02a396b4b3ffc4f842b73d -r085d7375fd23712963bacf46eb714eff35342f0c
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.TestUtil/Riskeer.AssemblyTool.Data.TestUtil.csproj	(.../Riskeer.AssemblyTool.Data.TestUtil.csproj)	(revision 76059c068a718d56ec02a396b4b3ffc4f842b73d)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.TestUtil/Riskeer.AssemblyTool.Data.TestUtil.csproj	(.../Riskeer.AssemblyTool.Data.TestUtil.csproj)	(revision 085d7375fd23712963bacf46eb714eff35342f0c)
@@ -1,32 +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>{C6EE9E6A-6578-49DF-914F-CDB531E61891}</ProjectGuid>
-    <RootNamespace>Riskeer.AssemblyTool.Data.TestUtil</RootNamespace>
-    <AssemblyName>Riskeer.AssemblyTool.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">
-      <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssemblyToolTestHelper.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <ProjectReference Include="..\..\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj"/>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj">
-      <Project>{420ED9C3-0C33-47EA-B893-121A9C0DB4F1}</Project>
-      <Name>Riskeer.AssemblyTool.Data</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>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 085d7375fd23712963bacf46eb714eff35342f0c refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.TestUtil/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 085d7375fd23712963bacf46eb714eff35342f0c refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Forms.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Forms.Test/Riskeer.AssemblyTool.Forms.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r085d7375fd23712963bacf46eb714eff35342f0c
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Forms.Test/Riskeer.AssemblyTool.Forms.Test.csproj	(.../Riskeer.AssemblyTool.Forms.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Forms.Test/Riskeer.AssemblyTool.Forms.Test.csproj	(.../Riskeer.AssemblyTool.Forms.Test.csproj)	(revision 085d7375fd23712963bacf46eb714eff35342f0c)
@@ -1,47 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{F6A1570F-AF1E-44BC-AD49-BAC419FE6D38}</ProjectGuid>
-    <RootNamespace>Riskeer.AssemblyTool.Forms.Test</RootNamespace>
-    <AssemblyName>Riskeer.AssemblyTool.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>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DisplayFailureMechanismSectionAssemblyCategoryGroupConverterTest.cs" />
-    <Compile Include="DisplayFailureMechanismSectionAssemblyCategoryGroupTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SelectableFailureMechanismSectionAssemblyCategoryGroupConverterTest.cs" />
-    <Compile Include="SelectableFailureMechanismSectionAssemblyCategoryGroupTest.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.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj">
-      <Project>{420ED9C3-0C33-47EA-B893-121A9C0DB4F1}</Project>
-      <Name>Riskeer.AssemblyTool.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.AssemblyTool.Forms\Riskeer.AssemblyTool.Forms.csproj">
-      <Project>{22C5DDB8-2491-4BC6-BDC6-2A7B7EBF40C1}</Project>
-      <Name>Riskeer.AssemblyTool.Forms</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.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.AssemblyTool.Forms\Riskeer.AssemblyTool.Forms.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 085d7375fd23712963bacf46eb714eff35342f0c refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Forms.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 085d7375fd23712963bacf46eb714eff35342f0c refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Riskeer.AssemblyTool.IO.Test.csproj
===================================================================
diff -u -rd98a49035ddfbdd477bb48870cee4c3ec18c80f7 -r085d7375fd23712963bacf46eb714eff35342f0c
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Riskeer.AssemblyTool.IO.Test.csproj	(.../Riskeer.AssemblyTool.IO.Test.csproj)	(revision d98a49035ddfbdd477bb48870cee4c3ec18c80f7)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/Riskeer.AssemblyTool.IO.Test.csproj	(.../Riskeer.AssemblyTool.IO.Test.csproj)	(revision 085d7375fd23712963bacf46eb714eff35342f0c)
@@ -1,84 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{A85EB391-52B6-410C-B827-82746C618FA0}</ProjectGuid>
-    <RootNamespace>Riskeer.AssemblyTool.IO.Test</RootNamespace>
-    <AssemblyName>Riskeer.AssemblyTool.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>
-    </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.Xml" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Model\DataTypes\SerializableAssessmentSectionAssemblyResultTest.cs" />
-    <Compile Include="Model\DataTypes\SerializableCombinedFailureMechanismSectionAssemblyResultTest.cs" />
-    <Compile Include="Model\DataTypes\SerializableFailureMechanismSectionAssemblyResultTest.cs" />
-    <Compile Include="Model\DataTypes\SerializableFailureMechanismAssemblyResultTest.cs" />
-    <Compile Include="Model\AssemblyXmlIdentifiersTest.cs" />
-    <Compile Include="Model\Enums\AssemblyXmlEnumIdentifiersTest.cs" />
-    <Compile Include="Model\Enums\SerializableFailureMechanismSectionTypeTest.cs" />
-    <Compile Include="Model\Enums\SerializableAssessmentTypeTest.cs" />
-    <Compile Include="Model\Enums\SerializableAssemblyMethodTest.cs" />
-    <Compile Include="Model\Enums\SerializableAssessmentSectionCategoryGroupTest.cs" />
-    <Compile Include="Model\Enums\SerializableFailureMechanismSectionCategoryGroupTest.cs" />
-    <Compile Include="Model\Enums\SerializableFailureMechanismTypeTest.cs" />
-    <Compile Include="Model\Enums\SerializableFailureMechanismGroupTest.cs" />
-    <Compile Include="Model\Enums\SerializableFailureMechanismCategoryGroupTest.cs" />
-    <Compile Include="Model\Helpers\GeometrySerializationFormatterTest.cs" />
-    <Compile Include="Model\Helpers\SerializableIdValidatorTest.cs" />
-    <Compile Include="Model\SerializableCombinedFailureMechanismSectionAssemblyTest.cs" />
-    <Compile Include="Model\SerializableFailureMechanismSectionTest.cs" />
-    <Compile Include="Model\SerializableFailureMechanismSectionCollectionTest.cs" />
-    <Compile Include="Model\SerializableFailureMechanismTest.cs" />
-    <Compile Include="Model\SerializableFailureMechanismSectionAssemblyTest.cs" />
-    <Compile Include="Model\SerializableTotalAssemblyResultTest.cs" />
-    <Compile Include="Model\SerializableAssessmentProcessTest.cs" />
-    <Compile Include="Model\SerializableAssessmentSectionTest.cs" />
-    <Compile Include="Model\DataTypes\SerializableLineTest.cs" />
-    <Compile Include="Model\Gml\SerializableLineStringTest.cs" />
-    <Compile Include="Model\DataTypes\SerializableMeasureTest.cs" />
-    <Compile Include="Model\SerializableAssemblyTest.cs" />
-    <Compile Include="Model\Gml\SerializableEnvelopeTest.cs" />
-    <Compile Include="Model\Gml\SerializableBoundaryTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SerializableAssemblyWriterTest.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\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.AssemblyTool.IO\Riskeer.AssemblyTool.IO.csproj">
-      <Project>{b9838495-b090-4b84-a387-a8974f4f9cc4}</Project>
-      <Name>Riskeer.AssemblyTool.IO</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Riskeer.AssemblyTool.IO.TestUtil\Riskeer.AssemblyTool.IO.TestUtil.csproj">
-      <Project>{C7023D25-F8DF-4E3F-BF5D-A8F961CC63F7}</Project>
-      <Name>Riskeer.AssemblyTool.IO.TestUtil</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\src\Core.Common.Util\Core.Common.Util.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj" />
+    <ProjectReference Include="..\..\src\Riskeer.AssemblyTool.IO\Riskeer.AssemblyTool.IO.csproj" />
+    <ProjectReference Include="..\Riskeer.AssemblyTool.IO.TestUtil\Riskeer.AssemblyTool.IO.TestUtil.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 085d7375fd23712963bacf46eb714eff35342f0c refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 085d7375fd23712963bacf46eb714eff35342f0c refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil.Test/Riskeer.AssemblyTool.IO.TestUtil.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r085d7375fd23712963bacf46eb714eff35342f0c
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil.Test/Riskeer.AssemblyTool.IO.TestUtil.Test.csproj	(.../Riskeer.AssemblyTool.IO.TestUtil.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil.Test/Riskeer.AssemblyTool.IO.TestUtil.Test.csproj	(.../Riskeer.AssemblyTool.IO.TestUtil.Test.csproj)	(revision 085d7375fd23712963bacf46eb714eff35342f0c)
@@ -1,32 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{13622063-46EC-41FA-8DB8-D8C11B6C802A}</ProjectGuid>
-    <RootNamespace>Riskeer.AssemblyTool.IO.TestUtil.Test</RootNamespace>
-    <AssemblyName>Riskeer.AssemblyTool.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>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="InvalidIdTestHelperTest.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="..\Riskeer.AssemblyTool.IO.TestUtil\Riskeer.AssemblyTool.IO.TestUtil.csproj">
-      <Project>{C7023D25-F8DF-4E3F-BF5D-A8F961CC63F7}</Project>
-      <Name>Riskeer.AssemblyTool.IO.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\Riskeer.AssemblyTool.IO.TestUtil\Riskeer.AssemblyTool.IO.TestUtil.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 085d7375fd23712963bacf46eb714eff35342f0c refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 085d7375fd23712963bacf46eb714eff35342f0c refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/Riskeer.AssemblyTool.IO.TestUtil.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r085d7375fd23712963bacf46eb714eff35342f0c
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/Riskeer.AssemblyTool.IO.TestUtil.csproj	(.../Riskeer.AssemblyTool.IO.TestUtil.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/Riskeer.AssemblyTool.IO.TestUtil.csproj	(.../Riskeer.AssemblyTool.IO.TestUtil.csproj)	(revision 085d7375fd23712963bacf46eb714eff35342f0c)
@@ -1,32 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{C7023D25-F8DF-4E3F-BF5D-A8F961CC63F7}</ProjectGuid>
-    <RootNamespace>Riskeer.AssemblyTool.IO.TestUtil</RootNamespace>
-    <AssemblyName>Riskeer.AssemblyTool.IO.TestUtil</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_TestUtil.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\TestUtil.targets" />
   <ItemGroup>
-    <Compile Include="InvalidIdTestHelper.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SerializableAttributeTestHelper.cs" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </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>
-    </Reference>
-    <Reference Include="System.Xml" />
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj"/>
   </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>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
   </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 085d7375fd23712963bacf46eb714eff35342f0c refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.TestUtil/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 085d7375fd23712963bacf46eb714eff35342f0c refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Riskeer.AssemblyTool.KernelWrapper.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r085d7375fd23712963bacf46eb714eff35342f0c
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Riskeer.AssemblyTool.KernelWrapper.Test.csproj	(.../Riskeer.AssemblyTool.KernelWrapper.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Riskeer.AssemblyTool.KernelWrapper.Test.csproj	(.../Riskeer.AssemblyTool.KernelWrapper.Test.csproj)	(revision 085d7375fd23712963bacf46eb714eff35342f0c)
@@ -1,72 +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>{41A89DD5-0F97-4B9F-9C17-7960600C2738}</ProjectGuid>
-    <RootNamespace>Riskeer.AssemblyTool.KernelWrapper.Test</RootNamespace>
-    <AssemblyName>Riskeer.AssemblyTool.KernelWrapper.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Test.targets" />
   <ItemGroup>
     <Reference Include="Assembly.Kernel">
       <HintPath>..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.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>
-    </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>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Creators\AssemblyErrorMessageCreatorTest.cs" />
-    <Compile Include="Calculators\AssemblyToolCalculatorFactoryTest.cs" />
-    <Compile Include="Calculators\Assembly\AssessmentSectionAssemblyCalculatorExceptionTest.cs" />
-    <Compile Include="Calculators\Assembly\AssessmentSectionAssemblyCalculatorTest.cs" />
-    <Compile Include="Calculators\Assembly\FailureMechanismAssemblyCalculatorExceptionTest.cs" />
-    <Compile Include="Calculators\Assembly\FailureMechanismSectionAssemblyCalculatorExceptionTest.cs" />
-    <Compile Include="Calculators\Assembly\FailureMechanismAssemblyCalculatorTest.cs" />
-    <Compile Include="Calculators\Assembly\FailureMechanismSectionAssemblyCalculatorTest.cs" />
-    <Compile Include="Calculators\Categories\AssemblyCategoriesCalculatorExceptionTest.cs" />
-    <Compile Include="Calculators\Categories\AssemblyCategoriesCalculatorTest.cs" />
-    <Compile Include="Creators\AssemblyCalculatorInputCreatorTest.cs" />
-    <Compile Include="Creators\AssemblyCategoryCreatorTest.cs" />
-    <Compile Include="Creators\AssessmentSectionAssemblyInputCreatorTest.cs" />
-    <Compile Include="Creators\CombinedFailureMechanismSectionAssemblyCreatorTest.cs" />
-    <Compile Include="Creators\FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs" />
-    <Compile Include="Creators\FailureMechanismAssemblyCreatorTest.cs" />
-    <Compile Include="Creators\FailureMechanismSectionAssemblyCreatorTest.cs" />
-    <Compile Include="Creators\FailureMechanismSectionListCreatorTest.cs" />
-    <Compile Include="Kernels\AssemblyToolKernelFactoryTest.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\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\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.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj">
-      <Project>{420ED9C3-0C33-47EA-B893-121A9C0DB4F1}</Project>
-      <Name>Riskeer.AssemblyTool.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.AssemblyTool.KernelWrapper\Riskeer.AssemblyTool.KernelWrapper.csproj">
-      <Project>{358B6DA2-A1DF-477F-B6AC-C30204265CB0}</Project>
-      <Name>Riskeer.AssemblyTool.KernelWrapper</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\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="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.AssemblyTool.KernelWrapper\Riskeer.AssemblyTool.KernelWrapper.csproj"/>
+    <ProjectReference Include="..\Riskeer.AssemblyTool.KernelWrapper.TestUtil\Riskeer.AssemblyTool.KernelWrapper.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 085d7375fd23712963bacf46eb714eff35342f0c refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 085d7375fd23712963bacf46eb714eff35342f0c refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test/Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r085d7375fd23712963bacf46eb714eff35342f0c
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test/Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test.csproj	(.../Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test/Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test.csproj	(.../Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test.csproj)	(revision 085d7375fd23712963bacf46eb714eff35342f0c)
@@ -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>{2482E455-076C-4FE4-83B3-3636395F164B}</ProjectGuid>
-    <RootNamespace>Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test</RootNamespace>
-    <AssemblyName>Riskeer.AssemblyTool.KernelWrapper.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="Assembly.Kernel">
       <HintPath>..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.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>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssessmentGradeConversionTestHelperTest.cs" />
-    <Compile Include="Calculators\AssemblyToolCalculatorFactoryConfigTest.cs" />
-    <Compile Include="Calculators\Assembly\AssessmentSectionAssemblyCalculatorStubTest.cs" />
-    <Compile Include="Calculators\Assembly\FailureMechanismAssemblyCalculatorStubTest.cs" />
-    <Compile Include="Calculators\Assembly\FailureMechanismSectionAssemblyCalculatorStubTest.cs" />
-    <Compile Include="Calculators\Categories\AssemblyCategoriesCalculatorStubTest.cs" />
-    <Compile Include="Calculators\TestAssemblyToolCalculatorFactoryTest.cs" />
-    <Compile Include="CategoriesListTestFactoryTest.cs" />
-    <Compile Include="Kernels\Assembly\AssessmentSectionAssemblyKernelStubTest.cs" />
-    <Compile Include="Kernels\Assembly\CombinedFailureMechanismSectionAssemblyKernelStubTest.cs" />
-    <Compile Include="Kernels\Assembly\FailureMechanismAssemblyKernelStubTest.cs" />
-    <Compile Include="Kernels\Assembly\FailureMechanismSectionAssemblyKernelStubTest.cs" />
-    <Compile Include="Kernels\Categories\AssemblyCategoriesKernelStubTest.cs" />
-    <Compile Include="Kernels\AssemblyToolKernelFactoryConfigTest.cs" />
-    <Compile Include="Kernels\TestAssemblyToolKernelFactoryTest.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\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\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.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj">
-      <Project>{420ED9C3-0C33-47EA-B893-121A9C0DB4F1}</Project>
-      <Name>Riskeer.AssemblyTool.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.AssemblyTool.KernelWrapper\Riskeer.AssemblyTool.KernelWrapper.csproj">
-      <Project>{358B6DA2-A1DF-477F-B6AC-C30204265CB0}</Project>
-      <Name>Riskeer.AssemblyTool.KernelWrapper</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\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="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.AssemblyTool.KernelWrapper\Riskeer.AssemblyTool.KernelWrapper.csproj"/>
+    <ProjectReference Include="..\Riskeer.AssemblyTool.KernelWrapper.TestUtil\Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 085d7375fd23712963bacf46eb714eff35342f0c refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 085d7375fd23712963bacf46eb714eff35342f0c refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj
===================================================================
diff -u -rcb13014444b07ba845474f6894336d71263413d1 -r085d7375fd23712963bacf46eb714eff35342f0c
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj	(.../Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj)	(revision cb13014444b07ba845474f6894336d71263413d1)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj	(.../Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj)	(revision 085d7375fd23712963bacf46eb714eff35342f0c)
@@ -1,64 +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>{0AB432BB-E2CC-42EA-A72C-7AFEF7536B38}</ProjectGuid>
-    <RootNamespace>Riskeer.AssemblyTool.KernelWrapper.TestUtil</RootNamespace>
-    <AssemblyName>Riskeer.AssemblyTool.KernelWrapper.TestUtil</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_TestUtil.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\TestUtil.targets" />
   <ItemGroup>
     <Reference Include="Assembly.Kernel">
       <HintPath>..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.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>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssemblyCategoryAssert.cs" />
-    <Compile Include="AssessmentGradeConversionTestHelper.cs" />
-    <Compile Include="Calculators\AssemblyToolCalculatorFactoryConfig.cs" />
-    <Compile Include="Calculators\Assembly\AssessmentSectionAssemblyCalculatorStub.cs" />
-    <Compile Include="Calculators\Assembly\FailureMechanismAssemblyCalculatorStub.cs" />
-    <Compile Include="Calculators\Assembly\FailureMechanismSectionAssemblyCalculatorStub.cs" />
-    <Compile Include="Calculators\Categories\AssemblyCategoriesCalculatorStub.cs" />
-    <Compile Include="Calculators\TestAssemblyToolCalculatorFactory.cs" />
-    <Compile Include="CategoriesListTestFactory.cs" />
-    <Compile Include="CombinedFailureMechanismSectionAssemblyAssert.cs" />
-    <Compile Include="CombinedFailureMechanismSectionsInputAssert.cs" />
-    <Compile Include="Kernels\AssemblyToolKernelFactoryConfig.cs" />
-    <Compile Include="Kernels\Assembly\AssessmentSectionAssemblyKernelStub.cs" />
-    <Compile Include="Kernels\Assembly\CombinedFailureMechanismSectionAssemblyKernelStub.cs" />
-    <Compile Include="Kernels\Assembly\FailureMechanismAssemblyKernelStub.cs" />
-    <Compile Include="Kernels\Assembly\FailureMechanismSectionAssemblyKernelStub.cs" />
-    <Compile Include="Kernels\Categories\AssemblyCategoriesKernelStub.cs" />
-    <Compile Include="Kernels\TestAssemblyToolKernelFactory.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\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
-      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
-      <Name>Core.Common.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\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.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj">
-      <Project>{420ED9C3-0C33-47EA-B893-121A9C0DB4F1}</Project>
-      <Name>Riskeer.AssemblyTool.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Riskeer.AssemblyTool.KernelWrapper\Riskeer.AssemblyTool.KernelWrapper.csproj">
-      <Project>{358B6DA2-A1DF-477F-B6AC-C30204265CB0}</Project>
-      <Name>Riskeer.AssemblyTool.KernelWrapper</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.AssemblyTool.KernelWrapper\Riskeer.AssemblyTool.KernelWrapper.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 085d7375fd23712963bacf46eb714eff35342f0c refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?