Index: Core/Components/src/Core.Components.BruTile/Core.Components.BruTile.csproj
===================================================================
diff -u -rfc0dfba9e807bbd1feff8c2d3dc1a4da8bd2e1bf -r4bdd13867fc9a432de6cc3f487debf9ed4469e63
--- Core/Components/src/Core.Components.BruTile/Core.Components.BruTile.csproj	(.../Core.Components.BruTile.csproj)	(revision fc0dfba9e807bbd1feff8c2d3dc1a4da8bd2e1bf)
+++ Core/Components/src/Core.Components.BruTile/Core.Components.BruTile.csproj	(.../Core.Components.BruTile.csproj)	(revision 4bdd13867fc9a432de6cc3f487debf9ed4469e63)
@@ -1,77 +1,50 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{E02482C7-F12B-42F0-BB2B-C7EC17503A72}</ProjectGuid>
-    <RootNamespace>Core.Components.BruTile</RootNamespace>
-    <AssemblyName>Core.Components.BruTile</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Source.targets" />
   <ItemGroup>
-    <Reference Include="BruTile, Version=0.19.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\BruTile.0.19.0\lib\net40\BruTile.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="BruTile.Desktop, Version=0.19.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\BruTile.Desktop.0.19.0\lib\net40\BruTile.Desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="BruTile.MbTiles, Version=0.19.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\BruTile.Desktop.0.19.0\lib\net40\BruTile.MbTiles.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Configurations\BruTileReflectionHelper.cs" />
-    <Compile Include="Configurations\IConfiguration.cs" />
-    <Compile Include="Configurations\ITileSourceFactory.cs" />
-    <Compile Include="Configurations\PersistentCacheConfiguration.cs" />
-    <Compile Include="Configurations\TileSourceFactory.cs" />
-    <Compile Include="Configurations\WellKnownTileSourceLayerConfiguration.cs" />
-    <Compile Include="Configurations\WmtsLayerConfiguration.cs" />
-    <Compile Include="FileCacheManager.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </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.Util\Core.Common.Util.csproj">
-      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
-      <Name>Core.Common.Util</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Core.Components.BruTile.Data\Core.Components.BruTile.Data.csproj">
-      <Project>{3DCEF8F6-CB6D-435C-9539-50143DACD86C}</Project>
-      <Name>Core.Components.BruTile.Data</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Core.Components.BruTile.IO\Core.Components.BruTile.IO.csproj">
-      <Project>{6B280C25-DB18-4F80-86D3-1CBA65208F9D}</Project>
-      <Name>Core.Components.BruTile.IO</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Core.Components.Gis\Core.Components.Gis.csproj">
-      <Project>{318ba582-88c9-4816-a54a-a7e431461de3}</Project>
-      <Name>Core.Components.Gis</Name>
       <Private>False</Private>
     </ProjectReference>
   </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>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="BruTile.Desktop">
+      <Version>0.19.0</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Core.Components.BruTile.Test</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 4bdd13867fc9a432de6cc3f487debf9ed4469e63 refers to a dead (removed) revision in file `Core/Components/src/Core.Components.BruTile/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4bdd13867fc9a432de6cc3f487debf9ed4469e63 refers to a dead (removed) revision in file `Core/Components/src/Core.Components.BruTile/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer.sln
===================================================================
diff -u -rb96bb415a46cc77d1a32116f91a249bb566deeea -r4bdd13867fc9a432de6cc3f487debf9ed4469e63
--- Riskeer.sln	(.../Riskeer.sln)	(revision b96bb415a46cc77d1a32116f91a249bb566deeea)
+++ Riskeer.sln	(.../Riskeer.sln)	(revision 4bdd13867fc9a432de6cc3f487debf9ed4469e63)
@@ -1345,9 +1345,6 @@
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Components.BruTile", "Core\Components\src\Core.Components.BruTile\Core.Components.BruTile.csproj", "{E02482C7-F12B-42F0-BB2B-C7EC17503A72}"
-	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", "Core\Components\src\Core.Components.BruTile.Forms\Core.Components.BruTile.Forms.csproj", "{1BA9EBD0-AA64-4BE3-9791-B2EE344EC938}"
 	ProjectSection(ProjectDependencies) = postProject