Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/Deltares.DamEngine.Interface.csproj
===================================================================
diff -u -r877 -r1497
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/Deltares.DamEngine.Interface.csproj	(.../Deltares.DamEngine.Interface.csproj)	(revision 877)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/Deltares.DamEngine.Interface.csproj	(.../Deltares.DamEngine.Interface.csproj)	(revision 1497)
@@ -78,7 +78,7 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
-  <Import Project="$(SolutionDir)..\build\Deltares.DamEngine.Version.targets" />
+  <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.Version.targets" />
   <PropertyGroup>
     <PreBuildEvent>
     </PreBuildEvent>
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj
===================================================================
diff -u -r1431 -r1497
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj	(.../Deltares.DamEngine.Data.csproj)	(revision 1431)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj	(.../Deltares.DamEngine.Data.csproj)	(revision 1497)
@@ -183,7 +183,7 @@
     <EmbeddedResource Include="Properties\Resources.nl-NL.resx" />
   </ItemGroup>
   <ItemGroup />
-  <Import Project="$(SolutionDir)..\build\Deltares.DamEngine.Version.targets" />
+  <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.Version.targets" />
   <PropertyGroup>
     <PreBuildEvent>
     </PreBuildEvent>
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj
===================================================================
diff -u -r1285 -r1497
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj	(.../Deltares.DamEngine.Calculators.Tests.csproj)	(revision 1285)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj	(.../Deltares.DamEngine.Calculators.Tests.csproj)	(revision 1497)
@@ -159,7 +159,7 @@
     </Content>
   </ItemGroup>
   <ItemGroup />
-  <Import Project="$(SolutionDir)..\build\Deltares.DamEngine.Version.targets" />
+  <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.Version.targets" />
   <!-- 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">
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/Deltares.DamEngine.Interface.Tests.csproj
===================================================================
diff -u -r1493 -r1497
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/Deltares.DamEngine.Interface.Tests.csproj	(.../Deltares.DamEngine.Interface.Tests.csproj)	(revision 1493)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/Deltares.DamEngine.Interface.Tests.csproj	(.../Deltares.DamEngine.Interface.Tests.csproj)	(revision 1497)
@@ -235,7 +235,7 @@
     </Content>
   </ItemGroup>
   <ItemGroup />
-  <Import Project="$(SolutionDir)..\build\Deltares.DamEngine.Version.targets" />
+  <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.Version.targets" />
   <!-- 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">
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
===================================================================
diff -u -r1468 -r1497
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj	(.../Deltares.DamEngine.Calculators.csproj)	(revision 1468)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj	(.../Deltares.DamEngine.Calculators.csproj)	(revision 1497)
@@ -207,7 +207,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <Import Project="$(SolutionDir)..\build\Deltares.DamEngine.Version.targets" />
+  <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.Version.targets" />
   <PropertyGroup>
     <PreBuildEvent>
     </PreBuildEvent>
Index: DamEngine/trunk/src/Deltares.DamEngine.Version/Deltares.DamEngine.Version.csproj
===================================================================
diff -u -r877 -r1497
--- DamEngine/trunk/src/Deltares.DamEngine.Version/Deltares.DamEngine.Version.csproj	(.../Deltares.DamEngine.Version.csproj)	(revision 877)
+++ DamEngine/trunk/src/Deltares.DamEngine.Version/Deltares.DamEngine.Version.csproj	(.../Deltares.DamEngine.Version.csproj)	(revision 1497)
@@ -46,7 +46,7 @@
   <ItemGroup>
     <None Include="GlobalAssembly.cs.svn" />
   </ItemGroup>
-  <Import Project="$(SolutionDir)..\build\Deltares.DamEngine.Version.targets" />
+  <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.Version.targets" />
   <PropertyGroup>
     <PreBuildEvent>"$(ProjectDir)..\..\utils\svn_insert_version.cmd" "$(ProjectDir)" GlobalAssembly.cs.svn GlobalAssembly.cs</PreBuildEvent>
   </PropertyGroup>
Index: DamEngine/trunk/src/Deltares.DamEngine.ConsoleRun/Deltares.DamEngine.ConsoleRun.csproj
===================================================================
diff -u -r1314 -r1497
--- DamEngine/trunk/src/Deltares.DamEngine.ConsoleRun/Deltares.DamEngine.ConsoleRun.csproj	(.../Deltares.DamEngine.ConsoleRun.csproj)	(revision 1314)
+++ DamEngine/trunk/src/Deltares.DamEngine.ConsoleRun/Deltares.DamEngine.ConsoleRun.csproj	(.../Deltares.DamEngine.ConsoleRun.csproj)	(revision 1497)
@@ -43,7 +43,7 @@
       <Name>Deltares.DamEngine.Interface</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(SolutionDir)..\build\Deltares.DamEngine.Version.targets" />
+  <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.Version.targets" />
   <!-- 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">
Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Deltares.DamEngine.Data.Tests.csproj
===================================================================
diff -u -r1408 -r1497
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Deltares.DamEngine.Data.Tests.csproj	(.../Deltares.DamEngine.Data.Tests.csproj)	(revision 1408)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Deltares.DamEngine.Data.Tests.csproj	(.../Deltares.DamEngine.Data.Tests.csproj)	(revision 1497)
@@ -61,7 +61,7 @@
       <Link>Copying.AGPL.licenseheader</Link>
     </None>
   </ItemGroup>
-  <Import Project="$(SolutionDir)..\build\Deltares.DamEngine.Version.targets" />
+  <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.Version.targets" />
   <!-- 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">
Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Deltares.DamEngine.TestHelpers.csproj
===================================================================
diff -u -r1135 -r1497
--- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Deltares.DamEngine.TestHelpers.csproj	(.../Deltares.DamEngine.TestHelpers.csproj)	(revision 1135)
+++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Deltares.DamEngine.TestHelpers.csproj	(.../Deltares.DamEngine.TestHelpers.csproj)	(revision 1497)
@@ -56,7 +56,7 @@
       <Name>Deltares.DamEngine.Data</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.Version.targets" />
   <!-- 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">
Index: DamEngine/trunk/src/Deltares.DamEngine.Io/Deltares.DamEngine.Io.csproj
===================================================================
diff -u -r877 -r1497
--- DamEngine/trunk/src/Deltares.DamEngine.Io/Deltares.DamEngine.Io.csproj	(.../Deltares.DamEngine.Io.csproj)	(revision 877)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/Deltares.DamEngine.Io.csproj	(.../Deltares.DamEngine.Io.csproj)	(revision 1497)
@@ -49,7 +49,7 @@
   <ItemGroup>
     <Content Include="Readme.txt" />
   </ItemGroup>
-  <Import Project="$(SolutionDir)..\build\Deltares.DamEngine.Version.targets" />
+  <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.Version.targets" />
   <PropertyGroup>
     <PreBuildEvent>
     </PreBuildEvent>
Index: DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/Deltares.DamEngine.Io.Tests.csproj
===================================================================
diff -u -r877 -r1497
--- DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/Deltares.DamEngine.Io.Tests.csproj	(.../Deltares.DamEngine.Io.Tests.csproj)	(revision 877)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/Deltares.DamEngine.Io.Tests.csproj	(.../Deltares.DamEngine.Io.Tests.csproj)	(revision 1497)
@@ -59,7 +59,7 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.Version.targets" />
   <!-- 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">