Index: Core/Components/test/Core.Components.BruTile.TestUtil/Core.Components.BruTile.TestUtil.csproj
===================================================================
diff -u -rb8f28b43208d1dac612347e750f26cd29ffd50e3 -rc673059c4f36262a5da769de272d4c2e43325772
--- Core/Components/test/Core.Components.BruTile.TestUtil/Core.Components.BruTile.TestUtil.csproj	(.../Core.Components.BruTile.TestUtil.csproj)	(revision b8f28b43208d1dac612347e750f26cd29ffd50e3)
+++ Core/Components/test/Core.Components.BruTile.TestUtil/Core.Components.BruTile.TestUtil.csproj	(.../Core.Components.BruTile.TestUtil.csproj)	(revision c673059c4f36262a5da769de272d4c2e43325772)
@@ -1,59 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{1081336C-D919-4249-AB33-9AF15F4D19EC}</ProjectGuid>
-    <RootNamespace>Core.Components.BruTile.TestUtil</RootNamespace>
-    <AssemblyName>Core.Components.BruTile.TestUtil</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer_TestUtil.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="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <DependentUpon>Resources.resx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="TestTileSourceFactory.cs" />
-    <Compile Include="TestWellKnownTileSource.cs" />
-    <Compile Include="TestWmtsTileSource.cs" />
-    <Compile Include="TileSchemaFactory.cs" />
-    <Compile Include="UseCustomTileSourceFactoryConfig.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
   </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>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="Resources\stubTile.png" />
   </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="..\..\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="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Components.BruTile\Core.Components.BruTile.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Components.Gis\Core.Components.Gis.csproj"/>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="BruTile">
+      <Version>0.20.0</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag c673059c4f36262a5da769de272d4c2e43325772 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.BruTile.TestUtil/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c673059c4f36262a5da769de272d4c2e43325772 refers to a dead (removed) revision in file `Core/Components/test/Core.Components.BruTile.TestUtil/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?