[shibboleth-sp2] 29/89: SSPCPP-689 Convert to VC14/VS2015

Ferenc Wágner wferi at moszumanska.debian.org
Thu Sep 1 09:24:05 UTC 2016


This is an automated email from the git hooks/post-receive script.

wferi pushed a commit to branch master
in repository shibboleth-sp2.

commit b9370b56856c20b7471e5b3ce3f7f35892d2d3ad
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date:   Thu May 12 16:34:07 2016 +0100

    SSPCPP-689 Convert to VC14/VS2015
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-689
    
    Initial convert by VS2015
---
 Projects/vc14/adfs/adfs-lite.vcxproj               |  10 +-
 Projects/vc14/adfs/adfs.vcxproj                    |  10 +-
 Projects/vc14/apache/mod_shib13.vcxproj            |  10 +-
 Projects/vc14/apache/mod_shib20.vcxproj            |  10 +-
 Projects/vc14/apache/mod_shib22.vcxproj            |  10 +-
 Projects/vc14/apache/mod_shib24.vcxproj            |  10 +-
 Projects/vc14/fastcgi/shibauthorizer.vcxproj       |  11 +-
 Projects/vc14/fastcgi/shibresponder.vcxproj        |  11 +-
 Projects/vc14/isapi_shib/isapi_shib.vcxproj        |  11 +-
 .../vc14/memcache-store/memcache-store.vcxproj     |  11 +-
 Projects/vc14/nsapi_shib/nsapi_shib.vcxproj        |  11 +-
 Projects/vc14/odbc-store/odbc-store.vcxproj        |  12 +-
 Projects/vc14/plugins/plugins-lite.vcxproj         |  11 +-
 Projects/vc14/plugins/plugins.vcxproj              |  11 +-
 Projects/vc14/plugins/plugins.vcxproj.filters      |  20 +-
 Projects/vc14/shibd/shibd.vcxproj                  |  10 +-
 Projects/vc14/shibsp/shibsp-lite.vcxproj           |  11 +-
 Projects/vc14/shibsp/shibsp-lite.vcxproj.filters   | 374 ++++++------
 Projects/vc14/shibsp/shibsp.vcxproj                |  10 +-
 Projects/vc14/shibsp/shibsp.vcxproj.filters        | 648 ++++++++++-----------
 Projects/vc14/util/mdquery.vcxproj                 |  11 +-
 Projects/vc14/util/resolvertest.vcxproj            |  12 +-
 22 files changed, 654 insertions(+), 591 deletions(-)

