From 073311be789ed010c276d5cf8741623b7f17522b Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Fri, 7 Sep 2018 18:02:30 +0200
Subject: [PATCH] Simplify property sheet inclusion

---
 ZRColaInstall/ZRColaInstall.props     | 5 ++++-
 ZRColaInstall/ZRColaInstallDe.vcxproj | 4 ----
 ZRColaInstall/ZRColaInstallEn.vcxproj | 4 ----
 ZRColaInstall/ZRColaInstallRu.vcxproj | 4 ----
 ZRColaInstall/ZRColaInstallSl.vcxproj | 4 ----
 5 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/ZRColaInstall/ZRColaInstall.props b/ZRColaInstall/ZRColaInstall.props
index a61fc2c..06ca785 100644
--- a/ZRColaInstall/ZRColaInstall.props
+++ b/ZRColaInstall/ZRColaInstall.props
@@ -1,6 +1,9 @@
 <?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="..\include\$(Platform).props" />
+    <Import Project="..\include\$(Configuration).props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
diff --git a/ZRColaInstall/ZRColaInstallDe.vcxproj b/ZRColaInstall/ZRColaInstallDe.vcxproj
index ac45ed0..dcc9ac9 100644
--- a/ZRColaInstall/ZRColaInstallDe.vcxproj
+++ b/ZRColaInstall/ZRColaInstallDe.vcxproj
@@ -32,14 +32,10 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\Win32.props" />
-    <Import Project="..\include\Debug.props" />
     <Import Project="ZRColaInstall.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\Win32.props" />
-    <Import Project="..\include\Release.props" />
     <Import Project="ZRColaInstall.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
diff --git a/ZRColaInstall/ZRColaInstallEn.vcxproj b/ZRColaInstall/ZRColaInstallEn.vcxproj
index a22deff..394bf03 100644
--- a/ZRColaInstall/ZRColaInstallEn.vcxproj
+++ b/ZRColaInstall/ZRColaInstallEn.vcxproj
@@ -32,14 +32,10 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\Win32.props" />
-    <Import Project="..\include\Debug.props" />
     <Import Project="ZRColaInstall.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\Win32.props" />
-    <Import Project="..\include\Release.props" />
     <Import Project="ZRColaInstall.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
diff --git a/ZRColaInstall/ZRColaInstallRu.vcxproj b/ZRColaInstall/ZRColaInstallRu.vcxproj
index 51ee67a..0d1c445 100644
--- a/ZRColaInstall/ZRColaInstallRu.vcxproj
+++ b/ZRColaInstall/ZRColaInstallRu.vcxproj
@@ -32,14 +32,10 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\Win32.props" />
-    <Import Project="..\include\Debug.props" />
     <Import Project="ZRColaInstall.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\Win32.props" />
-    <Import Project="..\include\Release.props" />
     <Import Project="ZRColaInstall.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
diff --git a/ZRColaInstall/ZRColaInstallSl.vcxproj b/ZRColaInstall/ZRColaInstallSl.vcxproj
index d471330..d1f1883 100644
--- a/ZRColaInstall/ZRColaInstallSl.vcxproj
+++ b/ZRColaInstall/ZRColaInstallSl.vcxproj
@@ -32,14 +32,10 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\Win32.props" />
-    <Import Project="..\include\Debug.props" />
     <Import Project="ZRColaInstall.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\Win32.props" />
-    <Import Project="..\include\Release.props" />
     <Import Project="ZRColaInstall.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />