Index: DamClients/DamUI/trunk/src/Deltares.Dam.Version/Properties/AssemblyInfo.cs
===================================================================
diff -u
--- DamClients/DamUI/trunk/src/Deltares.Dam.Version/Properties/AssemblyInfo.cs	(revision 0)
+++ DamClients/DamUI/trunk/src/Deltares.Dam.Version/Properties/AssemblyInfo.cs	(revision 887)
@@ -0,0 +1,7 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Deltares.Dam.Version")]
+[assembly: ComVisible(false)]
+[assembly: Guid("e5fbe34e-740d-42aa-ad11-431a23eef6ca")]
+
Index: DamClients/DamUI/trunk/src/Dam/Application/Properties/AssemblyInfo.cs
===================================================================
diff -u
--- DamClients/DamUI/trunk/src/Dam/Application/Properties/AssemblyInfo.cs	(revision 0)
+++ DamClients/DamUI/trunk/src/Dam/Application/Properties/AssemblyInfo.cs	(revision 887)
@@ -0,0 +1,5 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: Guid("5e092d68-b644-40e0-98b4-a5a5efb8c610")]
+[assembly: ComVisible(false)]
Index: DamClients/DamUI/trunk/src/Deltares.Dam.Version/Deltares.Dam.Version.csproj
===================================================================
diff -u
--- DamClients/DamUI/trunk/src/Deltares.Dam.Version/Deltares.Dam.Version.csproj	(revision 0)
+++ DamClients/DamUI/trunk/src/Deltares.Dam.Version/Deltares.Dam.Version.csproj	(revision 887)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{E5FBE34E-740D-42AA-AD11-431A23EEF6CA}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Deltares.Dam.Version</RootNamespace>
+    <AssemblyName>Deltares.Dam.Version</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="GlobalAssembly.cs.svn" />
+  </ItemGroup>
+  <Import Project="$(SolutionDir)..\build\Deltares.Dam.Version.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>"$(ProjectDir)..\..\utils\svn_insert_version.cmd" "$(ProjectDir)" GlobalAssembly.cs.svn GlobalAssembly.cs</PreBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
Index: DamClients/DamUI/trunk/src/Dam/Application/Deltares.Dam.Application.csproj
===================================================================
diff -u -r875 -r887
--- DamClients/DamUI/trunk/src/Dam/Application/Deltares.Dam.Application.csproj	(.../branches/CalcualtionIncluded/src/Dam/Application/Deltares.Dam.Application.csproj)	(revision 875)
+++ DamClients/DamUI/trunk/src/Dam/Application/Deltares.Dam.Application.csproj	(.../trunk/src/Dam/Application/Deltares.Dam.Application.csproj)	(revision 887)
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Deltares.Dam.Application</RootNamespace>
     <AssemblyName>Deltares.Dam.Application</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <ApplicationIcon>DAM_icon.ico</ApplicationIcon>
@@ -45,6 +45,7 @@
     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     <UseVSHostingProcess>false</UseVSHostingProcess>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>..\..\bin\Release\</OutputPath>
@@ -56,6 +57,7 @@
     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     <UseVSHostingProcess>false</UseVSHostingProcess>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Deltares.Authorization, Version=7.21.5431.21796, Culture=neutral, PublicKeyToken=379d563066715186, processorArchitecture=x86">
@@ -102,7 +104,6 @@
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\GlobalAssemblyInfo.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="Properties\Resources.resx">
@@ -115,10 +116,12 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <None Include="..\..\Copying.GPL.licenseheader">
+      <Link>Copying.GPL.licenseheader</Link>
+    </None>
     <None Include="App.config">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Properties\AssemblyInfo.cs.svn" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -181,9 +184,10 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)..\build\Deltares.Dam.Version.targets" />
   <PropertyGroup>
