Index: Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj
===================================================================
diff -u -r4b9bb58c473d9c3652aaa5436eabfadb195423b6 -r259e2cfea3b0952b293b6a4ac30d8e8c6ffaa90d
--- Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj	(.../Core.Components.DotSpatial.csproj)	(revision 4b9bb58c473d9c3652aaa5436eabfadb195423b6)
+++ Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj	(.../Core.Components.DotSpatial.csproj)	(revision 259e2cfea3b0952b293b6a4ac30d8e8c6ffaa90d)
@@ -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>{AA47E858-A2A7-470E-8B2D-C76AE8ED9CCD}</ProjectGuid>
-    <RootNamespace>Core.Components.DotSpatial</RootNamespace>
-    <AssemblyName>Core.Components.DotSpatial</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="DotSpatial.Controls, Version=1.8.0.0, Culture=neutral, PublicKeyToken=4d9e49339a7d240c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\DotSpatial.1.8\DotSpatial.Controls.dll</HintPath>
@@ -43,74 +33,51 @@
     <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Converter\FeatureBasedMapDataConverter.cs" />
-    <Compile Include="Layer\BruTile\BruTileLayer.cs" />
-    <Compile Include="Layer\ImageBasedMapDataLayerFactory.cs" />
-    <Compile Include="Projections\ReprojectExtensions.cs" />
-    <Compile Include="Projections\TileReprojector.cs" />
-    <Compile Include="Projections\WorldFile.cs" />
-    <Compile Include="Layer\IFeatureBasedMapDataLayer.cs" />
-    <Compile Include="Layer\FeatureBasedMapDataLayerFactory.cs" />
-    <Compile Include="Converter\MapDataHelper.cs" />
-    <Compile Include="Converter\MapLineDataConverter.cs" />
-    <Compile Include="Layer\MapLineDataLayer.cs" />
-    <Compile Include="Converter\MapPointDataConverter.cs" />
-    <Compile Include="Layer\MapPointDataLayer.cs" />
-    <Compile Include="Converter\MapPolygonDataConverter.cs" />
-    <Compile Include="Layer\MapPolygonDataLayer.cs" />
-    <Compile Include="MapDataConstants.cs" />
-    <Compile Include="MapFunctions\MapFunctionSelectionZoom.cs" />
-    <Compile Include="RdNewMouseCoordinatesMapExtension.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>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
     <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.Forms\Core.Components.BruTile.Forms.csproj">
-      <Project>{1BA9EBD0-AA64-4BE3-9791-B2EE344EC938}</Project>
-      <Name>Core.Components.BruTile.Forms</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.BruTile\Core.Components.BruTile.csproj">
-      <Project>{E02482C7-F12B-42F0-BB2B-C7EC17503A72}</Project>
-      <Name>Core.Components.BruTile</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>
     <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>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="BruTile">
+      <Version>0.19.0</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Core.Components.DotSpatial.Test</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 259e2cfea3b0952b293b6a4ac30d8e8c6ffaa90d refers to a dead (removed) revision in file `Core/Components/src/Core.Components.DotSpatial/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 259e2cfea3b0952b293b6a4ac30d8e8c6ffaa90d refers to a dead (removed) revision in file `Core/Components/src/Core.Components.DotSpatial/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?