Index: Core/Components/src/Core.Components.Gis.Forms/Core.Components.Gis.Forms.csproj
===================================================================
diff -u -r71cd7f49ce3b31f4989a61a853380c1dfec16344 -rb6ac49c6fdb473ce5d39e7c9848190504ad23354
--- Core/Components/src/Core.Components.Gis.Forms/Core.Components.Gis.Forms.csproj	(.../Core.Components.Gis.Forms.csproj)	(revision 71cd7f49ce3b31f4989a61a853380c1dfec16344)
+++ Core/Components/src/Core.Components.Gis.Forms/Core.Components.Gis.Forms.csproj	(.../Core.Components.Gis.Forms.csproj)	(revision b6ac49c6fdb473ce5d39e7c9848190504ad23354)
@@ -1,82 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{4A06DF0D-5D75-4BAD-A95A-A3DB9B7C4AD5}</ProjectGuid>
-    <RootNamespace>Core.Components.Gis.Forms</RootNamespace>
-    <AssemblyName>Core.Components.Gis.Forms</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="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="IMapControl.cs" />
-    <Compile Include="IMapView.cs" />
-    <Compile Include="IWmtsCapabilityFactory.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="Views\BackgroundMapDataSelectionControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Views\WellKnownMapDataControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Views\WellKnownMapDataControl.Designer.cs">
-      <DependentUpon>WellKnownMapDataControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Views\WmtsConnectionDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Views\WmtsConnectionDialog.Designer.cs">
-      <DependentUpon>WmtsConnectionDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Views\WmtsLocationControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Views\WmtsLocationControl.Designer.cs">
-      <DependentUpon>WmtsLocationControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="WmtsCapability.cs" />
-  </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.Controls\Core.Common.Controls.csproj">
-      <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
-      <Name>Core.Common.Controls</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.IO\Core.Common.IO.csproj">
-      <Project>{E344867E-9AC9-44C8-88A5-8185681679A9}</Project>
-      <Name>Core.Common.IO</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.Gis.IO\Core.Components.Gis.IO.csproj">
-      <Project>{FD264FAD-E6F9-47CC-97CD-770199A8E629}</Project>
-      <Name>Core.Components.Gis.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>
@@ -86,26 +32,27 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
+    <None Include="Resources\mapsicon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\information.png" />
+  </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>
     </EmbeddedResource>
-    <EmbeddedResource Include="Views\WellKnownMapDataControl.resx">
-      <DependentUpon>WellKnownMapDataControl.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\WmtsConnectionDialog.resx">
-      <DependentUpon>WmtsConnectionDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\WmtsLocationControl.resx">
-      <DependentUpon>WmtsLocationControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resources\mapsicon.png" />
+    <PackageReference Include="log4net">
+      <Version>2.0.8</Version>
+    </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\information.png" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag b6ac49c6fdb473ce5d39e7c9848190504ad23354 refers to a dead (removed) revision in file `Core/Components/src/Core.Components.Gis.Forms/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b6ac49c6fdb473ce5d39e7c9848190504ad23354 refers to a dead (removed) revision in file `Core/Components/src/Core.Components.Gis.Forms/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Components/src/Core.Components.Gis.IO/Core.Components.Gis.IO.csproj
===================================================================
diff -u -r71cd7f49ce3b31f4989a61a853380c1dfec16344 -rb6ac49c6fdb473ce5d39e7c9848190504ad23354
--- Core/Components/src/Core.Components.Gis.IO/Core.Components.Gis.IO.csproj	(.../Core.Components.Gis.IO.csproj)	(revision 71cd7f49ce3b31f4989a61a853380c1dfec16344)
+++ Core/Components/src/Core.Components.Gis.IO/Core.Components.Gis.IO.csproj	(.../Core.Components.Gis.IO.csproj)	(revision b6ac49c6fdb473ce5d39e7c9848190504ad23354)
@@ -1,11 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{FD264FAD-E6F9-47CC-97CD-770199A8E629}</ProjectGuid>
-    <RootNamespace>Core.Components.Gis.IO</RootNamespace>
-    <AssemblyName>Core.Components.Gis.IO</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Source.targets" />
   <ItemGroup>
     <Reference Include="DotSpatial.Data, Version=1.8.0.0, Culture=neutral, PublicKeyToken=c29dbf30e059ca9d, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -15,68 +9,48 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\DotSpatial.1.8\DotSpatial.Topology.dll</HintPath>
     </Reference>