-    <PreBuildEvent>"$(ProjectDir)..\..\..\utils\svn_insert_version.cmd" "$(ProjectDir)Properties"</PreBuildEvent>
+    <PreBuildEvent>
+    </PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: DamClients/DamUI/trunk/src/Deltares.Dam.Version/GlobalAssembly.cs.svn
===================================================================
diff -u
--- DamClients/DamUI/trunk/src/Deltares.Dam.Version/GlobalAssembly.cs.svn	(revision 0)
+++ DamClients/DamUI/trunk/src/Deltares.Dam.Version/GlobalAssembly.cs.svn	(revision 887)
@@ -0,0 +1,13 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Deltares")]
+[assembly: AssemblyCopyright("Copyright © Deltares 2018")]
+[assembly: AssemblyProduct("DAM (Dijksterkte Analyse Module)")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: AssemblyVersion("18.1.0.SVNREV")]
+[assembly: AssemblyFileVersion("18.1.0.SVNREV")]
\ No newline at end of file
Index: DamClients/DamUI/trunk/src/Dam/Data/Properties/AssemblyInfo.cs
===================================================================
diff -u
--- DamClients/DamUI/trunk/src/Dam/Data/Properties/AssemblyInfo.cs	(revision 0)
+++ DamClients/DamUI/trunk/src/Dam/Data/Properties/AssemblyInfo.cs	(revision 887)
@@ -0,0 +1,10 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Deltares.Dam.Data")]
+[assembly: ComVisible(false)]
+[assembly: Guid("a6184ba6-b126-4783-b437-e987b511e09b")]
+
+[assembly: InternalsVisibleTo("Deltares.Dam.Tests")]
+[assembly: InternalsVisibleTo("Deltares.Dam.IntegrationTests")]
Index: DamClients/DamUI/trunk/src/Dam.sln
===================================================================
diff -u -r875 -r887
--- DamClients/DamUI/trunk/src/Dam.sln	(.../branches/CalcualtionIncluded/src/Dam.sln)	(revision 875)
+++ DamClients/DamUI/trunk/src/Dam.sln	(.../trunk/src/Dam.sln)	(revision 887)
@@ -1,5 +1,7 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Clients", "Clients", "{95699CCD-37A6-4F2E-9462-F2F474AD8AE8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{6A55AC8E-14F0-4F4E-94C6-602BE8B3B2C9}"
@@ -28,30 +30,10 @@
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Setup", "Setup", "{BE4E3A78-F55F-4DE7-BCA4-9BAB59C37549}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Piping.Data", "Piping\Data\Deltares.Piping.Data.csproj", "{9F9EDCA8-ADAA-4D2B-B3FF-2A73B548E2DD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Uplift", "Uplift\Deltares.Uplift.csproj", "{61810811-6765-4D51-B569-3B50DA177F3C}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LumenWorks.Framework.IO", "Tools\LumenWorks.Framework.IO\LumenWorks.Framework.IO.csproj", "{E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.AssessmentMechanism", "Deltares.AssessmentMechanism\Deltares.AssessmentMechanism.csproj", "{AABFB557-DC0C-41EF-9B41-B84EEBF541BB}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Maps", "Maps\Deltares.Maps.csproj", "{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Geotechnics.WaternetCreator", "GeoTechnics\WaternetCreator\PlLineCreator\Deltares.Geotechnics.WaternetCreator.csproj", "{39C0F2CF-6419-4BE8-9329-47B0CC0AEF7F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Stability.IO.WTI", "Stability\WTIStability\Deltares.Stability.IO.WTI.csproj", "{5FCE5337-AC72-4A47-B6D5-7911ECBE867C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Stability.Calculation", "Stability\Calculation\Deltares.Stability.Calculation.csproj", "{45F3ED4E-EC88-4CA8-A604-6655E859D31F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Stability.Calculation.Inner", "Stability\Calculation\Inner\Deltares.Stability.Calculation.Inner.csproj", "{F7152FA2-65DB-4174-A142-0CA96B4A7E2E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Stability.Calculation2", "MacroStability\Data\Deltares.Stability.Calculation2.csproj", "{EFCCA6C8-D6DC-401C-AF3D-1A5572224C88}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.MStab.IO.Classic", "MStab\IO\Classic\Deltares.MStab.IO.Classic.csproj", "{65DFB3DF-DD36-49C9-9240-0D2EF87B186C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Stability", "Stability\Deltares.Stability.csproj", "{71C1E257-520D-4943-81C4-9E125DAA182C}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.Data", "Dam\Data\Deltares.Dam.Data.csproj", "{F1CD9620-15CF-41F8-AF70-5AE004A50F60}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{D4B66CA4-73D2-40CF-B3ED-9D473ABA34EE}"
@@ -61,10 +43,6 @@
 		.nuget\NuGet.targets = .nuget\NuGet.targets
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.DeltaModel", "Deltares.DeltaModel\Deltares.DeltaModel.csproj", "{4599EA18-543F-419C-BB0B-E554F9FDD126}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.MStab", "MStab\Deltares.MStab.csproj", "{960169CA-6D93-4039-85ED-E826E21FA84A}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.Forms", "Dam\Forms\Deltares.Dam.Forms.csproj", "{1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.Application", "Dam\Application\Deltares.Dam.Application.csproj", "{03810024-8D4D-4726-9C4A-4A6886651CAB}"
@@ -81,88 +59,34 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Maps.Tests", "Maps\Test\Deltares.Maps.Tests.csproj", "{E0820F33-3929-493D-821D-95E755F87D0B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Piping.Tests", "Piping\Tests\Deltares.Piping.Tests.csproj", "{49673DFB-0A90-43D7-BF9E-C2EEAFDD2E81}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Uplift.Tests", "Uplift\Tests\Deltares.Uplift.Tests.csproj", "{D258D962-3F8D-406D-A134-DEA27114EFAB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PerformanceTestClientConsole", "Dam\Tests\PerfTestClient\PerformanceTestClientConsole.csproj", "{792CB645-B070-4B05-95EB-5E5CF7E59CDC}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsvToDamxConverter", "Dam\Tools\CsvToDamxConverter\CsvToDamxConverter.csproj", "{D8457286-3BD4-49FB-9FCB-22D7CB662F57}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeoXY2LatLong", "Dam\Tools\GeoXY2LatLong\GeoXY2LatLong.csproj", "{2C1BFE67-A106-4926-BA5A-0374EA6B99B6}"
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Deltares.Dam.Setup", "Dam\Dam.Setup\Deltares.Dam.Setup.wixproj", "{5ACA0915-875D-4F5C-A5D1-7D6FE1E7B8CA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Geotechnics.WaternetCreator.Tests", "GeoTechnics\Tests\WaternetCreator\Deltares.Geotechnics.WaternetCreator.Tests.csproj", "{731A8E36-4E16-4C13-B548-D47DA12B813F}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.DamWti.Tests", "Dam\Tests\WTI\Deltares.Dam.DamWti.Tests\Deltares.Dam.DamWti.Tests.csproj", "{9184EF77-E11F-41C9-8926-CFF0AABE43A0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.Version", "Deltares.Dam.Version\Deltares.Dam.Version.csproj", "{E5FBE34E-740D-42AA-AD11-431A23EEF6CA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9F9EDCA8-ADAA-4D2B-B3FF-2A73B548E2DD}.Debug|x86.ActiveCfg = Debug|x86
-		{9F9EDCA8-ADAA-4D2B-B3FF-2A73B548E2DD}.Debug|x86.Build.0 = Debug|x86
-		{9F9EDCA8-ADAA-4D2B-B3FF-2A73B548E2DD}.Release|x86.ActiveCfg = Release|x86
-		{9F9EDCA8-ADAA-4D2B-B3FF-2A73B548E2DD}.Release|x86.Build.0 = Release|x86
-		{61810811-6765-4D51-B569-3B50DA177F3C}.Debug|x86.ActiveCfg = Debug|x86
-		{61810811-6765-4D51-B569-3B50DA177F3C}.Debug|x86.Build.0 = Debug|x86
-		{61810811-6765-4D51-B569-3B50DA177F3C}.Release|x86.ActiveCfg = Release|x86
-		{61810811-6765-4D51-B569-3B50DA177F3C}.Release|x86.Build.0 = Release|x86
 		{E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}.Debug|x86.ActiveCfg = Debug|x86
 		{E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}.Debug|x86.Build.0 = Debug|x86
 		{E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}.Release|x86.ActiveCfg = Release|x86
 		{E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}.Release|x86.Build.0 = Release|x86
-		{AABFB557-DC0C-41EF-9B41-B84EEBF541BB}.Debug|x86.ActiveCfg = Debug|x86
-		{AABFB557-DC0C-41EF-9B41-B84EEBF541BB}.Debug|x86.Build.0 = Debug|x86
-		{AABFB557-DC0C-41EF-9B41-B84EEBF541BB}.Release|x86.ActiveCfg = Release|x86
-		{AABFB557-DC0C-41EF-9B41-B84EEBF541BB}.Release|x86.Build.0 = Release|x86
 		{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Debug|x86.ActiveCfg = Debug|x86
 		{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Debug|x86.Build.0 = Debug|x86
 		{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Release|x86.ActiveCfg = Release|x86
 		{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Release|x86.Build.0 = Release|x86
-		{39C0F2CF-6419-4BE8-9329-47B0CC0AEF7F}.Debug|x86.ActiveCfg = Debug|x86
-		{39C0F2CF-6419-4BE8-9329-47B0CC0AEF7F}.Debug|x86.Build.0 = Debug|x86
-		{39C0F2CF-6419-4BE8-9329-47B0CC0AEF7F}.Release|x86.ActiveCfg = Release|x86
-		{39C0F2CF-6419-4BE8-9329-47B0CC0AEF7F}.Release|x86.Build.0 = Release|x86
-		{5FCE5337-AC72-4A47-B6D5-7911ECBE867C}.Debug|x86.ActiveCfg = Debug|x86
-		{5FCE5337-AC72-4A47-B6D5-7911ECBE867C}.Debug|x86.Build.0 = Debug|x86
-		{5FCE5337-AC72-4A47-B6D5-7911ECBE867C}.Release|x86.ActiveCfg = Release|x86
-		{5FCE5337-AC72-4A47-B6D5-7911ECBE867C}.Release|x86.Build.0 = Release|x86
-		{45F3ED4E-EC88-4CA8-A604-6655E859D31F}.Debug|x86.ActiveCfg = Debug|x86
-		{45F3ED4E-EC88-4CA8-A604-6655E859D31F}.Debug|x86.Build.0 = Debug|x86
-		{45F3ED4E-EC88-4CA8-A604-6655E859D31F}.Release|x86.ActiveCfg = Release|x86
-		{45F3ED4E-EC88-4CA8-A604-6655E859D31F}.Release|x86.Build.0 = Release|x86
-		{F7152FA2-65DB-4174-A142-0CA96B4A7E2E}.Debug|x86.ActiveCfg = Debug|x86
-		{F7152FA2-65DB-4174-A142-0CA96B4A7E2E}.Debug|x86.Build.0 = Debug|x86
-		{F7152FA2-65DB-4174-A142-0CA96B4A7E2E}.Release|x86.ActiveCfg = Release|x86
-		{F7152FA2-65DB-4174-A142-0CA96B4A7E2E}.Release|x86.Build.0 = Release|x86
-		{EFCCA6C8-D6DC-401C-AF3D-1A5572224C88}.Debug|x86.ActiveCfg = Debug|x86
-		{EFCCA6C8-D6DC-401C-AF3D-1A5572224C88}.Debug|x86.Build.0 = Debug|x86
-		{EFCCA6C8-D6DC-401C-AF3D-1A5572224C88}.Release|x86.ActiveCfg = Release|x86
-		{EFCCA6C8-D6DC-401C-AF3D-1A5572224C88}.Release|x86.Build.0 = Release|x86
-		{65DFB3DF-DD36-49C9-9240-0D2EF87B186C}.Debug|x86.ActiveCfg = Debug|x86
-		{65DFB3DF-DD36-49C9-9240-0D2EF87B186C}.Debug|x86.Build.0 = Debug|x86
-		{65DFB3DF-DD36-49C9-9240-0D2EF87B186C}.Release|x86.ActiveCfg = Release|x86
-		{65DFB3DF-DD36-49C9-9240-0D2EF87B186C}.Release|x86.Build.0 = Release|x86
-		{71C1E257-520D-4943-81C4-9E125DAA182C}.Debug|x86.ActiveCfg = Debug|x86
-		{71C1E257-520D-4943-81C4-9E125DAA182C}.Debug|x86.Build.0 = Debug|x86
-		{71C1E257-520D-4943-81C4-9E125DAA182C}.Release|x86.ActiveCfg = Release|x86
-		{71C1E257-520D-4943-81C4-9E125DAA182C}.Release|x86.Build.0 = Release|x86
 		{F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Debug|x86.ActiveCfg = Debug|x86
 		{F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Debug|x86.Build.0 = Debug|x86
 		{F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Release|x86.ActiveCfg = Release|x86
 		{F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Release|x86.Build.0 = Release|x86
-		{4599EA18-543F-419C-BB0B-E554F9FDD126}.Debug|x86.ActiveCfg = Debug|x86
-		{4599EA18-543F-419C-BB0B-E554F9FDD126}.Debug|x86.Build.0 = Debug|x86
-		{4599EA18-543F-419C-BB0B-E554F9FDD126}.Release|x86.ActiveCfg = Release|x86
-		{4599EA18-543F-419C-BB0B-E554F9FDD126}.Release|x86.Build.0 = Release|x86
-		{960169CA-6D93-4039-85ED-E826E21FA84A}.Debug|x86.ActiveCfg = Debug|x86
-		{960169CA-6D93-4039-85ED-E826E21FA84A}.Debug|x86.Build.0 = Debug|x86
-		{960169CA-6D93-4039-85ED-E826E21FA84A}.Release|x86.ActiveCfg = Release|x86
-		{960169CA-6D93-4039-85ED-E826E21FA84A}.Release|x86.Build.0 = Release|x86
 		{1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60}.Debug|x86.ActiveCfg = Debug|x86
 		{1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60}.Debug|x86.Build.0 = Debug|x86
 		{1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60}.Release|x86.ActiveCfg = Release|x86
@@ -195,18 +119,6 @@
 		{E0820F33-3929-493D-821D-95E755F87D0B}.Debug|x86.Build.0 = Debug|x86
 		{E0820F33-3929-493D-821D-95E755F87D0B}.Release|x86.ActiveCfg = Release|x86
 		{E0820F33-3929-493D-821D-95E755F87D0B}.Release|x86.Build.0 = Release|x86
-		{49673DFB-0A90-43D7-BF9E-C2EEAFDD2E81}.Debug|x86.ActiveCfg = Debug|x86
-		{49673DFB-0A90-43D7-BF9E-C2EEAFDD2E81}.Debug|x86.Build.0 = Debug|x86
-		{49673DFB-0A90-43D7-BF9E-C2EEAFDD2E81}.Release|x86.ActiveCfg = Release|x86
-		{49673DFB-0A90-43D7-BF9E-C2EEAFDD2E81}.Release|x86.Build.0 = Release|x86
-		{D258D962-3F8D-406D-A134-DEA27114EFAB}.Debug|x86.ActiveCfg = Debug|x86
-		{D258D962-3F8D-406D-A134-DEA27114EFAB}.Debug|x86.Build.0 = Debug|x86
-		{D258D962-3F8D-406D-A134-DEA27114EFAB}.Release|x86.ActiveCfg = Release|x86
-		{D258D962-3F8D-406D-A134-DEA27114EFAB}.Release|x86.Build.0 = Release|x86
-		{792CB645-B070-4B05-95EB-5E5CF7E59CDC}.Debug|x86.ActiveCfg = Debug|x86
-		{792CB645-B070-4B05-95EB-5E5CF7E59CDC}.Debug|x86.Build.0 = Debug|x86
-		{792CB645-B070-4B05-95EB-5E5CF7E59CDC}.Release|x86.ActiveCfg = Release|x86
-		{792CB645-B070-4B05-95EB-5E5CF7E59CDC}.Release|x86.Build.0 = Release|x86
 		{D8457286-3BD4-49FB-9FCB-22D7CB662F57}.Debug|x86.ActiveCfg = Debug|x86
 		{D8457286-3BD4-49FB-9FCB-22D7CB662F57}.Debug|x86.Build.0 = Debug|x86
 		{D8457286-3BD4-49FB-9FCB-22D7CB662F57}.Release|x86.ActiveCfg = Release|x86
@@ -217,53 +129,38 @@
 		{2C1BFE67-A106-4926-BA5A-0374EA6B99B6}.Release|x86.Build.0 = Release|x86
 		{5ACA0915-875D-4F5C-A5D1-7D6FE1E7B8CA}.Debug|x86.ActiveCfg = Debug|x86
 		{5ACA0915-875D-4F5C-A5D1-7D6FE1E7B8CA}.Release|x86.ActiveCfg = Release|x86
-		{731A8E36-4E16-4C13-B548-D47DA12B813F}.Debug|x86.ActiveCfg = Debug|x86
-		{731A8E36-4E16-4C13-B548-D47DA12B813F}.Debug|x86.Build.0 = Debug|x86
-		{731A8E36-4E16-4C13-B548-D47DA12B813F}.Release|x86.ActiveCfg = Release|x86
-		{731A8E36-4E16-4C13-B548-D47DA12B813F}.Release|x86.Build.0 = Release|x86
 		{9184EF77-E11F-41C9-8926-CFF0AABE43A0}.Debug|x86.ActiveCfg = Debug|x86
 		{9184EF77-E11F-41C9-8926-CFF0AABE43A0}.Debug|x86.Build.0 = Debug|x86
 		{9184EF77-E11F-41C9-8926-CFF0AABE43A0}.Release|x86.ActiveCfg = Release|x86
 		{9184EF77-E11F-41C9-8926-CFF0AABE43A0}.Release|x86.Build.0 = Release|x86
+		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA}.Debug|x86.ActiveCfg = Debug|x86
+		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA}.Debug|x86.Build.0 = Debug|x86
+		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA}.Release|x86.ActiveCfg = Release|x86
+		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{03810024-8D4D-4726-9C4A-4A6886651CAB} = {95699CCD-37A6-4F2E-9462-F2F474AD8AE8}
 		{146FCBE0-C8C1-46CA-AF69-E8F67F179958} = {6A55AC8E-14F0-4F4E-94C6-602BE8B3B2C9}
+		{7A9F4AF0-9F1B-4C80-83C0-252B5CED05A6} = {146FCBE0-C8C1-46CA-AF69-E8F67F179958}
+		{6708ED54-139D-4508-99B2-A3C27FA781FF} = {146FCBE0-C8C1-46CA-AF69-E8F67F179958}
 		{62CC2363-893F-4ECD-BCD6-AA7150AD6918} = {6A55AC8E-14F0-4F4E-94C6-602BE8B3B2C9}
-		{9F9EDCA8-ADAA-4D2B-B3FF-2A73B548E2DD} = {31A32A36-649A-41A8-9F43-6A6193C04770}
-		{61810811-6765-4D51-B569-3B50DA177F3C} = {31A32A36-649A-41A8-9F43-6A6193C04770}
 		{E3B83D68-C90C-4874-8E5F-DEC8D038BC7C} = {31A32A36-649A-41A8-9F43-6A6193C04770}
-		{AABFB557-DC0C-41EF-9B41-B84EEBF541BB} = {31A32A36-649A-41A8-9F43-6A6193C04770}
 		{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665} = {31A32A36-649A-41A8-9F43-6A6193C04770}
-		{39C0F2CF-6419-4BE8-9329-47B0CC0AEF7F} = {31A32A36-649A-41A8-9F43-6A6193C04770}
-		{5FCE5337-AC72-4A47-B6D5-7911ECBE867C} = {31A32A36-649A-41A8-9F43-6A6193C04770}
-		{45F3ED4E-EC88-4CA8-A604-6655E859D31F} = {31A32A36-649A-41A8-9F43-6A6193C04770}
-		{F7152FA2-65DB-4174-A142-0CA96B4A7E2E} = {31A32A36-649A-41A8-9F43-6A6193C04770}
-		{EFCCA6C8-D6DC-401C-AF3D-1A5572224C88} = {31A32A36-649A-41A8-9F43-6A6193C04770}
-		{65DFB3DF-DD36-49C9-9240-0D2EF87B186C} = {31A32A36-649A-41A8-9F43-6A6193C04770}
-		{71C1E257-520D-4943-81C4-9E125DAA182C} = {31A32A36-649A-41A8-9F43-6A6193C04770}
 		{F1CD9620-15CF-41F8-AF70-5AE004A50F60} = {31A32A36-649A-41A8-9F43-6A6193C04770}
-		{4599EA18-543F-419C-BB0B-E554F9FDD126} = {31A32A36-649A-41A8-9F43-6A6193C04770}
-		{960169CA-6D93-4039-85ED-E826E21FA84A} = {31A32A36-649A-41A8-9F43-6A6193C04770}
-		{7A9F4AF0-9F1B-4C80-83C0-252B5CED05A6} = {146FCBE0-C8C1-46CA-AF69-E8F67F179958}
-		{6708ED54-139D-4508-99B2-A3C27FA781FF} = {146FCBE0-C8C1-46CA-AF69-E8F67F179958}
+		{1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60} = {658575B9-AEBC-42C9-8ADA-D961449E00BC}
+		{03810024-8D4D-4726-9C4A-4A6886651CAB} = {95699CCD-37A6-4F2E-9462-F2F474AD8AE8}
 		{CF39BFD8-B4D7-4290-9223-F19D3E8E1058} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 		{3929C2AB-5F5B-40A1-8D77-6303AEE7976B} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 		{D092C06D-9CE6-48CF-8453-637FCCE8B371} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 		{D312A703-F6CF-4BEC-B5C5-4E9C161D2010} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 		{15503BE5-7148-4DA6-BDD0-5880266E79D4} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 		{E0820F33-3929-493D-821D-95E755F87D0B} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
-		{49673DFB-0A90-43D7-BF9E-C2EEAFDD2E81} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
-		{D258D962-3F8D-406D-A134-DEA27114EFAB} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
-		{792CB645-B070-4B05-95EB-5E5CF7E59CDC} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
-		{731A8E36-4E16-4C13-B548-D47DA12B813F} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
-		{9184EF77-E11F-41C9-8926-CFF0AABE43A0} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 		{D8457286-3BD4-49FB-9FCB-22D7CB662F57} = {21ABEBA9-040B-4522-BD23-837E4FB5CD08}
 		{2C1BFE67-A106-4926-BA5A-0374EA6B99B6} = {21ABEBA9-040B-4522-BD23-837E4FB5CD08}
-		{1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60} = {658575B9-AEBC-42C9-8ADA-D961449E00BC}
 		{5ACA0915-875D-4F5C-A5D1-7D6FE1E7B8CA} = {BE4E3A78-F55F-4DE7-BCA4-9BAB59C37549}
+		{9184EF77-E11F-41C9-8926-CFF0AABE43A0} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
+		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA} = {31A32A36-649A-41A8-9F43-6A6193C04770}
 	EndGlobalSection
 EndGlobal
Index: DamClients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj
===================================================================
diff -u -r875 -r887
--- DamClients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 875)
+++ DamClients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 887)
@@ -172,9 +172,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\GlobalAssemblyInfo.cs">
-      <Link>Properties\GlobalAssemblyInfo.cs</Link>
-    </Compile>
     <Compile Include="ApplicationLogger.cs" />
     <Compile Include="Assemblers\TimeSeriesAssembler.cs" />
     <Compile Include="BackgroundRepositoryFeature.cs" />
@@ -460,7 +457,7 @@
     <Folder Include="DtoAssembler\Properties\" />
     <Folder Include="MetaInfo\" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)..\build\Deltares.Dam.Version.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -469,7 +466,8 @@
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
   </Target>
   <PropertyGroup>
-    <PreBuildEvent>"$(ProjectDir)..\..\..\utils\svn_insert_version.cmd" "$(ProjectDir)Properties"</PreBuildEvent>
+    <PreBuildEvent>
+    </PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: DamClients/DamUI/trunk/src/Maps/Deltares.Maps.csproj
===================================================================
diff -u -r875 -r887
--- DamClients/DamUI/trunk/src/Maps/Deltares.Maps.csproj	(.../Deltares.Maps.csproj)	(revision 875)
+++ DamClients/DamUI/trunk/src/Maps/Deltares.Maps.csproj	(.../Deltares.Maps.csproj)	(revision 887)
@@ -139,7 +139,7 @@
   <ItemGroup>
     <EmbeddedResource Include="Translations.xml" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)..\build\Deltares.Dam.Version.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
Fisheye: Tag 887 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Application/Properties/GlobalAssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamClients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj
===================================================================
diff -u -r875 -r887
--- DamClients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj	(.../Deltares.Dam.Forms.csproj)	(revision 875)
+++ DamClients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj	(.../Deltares.Dam.Forms.csproj)	(revision 887)
@@ -156,9 +156,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\GlobalAssemblyInfo.cs">
-      <Link>Properties\GlobalAssemblyInfo.cs</Link>
-    </Compile>
     <Compile Include="AssessmentCalculationSpecificationPropertyControl.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -310,7 +307,6 @@
       <Link>Copying.GPL.licenseheader</Link>
     </None>
     <None Include="app.config" />
-    <None Include="Properties\AssemblyInfo.cs.svn" />
     <None Include="Resources\MStabResult.wmf" />
   </ItemGroup>
   <ItemGroup>
@@ -348,9 +344,10 @@
       <Name>Deltares.Dam.Data</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)..\build\Deltares.Dam.Version.targets" />
   <PropertyGroup>
-    <PreBuildEvent>"$(ProjectDir)..\..\..\utils\svn_insert_version.cmd" "$(ProjectDir)Properties"</PreBuildEvent>
+    <PreBuildEvent>
+    </PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Fisheye: Tag 887 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Application/Properties/AssemblyInfo.cs.svn'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamClients/DamUI/trunk/src/Maps/Properties/AssemblyInfo.cs
===================================================================
diff -u -r875 -r887
--- DamClients/DamUI/trunk/src/Maps/Properties/AssemblyInfo.cs	(.../branches/CalcualtionIncluded/src/Maps/Properties/AssemblyInfo.cs)	(revision 875)
+++ DamClients/DamUI/trunk/src/Maps/Properties/AssemblyInfo.cs	(.../trunk/src/Maps/Properties/AssemblyInfo.cs)	(revision 887)
@@ -1,39 +1,28 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of the application DAM - UI.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-
 [assembly: AssemblyTitle("Deltares.Maps")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("WL | Delft Hydraulics")]
-[assembly: AssemblyProduct("Deltares.Maps")]
-[assembly: AssemblyCopyright("Copyright © WL | Delft Hydraulics 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-
 [assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
 [assembly: Guid("12d231d2-d46c-41ca-bc1d-b91e2986c4d5")]
 
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
Fisheye: Tag 887 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Forms/Properties/AssemblyInfo.cs.svn'.
Fisheye: No comparison available.  Pass `N' to diff?