diff --git a/Projects/vc14/adfs/adfs-lite.vcxproj b/Projects/vc14/adfs/adfs-lite.vcxproj
index 758c056..adb80fd 100644
--- a/Projects/vc14/adfs/adfs-lite.vcxproj
+++ b/Projects/vc14/adfs/adfs-lite.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -28,19 +28,23 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -211,4 +215,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Projects/vc14/adfs/adfs.vcxproj b/Projects/vc14/adfs/adfs.vcxproj
index 46c2f85..94b376b 100644
--- a/Projects/vc14/adfs/adfs.vcxproj
+++ b/Projects/vc14/adfs/adfs.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -28,19 +28,23 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -203,4 +207,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Projects/vc14/apache/mod_shib13.vcxproj b/Projects/vc14/apache/mod_shib13.vcxproj
index db6d059..aeb3194 100644
--- a/Projects/vc14/apache/mod_shib13.vcxproj
+++ b/Projects/vc14/apache/mod_shib13.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -26,20 +26,24 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -248,4 +252,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Projects/vc14/apache/mod_shib20.vcxproj b/Projects/vc14/apache/mod_shib20.vcxproj
index 5c3103b..1a9e55c 100644
--- a/Projects/vc14/apache/mod_shib20.vcxproj
+++ b/Projects/vc14/apache/mod_shib20.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -26,20 +26,24 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -254,4 +258,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Projects/vc14/apache/mod_shib22.vcxproj b/Projects/vc14/apache/mod_shib22.vcxproj
index ad8fa19..d36320d 100644
--- a/Projects/vc14/apache/mod_shib22.vcxproj
+++ b/Projects/vc14/apache/mod_shib22.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -26,20 +26,24 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -262,4 +266,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Projects/vc14/apache/mod_shib24.vcxproj b/Projects/vc14/apache/mod_shib24.vcxproj
index b46ed26..c11b1f8 100644
--- a/Projects/vc14/apache/mod_shib24.vcxproj
+++ b/Projects/vc14/apache/mod_shib24.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -26,20 +26,24 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -226,4 +230,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Projects/vc14/fastcgi/shibauthorizer.vcxproj b/Projects/vc14/fastcgi/shibauthorizer.vcxproj
index 0a574bc..f935474 100644
--- a/Projects/vc14/fastcgi/shibauthorizer.vcxproj
+++ b/Projects/vc14/fastcgi/shibauthorizer.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -25,20 +25,24 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -71,7 +75,6 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
-
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
@@ -230,4 +233,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Projects/vc14/fastcgi/shibresponder.vcxproj b/Projects/vc14/fastcgi/shibresponder.vcxproj
index 55093f9..c4166f8 100644
--- a/Projects/vc14/fastcgi/shibresponder.vcxproj
+++ b/Projects/vc14/fastcgi/shibresponder.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -26,20 +26,24 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -72,7 +76,6 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
-
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
@@ -231,4 +234,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Projects/vc14/isapi_shib/isapi_shib.vcxproj b/Projects/vc14/isapi_shib/isapi_shib.vcxproj
index 3a1b9ec..3857ae7 100644
--- a/Projects/vc14/isapi_shib/isapi_shib.vcxproj
+++ b/Projects/vc14/isapi_shib/isapi_shib.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -25,18 +25,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -68,7 +72,6 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
-
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
@@ -239,4 +242,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Projects/vc14/memcache-store/memcache-store.vcxproj b/Projects/vc14/memcache-store/memcache-store.vcxproj
index f5fc267..fc45b0c 100644
--- a/Projects/vc14/memcache-store/memcache-store.vcxproj
+++ b/Projects/vc14/memcache-store/memcache-store.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -28,19 +28,23 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -68,7 +72,6 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
-
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
@@ -196,4 +199,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Projects/vc14/nsapi_shib/nsapi_shib.vcxproj b/Projects/vc14/nsapi_shib/nsapi_shib.vcxproj
index 2250657..f344ba6 100644
--- a/Projects/vc14/nsapi_shib/nsapi_shib.vcxproj
+++ b/Projects/vc14/nsapi_shib/nsapi_shib.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -25,20 +25,24 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -70,7 +74,6 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
-
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
@@ -238,4 +241,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Projects/vc14/odbc-store/odbc-store.vcxproj b/Projects/vc14/odbc-store/odbc-store.vcxproj
index dcf75b1..9195ec8 100644
--- a/Projects/vc14/odbc-store/odbc-store.vcxproj
+++ b/Projects/vc14/odbc-store/odbc-store.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -28,19 +28,23 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -68,11 +72,9 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
-
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -191,4 +193,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Projects/vc14/plugins/plugins-lite.vcxproj b/Projects/vc14/plugins/plugins-lite.vcxproj
index be7fc1f..b0c48c8 100644
--- a/Projects/vc14/plugins/plugins-lite.vcxproj
+++ b/Projects/vc14/plugins/plugins-lite.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -28,21 +28,25 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -70,7 +74,6 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
-
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
@@ -205,4 +208,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Projects/vc14/plugins/plugins.vcxproj b/Projects/vc14/plugins/plugins.vcxproj
index b41ee4f..59f9e27 100644
--- a/Projects/vc14/plugins/plugins.vcxproj
+++ b/Projects/vc14/plugins/plugins.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -28,21 +28,25 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -70,7 +74,6 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
-
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
@@ -207,4 +210,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Projects/vc14/plugins/plugins.vcxproj.filters b/Projects/vc14/plugins/plugins.vcxproj.filters
index 09299f3..6f1c71d 100644
--- a/Projects/vc14/plugins/plugins.vcxproj.filters
+++ b/Projects/vc14/plugins/plugins.vcxproj.filters
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="GSSAPIAttributeExtractor.cpp" />
-    <ClCompile Include="plugins.cpp" />
-    <ClCompile Include="TransformAttributeResolver.cpp" />
-    <ClCompile Include="TemplateAttributeResolver.cpp" />
-    <ClCompile Include="CaseFoldingAttributeResolver.cpp" />
-    <ClCompile Include="TimeAccessControl.cpp" />
+    <ClCompile Include="..\..\..\plugins\CaseFoldingAttributeResolver.cpp" />
+    <ClCompile Include="..\..\..\plugins\GSSAPIAttributeExtractor.cpp" />
+    <ClCompile Include="..\..\..\plugins\plugins.cpp" />
+    <ClCompile Include="..\..\..\plugins\TemplateAttributeResolver.cpp" />
+    <ClCompile Include="..\..\..\plugins\TimeAccessControl.cpp" />
+    <ClCompile Include="..\..\..\plugins\TransformAttributeResolver.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="internal.h" />
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="..\..\..\plugins\internal.h" />
+    <ClInclude Include="..\..\..\plugins\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Makefile.am" />
+    <None Include="..\..\..\plugins\Makefile.am" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="plugins.rc" />
+    <ResourceCompile Include="..\..\..\plugins\plugins.rc" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Projects/vc14/shibd/shibd.vcxproj b/Projects/vc14/shibd/shibd.vcxproj
index bef3c2b..1f97297 100644
--- a/Projects/vc14/shibd/shibd.vcxproj
+++ b/Projects/vc14/shibd/shibd.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -26,20 +26,24 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -221,4 +225,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Projects/vc14/shibsp/shibsp-lite.vcxproj b/Projects/vc14/shibsp/shibsp-lite.vcxproj
index b65b41e..1125c35 100644
--- a/Projects/vc14/shibsp/shibsp-lite.vcxproj
+++ b/Projects/vc14/shibsp/shibsp-lite.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -28,19 +28,23 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -69,7 +73,6 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
-
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
@@ -304,4 +307,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Projects/vc14/shibsp/shibsp-lite.vcxproj.filters b/Projects/vc14/shibsp/shibsp-lite.vcxproj.filters
index 0c3d198..04aace3 100644
--- a/Projects/vc14/shibsp/shibsp-lite.vcxproj.filters
+++ b/Projects/vc14/shibsp/shibsp-lite.vcxproj.filters
@@ -63,323 +63,323 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="AbstractSPRequest.cpp">
+    <ClCompile Include="..\..\..\shibsp\AbstractSPRequest.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Application.cpp">
+    <ClCompile Include="..\..\..\shibsp\Application.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ServiceProvider.cpp">
+    <ClCompile Include="..\..\..\shibsp\binding\impl\XMLProtocolProvider.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="SPConfig.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AttributeCheckerHandler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="util\CGIParser.cpp">
-      <Filter>Source Files\util</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\DiscoveryFeed.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="util\DOMPropertySet.cpp">
-      <Filter>Source Files\util</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ExternalAuthHandler.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="util\IPRange.cpp">
-      <Filter>Source Files\util</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LogoutInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="util\SPConstants.cpp">
-      <Filter>Source Files\util</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SecuredHandler.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="util\TemplateParameters.cpp">
-      <Filter>Source Files\util</Filter>
+    <ClCompile Include="..\..\..\shibsp\ServiceProvider.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="remoting\impl\ddf.cpp">
-      <Filter>Source Files\remoting\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\SPConfig.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="remoting\impl\ListenerService.cpp">
-      <Filter>Source Files\remoting\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\util\CGIParser.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="remoting\impl\SocketListener.cpp">
-      <Filter>Source Files\remoting\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\util\DOMPropertySet.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="remoting\impl\TCPListener.cpp">
-      <Filter>Source Files\remoting\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\util\IPRange.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="impl\ChainingAccessControl.cpp">
-      <Filter>Source Files\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\util\SPConstants.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="impl\StorageServiceSessionCache.cpp">
-      <Filter>Source Files\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\util\TemplateParameters.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="impl\XMLAccessControl.cpp">
-      <Filter>Source Files\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\ddf.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="impl\XMLRequestMapper.cpp">
-      <Filter>Source Files\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\ListenerService.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="impl\XMLServiceProvider.cpp">
-      <Filter>Source Files\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\SocketListener.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\Attribute.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\TCPListener.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\ExtensibleAttribute.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\ChainingAccessControl.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\NameIDAttribute.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\StorageServiceSessionCache.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\ScopedAttribute.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\XMLAccessControl.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\SimpleAttribute.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\XMLRequestMapper.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\XMLAttribute.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\XMLServiceProvider.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\AbstractHandler.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\Attribute.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\AssertionConsumerService.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\BinaryAttribute.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\AssertionLookup.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\ExtensibleAttribute.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\ChainingLogoutInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\NameIDAttribute.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\ChainingSessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\ScopedAttribute.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\CookieSessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\SimpleAttribute.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\FormSessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\XMLAttribute.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\LocalLogoutInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AbstractHandler.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\LogoutHandler.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AssertionConsumerService.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\MetadataGenerator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AssertionLookup.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\RemotedHandler.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ChainingLogoutInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML1Consumer.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ChainingSessionInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2ArtifactResolution.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\CookieSessionInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2Consumer.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\FormSessionInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2Logout.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LocalLogoutInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2LogoutInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LogoutHandler.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2NameIDMgmt.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\MetadataGenerator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2SessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\RemotedHandler.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAMLDSSessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML1Consumer.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SessionHandler.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2ArtifactResolution.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2Consumer.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\Shib1SessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2Logout.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\StatusHandler.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2LogoutInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\TransformSessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2NameIDMgmt.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\WAYFSessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2SessionInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="lite\CommonDomainCookie.cpp">
-      <Filter>Source Files\lite</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAMLDSSessionInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="lite\SAMLConstants.cpp">
-      <Filter>Source Files\lite</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SessionHandler.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\LogoutInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SessionInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="binding\impl\XMLProtocolProvider.cpp">
-      <Filter>Source Files\binding\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\Shib1SessionInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\DiscoveryFeed.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\StatusHandler.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="version.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\TransformSessionInitiator.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\BinaryAttribute.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\WAYFSessionInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\AttributeCheckerHandler.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\lite\CommonDomainCookie.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SecuredHandler.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\lite\SAMLConstants.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\ExternalAuthHandler.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\version.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="remoting\impl\SocketListener.h">
-      <Filter>Source Files\remoting\impl</Filter>
+    <ClInclude Include="..\..\..\shibsp\binding\ProtocolProvider.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="AbstractSPRequest.h">
+    <ClInclude Include="..\..\..\shibsp\GSSRequest.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="AccessControl.h">
+    <ClInclude Include="..\..\..\shibsp\handler\LogoutInitiator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Application.h">
+    <ClInclude Include="..\..\..\shibsp\handler\SecuredHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="base.h">
+    <ClInclude Include="..\..\..\shibsp\remoting\impl\SocketListener.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="exceptions.h">
+    <ClInclude Include="..\..\..\shibsp\AbstractSPRequest.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="internal.h">
+    <ClInclude Include="..\..\..\shibsp\AccessControl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="RequestMapper.h">
+    <ClInclude Include="..\..\..\shibsp\Application.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="..\..\..\shibsp\base.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="ServiceProvider.h">
+    <ClInclude Include="..\..\..\shibsp\config_pub_win32.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SessionCache.h">
+    <ClInclude Include="..\..\..\shibsp\exceptions.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SessionCacheEx.h">
+    <ClInclude Include="..\..\..\shibsp\internal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SPConfig.h">
+    <ClInclude Include="..\..\..\shibsp\RequestMapper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SPRequest.h">
+    <ClInclude Include="..\..\..\shibsp\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="version.h">
+    <ClInclude Include="..\..\..\shibsp\ServiceProvider.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="util\CGIParser.h">
-      <Filter>Header Files\util</Filter>
+    <ClInclude Include="..\..\..\shibsp\SessionCache.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="util\DOMPropertySet.h">
-      <Filter>Header Files\util</Filter>
+    <ClInclude Include="..\..\..\shibsp\SessionCacheEx.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="util\IPRange.h">
-      <Filter>Header Files\util</Filter>
+    <ClInclude Include="..\..\..\shibsp\SPConfig.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="util\PropertySet.h">
-      <Filter>Header Files\util</Filter>
+    <ClInclude Include="..\..\..\shibsp\SPRequest.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="util\SPConstants.h">
-      <Filter>Header Files\util</Filter>
+    <ClInclude Include="..\..\..\shibsp\version.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="util\TemplateParameters.h">
-      <Filter>Header Files\util</Filter>
+    <ClInclude Include="..\..\..\shibsp\util\CGIParser.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="remoting\ddf.h">
-      <Filter>Header Files\remoting</Filter>
+    <ClInclude Include="..\..\..\shibsp\util\DOMPropertySet.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="remoting\ListenerService.h">
-      <Filter>Header Files\remoting</Filter>
+    <ClInclude Include="..\..\..\shibsp\util\IPRange.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\Attribute.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\util\PropertySet.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\ExtensibleAttribute.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\util\SPConstants.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\NameIDAttribute.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\util\TemplateParameters.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\ScopedAttribute.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\remoting\ddf.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\SimpleAttribute.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\remoting\ListenerService.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\XMLAttribute.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\Attribute.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="handler\AbstractHandler.h">
-      <Filter>Header Files\handler</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\BinaryAttribute.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="handler\AssertionConsumerService.h">
-      <Filter>Header Files\handler</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\ExtensibleAttribute.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="handler\Handler.h">
-      <Filter>Header Files\handler</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\NameIDAttribute.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="handler\LogoutHandler.h">
-      <Filter>Header Files\handler</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\ScopedAttribute.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="handler\RemotedHandler.h">
-      <Filter>Header Files\handler</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\SimpleAttribute.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="handler\SessionInitiator.h">
-      <Filter>Header Files\handler</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\XMLAttribute.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="lite\CommonDomainCookie.h">
-      <Filter>Header Files\lite</Filter>
+    <ClInclude Include="..\..\..\shibsp\handler\AbstractHandler.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="lite\SAMLConstants.h">
-      <Filter>Header Files\lite</Filter>
+    <ClInclude Include="..\..\..\shibsp\handler\AssertionConsumerService.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="handler\LogoutInitiator.h">
-      <Filter>Header Files\handler</Filter>
+    <ClInclude Include="..\..\..\shibsp\handler\Handler.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="binding\ProtocolProvider.h">
-      <Filter>Header Files\binding</Filter>
+    <ClInclude Include="..\..\..\shibsp\handler\LogoutHandler.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSSRequest.h">
+    <ClInclude Include="..\..\..\shibsp\handler\RemotedHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="config_pub_win32.h">
+    <ClInclude Include="..\..\..\shibsp\handler\SessionInitiator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\BinaryAttribute.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\lite\CommonDomainCookie.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="handler\SecuredHandler.h">
-      <Filter>Header Files\handler</Filter>
+    <ClInclude Include="..\..\..\shibsp\lite\SAMLConstants.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="shibsp.rc">
+    <ResourceCompile Include="..\..\..\shibsp\shibsp.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Makefile.am" />
-    <None Include="paths.h.in" />
-    <None Include="config_pub.h.in" />
+    <None Include="..\..\..\shibsp\Makefile.am" />
+    <None Include="..\..\..\shibsp\paths.h.in" />
+    <None Include="..\..\..\shibsp\config_pub.h.in" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Projects/vc14/shibsp/shibsp.vcxproj b/Projects/vc14/shibsp/shibsp.vcxproj
index 611bf12..50a811d 100644
--- a/Projects/vc14/shibsp/shibsp.vcxproj
+++ b/Projects/vc14/shibsp/shibsp.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -28,19 +28,23 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -364,4 +368,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Projects/vc14/shibsp/shibsp.vcxproj.filters b/Projects/vc14/shibsp/shibsp.vcxproj.filters
index dbc9d95..56b5223 100644
--- a/Projects/vc14/shibsp/shibsp.vcxproj.filters
+++ b/Projects/vc14/shibsp/shibsp.vcxproj.filters
@@ -87,530 +87,530 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="AbstractSPRequest.cpp">
+    <ClCompile Include="..\..\..\shibsp\AbstractSPRequest.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Application.cpp">
+    <ClCompile Include="..\..\..\shibsp\Application.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ServiceProvider.cpp">
+    <ClCompile Include="..\..\..\shibsp\attribute\Base64AttributeDecoder.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="SPConfig.cpp">
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerEntityAttributeFunctor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="util\CGIParser.cpp">
-      <Filter>Source Files\util</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerEntityMatcherFunctor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="util\DOMPropertySet.cpp">
-      <Filter>Source Files\util</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterEntityAttributeFunctor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="util\IPRange.cpp">
-      <Filter>Source Files\util</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterEntityMatcherFunctor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="util\SPConstants.cpp">
-      <Filter>Source Files\util</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\DummyAttributeFilter.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="util\TemplateParameters.cpp">
-      <Filter>Source Files\util</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\NameIDQualifierStringFunctor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="security\PKIXTrustEngine.cpp">
-      <Filter>Source Files\security</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\AssertionAttributeExtractor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="security\SecurityPolicy.cpp">
-      <Filter>Source Files\security</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\MetadataAttributeExtractor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="metadata\DynamicMetadataProvider.cpp">
-      <Filter>Source Files\metadata</Filter>
+    <ClCompile Include="..\..\..\shibsp\binding\impl\XMLProtocolProvider.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="metadata\MetadataExtImpl.cpp">
-      <Filter>Source Files\metadata</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AttributeCheckerHandler.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="metadata\MetadataExtSchemaValidators.cpp">
-      <Filter>Source Files\metadata</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\DiscoveryFeed.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="metadata\MetadataProviderCriteria.cpp">
-      <Filter>Source Files\metadata</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ExternalAuthHandler.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="remoting\impl\ddf.cpp">
-      <Filter>Source Files\remoting\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LogoutInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="remoting\impl\ListenerService.cpp">
-      <Filter>Source Files\remoting\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SecuredHandler.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="remoting\impl\SocketListener.cpp">
-      <Filter>Source Files\remoting\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\XMLSecurityPolicyProvider.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="remoting\impl\TCPListener.cpp">
-      <Filter>Source Files\remoting\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\ServiceProvider.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="impl\ChainingAccessControl.cpp">
-      <Filter>Source Files\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\SPConfig.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="impl\StorageServiceSessionCache.cpp">
-      <Filter>Source Files\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\util\CGIParser.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="impl\TransactionLog.cpp">
-      <Filter>Source Files\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\util\DOMPropertySet.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="impl\XMLAccessControl.cpp">
-      <Filter>Source Files\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\util\IPRange.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="impl\XMLRequestMapper.cpp">
-      <Filter>Source Files\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\util\SPConstants.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="impl\XMLServiceProvider.cpp">
-      <Filter>Source Files\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\util\TemplateParameters.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\Attribute.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\security\PKIXTrustEngine.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\BinaryAttribute.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\security\SecurityPolicy.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\DOMAttributeDecoder.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\metadata\DynamicMetadataProvider.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\ExtensibleAttribute.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\metadata\MetadataExtImpl.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\KeyInfoAttributeDecoder.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\metadata\MetadataExtSchemaValidators.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\NameIDAttribute.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\metadata\MetadataProviderCriteria.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\NameIDAttributeDecoder.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\ddf.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\NameIDFromScopedAttributeDecoder.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\ListenerService.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\ScopedAttribute.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\SocketListener.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\ScopedAttributeDecoder.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\TCPListener.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\SimpleAttribute.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\ChainingAccessControl.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\StringAttributeDecoder.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\StorageServiceSessionCache.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\XMLAttribute.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\TransactionLog.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\XMLAttributeDecoder.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\XMLAccessControl.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\resolver\impl\ChainingAttributeExtractor.cpp">
-      <Filter>Source Files\attribute\resolver\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\XMLRequestMapper.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\resolver\impl\ChainingAttributeResolver.cpp">
-      <Filter>Source Files\attribute\resolver\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\XMLServiceProvider.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\resolver\impl\DelegationAttributeExtractor.cpp">
-      <Filter>Source Files\attribute\resolver\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\Attribute.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\resolver\impl\KeyDescriptorAttributeExtractor.cpp">
-      <Filter>Source Files\attribute\resolver\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\BinaryAttribute.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\resolver\impl\QueryAttributeResolver.cpp">
-      <Filter>Source Files\attribute\resolver\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\DOMAttributeDecoder.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\resolver\impl\SimpleAggregationAttributeResolver.cpp">
-      <Filter>Source Files\attribute\resolver\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\ExtensibleAttribute.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\resolver\impl\XMLAttributeExtractor.cpp">
-      <Filter>Source Files\attribute\resolver\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\KeyInfoAttributeDecoder.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AndMatchFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\NameIDAttribute.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AnyMatchFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\NameIDAttributeDecoder.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeFilter.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\NameIDFromScopedAttributeDecoder.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeIssuerInEntityGroupFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\ScopedAttribute.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeIssuerRegexFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\ScopedAttributeDecoder.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeIssuerStringFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\SimpleAttribute.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeRequesterInEntityGroupFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\StringAttributeDecoder.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeRequesterRegexFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\XMLAttribute.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeRequesterStringFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\XMLAttributeDecoder.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeScopeMatchesShibMDScopeFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\ChainingAttributeExtractor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeScopeRegexFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\ChainingAttributeResolver.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeScopeStringFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\DelegationAttributeExtractor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeValueRegexFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\KeyDescriptorAttributeExtractor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeValueStringFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\QueryAttributeResolver.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AuthenticationMethodRegexFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\SimpleAggregationAttributeResolver.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AuthenticationMethodStringFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\XMLAttributeExtractor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\BasicFilteringContext.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AndMatchFunctor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\ChainingAttributeFilter.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AnyMatchFunctor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\MatchFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeFilter.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\NotMatchFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerInEntityGroupFunctor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\NumberOfAttributeValuesFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerRegexFunctor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\OrMatchFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerStringFunctor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\XMLAttributeFilter.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterInEntityGroupFunctor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="binding\impl\ArtifactResolver.cpp">
-      <Filter>Source Files\binding\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterRegexFunctor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="binding\impl\SOAPClient.cpp">
-      <Filter>Source Files\binding\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterStringFunctor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\AbstractHandler.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeScopeMatchesShibMDScopeFunctor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\AssertionConsumerService.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeScopeRegexFunctor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\AssertionLookup.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeScopeStringFunctor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\ChainingLogoutInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeValueRegexFunctor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\ChainingSessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeValueStringFunctor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\CookieSessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AuthenticationMethodRegexFunctor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\FormSessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AuthenticationMethodStringFunctor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\LocalLogoutInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\BasicFilteringContext.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\LogoutHandler.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\ChainingAttributeFilter.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\MetadataGenerator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\MatchFunctor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\RemotedHandler.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\NotMatchFunctor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML1Consumer.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\NumberOfAttributeValuesFunctor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2ArtifactResolution.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\OrMatchFunctor.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2Consumer.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\XMLAttributeFilter.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2Logout.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\binding\impl\ArtifactResolver.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2LogoutInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\binding\impl\SOAPClient.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2NameIDMgmt.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AbstractHandler.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2SessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AssertionConsumerService.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAMLDSSessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AssertionLookup.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SessionHandler.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ChainingLogoutInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ChainingSessionInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\Shib1SessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\CookieSessionInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\StatusHandler.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\FormSessionInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\TransformSessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LocalLogoutInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\WAYFSessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LogoutHandler.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="impl\XMLSecurityPolicyProvider.cpp">
-      <Filter>Source Files\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\MetadataGenerator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\LogoutInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\RemotedHandler.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="binding\impl\XMLProtocolProvider.cpp">
-      <Filter>Source Files\binding\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML1Consumer.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\DiscoveryFeed.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2ArtifactResolution.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\Base64AttributeDecoder.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2Consumer.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\NameIDQualifierStringFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2Logout.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\DummyAttributeFilter.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2LogoutInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="version.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2NameIDMgmt.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\resolver\impl\AssertionAttributeExtractor.cpp">
-      <Filter>Source Files\attribute\resolver\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2SessionInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\resolver\impl\MetadataAttributeExtractor.cpp">
-      <Filter>Source Files\attribute\resolver\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAMLDSSessionInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\AttributeCheckerHandler.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SessionHandler.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeIssuerEntityAttributeFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SessionInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeRequesterEntityAttributeFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\Shib1SessionInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeIssuerEntityMatcherFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\StatusHandler.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeRequesterEntityMatcherFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\TransformSessionInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SecuredHandler.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\WAYFSessionInitiator.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\ExternalAuthHandler.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\version.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="remoting\impl\SocketListener.h">
-      <Filter>Source Files\remoting\impl</Filter>
+    <ClInclude Include="..\..\..\shibsp\binding\ProtocolProvider.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="AbstractSPRequest.h">
+    <ClInclude Include="..\..\..\shibsp\GSSRequest.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="AccessControl.h">
+    <ClInclude Include="..\..\..\shibsp\handler\LogoutInitiator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Application.h">
+    <ClInclude Include="..\..\..\shibsp\handler\SecuredHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="base.h">
+    <ClInclude Include="..\..\..\shibsp\remoting\impl\SocketListener.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="exceptions.h">
+    <ClInclude Include="..\..\..\shibsp\AbstractSPRequest.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="internal.h">
+    <ClInclude Include="..\..\..\shibsp\AccessControl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="RequestMapper.h">
+    <ClInclude Include="..\..\..\shibsp\Application.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="..\..\..\shibsp\base.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="ServiceProvider.h">
+    <ClInclude Include="..\..\..\shibsp\config_pub_win32.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SessionCache.h">
+    <ClInclude Include="..\..\..\shibsp\exceptions.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SessionCacheEx.h">
+    <ClInclude Include="..\..\..\shibsp\internal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SPConfig.h">
+    <ClInclude Include="..\..\..\shibsp\RequestMapper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SPRequest.h">
+    <ClInclude Include="..\..\..\shibsp\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="TransactionLog.h">
+    <ClInclude Include="..\..\..\shibsp\security\SecurityPolicyProvider.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="version.h">
+    <ClInclude Include="..\..\..\shibsp\ServiceProvider.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="util\CGIParser.h">
-      <Filter>Header Files\util</Filter>
+    <ClInclude Include="..\..\..\shibsp\SessionCache.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="util\DOMPropertySet.h">
-      <Filter>Header Files\util</Filter>
+    <ClInclude Include="..\..\..\shibsp\SessionCacheEx.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="util\IPRange.h">
-      <Filter>Header Files\util</Filter>
+    <ClInclude Include="..\..\..\shibsp\SPConfig.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="util\PropertySet.h">
-      <Filter>Header Files\util</Filter>
+    <ClInclude Include="..\..\..\shibsp\SPRequest.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="util\SPConstants.h">
-      <Filter>Header Files\util</Filter>
+    <ClInclude Include="..\..\..\shibsp\TransactionLog.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="util\TemplateParameters.h">
-      <Filter>Header Files\util</Filter>
+    <ClInclude Include="..\..\..\shibsp\version.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="security\PKIXTrustEngine.h">
-      <Filter>Header Files\security</Filter>
+    <ClInclude Include="..\..\..\shibsp\util\CGIParser.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="security\SecurityPolicy.h">
-      <Filter>Header Files\security</Filter>
+    <ClInclude Include="..\..\..\shibsp\util\DOMPropertySet.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="remoting\ddf.h">
-      <Filter>Header Files\remoting</Filter>
+    <ClInclude Include="..\..\..\shibsp\util\IPRange.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="remoting\ListenerService.h">
-      <Filter>Header Files\remoting</Filter>
+    <ClInclude Include="..\..\..\shibsp\util\PropertySet.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\Attribute.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\util\SPConstants.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\AttributeDecoder.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\util\TemplateParameters.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\ExtensibleAttribute.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\security\PKIXTrustEngine.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\NameIDAttribute.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\security\SecurityPolicy.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\ScopedAttribute.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\remoting\ddf.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\SimpleAttribute.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\remoting\ListenerService.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\XMLAttribute.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\Attribute.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\resolver\AttributeExtractor.h">
-      <Filter>Header Files\attribute\resolver</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\BinaryAttribute.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\resolver\AttributeResolver.h">
-      <Filter>Header Files\attribute\resolver</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\AttributeDecoder.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\resolver\ResolutionContext.h">
-      <Filter>Header Files\attribute\resolver</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\ExtensibleAttribute.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\filtering\AttributeFilter.h">
-      <Filter>Header Files\attribute\filtering</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\NameIDAttribute.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\filtering\BasicFilteringContext.h">
-      <Filter>Header Files\attribute\filtering</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\ScopedAttribute.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\filtering\FilteringContext.h">
-      <Filter>Header Files\attribute\filtering</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\SimpleAttribute.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\filtering\FilterPolicyContext.h">
-      <Filter>Header Files\attribute\filtering</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\XMLAttribute.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\filtering\MatchFunctor.h">
-      <Filter>Header Files\attribute\filtering</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\resolver\AttributeExtractor.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="binding\ArtifactResolver.h">
-      <Filter>Header Files\binding</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\resolver\AttributeResolver.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="binding\SOAPClient.h">
-      <Filter>Header Files\binding</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\resolver\ResolutionContext.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="handler\AbstractHandler.h">
-      <Filter>Header Files\handler</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\filtering\AttributeFilter.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="handler\AssertionConsumerService.h">
-      <Filter>Header Files\handler</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\filtering\BasicFilteringContext.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="handler\Handler.h">
-      <Filter>Header Files\handler</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\filtering\FilteringContext.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="handler\LogoutHandler.h">
-      <Filter>Header Files\handler</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\filtering\FilterPolicyContext.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="handler\RemotedHandler.h">
-      <Filter>Header Files\handler</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\filtering\MatchFunctor.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="handler\SessionInitiator.h">
-      <Filter>Header Files\handler</Filter>
+    <ClInclude Include="..\..\..\shibsp\binding\ArtifactResolver.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="metadata\MetadataExt.h">
-      <Filter>Header Files\metadata</Filter>
+    <ClInclude Include="..\..\..\shibsp\binding\SOAPClient.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="metadata\MetadataProviderCriteria.h">
-      <Filter>Header Files\metadata</Filter>
+    <ClInclude Include="..\..\..\shibsp\handler\AbstractHandler.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="security\SecurityPolicyProvider.h">
-      <Filter>Header Files\security</Filter>
+    <ClInclude Include="..\..\..\shibsp\handler\AssertionConsumerService.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="handler\LogoutInitiator.h">
-      <Filter>Header Files\handler</Filter>
+    <ClInclude Include="..\..\..\shibsp\handler\Handler.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="binding\ProtocolProvider.h">
-      <Filter>Header Files\binding</Filter>
+    <ClInclude Include="..\..\..\shibsp\handler\LogoutHandler.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GSSRequest.h">
+    <ClInclude Include="..\..\..\shibsp\handler\RemotedHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="config_pub_win32.h">
+    <ClInclude Include="..\..\..\shibsp\handler\SessionInitiator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\BinaryAttribute.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\metadata\MetadataExt.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="handler\SecuredHandler.h">
-      <Filter>Header Files\handler</Filter>
+    <ClInclude Include="..\..\..\shibsp\metadata\MetadataProviderCriteria.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="shibsp.rc">
+    <ResourceCompile Include="..\..\..\shibsp\shibsp.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Makefile.am" />
-    <None Include="paths.h.in" />
-    <None Include="config_pub.h.in" />
+    <None Include="..\..\..\shibsp\Makefile.am" />
+    <None Include="..\..\..\shibsp\paths.h.in" />
+    <None Include="..\..\..\shibsp\config_pub.h.in" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Projects/vc14/util/mdquery.vcxproj b/Projects/vc14/util/mdquery.vcxproj
index 902b348..569ee64 100644
--- a/Projects/vc14/util/mdquery.vcxproj
+++ b/Projects/vc14/util/mdquery.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -26,20 +26,24 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -67,7 +71,6 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
-
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
@@ -218,4 +221,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Projects/vc14/util/resolvertest.vcxproj b/Projects/vc14/util/resolvertest.vcxproj
index f2e53ad..53d5fa8 100644
--- a/Projects/vc14/util/resolvertest.vcxproj
+++ b/Projects/vc14/util/resolvertest.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -26,20 +26,24 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -62,7 +66,6 @@
   <Import Project="..\..\..\..\BuildPath.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>
@@ -70,7 +73,6 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
-
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
@@ -221,4 +223,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

-- 
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