-    <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="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.XML" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Importers\FeatureBasedMapDataImporter.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="Readers\PointShapeFileReader.cs" />
-    <Compile Include="Readers\PolygonShapeFileReader.cs" />
-    <Compile Include="Readers\PolylineShapeFileReader.cs" />
-    <Compile Include="Readers\ShapeFileReaderBase.cs" />
-    <Compile Include="Readers\WmtsConnectionInfoReader.cs" />
-    <Compile Include="WmtsConnectionInfoXmlDefinitions.cs" />
-    <Compile Include="Writers\PointShapeFileWriter.cs" />
-    <Compile Include="Writers\PolylineShapeFileWriter.cs" />
-    <Compile Include="Writers\ShapeFileWriterBase.cs" />
-    <Compile Include="Writers\WmtsConnectionInfoWriter.cs" />
-  </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.IO\Core.Common.IO.csproj">
-      <Project>{e344867e-9ac9-44c8-88a5-8185681679a9}</Project>
-      <Name>Core.Common.IO</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.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" />
     <None Include="Resources\defaultwmtsconnectioninfo.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="log4net">
+      <Version>2.0.8</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag b6ac49c6fdb473ce5d39e7c9848190504ad23354 refers to a dead (removed) revision in file `Core/Components/src/Core.Components.Gis.IO/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b6ac49c6fdb473ce5d39e7c9848190504ad23354 refers to a dead (removed) revision in file `Core/Components/src/Core.Components.Gis.IO/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Components/src/Core.Components.Gis/Core.Components.Gis.csproj
===================================================================
diff -u -r9bba38e3ebe3fe261e7c97c338b016681e07c140 -rb6ac49c6fdb473ce5d39e7c9848190504ad23354
--- Core/Components/src/Core.Components.Gis/Core.Components.Gis.csproj	(.../Core.Components.Gis.csproj)	(revision 9bba38e3ebe3fe261e7c97c338b016681e07c140)
+++ Core/Components/src/Core.Components.Gis/Core.Components.Gis.csproj	(.../Core.Components.Gis.csproj)	(revision b6ac49c6fdb473ce5d39e7c9848190504ad23354)
@@ -1,84 +1,34 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{318BA582-88C9-4816-A54A-A7E431461DE3}</ProjectGuid>
-    <RootNamespace>Core.Components.Gis</RootNamespace>
-    <AssemblyName>Core.Components.Gis</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Source.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Data\MapDataCollectionVisibility.cs" />
-    <Compile Include="Helpers\MapDataCollectionHelper.cs" />
-    <Compile Include="Theme\CategoryTheme.cs" />
-    <Compile Include="Theme\LineCategoryTheme.cs" />
-    <Compile Include="Theme\PointCategoryTheme.cs" />
-    <Compile Include="Theme\PolygonCategoryTheme.cs" />
-    <Compile Include="Theme\ValueCriterion.cs" />
-    <Compile Include="Theme\ValueCriterionOperator.cs" />
-    <Compile Include="Theme\MapTheme.cs" />
-    <Compile Include="Data\ImageBasedMapData.cs" />
-    <Compile Include="Data\Removable\IRemovable.cs" />
-    <Compile Include="Data\MapData.cs" />
-    <Compile Include="Data\MapDataCollection.cs" />
-    <Compile Include="Data\MapDataCollectionExtensions.cs" />
-    <Compile Include="Data\MapLineData.cs" />
-    <Compile Include="Data\MapPointData.cs" />
-    <Compile Include="Data\MapPolygonData.cs" />
-    <Compile Include="Data\FeatureBasedMapData.cs" />
-    <Compile Include="Data\Removable\RemovableMapDataConverter.cs" />
-    <Compile Include="Data\Removable\RemovableMapLineData.cs" />
-    <Compile Include="Data\Removable\RemovableMapPointData.cs" />
-    <Compile Include="Data\Removable\RemovableMapPolygonData.cs" />
-    <Compile Include="Data\WellKnownTileSource.cs" />
-    <Compile Include="Data\WellKnownTileSourceMapData.cs" />
-    <Compile Include="Data\WmtsMapData.cs" />
-    <Compile Include="Exceptions\CannotCreateTileCacheException.cs" />
-    <Compile Include="Exceptions\CannotFindTileSourceException.cs" />
-    <Compile Include="Exceptions\CannotReceiveTilesException.cs" />
-    <Compile Include="Exceptions\ConfigurationInitializationException.cs" />
-    <Compile Include="Features\MapFeature.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Style\LineDashStyle.cs" />
-    <Compile Include="Style\LineStyle.cs" />
-    <Compile Include="Geometries\MapGeometry.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Style\PointStyle.cs" />
-    <Compile Include="Style\PointSymbol.cs" />
-    <Compile Include="Style\PolygonStyle.cs" />
-    <Compile Include="WmtsConnectionInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
   </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>
   </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 />
 </Project>
