Index: dam engine/trunk/src/Deltares.DamEngine.Version/Deltares.DamEngine.Version.csproj
===================================================================
diff -u
--- dam engine/trunk/src/Deltares.DamEngine.Version/Deltares.DamEngine.Version.csproj	(revision 0)
+++ dam engine/trunk/src/Deltares.DamEngine.Version/Deltares.DamEngine.Version.csproj	(revision 871)
@@ -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>{4F235915-BF77-427C-9F8F-F2F05242C764}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Deltares.DamEngine.Version</RootNamespace>
+    <AssemblyName>Deltares.DamEngine.Version</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\bin\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\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.DamEngine.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: dam engine/trunk/src/DamEngine.sln
===================================================================
diff -u -r761 -r871
--- dam engine/trunk/src/DamEngine.sln	(.../DamEngine.sln)	(revision 761)
+++ dam engine/trunk/src/DamEngine.sln	(.../DamEngine.sln)	(revision 871)
@@ -29,6 +29,8 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.DamEngine.TestHelpers", "Deltares.DamEngine.TestHelpers\Deltares.DamEngine.TestHelpers.csproj", "{A41683F4-C3E0-4386-AEE7-FAACD535CF93}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.DamEngine.Version", "Deltares.DamEngine.Version\Deltares.DamEngine.Version.csproj", "{4F235915-BF77-427C-9F8F-F2F05242C764}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
@@ -71,6 +73,10 @@
 		{A41683F4-C3E0-4386-AEE7-FAACD535CF93}.Debug|x86.Build.0 = Debug|x86
 		{A41683F4-C3E0-4386-AEE7-FAACD535CF93}.Release|x86.ActiveCfg = Release|x86
 		{A41683F4-C3E0-4386-AEE7-FAACD535CF93}.Release|x86.Build.0 = Release|x86
+		{4F235915-BF77-427C-9F8F-F2F05242C764}.Debug|x86.ActiveCfg = Debug|x86
+		{4F235915-BF77-427C-9F8F-F2F05242C764}.Debug|x86.Build.0 = Debug|x86
+		{4F235915-BF77-427C-9F8F-F2F05242C764}.Release|x86.ActiveCfg = Release|x86
+		{4F235915-BF77-427C-9F8F-F2F05242C764}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
Index: dam engine/trunk/build/Deltares.DamEngine.Version.targets
===================================================================
diff -u
--- dam engine/trunk/build/Deltares.DamEngine.Version.targets	(revision 0)
+++ dam engine/trunk/build/Deltares.DamEngine.Version.targets	(revision 871)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition="$(Configuration) == ''">Debug</Configuration>
+    <Platform Condition="$(Platform) == ''">x86</Platform>
+    <OutputType Condition="$(OutputType) == ''">Library</OutputType>
+    <CheckForOverflowUnderflow Condition="$(CheckForOverflowUnderflow) == ''">true</CheckForOverflowUnderflow>
+    <SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
+    <OutputPath Condition="$(OutputPath) == ''">$(SolutionDir)\bin\$(Configuration)\</OutputPath>
+    <OutDir>$(OutputPath)</OutDir>
+    <PlatformTarget>x86</PlatformTarget>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <WarningLevel>4</WarningLevel>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <DefineConstants>TRACE</DefineConstants>
+    <DebugType>pdbonly</DebugType>
+    <AllowedReferenceRelatedFileExtensions>none</AllowedReferenceRelatedFileExtensions>
+  </PropertyGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <Compile Include="$(SolutionDir)\Deltares.DamEngine.Version\GlobalAssembly.cs">
+      <Link>GlobalAssembly.cs</Link>
+    </Compile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
Index: dam engine/trunk/utils/svn_insert_version.cmd
===================================================================
diff -u -r302 -r871
--- dam engine/trunk/utils/svn_insert_version.cmd	(.../svn_insert_version.cmd)	(revision 302)
+++ dam engine/trunk/utils/svn_insert_version.cmd	(.../svn_insert_version.cmd)	(revision 871)
@@ -2,9 +2,7 @@
 @ECHO off
 ECHO "svn_insert_version.cmd started"
 
