From bc932061744e7b44c5215d16891315c62cfe7948 Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Sun, 14 Oct 2018 00:18:20 +0200
Subject: [PATCH] Store Windows SDK version number for uicc.exe in central
 place

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
---
 src/TortoiseGit.common.props                | 4 ++++
 src/TortoiseMerge/TortoiseMerge.vcxproj     | 2 +-
 src/TortoiseMerge/TortoiseMergeLang.vcxproj | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/TortoiseGit.common.props b/src/TortoiseGit.common.props
index 799d1fe4c..6c8774340 100644
--- a/src/TortoiseGit.common.props
+++ b/src/TortoiseGit.common.props
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+    <TGIT_WIN10_SDK>10.0.17134.0</TGIT_WIN10_SDK>
+    <TGIT_UICC_PATH>$(WindowsSdkDir_10)bin\$(TGIT_WIN10_SDK)\x86\uicc.exe</TGIT_UICC_PATH>
+  </PropertyGroup>
+  <PropertyGroup>
     <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
     <IntDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)..\obj\$(ProjectName)\$(Configuration)\</IntDir>
diff --git a/src/TortoiseMerge/TortoiseMerge.vcxproj b/src/TortoiseMerge/TortoiseMerge.vcxproj
index 89eeefe0e..f24e3c719 100644
--- a/src/TortoiseMerge/TortoiseMerge.vcxproj
+++ b/src/TortoiseMerge/TortoiseMerge.vcxproj
@@ -444,7 +444,7 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\Resources\TortoiseGitMergeRibbon.xml">
-      <Command>"$(WindowsSdkDir_10)bin\10.0.17134.0\x86\uicc.exe" "%(FullPath)" "$(IntDir)TortoiseGitMergeRibbon.bml" /header:"$(IntDir)TortoiseGitMergeRibbon.h" /res:"$(IntDir)TortoiseGitMergeRibbon.rc" /name:TortoiseGitMergeRibbon</Command>
+      <Command>"$(TGIT_UICC_PATH)" "%(FullPath)" "$(IntDir)TortoiseGitMergeRibbon.bml" /header:"$(IntDir)TortoiseGitMergeRibbon.h" /res:"$(IntDir)TortoiseGitMergeRibbon.rc" /name:TortoiseGitMergeRibbon</Command>
       <Outputs>$(IntDir)TortoiseGitMergeRibbon.bml;$(IntDir)TortoiseGitMergeRibbon.rc;$(IntDir)TortoiseGitMergeRibbon.h;%(Outputs)</Outputs>
       <SubType>Designer</SubType>
     </CustomBuild>
diff --git a/src/TortoiseMerge/TortoiseMergeLang.vcxproj b/src/TortoiseMerge/TortoiseMergeLang.vcxproj
index d66112df5..f86e04a51 100644
--- a/src/TortoiseMerge/TortoiseMergeLang.vcxproj
+++ b/src/TortoiseMerge/TortoiseMergeLang.vcxproj
@@ -48,7 +48,7 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\Resources\TortoiseGitMergeRibbon.xml">
-      <Command>"$(WindowsSdkDir_10)bin\10.0.16299.0\x86\uicc.exe" "%(FullPath)" "$(IntDir)TortoiseGitMergeRibbon.bml" /header:"$(IntDir)TortoiseGitMergeRibbon.h" /res:"$(IntDir)TortoiseGitMergeRibbon.rc" /name:TortoiseGitMergeRibbon</Command>
+      <Command>"$(TGIT_UICC_PATH)" "%(FullPath)" "$(IntDir)TortoiseGitMergeRibbon.bml" /header:"$(IntDir)TortoiseGitMergeRibbon.h" /res:"$(IntDir)TortoiseGitMergeRibbon.rc" /name:TortoiseGitMergeRibbon</Command>
       <Outputs>$(IntDir)TortoiseGitMergeRibbon.bml;$(IntDir)TortoiseGitMergeRibbon.rc;$(IntDir)TortoiseGitMergeRibbon.h;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
-- 
2.11.4.GIT