\ No newline at end of file
Fisheye: Tag b6ac49c6fdb473ce5d39e7c9848190504ad23354 refers to a dead (removed) revision in file `Core/Components/src/Core.Components.Gis/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Components/test/Core.Components.Gis.IO.Test/Writers/PointShapeFileWriterTest.cs
===================================================================
diff -u -rdf4b8185584046d57926f8be9b6e8fc86cda1711 -rb6ac49c6fdb473ce5d39e7c9848190504ad23354
--- Core/Components/test/Core.Components.Gis.IO.Test/Writers/PointShapeFileWriterTest.cs	(.../PointShapeFileWriterTest.cs)	(revision df4b8185584046d57926f8be9b6e8fc86cda1711)
+++ Core/Components/test/Core.Components.Gis.IO.Test/Writers/PointShapeFileWriterTest.cs	(.../PointShapeFileWriterTest.cs)	(revision b6ac49c6fdb473ce5d39e7c9848190504ad23354)
@@ -28,7 +28,6 @@
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Features;
 using Core.Components.Gis.Geometries;
-using Core.Components.Gis.IO.Properties;
 using Core.Components.Gis.IO.Writers;
 using NUnit.Framework;
 
@@ -68,8 +67,7 @@
                 TestDelegate call = () => writer.CopyToFeature(mapData);
 
                 // Assert
-                string expectedMessage = Resources.PointShapeFileWriter_CreatePointFromMapFeature_A_feature_can_only_contain_one_geometry;
-                TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage);
+                TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, "Een feature mag maar één geometrie bevatten.");
             }
         }
 
@@ -103,8 +101,7 @@
                 TestDelegate call = () => writer.CopyToFeature(mapData);
 
                 // Assert
-                string expectedMessage = Resources.PointShapeFileWriter_CreatePointFromMapFeature_A_feature_can_only_contain_one_geometry;
-                TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage);
+                TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, "Een feature mag maar één geometrie bevatten.");
             }
         }
 
Index: Core/Components/test/Core.Components.Gis.IO.Test/Writers/PolylineShapeFileWriterTest.cs
===================================================================
diff -u -rdf4b8185584046d57926f8be9b6e8fc86cda1711 -rb6ac49c6fdb473ce5d39e7c9848190504ad23354
--- Core/Components/test/Core.Components.Gis.IO.Test/Writers/PolylineShapeFileWriterTest.cs	(.../PolylineShapeFileWriterTest.cs)	(revision df4b8185584046d57926f8be9b6e8fc86cda1711)
+++ Core/Components/test/Core.Components.Gis.IO.Test/Writers/PolylineShapeFileWriterTest.cs	(.../PolylineShapeFileWriterTest.cs)	(revision b6ac49c6fdb473ce5d39e7c9848190504ad23354)
@@ -27,7 +27,6 @@
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Features;
 using Core.Components.Gis.Geometries;
-using Core.Components.Gis.IO.Properties;
 using Core.Components.Gis.IO.Writers;
 using NUnit.Framework;
 
@@ -67,8 +66,7 @@
                 TestDelegate call = () => writer.CopyToFeature(mapData);
 
                 // Assert
-                string expectedMessage = Resources.PointShapeFileWriter_CreatePointFromMapFeature_A_feature_can_only_contain_one_geometry;
-                TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage);
+                TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, "Een feature mag maar één geometrie bevatten.");
             }
         }
 
@@ -102,8 +100,7 @@
                 TestDelegate call = () => writer.CopyToFeature(mapData);
 
                 // Assert
-                string expectedMessage = Resources.PointShapeFileWriter_CreatePointFromMapFeature_A_feature_can_only_contain_one_geometry;
-                TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage);
+                TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, "Een feature mag maar één geometrie bevatten.");
             }
         }
 
Index: Core/Components/test/Core.Components.Gis.IO.Test/Writers/ShapeFileWriterBaseTest.cs
===================================================================
diff -u -rdf4b8185584046d57926f8be9b6e8fc86cda1711 -rb6ac49c6fdb473ce5d39e7c9848190504ad23354
--- Core/Components/test/Core.Components.Gis.IO.Test/Writers/ShapeFileWriterBaseTest.cs	(.../ShapeFileWriterBaseTest.cs)	(revision df4b8185584046d57926f8be9b6e8fc86cda1711)
+++ Core/Components/test/Core.Components.Gis.IO.Test/Writers/ShapeFileWriterBaseTest.cs	(.../ShapeFileWriterBaseTest.cs)	(revision b6ac49c6fdb473ce5d39e7c9848190504ad23354)
@@ -26,7 +26,6 @@
 using Core.Common.TestUtil;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Features;
-using Core.Components.Gis.IO.Properties;
 using Core.Components.Gis.IO.Writers;
 using DotSpatial.Data;
 using NUnit.Framework;
@@ -72,8 +71,7 @@
                 TestDelegate test = () => writer.CopyToFeature(new MapLineData("test"));
 
                 // Assert
-                string expectedMessage = Resources.ShapeFileWriterBase_CopyToFeature_Mapdata_can_only_contain_one_feature;
-                TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, expectedMessage);
+                TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, "Mapdata mag maar één feature bevatten.");
             }
         }