[cpp-msbuild] branch master updated: Merge Module name and location

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository cpp-msbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-msbuild.git;a=commit;h=71ddebbd4ce3115b918d7fb12eb349bf8ed8454d

The following commit(s) were added to refs/heads/master by this push:
       new  71ddebb   Merge Module name and location
71ddebb is described below

commit 71ddebbd4ce3115b918d7fb12eb349bf8ed8454d
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Oct 7 17:05:36 2017 +0100

    Merge Module name and location
    
    In VC15.3.5 the merge module name does not track the Compiler version,
    it tracks the build environment (which is VC141), so define that.
---
 Versions.props | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Versions.props b/Versions.props
index fb72215..bf43ba5 100644
--- a/Versions.props
+++ b/Versions.props
@@ -3,7 +3,8 @@
   <PropertyGroup Label="VersionMacros">
     <MsVCVersion>vc15</MsVCVersion>
     <!-- NO TRAILING '\' for the following.  Default value is C:\Program Files (x86)\Common Files\Merge Modules -->
-    <CppMmDir>D:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Redist\MSVC\14.10.25008\MergeModules</CppMmDir>
+    <CppMmDir>D:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Redist\MSVC\14.11.25325\MergeModules</CppMmDir>
+    <CppVCVersion>VC141</CppVCVersion>
 
     <CxxTestRoot>$(BuildRoot)\cxxtest</CxxTestRoot>
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.