Index: Core/Common/src/Core.Common.Util/Core.Common.Util.csproj
===================================================================
diff -u -r4b9bb58c473d9c3652aaa5436eabfadb195423b6 -rb96bb415a46cc77d1a32116f91a249bb566deeea
--- Core/Common/src/Core.Common.Util/Core.Common.Util.csproj	(.../Core.Common.Util.csproj)	(revision 4b9bb58c473d9c3652aaa5436eabfadb195423b6)
+++ Core/Common/src/Core.Common.Util/Core.Common.Util.csproj	(.../Core.Common.Util.csproj)	(revision b96bb415a46cc77d1a32116f91a249bb566deeea)
@@ -1,16 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</ProjectGuid>
-    <RootNamespace>Core.Common.Util</RootNamespace>
-    <AssemblyName>Core.Common.Util</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Source.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="PresentationCore" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -19,52 +9,26 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Attributes\ResourceHelper.cs" />
-    <Compile Include="Attributes\ResourcesCategoryAttribute.cs" />
-    <Compile Include="Attributes\ResourcesDescriptionAttribute.cs" />
-    <Compile Include="Attributes\ResourcesDisplayNameAttribute.cs" />
-    <Compile Include="Builders\DirectoryWriterErrorMessageBuilder.cs" />
-    <Compile Include="Builders\FileReaderErrorMessageBuilder.cs" />
-    <Compile Include="Builders\FileWriterErrorMessageBuilder.cs" />
-    <Compile Include="Drawing\ColorAccess.cs" />
-    <Compile Include="Drawing\GraphicsExtensions.cs" />
-    <Compile Include="EnumDisplayWrapper.cs" />
-    <Compile Include="EnumTypeConverter.cs" />
-    <Compile Include="Events\EventArgs.cs" />
-    <Compile Include="Exceptions\InvalidTypeParameterException.cs" />
-    <Compile Include="Extensions\CollectionExtensions.cs" />
-    <Compile Include="Extensions\ComparableExtensions.cs" />
-    <Compile Include="Extensions\EnumerableExtensions.cs" />
-    <Compile Include="Extensions\StringExtensions.cs" />
-    <Compile Include="FileFilterGenerator.cs" />
-    <Compile Include="IOUtils.cs" />
-    <Compile Include="IO\EmbeddedResourceFileWriter.cs" />
-    <Compile Include="NullableEnumConverter.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="ReferenceEqualityComparer.cs" />
-    <Compile Include="Drawing\ImageExtensions.cs" />
-    <Compile Include="Reflection\TypeUtils.cs" />
-    <Compile Include="Reflection\AssemblyUtils.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Settings\ISettingsHelper.cs" />
-    <Compile Include="Settings\SettingsHelper.cs" />
-    <Compile Include="StatisticsConverter.cs" />
-  </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">
+    <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>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="MathNet.Numerics">
+      <Version>3.19.0</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag b96bb415a46cc77d1a32116f91a249bb566deeea refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Util/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b96bb415a46cc77d1a32116f91a249bb566deeea refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Util/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer.sln
===================================================================
diff -u -r2626d4018bd7196a3b52a5c68ebedd09484b7a88 -rb96bb415a46cc77d1a32116f91a249bb566deeea
--- Riskeer.sln	(.../Riskeer.sln)	(revision 2626d4018bd7196a3b52a5c68ebedd09484b7a88)
+++ Riskeer.sln	(.../Riskeer.sln)	(revision b96bb415a46cc77d1a32116f91a249bb566deeea)
@@ -122,9 +122,6 @@
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8261CCE1-98D7-465B-BC94-4ED239DE7F2E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Util", "Core\Common\src\Core.Common.Util\Core.Common.Util.csproj", "{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
-	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Common.Gui", "Core\Common\src\Core.Common.Gui\Core.Common.Gui.csproj", "{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}"
 EndProject