From 864f01be16d0390d36ac6c664a6bd38911f13467 Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Tue, 21 May 2013 17:41:40 +0000
Subject: [PATCH] Parameterize msbuild path

---
 adfs/adfs-lite.vcxproj                    | 4 ++--
 adfs/adfs.vcxproj                         | 4 ++--
 apache/mod_shib13.vcxproj                 | 4 ++--
 apache/mod_shib20.vcxproj                 | 4 ++--
 apache/mod_shib22.vcxproj                 | 4 ++--
 apache/mod_shib24.vcxproj                 | 4 ++--
 fastcgi/shibauthorizer.vcxproj            | 4 ++--
 fastcgi/shibresponder.vcxproj             | 4 ++--
 isapi_shib/isapi_shib.vcxproj             | 4 ++--
 msi/WiX/Installer.vcxproj                 | 2 +-
 msi/WiX/MergeModules/MergeModules.vcxproj | 2 +-
 nsapi_shib/nsapi_shib.vcxproj             | 4 ++--
 odbc-store/odbc-store.vcxproj             | 4 ++--
 plugins/plugins-lite.vcxproj              | 4 ++--
 plugins/plugins.vcxproj                   | 4 ++--
 shibd/shibd.vcxproj                       | 4 ++--
 shibsp/shibsp-lite.vcxproj                | 4 ++--
 shibsp/shibsp.vcxproj                     | 4 ++--
 util/mdquery.vcxproj                      | 4 ++--
 util/resolvertest.vcxproj                 | 4 ++--
 20 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/adfs/adfs-lite.vcxproj b/adfs/adfs-lite.vcxproj
index 97d893f..35761e6 100644
--- a/adfs/adfs-lite.vcxproj
+++ b/adfs/adfs-lite.vcxproj
@@ -59,8 +59,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <Import Project="..\..\BuildPath.props" />
-  <Import Project="..\MsBuild\Versions.props" />
-  <Import Project="..\MsBuild\Includes.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
diff --git a/adfs/adfs.vcxproj b/adfs/adfs.vcxproj
index ad81ea6..e1bf9ff 100644
--- a/adfs/adfs.vcxproj
+++ b/adfs/adfs.vcxproj
@@ -59,8 +59,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <Import Project="..\..\BuildPath.props" />
-  <Import Project="..\MsBuild\Versions.props" />
-  <Import Project="..\MsBuild\Includes.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
diff --git a/apache/mod_shib13.vcxproj b/apache/mod_shib13.vcxproj
index f1a7f12..ad24e13 100644
--- a/apache/mod_shib13.vcxproj
+++ b/apache/mod_shib13.vcxproj
@@ -62,8 +62,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <Import Project="..\..\BuildPath.props" />
-  <Import Project="..\MsBuild\Versions.props" />
-  <Import Project="..\MsBuild\Includes.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
diff --git a/apache/mod_shib20.vcxproj b/apache/mod_shib20.vcxproj
index f91fb91..086ad18 100644
--- a/apache/mod_shib20.vcxproj
+++ b/apache/mod_shib20.vcxproj
@@ -62,8 +62,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <Import Project="..\..\BuildPath.props" />
-  <Import Project="..\MsBuild\Versions.props" />
-  <Import Project="..\MsBuild\Includes.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
diff --git a/apache/mod_shib22.vcxproj b/apache/mod_shib22.vcxproj
index daffc2d..76957fb 100644
--- a/apache/mod_shib22.vcxproj
+++ b/apache/mod_shib22.vcxproj
@@ -62,8 +62,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <Import Project="..\..\BuildPath.props" />
-  <Import Project="..\MsBuild\Versions.props" />
-  <Import Project="..\MsBuild\Includes.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
diff --git a/apache/mod_shib24.vcxproj b/apache/mod_shib24.vcxproj
index e2222cd..4b05521 100644
--- a/apache/mod_shib24.vcxproj
+++ b/apache/mod_shib24.vcxproj
@@ -62,8 +62,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <Import Project="..\..\BuildPath.props" />
-  <Import Project="..\MsBuild\Versions.props" />
-  <Import Project="..\MsBuild\Includes.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
diff --git a/fastcgi/shibauthorizer.vcxproj b/fastcgi/shibauthorizer.vcxproj
index d366656..8c60dc3 100644
--- a/fastcgi/shibauthorizer.vcxproj
+++ b/fastcgi/shibauthorizer.vcxproj
@@ -61,8 +61,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <Import Project="..\..\BuildPath.props" />
-  <Import Project="..\MsBuild\Versions.props" />
-  <Import Project="..\MsBuild\Includes.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
diff --git a/fastcgi/shibresponder.vcxproj b/fastcgi/shibresponder.vcxproj
index a586f24..a16f10b 100644
--- a/fastcgi/shibresponder.vcxproj
+++ b/fastcgi/shibresponder.vcxproj
@@ -62,8 +62,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <Import Project="..\..\BuildPath.props" />
-  <Import Project="..\MsBuild\Versions.props" />
-  <Import Project="..\MsBuild\Includes.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
diff --git a/isapi_shib/isapi_shib.vcxproj b/isapi_shib/isapi_shib.vcxproj
index 2a856fb..b1c52e6 100644
--- a/isapi_shib/isapi_shib.vcxproj
+++ b/isapi_shib/isapi_shib.vcxproj
@@ -59,8 +59,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <Import Project="..\..\BuildPath.props" />
-  <Import Project="..\MsBuild\Versions.props" />
-  <Import Project="..\MsBuild\Includes.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
diff --git a/msi/WiX/Installer.vcxproj b/msi/WiX/Installer.vcxproj
index df53903..82c938a 100644
--- a/msi/WiX/Installer.vcxproj
+++ b/msi/WiX/Installer.vcxproj
@@ -37,7 +37,7 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <Import Project="..\..\..\BuildPath.props" />
-  <Import Project="..\..\MsBuild\Versions.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
     <NMakeBuildCommandLine>nmake /f Installer.make clean</NMakeBuildCommandLine>
