Index: Core/Components/test/Core.Components.BruTile.TestUtil.Test/Core.Components.BruTile.TestUtil.Test.csproj
===================================================================
diff -u -rb8f28b43208d1dac612347e750f26cd29ffd50e3 -r16bc3df2bffef7abd3ffaed4276c70ae0f9db71c
--- Core/Components/test/Core.Components.BruTile.TestUtil.Test/Core.Components.BruTile.TestUtil.Test.csproj	(.../Core.Components.BruTile.TestUtil.Test.csproj)	(revision b8f28b43208d1dac612347e750f26cd29ffd50e3)
+++ Core/Components/test/Core.Components.BruTile.TestUtil.Test/Core.Components.BruTile.TestUtil.Test.csproj	(.../Core.Components.BruTile.TestUtil.Test.csproj)	(revision 16bc3df2bffef7abd3ffaed4276c70ae0f9db71c)
@@ -1,66 +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>{69B97F30-F52B-4A31-A250-7280123CFF3D}</ProjectGuid>
-    <RootNamespace>Core.Components.BruTile.TestUtil.Test</RootNamespace>
-    <AssemblyName>Core.Components.BruTile.TestUtil.Test</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_Test.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\TestUtil.targets" />
   <ItemGroup>
-    <Reference Include="BruTile, Version=0.20.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\BruTile.0.20.0\lib\portable-net45+win+WindowsPhoneApp81+Xamarin.iOS10+MonoAndroid10+MonoTouch10\BruTile.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" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestTileSourceFactoryTest.cs" />
-    <Compile Include="TestWellKnownTileSourceTest.cs" />
-    <Compile Include="TestWmtsTileSourceTest.cs" />
-    <Compile Include="TileSchemaFactoryTest.cs" />
-    <Compile Include="UseCustomTileSourceFactoryConfigTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="app.config" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\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\Core.Components.BruTile\Core.Components.BruTile.csproj">
-      <Project>{E02482C7-F12B-42F0-BB2B-C7EC17503A72}</Project>
-      <Name>Core.Components.BruTile</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Core.Components.Gis\Core.Components.Gis.csproj">
-      <Project>{318BA582-88C9-4816-A54A-A7E431461DE3}</Project>
-      <Name>Core.Components.Gis</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Core.Components.BruTile.TestUtil\Core.Components.BruTile.TestUtil.csproj">
-      <Project>{1081336C-D919-4249-AB33-9AF15F4D19EC}</Project>
-      <Name>Core.Components.BruTile.TestUtil</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Core.Components.Gis.TestUtil\Core.Components.Gis.TestUtil.csproj">
-      <Project>{F0FB401A-3494-4237-9E6D-02CDF77912A8}</Project>
-      <Name>Core.Components.Gis.TestUtil</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Components.BruTile\Core.Components.BruTile.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Components.Gis\Core.Components.Gis.csproj"/>
+    <ProjectReference Include="..\Core.Components.BruTile.TestUtil\Core.Components.BruTile.TestUtil.csproj"/>
+    <ProjectReference Include="..\Core.Components.Gis.TestUtil\Core.Components.Gis.TestUtil.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="BruTile">
+      <Version>0.20.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 16bc3df2bffef7abd3ffaed4276c70ae0f9db71c refers to a dead (removed) revision in file `Core/Components/test/Core.Components.BruTile.TestUtil.Test/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 16bc3df2bffef7abd3ffaed4276c70ae0f9db71c refers to a dead (removed) revision in file `Core/Components/test/Core.Components.BruTile.TestUtil.Test/app.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 16bc3df2bffef7abd3ffaed4276c70ae0f9db71c refers to a dead (removed) revision in file `Core/Components/test/Core.Components.BruTile.TestUtil.Test/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer.sln
===================================================================
diff -u -ra27a01125b8f4166276e77377ac98794eedb27f8 -r16bc3df2bffef7abd3ffaed4276c70ae0f9db71c
--- Riskeer.sln	(.../Riskeer.sln)	(revision a27a01125b8f4166276e77377ac98794eedb27f8)
+++ Riskeer.sln	(.../Riskeer.sln)	(revision 16bc3df2bffef7abd3ffaed4276c70ae0f9db71c)
@@ -1356,17 +1356,17 @@
 		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Components.BruTile.Test", "Core\Components\test\Core.Components.BruTile.Test\Core.Components.BruTile.Test.csproj", "{0CE93555-A056-434C-9D91-B55DBA7C3877}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Components.BruTile.Test", "Core\Components\test\Core.Components.BruTile.Test\Core.Components.BruTile.Test.csproj", "{0CE93555-A056-434C-9D91-B55DBA7C3877}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Components.BruTile.Forms.Test", "Core\Components\test\Core.Components.BruTile.Forms.Test\Core.Components.BruTile.Forms.Test.csproj", "{05A2A229-B98A-43F5-8F86-B812F30CAF5B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Components.BruTile.Forms.Test", "Core\Components\test\Core.Components.BruTile.Forms.Test\Core.Components.BruTile.Forms.Test.csproj", "{05A2A229-B98A-43F5-8F86-B812F30CAF5B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Components.BruTile.IO.Test", "Core\Components\test\Core.Components.BruTile.IO.Test\Core.Components.BruTile.IO.Test.csproj", "{041095A1-5C95-482E-A063-9A4796E4DA38}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Components.BruTile.IO.Test", "Core\Components\test\Core.Components.BruTile.IO.Test\Core.Components.BruTile.IO.Test.csproj", "{041095A1-5C95-482E-A063-9A4796E4DA38}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
 	EndProjectSection
@@ -1381,12 +1381,12 @@
 		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Components.BruTile.TestUtil", "Core\Components\test\Core.Components.BruTile.TestUtil\Core.Components.BruTile.TestUtil.csproj", "{1081336C-D919-4249-AB33-9AF15F4D19EC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Components.BruTile.TestUtil", "Core\Components\test\Core.Components.BruTile.TestUtil\Core.Components.BruTile.TestUtil.csproj", "{1081336C-D919-4249-AB33-9AF15F4D19EC}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Components.BruTile.TestUtil.Test", "Core\Components\test\Core.Components.BruTile.TestUtil.Test\Core.Components.BruTile.TestUtil.Test.csproj", "{69B97F30-F52B-4A31-A250-7280123CFF3D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Components.BruTile.TestUtil.Test", "Core\Components\test\Core.Components.BruTile.TestUtil.Test\Core.Components.BruTile.TestUtil.Test.csproj", "{69B97F30-F52B-4A31-A250-7280123CFF3D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
 	EndProjectSection
@@ -4237,6 +4237,7 @@
 		{1081336C-D919-4249-AB33-9AF15F4D19EC}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
 		{1081336C-D919-4249-AB33-9AF15F4D19EC}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
 		{69B97F30-F52B-4A31-A250-7280123CFF3D}.CreateInstaller|x86.ActiveCfg = CreateInstaller|x86
+		{69B97F30-F52B-4A31-A250-7280123CFF3D}.CreateInstaller|x86.Build.0 = CreateInstaller|x86
 		{69B97F30-F52B-4A31-A250-7280123CFF3D}.CreateInstallerWithDemoProject|x86.ActiveCfg = CreateInstallerWithDemoProject|x86
 		{69B97F30-F52B-4A31-A250-7280123CFF3D}.CreateInstallerWithDemoProject|x86.Build.0 = CreateInstallerWithDemoProject|x86
 		{69B97F30-F52B-4A31-A250-7280123CFF3D}.Debug|x86.ActiveCfg = Debug|x86