-REM REMEMBER ORIGINAL WORKING FOLDER AND GO TO THE SOURCES DIRECTORY
 SET ORG_DIR=%CD%
-cd ..\..
 
 SET argcount=0
 FOR %%x IN (%*) DO SET /A argcount+=1
@@ -30,11 +28,13 @@
     SET OUTTEXTFILE=%3
 ) 
 
+CD %1
+
 ECHO "parsing svn info in directory %CD%"
 
 REM GET THE SVN VERSION NUMBER AND REVISION PATH
 FOR /f "tokens=1,* delims=�" %%A IN ('svn info') DO (
-	ECHO %%A | findstr /I /C:"Last Changed Rev" && SET REV_BUF=%%A
+	ECHO %%A | findstr /I "^Revision" && SET REV_BUF=%%A
 	ECHO %%A | findstr /I "^URL" && SET ROOT_BUF=%%A
     ECHO %%A | findstr /I /C:"Repository Root" && SET AFTER_BUF=%%A
 )
@@ -43,7 +43,7 @@
     SET SVN_REV=0
 	SET SVN_ROOT=
 ) ELSE (
-    SET SVN_REV=%REV_BUF:~18%
+    SET SVN_REV=%REV_BUF:~10%
     SET SVN_ROOT=%ROOT_BUF:~5%
     SET "FIND=*%AFTER_BUF:~17%
     CALL SET SVN_ROOT=%%SVN_ROOT:!FIND!=%%
@@ -52,7 +52,6 @@
 ECHO "using rev %SVN_REV% and root %SVN_ROOT%"
 
 REM SUBSTITUTE THE VERSION NUMBER IN TEMPLATE
-CD %1
 ECHO "modifying %OUTTEXTFILE% in directory %1"
 SET SEARCHTEXT=SVNREV
 SET SEARCHROOT=SVNROOT
@@ -66,7 +65,7 @@
 ECHO "writing new %OUTTEXTFILE%"
 
 REM This command can process version files which contain special character "!"
-call powershell -Command "(gc %INTEXTFILE%) -replace '%SEARCHTEXT%', '%SVN_REV%' | Out-File -encoding ASCII %OUTTEXTFILE%
+call powershell -Command "(gc %INTEXTFILE%) -replace '%SEARCHTEXT%', '%SVN_REV%' | Out-File -encoding UTF8 %OUTTEXTFILE%
 
 )
 
Index: dam engine/trunk/src/Deltares.DamEngine.Version/GlobalAssembly.cs.svn
===================================================================
diff -u
--- dam engine/trunk/src/Deltares.DamEngine.Version/GlobalAssembly.cs.svn	(revision 0)
+++ dam engine/trunk/src/Deltares.DamEngine.Version/GlobalAssembly.cs.svn	(revision 871)
@@ -0,0 +1,12 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Deltares")]
+[assembly: AssemblyCopyright("Copyright © Deltares 2018")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: AssemblyVersion("18.1.0.SVNREV")]
+[assembly: AssemblyFileVersion("18.1.0.SVNREV")]
\ No newline at end of file
Index: dam engine/trunk/src/Deltares.DamEngine.Version/Properties/AssemblyInfo.cs
===================================================================
diff -u
--- dam engine/trunk/src/Deltares.DamEngine.Version/Properties/AssemblyInfo.cs	(revision 0)
+++ dam engine/trunk/src/Deltares.DamEngine.Version/Properties/AssemblyInfo.cs	(revision 871)
@@ -0,0 +1,7 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Deltares.DamEngine.Version")]
+[assembly: AssemblyProduct("Deltares.DamEngine.Version")]
+[assembly: ComVisible(false)]
+[assembly: Guid("4f235915-bf77-427c-9f8f-f2f05242c764")]