Use vs2015 MSBuild property sheets in older projects

All the older (vs2010 -> vs2013) projects had copies of the Visual Studio 2015 MSBuild applied to them when running the 'configure.bat' batch file. Any modifications to a property sheet was not applied to the other Visual Studio versions' projects unless the batch file was re-executed.

* Modified the older projects to reference the Visual Studio 2015 property sheets so changes are immediately applied
* Removed the batch file copy steps (which left the repository very dirty after execution)

builds/msvc/configure.bat

@@ -27,31 +27,3 @@ IF EXIST "..\..\..\libsodium" (
 
 ECHO. >> platform.hpp
 ECHO #endif>> platform.hpp
-
-:-  Copy property files for test suite; these are the
-:-  same for all versions of VS so we maintain only the ones
-:-  in vs2015
-
-COPY /Y vs2015\libzmq\libzmq.props           vs2010\libzmq >nul
-COPY /Y vs2015\inproc_lat\inproc_lat.props   vs2010\inproc_lat >nul
-COPY /Y vs2015\inproc_thr\inproc_thr.props   vs2010\inproc_thr >nul
-COPY /Y vs2015\local_lat\local_lat.props     vs2010\local_lat  >nul
-COPY /Y vs2015\local_thr\local_thr.props     vs2010\local_thr  >nul
-COPY /Y vs2015\remote_lat\remote_lat.props   vs2010\remote_lat >nul
-COPY /Y vs2015\remote_thr\remote_thr.props   vs2010\remote_thr >nul
-
-COPY /Y vs2015\libzmq\libzmq.props           vs2012\libzmq >nul
-COPY /Y vs2015\inproc_lat\inproc_lat.props   vs2012\inproc_lat >nul
-COPY /Y vs2015\inproc_thr\inproc_thr.props   vs2012\inproc_thr >nul
-COPY /Y vs2015\local_lat\local_lat.props     vs2012\local_lat  >nul
-COPY /Y vs2015\local_thr\local_thr.props     vs2012\local_thr  >nul
-COPY /Y vs2015\remote_lat\remote_lat.props   vs2012\remote_lat >nul
-COPY /Y vs2015\remote_thr\remote_thr.props   vs2012\remote_thr >nul
-
-COPY /Y vs2015\libzmq\libzmq.props           vs2013\libzmq >nul
-COPY /Y vs2015\inproc_lat\inproc_lat.props   vs2013\inproc_lat >nul
-COPY /Y vs2015\inproc_thr\inproc_thr.props   vs2013\inproc_thr >nul
-COPY /Y vs2015\local_lat\local_lat.props     vs2013\local_lat  >nul
-COPY /Y vs2015\local_thr\local_thr.props     vs2013\local_thr  >nul
-COPY /Y vs2015\remote_lat\remote_lat.props   vs2013\remote_lat >nul
-COPY /Y vs2015\remote_thr\remote_thr.props   vs2013\remote_thr >nul

builds/msvc/vs2010/inproc_lat/inproc_lat.vcxproj

@@ -61,7 +61,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
     <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
     <ClInclude Include="..\..\platform.hpp" />

builds/msvc/vs2010/inproc_thr/inproc_thr.vcxproj

@@ -61,7 +61,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
     <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
     <ClInclude Include="..\..\platform.hpp" />

builds/msvc/vs2010/libzmq/libzmq.vcxproj

@@ -64,7 +64,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
     <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
   </ImportGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'">
     <ClCompile>

builds/msvc/vs2010/local_lat/local_lat.vcxproj

@@ -61,7 +61,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
     <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
   </ImportGroup> 
   <ItemGroup>
     <ClInclude Include="..\..\platform.hpp" />

builds/msvc/vs2010/local_thr/local_thr.vcxproj

@@ -61,7 +61,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
     <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
     <ClInclude Include="..\..\platform.hpp" />

builds/msvc/vs2010/remote_lat/remote_lat.vcxproj

@@ -61,7 +61,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
     <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
   </ImportGroup> 
   <ItemGroup>
     <ClInclude Include="..\..\platform.hpp" />

builds/msvc/vs2010/remote_thr/remote_thr.vcxproj

@@ -61,7 +61,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
     <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
   </ImportGroup>  
   <ItemGroup>
     <ClInclude Include="..\..\platform.hpp" />

builds/msvc/vs2012/inproc_lat/inproc_lat.vcxproj

@@ -61,7 +61,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
     <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
     <ClInclude Include="..\..\platform.hpp" />

builds/msvc/vs2012/inproc_thr/inproc_thr.vcxproj

@@ -61,7 +61,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
     <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
     <ClInclude Include="..\..\platform.hpp" />

builds/msvc/vs2012/libzmq/libzmq.vcxproj

@@ -64,7 +64,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
     <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
   </ImportGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'">
     <ClCompile>

builds/msvc/vs2012/local_lat/local_lat.vcxproj

@@ -61,7 +61,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
     <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
   </ImportGroup> 
   <ItemGroup>
     <ClInclude Include="..\..\platform.hpp" />

builds/msvc/vs2012/local_thr/local_thr.vcxproj

@@ -61,7 +61,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
     <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
     <ClInclude Include="..\..\platform.hpp" />

builds/msvc/vs2012/remote_lat/remote_lat.vcxproj

@@ -61,7 +61,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
     <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
   </ImportGroup> 
   <ItemGroup>
     <ClInclude Include="..\..\platform.hpp" />

builds/msvc/vs2012/remote_thr/remote_thr.vcxproj

@@ -61,7 +61,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
     <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
   </ImportGroup>  
   <ItemGroup>
     <ClInclude Include="..\..\platform.hpp" />

builds/msvc/vs2013/inproc_lat/inproc_lat.vcxproj

@@ -61,7 +61,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
     <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
     <ClInclude Include="..\..\platform.hpp" />

builds/msvc/vs2013/inproc_thr/inproc_thr.vcxproj

@@ -61,7 +61,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
     <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
     <ClInclude Include="..\..\platform.hpp" />

builds/msvc/vs2013/libzmq/libzmq.vcxproj

@@ -64,7 +64,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
     <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
   </ImportGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'">
     <ClCompile>

builds/msvc/vs2013/local_lat/local_lat.vcxproj

@@ -61,7 +61,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
     <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
   </ImportGroup> 
   <ItemGroup>
     <ClInclude Include="..\..\platform.hpp" />

builds/msvc/vs2013/local_thr/local_thr.vcxproj

@@ -61,7 +61,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
     <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
     <ClInclude Include="..\..\platform.hpp" />

builds/msvc/vs2013/remote_lat/remote_lat.vcxproj

@@ -61,7 +61,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
     <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
   </ImportGroup> 
   <ItemGroup>
     <ClInclude Include="..\..\platform.hpp" />

builds/msvc/vs2013/remote_thr/remote_thr.vcxproj

@@ -61,7 +61,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
     <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
   </ImportGroup>  
   <ItemGroup>
     <ClInclude Include="..\..\platform.hpp" />