Index: DamClients/DamUI/trunk/src/Maps/Deltares.Maps.csproj
===================================================================
diff -u -r887 -r888
--- DamClients/DamUI/trunk/src/Maps/Deltares.Maps.csproj	(.../Deltares.Maps.csproj)	(revision 887)
+++ DamClients/DamUI/trunk/src/Maps/Deltares.Maps.csproj	(.../Deltares.Maps.csproj)	(revision 888)
@@ -139,7 +139,7 @@
   <ItemGroup>
     <EmbeddedResource Include="Translations.xml" />
   </ItemGroup>
-  <Import Project="$(SolutionDir)..\build\Deltares.Dam.Version.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>
Index: DamClients/DamUI/trunk/src/Dam/Application/Deltares.Dam.Application.csproj
===================================================================
diff -u -r887 -r888
--- DamClients/DamUI/trunk/src/Dam/Application/Deltares.Dam.Application.csproj	(.../Deltares.Dam.Application.csproj)	(revision 887)
+++ DamClients/DamUI/trunk/src/Dam/Application/Deltares.Dam.Application.csproj	(.../Deltares.Dam.Application.csproj)	(revision 888)
@@ -184,7 +184,7 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
-  <Import Project="$(SolutionDir)..\build\Deltares.Dam.Version.targets" />
+  <Import Project="$(SolutionDir)\build\Deltares.Dam.Version.targets" />
   <PropertyGroup>
     <PreBuildEvent>
     </PreBuildEvent>
Index: DamClients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj
===================================================================
diff -u -r887 -r888
--- DamClients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 887)
+++ DamClients/DamUI/trunk/src/Dam/Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 888)
@@ -457,7 +457,7 @@
     <Folder Include="DtoAssembler\Properties\" />
     <Folder Include="MetaInfo\" />
   </ItemGroup>
-  <Import Project="$(SolutionDir)..\build\Deltares.Dam.Version.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>
Index: DamClients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj
===================================================================
diff -u -r887 -r888
--- DamClients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj	(.../Deltares.Dam.Forms.csproj)	(revision 887)
+++ DamClients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj	(.../Deltares.Dam.Forms.csproj)	(revision 888)
@@ -344,7 +344,7 @@
       <Name>Deltares.Dam.Data</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(SolutionDir)..\build\Deltares.Dam.Version.targets" />
+  <Import Project="$(SolutionDir)\build\Deltares.Dam.Version.targets" />
   <PropertyGroup>
     <PreBuildEvent>
     </PreBuildEvent>
Index: DamClients/DamUI/trunk/src/Deltares.Dam.Version/Deltares.Dam.Version.csproj
===================================================================
diff -u -r887 -r888
--- DamClients/DamUI/trunk/src/Deltares.Dam.Version/Deltares.Dam.Version.csproj	(.../Deltares.Dam.Version.csproj)	(revision 887)
+++ DamClients/DamUI/trunk/src/Deltares.Dam.Version/Deltares.Dam.Version.csproj	(.../Deltares.Dam.Version.csproj)	(revision 888)
@@ -46,7 +46,7 @@
   <ItemGroup>
     <None Include="GlobalAssembly.cs.svn" />
   </ItemGroup>
-  <Import Project="$(SolutionDir)..\build\Deltares.Dam.Version.targets" />
+  <Import Project="$(SolutionDir)\build\Deltares.Dam.Version.targets" />
   <PropertyGroup>
     <PreBuildEvent>"$(ProjectDir)..\..\utils\svn_insert_version.cmd" "$(ProjectDir)" GlobalAssembly.cs.svn GlobalAssembly.cs</PreBuildEvent>
   </PropertyGroup>
Index: DamClients/DamUI/trunk/utils/svn_insert_version.cmd
===================================================================
diff -u -r875 -r888
--- DamClients/DamUI/trunk/utils/svn_insert_version.cmd	(.../branches/CalcualtionIncluded/utils/svn_insert_version.cmd)	(revision 875)
+++ DamClients/DamUI/trunk/utils/svn_insert_version.cmd	(.../trunk/utils/svn_insert_version.cmd)	(revision 888)
@@ -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%
 
 )