[shibboleth-sp2] 15/23: SSPCPP-765 Death to ParentRoot
Ferenc Wágner
wferi at moszumanska.debian.org
Wed Feb 21 10:57:07 UTC 2018
This is an automated email from the git hooks/post-receive script.
wferi pushed a commit to branch master
in repository shibboleth-sp2.
commit 4a3a0eee1f569747ba9e095797e48d7e9f92888d
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date: Mon Dec 4 16:46:52 2017 +0000
SSPCPP-765 Death to ParentRoot
https://issues.shibboleth.net/jira/browse/SSPCPP-765
---
Projects/vc15/UnitTests/UnitTests.vcxproj | 8 ++++----
Projects/vc15/adfs/adfs-lite.vcxproj | 8 ++++----
Projects/vc15/adfs/adfs.vcxproj | 6 +++---
Projects/vc15/apache/mod_shib13.vcxproj | 8 ++++----
Projects/vc15/apache/mod_shib20.vcxproj | 4 ++--
Projects/vc15/apache/mod_shib22.vcxproj | 6 +++---
Projects/vc15/apache/mod_shib24.vcxproj | 6 +++---
Projects/vc15/iis7_shib/iis7_shib.vcxproj | 8 ++++----
Projects/vc15/isapi_shib/isapi_shib.vcxproj | 6 +++---
Projects/vc15/memcache-store/memcache-store.vcxproj | 6 +++---
Projects/vc15/odbc-store/odbc-store.vcxproj | 6 +++---
Projects/vc15/plugins/plugins-lite.vcxproj | 6 +++---
Projects/vc15/plugins/plugins.vcxproj | 6 +++---
Projects/vc15/shibd/shibd.vcxproj | 6 +++---
Projects/vc15/shibsp/shibsp-lite.vcxproj | 8 ++++----
Projects/vc15/shibsp/shibsp.vcxproj | 8 ++++----
Projects/vc15/util/mdquery.vcxproj | 6 +++---
Projects/vc15/util/messages.vcxproj | 6 +++---
Projects/vc15/util/resolvertest.vcxproj | 6 +++---
Projects/vc15/wix/Installer.vcxproj | 2 +-
Projects/vc15/wix/MergeModules.vcxproj | 2 +-
21 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/Projects/vc15/UnitTests/UnitTests.vcxproj b/Projects/vc15/UnitTests/UnitTests.vcxproj
index 3b61856..f368c2c 100644
--- a/Projects/vc15/UnitTests/UnitTests.vcxproj
+++ b/Projects/vc15/UnitTests/UnitTests.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -67,8 +67,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\..\..\BuildPath.props" />
- <Import Project="$(ParentRoot)\Versions.props" />
- <Import Project="$(ParentRoot)\Includes.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Versions.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Includes.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IntDir>$(SolutionDir)..\..\Build\VC15\$(projectName)\$(Platform)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)\..\..\Build\VC15\$(Configuration)\</OutDir>
@@ -191,4 +191,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc15/adfs/adfs-lite.vcxproj b/Projects/vc15/adfs/adfs-lite.vcxproj
index 4ea43e2..0d703e8 100644
--- a/Projects/vc15/adfs/adfs-lite.vcxproj
+++ b/Projects/vc15/adfs/adfs-lite.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?Xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -64,8 +64,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\..\..\BuildPath.props" />
- <Import Project="$(ParentRoot)\Versions.props" />
- <Import Project="$(ParentRoot)\Includes.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Versions.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\..\Build\VC15\$(projectName)\$(Platform)\$(Configuration)\</IntDir>
@@ -222,4 +222,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc15/adfs/adfs.vcxproj b/Projects/vc15/adfs/adfs.vcxproj
index 3a9c0cf..cb91980 100644
--- a/Projects/vc15/adfs/adfs.vcxproj
+++ b/Projects/vc15/adfs/adfs.vcxproj
@@ -64,8 +64,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\..\..\BuildPath.props" />
- <Import Project="$(ParentRoot)\Versions.props" />
- <Import Project="$(ParentRoot)\Includes.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Versions.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
@@ -220,4 +220,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc15/apache/mod_shib13.vcxproj b/Projects/vc15/apache/mod_shib13.vcxproj
index 67a56f8..7a5e5e6 100644
--- a/Projects/vc15/apache/mod_shib13.vcxproj
+++ b/Projects/vc15/apache/mod_shib13.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -67,8 +67,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\..\..\BuildPath.props" />
- <Import Project="$(ParentRoot)\Versions.props" />
- <Import Project="$(ParentRoot)\Includes.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Versions.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
@@ -265,4 +265,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc15/apache/mod_shib20.vcxproj b/Projects/vc15/apache/mod_shib20.vcxproj
index 017b97a..28a87a9 100644
--- a/Projects/vc15/apache/mod_shib20.vcxproj
+++ b/Projects/vc15/apache/mod_shib20.vcxproj
@@ -66,8 +66,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\..\..\BuildPath.props" />
- <Import Project="$(ParentRoot)\Versions.props" />
- <Import Project="$(ParentRoot)\Includes.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Versions.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
diff --git a/Projects/vc15/apache/mod_shib22.vcxproj b/Projects/vc15/apache/mod_shib22.vcxproj
index e5b332f..5c239cc 100644
--- a/Projects/vc15/apache/mod_shib22.vcxproj
+++ b/Projects/vc15/apache/mod_shib22.vcxproj
@@ -66,8 +66,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\..\..\BuildPath.props" />
- <Import Project="$(ParentRoot)\Versions.props" />
- <Import Project="$(ParentRoot)\Includes.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Versions.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
@@ -272,4 +272,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc15/apache/mod_shib24.vcxproj b/Projects/vc15/apache/mod_shib24.vcxproj
index 2e3dce8..b46e3a1 100644
--- a/Projects/vc15/apache/mod_shib24.vcxproj
+++ b/Projects/vc15/apache/mod_shib24.vcxproj
@@ -66,8 +66,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\..\..\BuildPath.props" />
- <Import Project="$(ParentRoot)\Versions.props" />
- <Import Project="$(ParentRoot)\Includes.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Versions.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\..\Build\VC15\$(projectName)\$(Platform)\$(Configuration)\</IntDir>
@@ -236,4 +236,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc15/iis7_shib/iis7_shib.vcxproj b/Projects/vc15/iis7_shib/iis7_shib.vcxproj
index e159081..b9f1de5 100644
--- a/Projects/vc15/iis7_shib/iis7_shib.vcxproj
+++ b/Projects/vc15/iis7_shib/iis7_shib.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -64,8 +64,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\..\..\BuildPath.props" />
- <Import Project="$(ParentRoot)\Versions.props" />
- <Import Project="$(ParentRoot)\Includes.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Versions.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
@@ -225,4 +225,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc15/isapi_shib/isapi_shib.vcxproj b/Projects/vc15/isapi_shib/isapi_shib.vcxproj
index 0817d84..da0d331 100644
--- a/Projects/vc15/isapi_shib/isapi_shib.vcxproj
+++ b/Projects/vc15/isapi_shib/isapi_shib.vcxproj
@@ -63,8 +63,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\..\..\BuildPath.props" />
- <Import Project="$(ParentRoot)\Versions.props" />
- <Import Project="$(ParentRoot)\Includes.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Versions.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
@@ -255,4 +255,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc15/memcache-store/memcache-store.vcxproj b/Projects/vc15/memcache-store/memcache-store.vcxproj
index 67d1683..a64ab29 100644
--- a/Projects/vc15/memcache-store/memcache-store.vcxproj
+++ b/Projects/vc15/memcache-store/memcache-store.vcxproj
@@ -64,8 +64,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\..\..\BuildPath.props" />
- <Import Project="$(ParentRoot)\Versions.props" />
- <Import Project="$(ParentRoot)\Includes.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Versions.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
@@ -208,4 +208,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc15/odbc-store/odbc-store.vcxproj b/Projects/vc15/odbc-store/odbc-store.vcxproj
index f5dd798..f1bcd90 100644
--- a/Projects/vc15/odbc-store/odbc-store.vcxproj
+++ b/Projects/vc15/odbc-store/odbc-store.vcxproj
@@ -64,8 +64,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\..\..\BuildPath.props" />
- <Import Project="$(ParentRoot)\Versions.props" />
- <Import Project="$(ParentRoot)\Includes.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Versions.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
@@ -206,4 +206,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc15/plugins/plugins-lite.vcxproj b/Projects/vc15/plugins/plugins-lite.vcxproj
index 735e4eb..c3035bd 100644
--- a/Projects/vc15/plugins/plugins-lite.vcxproj
+++ b/Projects/vc15/plugins/plugins-lite.vcxproj
@@ -66,8 +66,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\..\..\BuildPath.props" />
- <Import Project="$(ParentRoot)\Versions.props" />
- <Import Project="$(ParentRoot)\Includes.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Versions.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
@@ -216,4 +216,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc15/plugins/plugins.vcxproj b/Projects/vc15/plugins/plugins.vcxproj
index 786f341..5b01511 100644
--- a/Projects/vc15/plugins/plugins.vcxproj
+++ b/Projects/vc15/plugins/plugins.vcxproj
@@ -66,8 +66,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\..\..\BuildPath.props" />
- <Import Project="$(ParentRoot)\Versions.props" />
- <Import Project="$(ParentRoot)\Includes.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Versions.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
@@ -224,4 +224,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc15/shibd/shibd.vcxproj b/Projects/vc15/shibd/shibd.vcxproj
index 9972581..6e15578 100644
--- a/Projects/vc15/shibd/shibd.vcxproj
+++ b/Projects/vc15/shibd/shibd.vcxproj
@@ -62,8 +62,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\..\..\BuildPath.props" />
- <Import Project="$(ParentRoot)\Versions.props" />
- <Import Project="$(ParentRoot)\Includes.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Versions.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
@@ -237,4 +237,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc15/shibsp/shibsp-lite.vcxproj b/Projects/vc15/shibsp/shibsp-lite.vcxproj
index 30a94dd..f8071ee 100644
--- a/Projects/vc15/shibsp/shibsp-lite.vcxproj
+++ b/Projects/vc15/shibsp/shibsp-lite.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -63,8 +63,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\..\..\BuildPath.props" />
- <Import Project="$(ParentRoot)\Versions.props" />
- <Import Project="$(ParentRoot)\Includes.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Versions.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\..\Build\VC15\$(projectName)\$(Platform)\$(Configuration)\</IntDir>
@@ -313,4 +313,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc15/shibsp/shibsp.vcxproj b/Projects/vc15/shibsp/shibsp.vcxproj
index 87b7921..6d53173 100644
--- a/Projects/vc15/shibsp/shibsp.vcxproj
+++ b/Projects/vc15/shibsp/shibsp.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -63,8 +63,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\..\..\BuildPath.props" />
- <Import Project="$(ParentRoot)\Versions.props" />
- <Import Project="$(ParentRoot)\Includes.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Versions.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
@@ -381,4 +381,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc15/util/mdquery.vcxproj b/Projects/vc15/util/mdquery.vcxproj
index 1258121..1524edb 100644
--- a/Projects/vc15/util/mdquery.vcxproj
+++ b/Projects/vc15/util/mdquery.vcxproj
@@ -62,8 +62,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\..\..\BuildPath.props" />
- <Import Project="$(ParentRoot)\Versions.props" />
- <Import Project="$(ParentRoot)\Includes.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Versions.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
@@ -229,4 +229,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc15/util/messages.vcxproj b/Projects/vc15/util/messages.vcxproj
index 9286275..ba3cfb7 100644
--- a/Projects/vc15/util/messages.vcxproj
+++ b/Projects/vc15/util/messages.vcxproj
@@ -66,8 +66,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\..\..\BuildPath.props" />
- <Import Project="$(ParentRoot)\Versions.props" />
- <Import Project="$(ParentRoot)\Includes.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Versions.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Includes.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetExt>.dll</TargetExt>
<LinkIncremental>false</LinkIncremental>
@@ -201,4 +201,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc15/util/resolvertest.vcxproj b/Projects/vc15/util/resolvertest.vcxproj
index 1fa7d38..3142a62 100644
--- a/Projects/vc15/util/resolvertest.vcxproj
+++ b/Projects/vc15/util/resolvertest.vcxproj
@@ -64,8 +64,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<Import Project="..\..\..\..\BuildPath.props" />
- <Import Project="$(ParentRoot)\Versions.props" />
- <Import Project="$(ParentRoot)\Includes.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Versions.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Includes.props" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
@@ -235,4 +235,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc15/wix/Installer.vcxproj b/Projects/vc15/wix/Installer.vcxproj
index 9ba2580..bf1b2da 100644
--- a/Projects/vc15/wix/Installer.vcxproj
+++ b/Projects/vc15/wix/Installer.vcxproj
@@ -43,7 +43,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="$(ParentRoot)\Versions.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Versions.props" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
<NMakeBuildCommandLine>cd ..\..\..\msi\Wix\
diff --git a/Projects/vc15/wix/MergeModules.vcxproj b/Projects/vc15/wix/MergeModules.vcxproj
index 101db35..b0a8604 100644
--- a/Projects/vc15/wix/MergeModules.vcxproj
+++ b/Projects/vc15/wix/MergeModules.vcxproj
@@ -43,7 +43,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="$(ParentRoot)\Versions.props" />
+ <Import Project="$(SolutionDir)..\..\..\cpp-msbuild\Versions.props" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
<NMakeBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git
More information about the Pkg-shibboleth-devel
mailing list