diff --git a/msi/WiX/MergeModules/MergeModules.vcxproj b/msi/WiX/MergeModules/MergeModules.vcxproj
index 4ba3792..151c6f7 100644
--- a/msi/WiX/MergeModules/MergeModules.vcxproj
+++ b/msi/WiX/MergeModules/MergeModules.vcxproj
@@ -37,7 +37,7 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <Import Project="..\..\..\..\BuildPath.props" />
-  <Import Project="..\..\..\MsBuild\Versions.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
     <NMakeBuildCommandLine>nmake /f MergeModules.make clean</NMakeBuildCommandLine>
diff --git a/nsapi_shib/nsapi_shib.vcxproj b/nsapi_shib/nsapi_shib.vcxproj
index 9ea4de6..67f1197 100644
--- a/nsapi_shib/nsapi_shib.vcxproj
+++ b/nsapi_shib/nsapi_shib.vcxproj
@@ -61,8 +61,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <Import Project="..\..\BuildPath.props" />
-  <Import Project="..\MsBuild\Versions.props" />
-  <Import Project="..\MsBuild\Includes.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
diff --git a/odbc-store/odbc-store.vcxproj b/odbc-store/odbc-store.vcxproj
index f30af70..4fdf91d 100644
--- a/odbc-store/odbc-store.vcxproj
+++ b/odbc-store/odbc-store.vcxproj
@@ -59,8 +59,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <Import Project="..\..\BuildPath.props" />
-  <Import Project="..\MsBuild\Versions.props" />
-  <Import Project="..\MsBuild\Includes.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
diff --git a/plugins/plugins-lite.vcxproj b/plugins/plugins-lite.vcxproj
index d71b9f8..643f5ca 100644
--- a/plugins/plugins-lite.vcxproj
+++ b/plugins/plugins-lite.vcxproj
@@ -61,8 +61,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <Import Project="..\..\BuildPath.props" />
-  <Import Project="..\MsBuild\Versions.props" />
-  <Import Project="..\MsBuild\Includes.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
diff --git a/plugins/plugins.vcxproj b/plugins/plugins.vcxproj
index e77eb3d..136f576 100644
--- a/plugins/plugins.vcxproj
+++ b/plugins/plugins.vcxproj
@@ -61,8 +61,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <Import Project="..\..\BuildPath.props" />
-  <Import Project="..\MsBuild\Versions.props" />
-  <Import Project="..\MsBuild\Includes.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
diff --git a/shibd/shibd.vcxproj b/shibd/shibd.vcxproj
index 933bceb..da81db8 100644
--- a/shibd/shibd.vcxproj
+++ b/shibd/shibd.vcxproj
@@ -58,8 +58,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <Import Project="..\..\BuildPath.props" />
-  <Import Project="..\MsBuild\Versions.props" />
-  <Import Project="..\MsBuild\Includes.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
diff --git a/shibsp/shibsp-lite.vcxproj b/shibsp/shibsp-lite.vcxproj
index 64612c1..b049cbd 100644
--- a/shibsp/shibsp-lite.vcxproj
+++ b/shibsp/shibsp-lite.vcxproj
@@ -59,8 +59,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <Import Project="..\..\BuildPath.props" />
-  <Import Project="..\MsBuild\Versions.props" />
-  <Import Project="..\MsBuild\Includes.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
diff --git a/shibsp/shibsp.vcxproj b/shibsp/shibsp.vcxproj
index a0c84f8..2a6b2cd 100644
--- a/shibsp/shibsp.vcxproj
+++ b/shibsp/shibsp.vcxproj
@@ -59,8 +59,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <Import Project="..\..\BuildPath.props" />
-  <Import Project="..\MsBuild\Versions.props" />
-  <Import Project="..\MsBuild\Includes.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
diff --git a/util/mdquery.vcxproj b/util/mdquery.vcxproj
index c5f7aa3..17e0923 100644
--- a/util/mdquery.vcxproj
+++ b/util/mdquery.vcxproj
@@ -58,8 +58,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <Import Project="..\..\BuildPath.props" />
-  <Import Project="..\MsBuild\Versions.props" />
-  <Import Project="..\MsBuild\Includes.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
diff --git a/util/resolvertest.vcxproj b/util/resolvertest.vcxproj
index 2e56a3a..bc77413 100644
--- a/util/resolvertest.vcxproj
+++ b/util/resolvertest.vcxproj
@@ -60,8 +60,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <Import Project="..\..\BuildPath.props" />
-  <Import Project="..\MsBuild\Versions.props" />
-  <Import Project="..\MsBuild\Includes.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
 
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-- 
2.1.4