Index: Core/Common/src/Core.Common.Base/Core.Common.Base.csproj
===================================================================
diff -u -r71cd7f49ce3b31f4989a61a853380c1dfec16344 -re2ae88c55e38d82bee57491ec119a35b66c30ca0
--- Core/Common/src/Core.Common.Base/Core.Common.Base.csproj	(.../Core.Common.Base.csproj)	(revision 71cd7f49ce3b31f4989a61a853380c1dfec16344)
+++ Core/Common/src/Core.Common.Base/Core.Common.Base.csproj	(.../Core.Common.Base.csproj)	(revision e2ae88c55e38d82bee57491ec119a35b66c30ca0)
@@ -1,89 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</ProjectGuid>
-    <RootNamespace>Core.Common.Base</RootNamespace>
-    <AssemblyName>Core.Common.Base</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Source.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="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="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CloneableObservableList.cs" />
-    <Compile Include="CloneableObservable.cs" />
-    <Compile Include="Data\IProject.cs" />
-    <Compile Include="Data\IProjectFactory.cs" />
-    <Compile Include="Data\Range.cs" />
-    <Compile Include="Data\RoundedDouble.cs" />
-    <Compile Include="Data\RoundedPoint2DCollection.cs" />
-    <Compile Include="FormattableConstants.cs" />
-    <Compile Include="Geometry\Intersection2DType.cs" />
-    <Compile Include="Geometry\Math2D.cs" />
-    <Compile Include="Geometry\Point2D.cs" />
-    <Compile Include="Geometry\Point3D.cs" />
-    <Compile Include="Geometry\Point2DCollectionExtensions.cs" />
-    <Compile Include="Geometry\Point3DCollectionExtensions.cs" />
-    <Compile Include="Geometry\Point3DExtensions.cs" />
-    <Compile Include="Geometry\Segment2D.cs" />
-    <Compile Include="Geometry\Segment2DCollectionExtensions.cs" />
-    <Compile Include="Geometry\Segment2DExtensions.cs" />
-    <Compile Include="Geometry\Segment2DIntersectSegment2DResult.cs" />
-    <Compile Include="IObservableEnumerable.cs" />
-    <Compile Include="IO\CriticalFileReadException.cs" />
-    <Compile Include="IO\FileImporterBase.cs" />
-    <Compile Include="IO\OnProgressChanged.cs" />
-    <Compile Include="Observer.cs" />
-    <Compile Include="RecursiveObserver.cs" />
-    <Compile Include="ObservableUniqueItemCollectionWithSourcePath.cs" />
-    <Compile Include="Storage\IMigrateProject.cs" />
-    <Compile Include="Storage\MigrationRequired.cs" />
-    <Compile Include="Storage\StorageException.cs" />
-    <Compile Include="Storage\StorageValidationException.cs" />
-    <Compile Include="Storage\CouldNotConnectException.cs" />
-    <Compile Include="Storage\IStoreProject.cs" />
-    <Compile Include="IO\IFileExporter.cs" />
-    <Compile Include="IO\IFileImporter.cs" />
-    <Compile Include="IObservable.cs" />
-    <Compile Include="IObserver.cs" />
-    <Compile Include="Observable.cs" />
-    <Compile Include="ObservableList.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="Service\Activity.cs" />
-    <Compile Include="Service\ActivityState.cs" />
-    <Compile Include="Service\FileImportActivity.cs" />
-    <Compile Include="Storage\UpdateStorageException.cs" />
-    <Compile Include="TypeConverters\RoundedDoubleConverter.cs" />
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
+    <ProjectReference Include="..\Core.Common.Util\Core.Common.Util.csproj">
+      <Private>False</Private>
+    </ProjectReference>
+  </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>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Core.Common.Util\Core.Common.Util.csproj">
-      <Project>{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}</Project>
-      <Name>Core.Common.Util</Name>
-      <Private>False</Private>
-    </ProjectReference>
+    <PackageReference Include="log4net">
+      <Version>2.0.8</Version>
+    </PackageReference>
+    <PackageReference Include="MathNet.Numerics">
+      <Version>3.19.0</Version>
+    </PackageReference>
   </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag e2ae88c55e38d82bee57491ec119a35b66c30ca0 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Base/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e2ae88c55e38d82bee57491ec119a35b66c30ca0 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Base/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer.sln
===================================================================
diff -u -r3daf515badf32c085a355ce388bc0d3d9900a100 -re2ae88c55e38d82bee57491ec119a35b66c30ca0
--- Riskeer.sln	(.../Riskeer.sln)	(revision 3daf515badf32c085a355ce388bc0d3d9900a100)
+++ Riskeer.sln	(.../Riskeer.sln)	(revision e2ae88c55e38d82bee57491ec119a35b66c30ca0)
@@ -12,7 +12,7 @@
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{FE36E7E0-D5F7-48E3-9730-D05443351EAD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Application.Riskeer", "Application\Riskeer\src\Application.Riskeer\Application.Riskeer.csproj", "{4A7D6720-4AA1-4F0B-A796-A0436DB3D7D7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Application.Riskeer", "Application\Riskeer\src\Application.Riskeer\Application.Riskeer.csproj", "{4A7D6720-4AA1-4F0B-A796-A0436DB3D7D7}"
 	ProjectSection(ProjectDependencies) = postProject
 		{EC2DEF03-71FE-48A0-AB85-31E13112E4A1} = {EC2DEF03-71FE-48A0-AB85-31E13112E4A1}
 		{C6309704-D67B-434C-BC98-9F8910BC1D10} = {C6309704-D67B-434C-BC98-9F8910BC1D10}
@@ -129,9 +129,6 @@
 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
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Base", "Core\Common\src\Core.Common.Base\Core.Common.Base.csproj", "{3BBFD65B-B277-4E50-AE6D-BD24C3434609}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
-	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Controls", "Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj", "{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -1314,7 +1311,7 @@
 		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Application.Riskeer.Migration.Console", "Application\Riskeer\src\Application.Riskeer.Migration.Console\Application.Riskeer.Migration.Console.csproj", "{23C45BFD-0A07-400F-B216-DF0C74CC99A1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Application.Riskeer.Migration.Console", "Application\Riskeer\src\Application.Riskeer.Migration.Console\Application.Riskeer.Migration.Console.csproj", "{23C45BFD-0A07-400F-B216-DF0C74CC99A1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
 	EndProjectSection