From 6aaa31def234773bd63719e034094897287d9bef Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Fri, 11 Mar 2016 14:12:44 +0100
Subject: [PATCH] Common property sheet removed and referenced in Win32 and x64
 property sheets now

---
 MSICA/MSICA.vcxproj | 3 ---
 include/Win32.props | 4 +++-
 include/x64.props   | 4 +++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/MSICA/MSICA.vcxproj b/MSICA/MSICA.vcxproj
index 8b83c62..6de0d78 100644
--- a/MSICA/MSICA.vcxproj
+++ b/MSICA/MSICA.vcxproj
@@ -49,7 +49,6 @@
   <ImportGroup Label="ExtensionSettings" />
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\common.props" />
     <Import Project="..\include\Win32.props" />
     <Import Project="..\include\Release.props" />
     <Import Project="MSICA.props" />
@@ -63,14 +62,12 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\common.props" />
     <Import Project="..\include\x64.props" />
     <Import Project="..\include\Release.props" />
     <Import Project="MSICA.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\common.props" />
     <Import Project="..\include\x64.props" />
     <Import Project="..\include\Debug.props" />
     <Import Project="MSICA.props" />
diff --git a/include/Win32.props b/include/Win32.props
index fbd0e31..b63e5b4 100644
--- a/include/Win32.props
+++ b/include/Win32.props
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
+  <ImportGroup Label="PropertySheets">
+    <Import Project="common.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_PropertySheetDisplayName>MSICA Win32</_PropertySheetDisplayName>
diff --git a/include/x64.props b/include/x64.props
index ff52cec..30140ff 100644
--- a/include/x64.props
+++ b/include/x64.props
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
+  <ImportGroup Label="PropertySheets">
+    <Import Project="common.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_PropertySheetDisplayName>MSICA x64</_PropertySheetDisplayName>