From 2b806f2125ed36bffe796942cad1949b44fe8de5 Mon Sep 17 00:00:00 2001
From: Rod Widdowson <rdw@steadingsoftware.com>
Date: Thu, 28 Apr 2016 17:00:54 +0100
Subject: [PATCH] CPPOST-94 move VC stuff into a projects directory

https://issues.shibboleth.net/jira/browse/CPPOST-94
---
 .gitignore                                         |   9 +
 .../vc10/cpp-opensaml2.sln                         |   0
 Projects/vc10/saml/saml.vcxproj                    | 345 ++++++++++++++++++
 {saml => Projects/vc10/saml}/saml.vcxproj.filters  | 274 +++++++--------
 .../vc10/samlsign}/samlsign.vcxproj                |  34 +-
 .../vc10/samltest}/samltest.vcxproj                | 390 ++++++++++-----------
 .../vc10/samltest}/samltest.vcxproj.filters        | 190 +++++-----
 saml/saml.vcxproj                                  | 345 ------------------
 8 files changed, 798 insertions(+), 789 deletions(-)
 rename cpp-opensaml2.sln => Projects/vc10/cpp-opensaml2.sln (100%)
 create mode 100644 Projects/vc10/saml/saml.vcxproj
 rename {saml => Projects/vc10/saml}/saml.vcxproj.filters (58%)
 rename {samlsign => Projects/vc10/samlsign}/samlsign.vcxproj (80%)
 rename {samltest => Projects/vc10/samltest}/samltest.vcxproj (88%)
 rename {samltest => Projects/vc10/samltest}/samltest.vcxproj.filters (73%)
 delete mode 100644 saml/saml.vcxproj

diff --git a/.gitignore b/.gitignore
index d484b5a..65d074f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,15 @@
 *.pyc
 *.pyo
 *.rej
+*.sdf
+Projects/*/*.opensdf
+Projects/*/*.suo
+Projects/*/*/Debug/*
+Projects/*/*/Release/*
+Projects/*/*/x64/*
+Projects/*/ipch
+*.vcxproj.user
+Projects/*/samltest/samltest.cpp
 *~
 *.#*
 .*.swp
diff --git a/cpp-opensaml2.sln b/Projects/vc10/cpp-opensaml2.sln
similarity index 100%
rename from cpp-opensaml2.sln
rename to Projects/vc10/cpp-opensaml2.sln
diff --git a/Projects/vc10/saml/saml.vcxproj b/Projects/vc10/saml/saml.vcxproj
new file mode 100644
index 0000000..c09f1c5
--- /dev/null
+++ b/Projects/vc10/saml/saml.vcxproj
@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{34DE3EA5-EA05-4261-8B63-A850FFB91768}</ProjectGuid>
+    <RootNamespace>saml</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <Import Project="..\..\..\..\BuildPath.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\..\Build\vc10\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\..\Build\vc10\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\..\Build\vc10\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\..\Build\vc10\$(Platform)\$(Configuration)\</OutDir>
+    <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>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)2_5D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)2_5D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)2_5</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)2_5</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\;$(ProjectDir)..\..\..\saml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration)\xmltooling1D.lib;xerces-c_3D.lib;xsec_1D.lib;log4shib1D.lib;zlib1d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(TargetDir)$(ProjectName)2D.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\;$(ProjectDir)..\..\..\saml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration)\xmltooling1D.lib;xerces-c_3D.lib;xsec_1D.lib;log4shib1D.lib;zlib1d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(TargetDir)$(ProjectName)2D.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\;$(ProjectDir)..\..\..\saml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration)\xmltooling1.lib;xerces-c_3.lib;xsec_1.lib;log4shib1.lib;zlib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(TargetDir)$(ProjectName)2.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\;$(ProjectDir)..\..\..\saml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration)\xmltooling1.lib;xerces-c_3.lib;xsec_1.lib;log4shib1.lib;zlib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(TargetDir)$(ProjectName)2.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\DiscoverableMetadataProvider.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\EntityAttributesEntityMatcher.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\EntityAttributesMetadataFilter.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\FolderMetadataProvider.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\NameEntityMatcher.cpp" />
+    <ClCompile Include="..\..\..\saml\SAMLConfig.cpp" />
+    <ClCompile Include="..\..\..\saml\util\CommonDomainCookie.cpp" />
+    <ClCompile Include="..\..\..\saml\util\SAMLConstants.cpp" />
+    <ClCompile Include="..\..\..\saml\saml1\core\impl\AssertionsImpl.cpp" />
+    <ClCompile Include="..\..\..\saml\saml1\core\impl\AssertionsSchemaValidators.cpp" />
+    <ClCompile Include="..\..\..\saml\saml1\core\impl\ProtocolsImpl.cpp" />
+    <ClCompile Include="..\..\..\saml\saml1\core\impl\ProtocolsSchemaValidators.cpp" />
+    <ClCompile Include="..\..\..\saml\saml1\binding\impl\SAML1ArtifactDecoder.cpp" />
+    <ClCompile Include="..\..\..\saml\saml1\binding\impl\SAML1ArtifactEncoder.cpp" />
+    <ClCompile Include="..\..\..\saml\saml1\binding\impl\SAML1MessageDecoder.cpp" />
+    <ClCompile Include="..\..\..\saml\saml1\binding\impl\SAML1POSTDecoder.cpp" />
+    <ClCompile Include="..\..\..\saml\saml1\binding\impl\SAML1POSTEncoder.cpp" />
+    <ClCompile Include="..\..\..\saml\saml1\binding\impl\SAML1SOAPClient.cpp" />
+    <ClCompile Include="..\..\..\saml\saml1\binding\impl\SAML1SOAPDecoder.cpp" />
+    <ClCompile Include="..\..\..\saml\saml1\binding\impl\SAML1SOAPEncoder.cpp" />
+    <ClCompile Include="..\..\..\saml\saml1\binding\impl\SAMLArtifactType0001.cpp" />
+    <ClCompile Include="..\..\..\saml\saml1\binding\impl\SAMLArtifactType0002.cpp" />
+    <ClCompile Include="..\..\..\saml\saml1\profile\impl\AssertionValidator.cpp" />
+    <ClCompile Include="..\..\..\saml\saml1\profile\impl\BrowserSSOProfileValidator.cpp" />
+    <ClCompile Include="..\..\..\saml\saml1\profile\impl\SAML1BrowserSSORule.cpp" />
+    <ClCompile Include="..\..\..\saml\signature\ContentReference.cpp" />
+    <ClCompile Include="..\..\..\saml\signature\SignatureProfileValidator.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\core\impl\Assertions.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\core\impl\Assertions20Impl.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\core\impl\Assertions20SchemaValidators.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\core\impl\Protocols20Impl.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\core\impl\Protocols20SchemaValidators.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\AbstractMetadataProvider.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\BlacklistMetadataFilter.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\ChainingMetadataProvider.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\DynamicMetadataProvider.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\EntityRoleMetadataFilter.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\MetadataCredentialContext.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\MetadataCredentialCriteria.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\MetadataImpl.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\MetadataProvider.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\MetadataSchemaValidators.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\NullMetadataProvider.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\ObservableMetadataProvider.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\RequireValidUntilMetadataFilter.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\SignatureMetadataFilter.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\WhitelistMetadataFilter.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\XMLMetadataProvider.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2Artifact.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2ArtifactDecoder.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2ArtifactEncoder.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2ArtifactType0004.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2ECPDecoder.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2ECPEncoder.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2MessageDecoder.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2POSTDecoder.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2POSTEncoder.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2Redirect.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2RedirectDecoder.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2RedirectEncoder.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2SOAPClient.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2SOAPDecoder.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2SOAPEncoder.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\profile\impl\Assertion20Validator.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\profile\impl\BearerConfirmationRule.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\profile\impl\BrowserSSOProfile20Validator.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\profile\impl\DelegationRestrictionRule.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\profile\impl\SAML2AssertionPolicy.cpp" />
+    <ClCompile Include="..\..\..\saml\encryption\EncryptedKeyResolver.cpp" />
+    <ClCompile Include="..\..\..\saml\binding\impl\ArtifactMap.cpp" />
+    <ClCompile Include="..\..\..\saml\binding\impl\ClientCertAuthRule.cpp" />
+    <ClCompile Include="..\..\..\saml\binding\impl\MessageDecoder.cpp" />
+    <ClCompile Include="..\..\..\saml\binding\impl\MessageEncoder.cpp" />
+    <ClCompile Include="..\..\..\saml\binding\impl\MessageFlowRule.cpp" />
+    <ClCompile Include="..\..\..\saml\binding\impl\NullSecurityRule.cpp" />
+    <ClCompile Include="..\..\..\saml\binding\impl\SAMLArtifact.cpp" />
+    <ClCompile Include="..\..\..\saml\binding\impl\SecurityPolicy.cpp" />
+    <ClCompile Include="..\..\..\saml\binding\impl\SimpleSigningRule.cpp" />
+    <ClCompile Include="..\..\..\saml\binding\impl\SOAPClient.cpp" />
+    <ClCompile Include="..\..\..\saml\binding\impl\XMLSigningRule.cpp" />
+    <ClCompile Include="..\..\..\saml\profile\impl\AudienceRestrictionRule.cpp" />
+    <ClCompile Include="..\..\..\saml\profile\impl\ConditionsRule.cpp" />
+    <ClCompile Include="..\..\..\saml\profile\impl\IgnoreRule.cpp" />
+    <ClCompile Include="..\..\..\saml\version.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\saml\Assertion.h" />
+    <ClInclude Include="..\..\..\saml\base.h" />
+    <ClInclude Include="..\..\..\saml\exceptions.h" />
+    <ClInclude Include="..\..\..\saml\internal.h" />
+    <ClInclude Include="..\..\..\saml\RootObject.h" />
+    <ClInclude Include="..\..\..\saml\saml2\metadata\DiscoverableMetadataProvider.h" />
+    <ClInclude Include="..\..\..\saml\saml2\metadata\EntityMatcher.h" />
+    <ClInclude Include="..\..\..\saml\SAMLConfig.h" />
+    <ClInclude Include="..\..\..\saml\version.h" />
+    <ClInclude Include="..\..\..\saml\util\CommonDomainCookie.h" />
+    <ClInclude Include="..\..\..\saml\util\SAMLConstants.h" />
+    <ClInclude Include="..\..\..\saml\saml1\core\Assertions.h" />
+    <ClInclude Include="..\..\..\saml\saml1\core\Protocols.h" />
+    <ClInclude Include="..\..\..\saml\saml1\binding\SAML1MessageDecoder.h" />
+    <ClInclude Include="..\..\..\saml\saml1\binding\SAML1SOAPClient.h" />
+    <ClInclude Include="..\..\..\saml\saml1\binding\SAMLArtifactType0001.h" />
+    <ClInclude Include="..\..\..\saml\saml1\binding\SAMLArtifactType0002.h" />
+    <ClInclude Include="..\..\..\saml\saml1\profile\AssertionValidator.h" />
+    <ClInclude Include="..\..\..\saml\saml1\profile\BrowserSSOProfileValidator.h" />
+    <ClInclude Include="..\..\..\saml\signature\ContentReference.h" />
+    <ClInclude Include="..\..\..\saml\signature\SignableObject.h" />
+    <ClInclude Include="..\..\..\saml\signature\SignatureProfileValidator.h" />
+    <ClInclude Include="..\..\..\saml\saml2\core\Assertions.h" />
+    <ClInclude Include="..\..\..\saml\saml2\core\Protocols.h" />
+    <ClInclude Include="..\..\..\saml\saml2\metadata\AbstractMetadataProvider.h" />
+    <ClInclude Include="..\..\..\saml\saml2\metadata\DynamicMetadataProvider.h" />
+    <ClInclude Include="..\..\..\saml\saml2\metadata\EndpointManager.h" />
+    <ClInclude Include="..\..\..\saml\saml2\metadata\Metadata.h" />
+    <ClInclude Include="..\..\..\saml\saml2\metadata\MetadataCredentialContext.h" />
+    <ClInclude Include="..\..\..\saml\saml2\metadata\MetadataCredentialCriteria.h" />
+    <ClInclude Include="..\..\..\saml\saml2\metadata\MetadataFilter.h" />
+    <ClInclude Include="..\..\..\saml\saml2\metadata\MetadataProvider.h" />
+    <ClInclude Include="..\..\..\saml\saml2\metadata\ObservableMetadataProvider.h" />
+    <ClInclude Include="..\..\..\saml\saml2\binding\SAML2Artifact.h" />
+    <ClInclude Include="..\..\..\saml\saml2\binding\SAML2ArtifactType0004.h" />
+    <ClInclude Include="..\..\..\saml\saml2\binding\SAML2MessageDecoder.h" />
+    <ClInclude Include="..\..\..\saml\saml2\binding\SAML2Redirect.h" />
+    <ClInclude Include="..\..\..\saml\saml2\binding\SAML2SOAPClient.h" />
+    <ClInclude Include="..\..\..\saml\saml2\profile\AssertionValidator.h" />
+    <ClInclude Include="..\..\..\saml\saml2\profile\BrowserSSOProfileValidator.h" />
+    <ClInclude Include="..\..\..\saml\saml2\profile\SAML2AssertionPolicy.h" />
+    <ClInclude Include="..\..\..\saml\encryption\EncryptedKeyResolver.h" />
+    <ClInclude Include="..\..\..\saml\binding\ArtifactMap.h" />
+    <ClInclude Include="..\..\..\saml\binding\MessageDecoder.h" />
+    <ClInclude Include="..\..\..\saml\binding\MessageEncoder.h" />
+    <ClInclude Include="..\..\..\saml\binding\SAMLArtifact.h" />
+    <ClInclude Include="..\..\..\saml\binding\SecurityPolicy.h" />
+    <ClInclude Include="..\..\..\saml\binding\SecurityPolicyRule.h" />
+    <ClInclude Include="..\..\..\saml\binding\SOAPClient.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\saml\saml.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\saml\Makefile.am" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/saml/saml.vcxproj.filters b/Projects/vc10/saml/saml.vcxproj.filters
similarity index 58%
rename from saml/saml.vcxproj.filters
rename to Projects/vc10/saml/saml.vcxproj.filters
index 93a3dfd..3c9ef8b 100644
--- a/saml/saml.vcxproj.filters
+++ b/Projects/vc10/saml/saml.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -123,414 +123,414 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="SAMLConfig.cpp">
+    <ClCompile Include="..\..\..\saml\SAMLConfig.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="util\CommonDomainCookie.cpp">
+    <ClCompile Include="..\..\..\saml\util\CommonDomainCookie.cpp">
       <Filter>Source Files\util</Filter>
     </ClCompile>
-    <ClCompile Include="util\SAMLConstants.cpp">
+    <ClCompile Include="..\..\..\saml\util\SAMLConstants.cpp">
       <Filter>Source Files\util</Filter>
     </ClCompile>
-    <ClCompile Include="saml1\core\impl\AssertionsImpl.cpp">
+    <ClCompile Include="..\..\..\saml\saml1\core\impl\AssertionsImpl.cpp">
       <Filter>Source Files\saml1\core\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml1\core\impl\AssertionsSchemaValidators.cpp">
+    <ClCompile Include="..\..\..\saml\saml1\core\impl\AssertionsSchemaValidators.cpp">
       <Filter>Source Files\saml1\core\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml1\core\impl\ProtocolsImpl.cpp">
+    <ClCompile Include="..\..\..\saml\saml1\core\impl\ProtocolsImpl.cpp">
       <Filter>Source Files\saml1\core\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml1\core\impl\ProtocolsSchemaValidators.cpp">
+    <ClCompile Include="..\..\..\saml\saml1\core\impl\ProtocolsSchemaValidators.cpp">
       <Filter>Source Files\saml1\core\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml1\binding\impl\SAML1ArtifactDecoder.cpp">
+    <ClCompile Include="..\..\..\saml\saml1\binding\impl\SAML1ArtifactDecoder.cpp">
       <Filter>Source Files\saml1\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml1\binding\impl\SAML1ArtifactEncoder.cpp">
+    <ClCompile Include="..\..\..\saml\saml1\binding\impl\SAML1ArtifactEncoder.cpp">
       <Filter>Source Files\saml1\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml1\binding\impl\SAML1MessageDecoder.cpp">
+    <ClCompile Include="..\..\..\saml\saml1\binding\impl\SAML1MessageDecoder.cpp">
       <Filter>Source Files\saml1\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml1\binding\impl\SAML1POSTDecoder.cpp">
+    <ClCompile Include="..\..\..\saml\saml1\binding\impl\SAML1POSTDecoder.cpp">
       <Filter>Source Files\saml1\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml1\binding\impl\SAML1POSTEncoder.cpp">
+    <ClCompile Include="..\..\..\saml\saml1\binding\impl\SAML1POSTEncoder.cpp">
       <Filter>Source Files\saml1\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml1\binding\impl\SAML1SOAPClient.cpp">
+    <ClCompile Include="..\..\..\saml\saml1\binding\impl\SAML1SOAPClient.cpp">
       <Filter>Source Files\saml1\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml1\binding\impl\SAML1SOAPDecoder.cpp">
+    <ClCompile Include="..\..\..\saml\saml1\binding\impl\SAML1SOAPDecoder.cpp">
       <Filter>Source Files\saml1\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml1\binding\impl\SAML1SOAPEncoder.cpp">
+    <ClCompile Include="..\..\..\saml\saml1\binding\impl\SAML1SOAPEncoder.cpp">
       <Filter>Source Files\saml1\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml1\binding\impl\SAMLArtifactType0001.cpp">
+    <ClCompile Include="..\..\..\saml\saml1\binding\impl\SAMLArtifactType0001.cpp">
       <Filter>Source Files\saml1\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml1\binding\impl\SAMLArtifactType0002.cpp">
+    <ClCompile Include="..\..\..\saml\saml1\binding\impl\SAMLArtifactType0002.cpp">
       <Filter>Source Files\saml1\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml1\profile\impl\AssertionValidator.cpp">
+    <ClCompile Include="..\..\..\saml\saml1\profile\impl\AssertionValidator.cpp">
       <Filter>Source Files\saml1\profile\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml1\profile\impl\BrowserSSOProfileValidator.cpp">
+    <ClCompile Include="..\..\..\saml\saml1\profile\impl\BrowserSSOProfileValidator.cpp">
       <Filter>Source Files\saml1\profile\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml1\profile\impl\SAML1BrowserSSORule.cpp">
+    <ClCompile Include="..\..\..\saml\saml1\profile\impl\SAML1BrowserSSORule.cpp">
       <Filter>Source Files\saml1\profile\impl</Filter>
     </ClCompile>
-    <ClCompile Include="signature\ContentReference.cpp">
+    <ClCompile Include="..\..\..\saml\signature\ContentReference.cpp">
       <Filter>Source Files\signature</Filter>
     </ClCompile>
-    <ClCompile Include="signature\SignatureProfileValidator.cpp">
+    <ClCompile Include="..\..\..\saml\signature\SignatureProfileValidator.cpp">
       <Filter>Source Files\signature</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\core\impl\Assertions.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\core\impl\Assertions.cpp">
       <Filter>Source Files\saml2\core\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\core\impl\Assertions20Impl.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\core\impl\Assertions20Impl.cpp">
       <Filter>Source Files\saml2\core\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\core\impl\Assertions20SchemaValidators.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\core\impl\Assertions20SchemaValidators.cpp">
       <Filter>Source Files\saml2\core\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\core\impl\Protocols20Impl.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\core\impl\Protocols20Impl.cpp">
       <Filter>Source Files\saml2\core\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\core\impl\Protocols20SchemaValidators.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\core\impl\Protocols20SchemaValidators.cpp">
       <Filter>Source Files\saml2\core\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\metadata\impl\AbstractMetadataProvider.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\AbstractMetadataProvider.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\metadata\impl\BlacklistMetadataFilter.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\BlacklistMetadataFilter.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\metadata\impl\ChainingMetadataProvider.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\ChainingMetadataProvider.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\metadata\impl\DynamicMetadataProvider.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\DynamicMetadataProvider.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\metadata\impl\EntityRoleMetadataFilter.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\EntityRoleMetadataFilter.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\metadata\impl\MetadataCredentialContext.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\MetadataCredentialContext.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\metadata\impl\MetadataCredentialCriteria.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\MetadataCredentialCriteria.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\metadata\impl\MetadataImpl.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\MetadataImpl.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\metadata\impl\MetadataProvider.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\MetadataProvider.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\metadata\impl\MetadataSchemaValidators.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\MetadataSchemaValidators.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\metadata\impl\NullMetadataProvider.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\NullMetadataProvider.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\metadata\impl\ObservableMetadataProvider.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\ObservableMetadataProvider.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\metadata\impl\RequireValidUntilMetadataFilter.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\RequireValidUntilMetadataFilter.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\metadata\impl\SignatureMetadataFilter.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\SignatureMetadataFilter.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\metadata\impl\WhitelistMetadataFilter.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\WhitelistMetadataFilter.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\metadata\impl\XMLMetadataProvider.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\XMLMetadataProvider.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\binding\impl\SAML2Artifact.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2Artifact.cpp">
       <Filter>Source Files\saml2\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\binding\impl\SAML2ArtifactDecoder.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2ArtifactDecoder.cpp">
       <Filter>Source Files\saml2\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\binding\impl\SAML2ArtifactEncoder.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2ArtifactEncoder.cpp">
       <Filter>Source Files\saml2\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\binding\impl\SAML2ArtifactType0004.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2ArtifactType0004.cpp">
       <Filter>Source Files\saml2\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\binding\impl\SAML2ECPDecoder.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2ECPDecoder.cpp">
       <Filter>Source Files\saml2\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\binding\impl\SAML2ECPEncoder.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2ECPEncoder.cpp">
       <Filter>Source Files\saml2\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\binding\impl\SAML2MessageDecoder.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2MessageDecoder.cpp">
       <Filter>Source Files\saml2\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\binding\impl\SAML2POSTDecoder.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2POSTDecoder.cpp">
       <Filter>Source Files\saml2\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\binding\impl\SAML2POSTEncoder.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2POSTEncoder.cpp">
       <Filter>Source Files\saml2\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\binding\impl\SAML2Redirect.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2Redirect.cpp">
       <Filter>Source Files\saml2\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\binding\impl\SAML2RedirectDecoder.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2RedirectDecoder.cpp">
       <Filter>Source Files\saml2\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\binding\impl\SAML2RedirectEncoder.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2RedirectEncoder.cpp">
       <Filter>Source Files\saml2\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\binding\impl\SAML2SOAPClient.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2SOAPClient.cpp">
       <Filter>Source Files\saml2\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\binding\impl\SAML2SOAPDecoder.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2SOAPDecoder.cpp">
       <Filter>Source Files\saml2\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\binding\impl\SAML2SOAPEncoder.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\binding\impl\SAML2SOAPEncoder.cpp">
       <Filter>Source Files\saml2\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\profile\impl\Assertion20Validator.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\profile\impl\Assertion20Validator.cpp">
       <Filter>Source Files\saml2\profile\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\profile\impl\BearerConfirmationRule.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\profile\impl\BearerConfirmationRule.cpp">
       <Filter>Source Files\saml2\profile\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\profile\impl\BrowserSSOProfile20Validator.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\profile\impl\BrowserSSOProfile20Validator.cpp">
       <Filter>Source Files\saml2\profile\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\profile\impl\DelegationRestrictionRule.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\profile\impl\DelegationRestrictionRule.cpp">
       <Filter>Source Files\saml2\profile\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\profile\impl\SAML2AssertionPolicy.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\profile\impl\SAML2AssertionPolicy.cpp">
       <Filter>Source Files\saml2\profile\impl</Filter>
     </ClCompile>
-    <ClCompile Include="encryption\EncryptedKeyResolver.cpp">
+    <ClCompile Include="..\..\..\saml\encryption\EncryptedKeyResolver.cpp">
       <Filter>Source Files\encryption</Filter>
     </ClCompile>
-    <ClCompile Include="binding\impl\ArtifactMap.cpp">
+    <ClCompile Include="..\..\..\saml\binding\impl\ArtifactMap.cpp">
       <Filter>Source Files\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="binding\impl\ClientCertAuthRule.cpp">
+    <ClCompile Include="..\..\..\saml\binding\impl\ClientCertAuthRule.cpp">
       <Filter>Source Files\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="binding\impl\MessageDecoder.cpp">
+    <ClCompile Include="..\..\..\saml\binding\impl\MessageDecoder.cpp">
       <Filter>Source Files\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="binding\impl\MessageEncoder.cpp">
+    <ClCompile Include="..\..\..\saml\binding\impl\MessageEncoder.cpp">
       <Filter>Source Files\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="binding\impl\MessageFlowRule.cpp">
+    <ClCompile Include="..\..\..\saml\binding\impl\MessageFlowRule.cpp">
       <Filter>Source Files\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="binding\impl\NullSecurityRule.cpp">
+    <ClCompile Include="..\..\..\saml\binding\impl\NullSecurityRule.cpp">
       <Filter>Source Files\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="binding\impl\SAMLArtifact.cpp">
+    <ClCompile Include="..\..\..\saml\binding\impl\SAMLArtifact.cpp">
       <Filter>Source Files\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="binding\impl\SecurityPolicy.cpp">
+    <ClCompile Include="..\..\..\saml\binding\impl\SecurityPolicy.cpp">
       <Filter>Source Files\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="binding\impl\SimpleSigningRule.cpp">
+    <ClCompile Include="..\..\..\saml\binding\impl\SimpleSigningRule.cpp">
       <Filter>Source Files\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="binding\impl\SOAPClient.cpp">
+    <ClCompile Include="..\..\..\saml\binding\impl\SOAPClient.cpp">
       <Filter>Source Files\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="binding\impl\XMLSigningRule.cpp">
+    <ClCompile Include="..\..\..\saml\binding\impl\XMLSigningRule.cpp">
       <Filter>Source Files\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="profile\impl\AudienceRestrictionRule.cpp">
+    <ClCompile Include="..\..\..\saml\profile\impl\AudienceRestrictionRule.cpp">
       <Filter>Source Files\profile\impl</Filter>
     </ClCompile>
-    <ClCompile Include="profile\impl\ConditionsRule.cpp">
+    <ClCompile Include="..\..\..\saml\profile\impl\ConditionsRule.cpp">
       <Filter>Source Files\profile\impl</Filter>
     </ClCompile>
-    <ClCompile Include="profile\impl\IgnoreRule.cpp">
+    <ClCompile Include="..\..\..\saml\profile\impl\IgnoreRule.cpp">
       <Filter>Source Files\profile\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\metadata\impl\DiscoverableMetadataProvider.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\DiscoverableMetadataProvider.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
-    <ClCompile Include="version.cpp">
+    <ClCompile Include="..\..\..\saml\version.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\metadata\impl\FolderMetadataProvider.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\FolderMetadataProvider.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\metadata\impl\EntityAttributesMetadataFilter.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\EntityAttributesMetadataFilter.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\metadata\impl\NameEntityMatcher.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\NameEntityMatcher.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
-    <ClCompile Include="saml2\metadata\impl\EntityAttributesEntityMatcher.cpp">
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\EntityAttributesEntityMatcher.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Assertion.h">
+    <ClInclude Include="..\..\..\saml\Assertion.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="base.h">
+    <ClInclude Include="..\..\..\saml\base.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="exceptions.h">
+    <ClInclude Include="..\..\..\saml\exceptions.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="internal.h">
+    <ClInclude Include="..\..\..\saml\internal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="RootObject.h">
+    <ClInclude Include="..\..\..\saml\RootObject.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SAMLConfig.h">
+    <ClInclude Include="..\..\..\saml\SAMLConfig.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="version.h">
+    <ClInclude Include="..\..\..\saml\version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="util\CommonDomainCookie.h">
+    <ClInclude Include="..\..\..\saml\util\CommonDomainCookie.h">
       <Filter>Header Files\util</Filter>
     </ClInclude>
-    <ClInclude Include="util\SAMLConstants.h">
+    <ClInclude Include="..\..\..\saml\util\SAMLConstants.h">
       <Filter>Header Files\util</Filter>
     </ClInclude>
-    <ClInclude Include="saml1\core\Assertions.h">
+    <ClInclude Include="..\..\..\saml\saml1\core\Assertions.h">
       <Filter>Header Files\saml1\core</Filter>
     </ClInclude>
-    <ClInclude Include="saml1\core\Protocols.h">
+    <ClInclude Include="..\..\..\saml\saml1\core\Protocols.h">
       <Filter>Header Files\saml1\core</Filter>
     </ClInclude>
-    <ClInclude Include="saml1\binding\SAML1MessageDecoder.h">
+    <ClInclude Include="..\..\..\saml\saml1\binding\SAML1MessageDecoder.h">
       <Filter>Header Files\saml1\binding</Filter>
     </ClInclude>
-    <ClInclude Include="saml1\binding\SAML1SOAPClient.h">
+    <ClInclude Include="..\..\..\saml\saml1\binding\SAML1SOAPClient.h">
       <Filter>Header Files\saml1\binding</Filter>
     </ClInclude>
-    <ClInclude Include="saml1\binding\SAMLArtifactType0001.h">
+    <ClInclude Include="..\..\..\saml\saml1\binding\SAMLArtifactType0001.h">
       <Filter>Header Files\saml1\binding</Filter>
     </ClInclude>
-    <ClInclude Include="saml1\binding\SAMLArtifactType0002.h">
+    <ClInclude Include="..\..\..\saml\saml1\binding\SAMLArtifactType0002.h">
       <Filter>Header Files\saml1\binding</Filter>
     </ClInclude>
-    <ClInclude Include="saml1\profile\AssertionValidator.h">
+    <ClInclude Include="..\..\..\saml\saml1\profile\AssertionValidator.h">
       <Filter>Header Files\saml1\profile</Filter>
     </ClInclude>
-    <ClInclude Include="saml1\profile\BrowserSSOProfileValidator.h">
+    <ClInclude Include="..\..\..\saml\saml1\profile\BrowserSSOProfileValidator.h">
       <Filter>Header Files\saml1\profile</Filter>
     </ClInclude>
-    <ClInclude Include="signature\ContentReference.h">
+    <ClInclude Include="..\..\..\saml\signature\ContentReference.h">
       <Filter>Header Files\signature</Filter>
     </ClInclude>
-    <ClInclude Include="signature\SignableObject.h">
+    <ClInclude Include="..\..\..\saml\signature\SignableObject.h">
       <Filter>Header Files\signature</Filter>
     </ClInclude>
-    <ClInclude Include="signature\SignatureProfileValidator.h">
+    <ClInclude Include="..\..\..\saml\signature\SignatureProfileValidator.h">
       <Filter>Header Files\signature</Filter>
     </ClInclude>
-    <ClInclude Include="saml2\core\Assertions.h">
+    <ClInclude Include="..\..\..\saml\saml2\core\Assertions.h">
       <Filter>Header Files\saml2\core</Filter>
     </ClInclude>
-    <ClInclude Include="saml2\core\Protocols.h">
+    <ClInclude Include="..\..\..\saml\saml2\core\Protocols.h">
       <Filter>Header Files\saml2\core</Filter>
     </ClInclude>
-    <ClInclude Include="saml2\metadata\AbstractMetadataProvider.h">
+    <ClInclude Include="..\..\..\saml\saml2\metadata\AbstractMetadataProvider.h">
       <Filter>Header Files\saml2\metadata</Filter>
     </ClInclude>
-    <ClInclude Include="saml2\metadata\DynamicMetadataProvider.h">
+    <ClInclude Include="..\..\..\saml\saml2\metadata\DynamicMetadataProvider.h">
       <Filter>Header Files\saml2\metadata</Filter>
     </ClInclude>
-    <ClInclude Include="saml2\metadata\EndpointManager.h">
+    <ClInclude Include="..\..\..\saml\saml2\metadata\EndpointManager.h">
       <Filter>Header Files\saml2\metadata</Filter>
     </ClInclude>
-    <ClInclude Include="saml2\metadata\Metadata.h">
+    <ClInclude Include="..\..\..\saml\saml2\metadata\Metadata.h">
       <Filter>Header Files\saml2\metadata</Filter>
     </ClInclude>
-    <ClInclude Include="saml2\metadata\MetadataCredentialContext.h">
+    <ClInclude Include="..\..\..\saml\saml2\metadata\MetadataCredentialContext.h">
       <Filter>Header Files\saml2\metadata</Filter>
     </ClInclude>
-    <ClInclude Include="saml2\metadata\MetadataCredentialCriteria.h">
+    <ClInclude Include="..\..\..\saml\saml2\metadata\MetadataCredentialCriteria.h">
       <Filter>Header Files\saml2\metadata</Filter>
     </ClInclude>
-    <ClInclude Include="saml2\metadata\MetadataFilter.h">
+    <ClInclude Include="..\..\..\saml\saml2\metadata\MetadataFilter.h">
       <Filter>Header Files\saml2\metadata</Filter>
     </ClInclude>
-    <ClInclude Include="saml2\metadata\MetadataProvider.h">
+    <ClInclude Include="..\..\..\saml\saml2\metadata\MetadataProvider.h">
       <Filter>Header Files\saml2\metadata</Filter>
     </ClInclude>
-    <ClInclude Include="saml2\metadata\ObservableMetadataProvider.h">
+    <ClInclude Include="..\..\..\saml\saml2\metadata\ObservableMetadataProvider.h">
       <Filter>Header Files\saml2\metadata</Filter>
     </ClInclude>
-    <ClInclude Include="saml2\binding\SAML2Artifact.h">
+    <ClInclude Include="..\..\..\saml\saml2\binding\SAML2Artifact.h">
       <Filter>Header Files\saml2\binding</Filter>
     </ClInclude>
-    <ClInclude Include="saml2\binding\SAML2ArtifactType0004.h">
+    <ClInclude Include="..\..\..\saml\saml2\binding\SAML2ArtifactType0004.h">
       <Filter>Header Files\saml2\binding</Filter>
     </ClInclude>
-    <ClInclude Include="saml2\binding\SAML2MessageDecoder.h">
+    <ClInclude Include="..\..\..\saml\saml2\binding\SAML2MessageDecoder.h">
       <Filter>Header Files\saml2\binding</Filter>
     </ClInclude>
-    <ClInclude Include="saml2\binding\SAML2Redirect.h">
+    <ClInclude Include="..\..\..\saml\saml2\binding\SAML2Redirect.h">
       <Filter>Header Files\saml2\binding</Filter>
     </ClInclude>
-    <ClInclude Include="saml2\binding\SAML2SOAPClient.h">
+    <ClInclude Include="..\..\..\saml\saml2\binding\SAML2SOAPClient.h">
       <Filter>Header Files\saml2\binding</Filter>
     </ClInclude>
-    <ClInclude Include="saml2\profile\AssertionValidator.h">
+    <ClInclude Include="..\..\..\saml\saml2\profile\AssertionValidator.h">
       <Filter>Header Files\saml2\profile</Filter>
     </ClInclude>
-    <ClInclude Include="saml2\profile\BrowserSSOProfileValidator.h">
+    <ClInclude Include="..\..\..\saml\saml2\profile\BrowserSSOProfileValidator.h">
       <Filter>Header Files\saml2\profile</Filter>
     </ClInclude>
-    <ClInclude Include="saml2\profile\SAML2AssertionPolicy.h">
+    <ClInclude Include="..\..\..\saml\saml2\profile\SAML2AssertionPolicy.h">
       <Filter>Header Files\saml2\profile</Filter>
     </ClInclude>
-    <ClInclude Include="encryption\EncryptedKeyResolver.h">
+    <ClInclude Include="..\..\..\saml\encryption\EncryptedKeyResolver.h">
       <Filter>Header Files\encryption</Filter>
     </ClInclude>
-    <ClInclude Include="binding\ArtifactMap.h">
+    <ClInclude Include="..\..\..\saml\binding\ArtifactMap.h">
       <Filter>Header Files\binding</Filter>
     </ClInclude>
-    <ClInclude Include="binding\MessageDecoder.h">
+    <ClInclude Include="..\..\..\saml\binding\MessageDecoder.h">
       <Filter>Header Files\binding</Filter>
     </ClInclude>
-    <ClInclude Include="binding\MessageEncoder.h">
+    <ClInclude Include="..\..\..\saml\binding\MessageEncoder.h">
       <Filter>Header Files\binding</Filter>
     </ClInclude>
-    <ClInclude Include="binding\SAMLArtifact.h">
+    <ClInclude Include="..\..\..\saml\binding\SAMLArtifact.h">
       <Filter>Header Files\binding</Filter>
     </ClInclude>
-    <ClInclude Include="binding\SecurityPolicy.h">
+    <ClInclude Include="..\..\..\saml\binding\SecurityPolicy.h">
       <Filter>Header Files\binding</Filter>
     </ClInclude>
-    <ClInclude Include="binding\SecurityPolicyRule.h">
+    <ClInclude Include="..\..\..\saml\binding\SecurityPolicyRule.h">
       <Filter>Header Files\binding</Filter>
     </ClInclude>
-    <ClInclude Include="binding\SOAPClient.h">
+    <ClInclude Include="..\..\..\saml\binding\SOAPClient.h">
       <Filter>Header Files\binding</Filter>
     </ClInclude>
-    <ClInclude Include="saml2\metadata\DiscoverableMetadataProvider.h">
+    <ClInclude Include="..\..\..\saml\saml2\metadata\DiscoverableMetadataProvider.h">
       <Filter>Header Files\saml2\metadata</Filter>
     </ClInclude>
-    <ClInclude Include="saml2\metadata\EntityMatcher.h">
+    <ClInclude Include="..\..\..\saml\saml2\metadata\EntityMatcher.h">
       <Filter>Header Files\saml2\metadata</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="saml.rc">
+    <ResourceCompile Include="..\..\..\saml\saml.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Makefile.am" />
+    <None Include="..\..\..\saml]\Makefile.am" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/samlsign/samlsign.vcxproj b/Projects/vc10/samlsign/samlsign.vcxproj
similarity index 80%
rename from samlsign/samlsign.vcxproj
rename to Projects/vc10/samlsign/samlsign.vcxproj
index 00d8cd6..df9d4e1 100644
--- a/samlsign/samlsign.vcxproj
+++ b/Projects/vc10/samlsign/samlsign.vcxproj
@@ -58,21 +58,21 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="..\..\BuildPath.props" />
+  <Import Project="..\..\..\..\BuildPath.props" />
   <Import Project="$(ParentRoot)\Versions.props" />
   <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\..\Build\vc10\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\..\Build\vc10\$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\..\Build\vc10\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\..\Build\vc10\$(Platform)\$(Configuration)\</OutDir>
     <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>
@@ -91,7 +91,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\;$(ProjectDir)..\..\..\samlsign\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -101,7 +101,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\cpp-xmltooling\Build\VC10\$(Configuration)\xmltooling1D.lib;xerces-c_3D.lib;xsec_1D.lib;log4shib1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration)\xmltooling1D.lib;xerces-c_3D.lib;xsec_1D.lib;log4shib1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
@@ -114,7 +114,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\;$(ProjectDir)..\..\..\samlsign\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -124,7 +124,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration)\xmltooling1D.lib;xerces-c_3D.lib;xsec_1D.lib;log4shib1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration)\xmltooling1D.lib;xerces-c_3D.lib;xsec_1D.lib;log4shib1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
@@ -133,14 +133,14 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\;$(ProjectDir)..\..\..\samlsign\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\cpp-xmltooling\Build\VC10\$(Configuration)\xmltooling1.lib;xerces-c_3.lib;xsec_1.lib;log4shib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration)\xmltooling1.lib;xerces-c_3.lib;xsec_1.lib;log4shib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -154,14 +154,14 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\;$(ProjectDir)..\..\..\samlsign\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration)\xmltooling1.lib;xerces-c_3.lib;xsec_1.lib;log4shib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration)\xmltooling1.lib;xerces-c_3.lib;xsec_1.lib;log4shib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -171,10 +171,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <None Include="Makefile.am" />
+    <None Include="..\..\..\samlsign\Makefile.am" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="samlsign.cpp" />
+    <ClCompile Include="..\..\..\samlsign\samlsign.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\saml\saml.vcxproj">
@@ -183,10 +183,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="..\..\..\samlsign\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="samlsign.rc" />
+    <ResourceCompile Include="..\..\..\samlsign\samlsign.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/samltest/samltest.vcxproj b/Projects/vc10/samltest/samltest.vcxproj
similarity index 88%
rename from samltest/samltest.vcxproj
rename to Projects/vc10/samltest/samltest.vcxproj
index a32fc02..173a19b 100644
--- a/samltest/samltest.vcxproj
+++ b/Projects/vc10/samltest/samltest.vcxproj
@@ -59,21 +59,21 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="..\..\BuildPath.props" />
+  <Import Project="..\..\..\..\BuildPath.props" />
   <Import Project="$(ParentRoot)\Versions.props" />
   <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\..\Build\vc10\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\..\Build\vc10\$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\..\Build\vc10\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\..\Build\vc10\$(Platform)\$(Configuration)\</OutDir>
     <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>
@@ -92,7 +92,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\;$(ProjectDir)..\..\..\samltest\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BrowseInformation>true</BrowseInformation>
@@ -100,7 +100,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\cpp-xmltooling\Build\VC10\$(Configuration)\xmltooling1D.lib;xerces-c_3D.lib;xsec_1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration)\xmltooling1D.lib;xerces-c_3D.lib;xsec_1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
@@ -113,7 +113,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\;$(ProjectDir)..\..\..\samltest\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BrowseInformation>true</BrowseInformation>
@@ -121,7 +121,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration)\xmltooling1D.lib;xerces-c_3D.lib;xsec_1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration)\xmltooling1D.lib;xerces-c_3D.lib;xsec_1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
@@ -130,12 +130,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\;$(ProjectDir)..\..\..\samltest\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\cpp-xmltooling\Build\VC10\$(Configuration)\xmltooling1.lib;xerces-c_3.lib;xsec_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration)\xmltooling1.lib;xerces-c_3.lib;xsec_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -149,12 +149,12 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\;$(ProjectDir)..\..\..\samltest\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration)\xmltooling1.lib;xerces-c_3.lib;xsec_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration)\xmltooling1.lib;xerces-c_3.lib;xsec_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -164,98 +164,98 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="ArtifactMapTest.cpp" />
-    <ClCompile Include="CookieTest.cpp" />
-    <ClCompile Include="SAMLArtifactCreationTest.cpp" />
-    <ClCompile Include="SAMLArtifactType0001Test.cpp" />
-    <ClCompile Include="SAMLArtifactType0002Test.cpp" />
-    <ClCompile Include="SAMLArtifactType0004Test.cpp" />
-    <ClCompile Include="samltest.cpp" />
-    <ClCompile Include="saml1\core\impl\ActionTest.cpp" />
-    <ClCompile Include="saml1\core\impl\AdviceTest.cpp" />
-    <ClCompile Include="saml1\core\impl\AssertionIDReferenceTest.cpp" />
-    <ClCompile Include="saml1\core\impl\AssertionTest.cpp" />
-    <ClCompile Include="saml1\core\impl\AttributeDesignatorTest.cpp" />
-    <ClCompile Include="saml1\core\impl\AttributeStatementTest.cpp" />
-    <ClCompile Include="saml1\core\impl\AttributeTest.cpp" />
-    <ClCompile Include="saml1\core\impl\AudienceRestrictionConditionTest.cpp" />
-    <ClCompile Include="saml1\core\impl\AudienceTest.cpp" />
-    <ClCompile Include="saml1\core\impl\AuthenticationStatementTest.cpp" />
-    <ClCompile Include="saml1\binding\SAML1ArtifactTest.cpp" />
-    <ClCompile Include="saml1\binding\SAML1POSTTest.cpp" />
-    <ClCompile Include="saml1\profile\SAML1PolicyTest.cpp" />
-    <ClCompile Include="signature\SAML1AssertionTest.cpp" />
-    <ClCompile Include="signature\SAML1RequestTest.cpp" />
-    <ClCompile Include="signature\SAML1ResponseTest.cpp" />
-    <ClCompile Include="signature\SAML2AssertionTest.cpp" />
-    <ClCompile Include="saml2\core\impl\Action20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\Advice20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\Artifact20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\ArtifactResolve20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\ArtifactResponse20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\Assertion20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\AssertionIDRef20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\AssertionIDRequest20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\AssertionURIRef20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\Attribute20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\AttributeQuery20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\AttributeStatement20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\Audience20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\AudienceRestriction20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\AuthenticatingAuthority20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\AuthnContext20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\AuthnContextClassRef20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\AuthnContextDeclRef20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\AuthnQuery20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\AuthnRequest20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\AuthnStatement20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\AuthzDecisionQuery20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\AuthzDecisionStatement20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\Conditions20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\Evidence20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\GetComplete20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\IDPEntry20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\IDPList20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\Issuer20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\KeyInfoConfirmationDataType20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\LogoutRequest20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\LogoutResponse20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\ManageNameIDRequest20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\ManageNameIDResponse20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\NameID20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\NameIDMappingRequest20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\NameIDMappingResponse20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\NameIDPolicy20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\NameIDType20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\NewEncryptedID20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\NewID20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\OneTimeUse20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\ProxyRestriction20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\RequestedAuthnContext20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\RequesterID20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\Response20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\Scoping20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\SessionIndex20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\Status20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\StatusCode20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\StatusDetail20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\StatusMessage20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\Subject20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\SubjectConfirmation20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\SubjectConfirmationData20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\SubjectLocality20Test.cpp" />
-    <ClCompile Include="saml2\core\impl\Terminate20Test.cpp" />
-    <ClCompile Include="saml2\metadata\XMLMetadataProviderTest.cpp" />
-    <ClCompile Include="saml2\binding\SAML2ArtifactTest.cpp" />
-    <ClCompile Include="saml2\binding\SAML2POSTTest.cpp" />
-    <ClCompile Include="saml2\binding\SAML2RedirectTest.cpp" />
-    <ClCompile Include="saml2\profile\SAML2PolicyTest.cpp" />
-    <ClCompile Include="security\ExplicitKeyTrustEngineTest.cpp" />
-    <ClCompile Include="security\StaticPKIXTrustEngineTest.cpp" />
-    <ClCompile Include="encryption\EncryptedAssertionTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\ArtifactMapTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\CookieTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\SAMLArtifactCreationTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\SAMLArtifactType0001Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\SAMLArtifactType0002Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\SAMLArtifactType0004Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\samltest.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml1\core\impl\ActionTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml1\core\impl\AdviceTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml1\core\impl\AssertionIDReferenceTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml1\core\impl\AssertionTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml1\core\impl\AttributeDesignatorTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml1\core\impl\AttributeStatementTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml1\core\impl\AttributeTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml1\core\impl\AudienceRestrictionConditionTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml1\core\impl\AudienceTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml1\core\impl\AuthenticationStatementTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml1\binding\SAML1ArtifactTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml1\binding\SAML1POSTTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml1\profile\SAML1PolicyTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\signature\SAML1AssertionTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\signature\SAML1RequestTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\signature\SAML1ResponseTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\signature\SAML2AssertionTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\Action20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\Advice20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\Artifact20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\ArtifactResolve20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\ArtifactResponse20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\Assertion20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\AssertionIDRef20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\AssertionIDRequest20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\AssertionURIRef20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\Attribute20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\AttributeQuery20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\AttributeStatement20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\Audience20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\AudienceRestriction20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\AuthenticatingAuthority20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\AuthnContext20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\AuthnContextClassRef20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\AuthnContextDeclRef20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\AuthnQuery20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\AuthnRequest20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\AuthnStatement20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\AuthzDecisionQuery20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\AuthzDecisionStatement20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\Conditions20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\Evidence20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\GetComplete20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\IDPEntry20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\IDPList20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\Issuer20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\KeyInfoConfirmationDataType20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\LogoutRequest20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\LogoutResponse20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\ManageNameIDRequest20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\ManageNameIDResponse20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\NameID20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\NameIDMappingRequest20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\NameIDMappingResponse20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\NameIDPolicy20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\NameIDType20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\NewEncryptedID20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\NewID20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\OneTimeUse20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\ProxyRestriction20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\RequestedAuthnContext20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\RequesterID20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\Response20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\Scoping20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\SessionIndex20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\Status20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\StatusCode20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\StatusDetail20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\StatusMessage20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\Subject20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\SubjectConfirmation20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\SubjectConfirmationData20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\SubjectLocality20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\core\impl\Terminate20Test.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\metadata\XMLMetadataProviderTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\binding\SAML2ArtifactTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\binding\SAML2POSTTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\binding\SAML2RedirectTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\saml2\profile\SAML2PolicyTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\security\ExplicitKeyTrustEngineTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\security\StaticPKIXTrustEngineTest.cpp" />
+    <ClCompile Include="..\..\..\samltest\encryption\EncryptedAssertionTest.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="ArtifactMapTest.h">
+    <CustomBuild Include="..\..\..\samltest\ArtifactMapTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -269,7 +269,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="SAMLArtifactCreationTest.h">
+    <CustomBuild Include="..\..\..\samltest\SAMLArtifactCreationTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -283,7 +283,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="SAMLArtifactType0001Test.h">
+    <CustomBuild Include="..\..\..\samltest\SAMLArtifactType0001Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -297,7 +297,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="SAMLArtifactType0002Test.h">
+    <CustomBuild Include="..\..\..\samltest\SAMLArtifactType0002Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -311,7 +311,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="SAMLArtifactType0004Test.h">
+    <CustomBuild Include="..\..\..\samltest\SAMLArtifactType0004Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -325,7 +325,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="samltest.h">
+    <CustomBuild Include="..\..\..\samltest\samltest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --error-printer --have-eh --have-std --abort-on-fail -o "%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).cpp;%(Outputs)</Outputs>
@@ -339,7 +339,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml1\core\impl\ActionTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\core\impl\ActionTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -353,7 +353,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml1\core\impl\AdviceTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\core\impl\AdviceTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -367,7 +367,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml1\core\impl\AssertionIDReferenceTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\core\impl\AssertionIDReferenceTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -381,7 +381,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml1\core\impl\AssertionTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\core\impl\AssertionTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -395,7 +395,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml1\core\impl\AttributeDesignatorTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\core\impl\AttributeDesignatorTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -409,7 +409,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml1\core\impl\AttributeStatementTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\core\impl\AttributeStatementTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -423,7 +423,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml1\core\impl\AttributeTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\core\impl\AttributeTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -437,7 +437,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml1\core\impl\AudienceRestrictionConditionTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\core\impl\AudienceRestrictionConditionTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -451,7 +451,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml1\core\impl\AudienceTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\core\impl\AudienceTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -465,7 +465,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml1\core\impl\AuthenticationStatementTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\core\impl\AuthenticationStatementTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -479,7 +479,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml1\binding\SAML1ArtifactTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\binding\SAML1ArtifactTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -493,7 +493,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml1\binding\SAML1POSTTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\binding\SAML1POSTTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -507,7 +507,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml1\profile\SAML1PolicyTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\profile\SAML1PolicyTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -521,7 +521,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="signature\SAML1AssertionTest.h">
+    <CustomBuild Include="..\..\..\samltest\signature\SAML1AssertionTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -535,7 +535,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="signature\SAML1RequestTest.h">
+    <CustomBuild Include="..\..\..\samltest\signature\SAML1RequestTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -549,7 +549,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="signature\SAML1ResponseTest.h">
+    <CustomBuild Include="..\..\..\samltest\signature\SAML1ResponseTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -563,7 +563,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="signature\SAML2AssertionTest.h">
+    <CustomBuild Include="..\..\..\samltest\signature\SAML2AssertionTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -577,7 +577,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="CookieTest.h">
+    <CustomBuild Include="..\..\..\samltest\CookieTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"</Command>
@@ -587,8 +587,8 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <ClInclude Include="signature\SAMLSignatureTestBase.h" />
-    <CustomBuild Include="saml2\core\impl\Action20Test.h">
+    <ClInclude Include="..\..\..\samltest\signature\SAMLSignatureTestBase.h" />
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Action20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -602,7 +602,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Advice20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Advice20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -616,7 +616,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Artifact20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Artifact20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -630,7 +630,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\ArtifactResolve20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\ArtifactResolve20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -644,7 +644,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\ArtifactResponse20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\ArtifactResponse20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -658,7 +658,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Assertion20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Assertion20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -672,7 +672,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AssertionIDRef20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AssertionIDRef20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -686,7 +686,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AssertionIDRequest20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AssertionIDRequest20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -700,7 +700,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AssertionURIRef20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AssertionURIRef20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -714,7 +714,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Attribute20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Attribute20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -728,7 +728,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AttributeQuery20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AttributeQuery20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -742,7 +742,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AttributeStatement20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AttributeStatement20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -756,7 +756,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Audience20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Audience20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -770,7 +770,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AudienceRestriction20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AudienceRestriction20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -784,7 +784,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AuthenticatingAuthority20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AuthenticatingAuthority20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -798,7 +798,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AuthnContext20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AuthnContext20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -812,7 +812,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AuthnContextClassRef20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AuthnContextClassRef20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -826,7 +826,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AuthnContextDeclRef20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AuthnContextDeclRef20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -840,7 +840,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AuthnQuery20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AuthnQuery20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -854,7 +854,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AuthnRequest20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AuthnRequest20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -868,7 +868,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AuthnStatement20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AuthnStatement20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -882,7 +882,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AuthzDecisionQuery20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AuthzDecisionQuery20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -896,7 +896,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AuthzDecisionStatement20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AuthzDecisionStatement20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -910,7 +910,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Conditions20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Conditions20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -924,7 +924,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Evidence20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Evidence20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -938,7 +938,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\GetComplete20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\GetComplete20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -952,7 +952,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\IDPEntry20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\IDPEntry20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -966,7 +966,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\IDPList20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\IDPList20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -980,7 +980,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Issuer20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Issuer20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -994,7 +994,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\KeyInfoConfirmationDataType20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\KeyInfoConfirmationDataType20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1008,7 +1008,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\LogoutRequest20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\LogoutRequest20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1022,7 +1022,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\LogoutResponse20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\LogoutResponse20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1036,7 +1036,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\ManageNameIDRequest20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\ManageNameIDRequest20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1050,7 +1050,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\ManageNameIDResponse20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\ManageNameIDResponse20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1064,7 +1064,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\NameID20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\NameID20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1078,7 +1078,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\NameIDMappingRequest20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\NameIDMappingRequest20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1092,7 +1092,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\NameIDMappingResponse20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\NameIDMappingResponse20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1106,7 +1106,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\NameIDPolicy20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\NameIDPolicy20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1120,7 +1120,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\NameIDType20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\NameIDType20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1134,7 +1134,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\NewEncryptedID20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\NewEncryptedID20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1148,7 +1148,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\NewID20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\NewID20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1162,7 +1162,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\OneTimeUse20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\OneTimeUse20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1176,7 +1176,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\ProxyRestriction20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\ProxyRestriction20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1190,7 +1190,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\RequestedAuthnContext20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\RequestedAuthnContext20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1204,7 +1204,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\RequesterID20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\RequesterID20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1218,7 +1218,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Response20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Response20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1232,7 +1232,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Scoping20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Scoping20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1246,7 +1246,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\SessionIndex20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\SessionIndex20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1260,7 +1260,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Status20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Status20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1274,7 +1274,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\StatusCode20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\StatusCode20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1288,7 +1288,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\StatusDetail20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\StatusDetail20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1302,7 +1302,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\StatusMessage20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\StatusMessage20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1316,7 +1316,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Subject20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Subject20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1330,7 +1330,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\SubjectConfirmation20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\SubjectConfirmation20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1344,7 +1344,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\SubjectConfirmationData20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\SubjectConfirmationData20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1358,7 +1358,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\SubjectLocality20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\SubjectLocality20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1372,7 +1372,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Terminate20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Terminate20Test.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1386,7 +1386,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\metadata\XMLMetadataProviderTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\metadata\XMLMetadataProviderTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1400,7 +1400,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\binding\SAML2ArtifactTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\binding\SAML2ArtifactTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1414,7 +1414,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\binding\SAML2POSTTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\binding\SAML2POSTTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1428,7 +1428,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\binding\SAML2RedirectTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\binding\SAML2RedirectTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1442,7 +1442,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="saml2\profile\SAML2PolicyTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\profile\SAML2PolicyTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1456,7 +1456,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="security\ExplicitKeyTrustEngineTest.h">
+    <CustomBuild Include="..\..\..\samltest\security\ExplicitKeyTrustEngineTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1470,7 +1470,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="security\StaticPKIXTrustEngineTest.h">
+    <CustomBuild Include="..\..\..\samltest\security\StaticPKIXTrustEngineTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1484,7 +1484,7 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="encryption\EncryptedAssertionTest.h">
+    <CustomBuild Include="..\..\..\samltest\encryption\EncryptedAssertionTest.h">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">perl.exe -w $(CxxTestRoot)\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o "%(RootDir)%(Directory)%(Filename)".cpp "%(FullPath)"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
@@ -1498,11 +1498,11 @@
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <ClInclude Include="binding.h" />
-    <ClInclude Include="internal.h" />
+    <ClInclude Include="..\..\..\samltest\binding.h" />
+    <ClInclude Include="..\..\..\samltest\internal.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Makefile.am" />
+    <None Include="..\..\..\samltest\Makefile.am" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\saml\saml.vcxproj">
diff --git a/samltest/samltest.vcxproj.filters b/Projects/vc10/samltest/samltest.vcxproj.filters
similarity index 73%
rename from samltest/samltest.vcxproj.filters
rename to Projects/vc10/samltest/samltest.vcxproj.filters
index b666a91..1715c0c 100644
--- a/samltest/samltest.vcxproj.filters
+++ b/Projects/vc10/samltest/samltest.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Generated Files">
@@ -364,286 +364,286 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="signature\SAMLSignatureTestBase.h">
+    <ClInclude Include="..\..\..\samltest\signature\SAMLSignatureTestBase.h">
       <Filter>Unit Tests\signature</Filter>
     </ClInclude>
-    <ClInclude Include="binding.h">
+    <ClInclude Include="..\..\..\samltest\binding.h">
       <Filter>Unit Tests</Filter>
     </ClInclude>
-    <ClInclude Include="internal.h">
+    <ClInclude Include="..\..\..\samltest\internal.h">
       <Filter>Unit Tests</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Makefile.am" />
+    <None Include="..\..\..\samltest\Makefile.am" />
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="ArtifactMapTest.h">
+    <CustomBuild Include="..\..\..\samltest\ArtifactMapTest.h">
       <Filter>Unit Tests</Filter>
     </CustomBuild>
-    <CustomBuild Include="SAMLArtifactCreationTest.h">
+    <CustomBuild Include="..\..\..\samltest\SAMLArtifactCreationTest.h">
       <Filter>Unit Tests</Filter>
     </CustomBuild>
-    <CustomBuild Include="SAMLArtifactType0001Test.h">
+    <CustomBuild Include="..\..\..\samltest\SAMLArtifactType0001Test.h">
       <Filter>Unit Tests</Filter>
     </CustomBuild>
-    <CustomBuild Include="SAMLArtifactType0002Test.h">
+    <CustomBuild Include="..\..\..\samltest\SAMLArtifactType0002Test.h">
       <Filter>Unit Tests</Filter>
     </CustomBuild>
-    <CustomBuild Include="SAMLArtifactType0004Test.h">
+    <CustomBuild Include="..\..\..\samltest\SAMLArtifactType0004Test.h">
       <Filter>Unit Tests</Filter>
     </CustomBuild>
-    <CustomBuild Include="samltest.h">
+    <CustomBuild Include="..\..\..\samltest\samltest.h">
       <Filter>Unit Tests</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml1\core\impl\ActionTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\core\impl\ActionTest.h">
       <Filter>Unit Tests\saml1\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml1\core\impl\AdviceTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\core\impl\AdviceTest.h">
       <Filter>Unit Tests\saml1\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml1\core\impl\AssertionIDReferenceTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\core\impl\AssertionIDReferenceTest.h">
       <Filter>Unit Tests\saml1\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml1\core\impl\AssertionTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\core\impl\AssertionTest.h">
       <Filter>Unit Tests\saml1\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml1\core\impl\AttributeDesignatorTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\core\impl\AttributeDesignatorTest.h">
       <Filter>Unit Tests\saml1\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml1\core\impl\AttributeStatementTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\core\impl\AttributeStatementTest.h">
       <Filter>Unit Tests\saml1\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml1\core\impl\AttributeTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\core\impl\AttributeTest.h">
       <Filter>Unit Tests\saml1\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml1\core\impl\AudienceRestrictionConditionTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\core\impl\AudienceRestrictionConditionTest.h">
       <Filter>Unit Tests\saml1\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml1\core\impl\AudienceTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\core\impl\AudienceTest.h">
       <Filter>Unit Tests\saml1\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml1\core\impl\AuthenticationStatementTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\core\impl\AuthenticationStatementTest.h">
       <Filter>Unit Tests\saml1\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml1\binding\SAML1ArtifactTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\binding\SAML1ArtifactTest.h">
       <Filter>Unit Tests\saml1\bnding</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml1\binding\SAML1POSTTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\binding\SAML1POSTTest.h">
       <Filter>Unit Tests\saml1\bnding</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml1\profile\SAML1PolicyTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml1\profile\SAML1PolicyTest.h">
       <Filter>Unit Tests\saml1\profile</Filter>
     </CustomBuild>
-    <CustomBuild Include="signature\SAML1AssertionTest.h">
+    <CustomBuild Include="..\..\..\samltest\signature\SAML1AssertionTest.h">
       <Filter>Unit Tests\signature</Filter>
     </CustomBuild>
-    <CustomBuild Include="signature\SAML1RequestTest.h">
+    <CustomBuild Include="..\..\..\samltest\signature\SAML1RequestTest.h">
       <Filter>Unit Tests\signature</Filter>
     </CustomBuild>
-    <CustomBuild Include="signature\SAML1ResponseTest.h">
+    <CustomBuild Include="..\..\..\samltest\signature\SAML1ResponseTest.h">
       <Filter>Unit Tests\signature</Filter>
     </CustomBuild>
-    <CustomBuild Include="signature\SAML2AssertionTest.h">
+    <CustomBuild Include="..\..\..\samltest\signature\SAML2AssertionTest.h">
       <Filter>Unit Tests\signature</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Action20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Action20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Advice20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Advice20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Artifact20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Artifact20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\ArtifactResolve20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\ArtifactResolve20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\ArtifactResponse20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\ArtifactResponse20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Assertion20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Assertion20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AssertionIDRef20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AssertionIDRef20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AssertionIDRequest20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AssertionIDRequest20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AssertionURIRef20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AssertionURIRef20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Attribute20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Attribute20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AttributeQuery20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AttributeQuery20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AttributeStatement20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AttributeStatement20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Audience20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Audience20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AudienceRestriction20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AudienceRestriction20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AuthenticatingAuthority20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AuthenticatingAuthority20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AuthnContext20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AuthnContext20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AuthnContextClassRef20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AuthnContextClassRef20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AuthnContextDeclRef20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AuthnContextDeclRef20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AuthnQuery20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AuthnQuery20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AuthnRequest20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AuthnRequest20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AuthnStatement20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AuthnStatement20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AuthzDecisionQuery20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AuthzDecisionQuery20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\AuthzDecisionStatement20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\AuthzDecisionStatement20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Conditions20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Conditions20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Evidence20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Evidence20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\GetComplete20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\GetComplete20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\IDPEntry20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\IDPEntry20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\IDPList20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\IDPList20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Issuer20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Issuer20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\KeyInfoConfirmationDataType20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\KeyInfoConfirmationDataType20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\LogoutRequest20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\LogoutRequest20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\LogoutResponse20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\LogoutResponse20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\ManageNameIDRequest20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\ManageNameIDRequest20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\ManageNameIDResponse20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\ManageNameIDResponse20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\NameID20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\NameID20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\NameIDMappingRequest20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\NameIDMappingRequest20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\NameIDMappingResponse20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\NameIDMappingResponse20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\NameIDPolicy20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\NameIDPolicy20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\NameIDType20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\NameIDType20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\NewEncryptedID20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\NewEncryptedID20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\NewID20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\NewID20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\OneTimeUse20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\OneTimeUse20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\ProxyRestriction20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\ProxyRestriction20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\RequestedAuthnContext20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\RequestedAuthnContext20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\RequesterID20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\RequesterID20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Response20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Response20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Scoping20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Scoping20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\SessionIndex20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\SessionIndex20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Status20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Status20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\StatusCode20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\StatusCode20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\StatusDetail20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\StatusDetail20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\StatusMessage20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\StatusMessage20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Subject20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Subject20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\SubjectConfirmation20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\SubjectConfirmation20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\SubjectConfirmationData20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\SubjectConfirmationData20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\SubjectLocality20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\SubjectLocality20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\core\impl\Terminate20Test.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\core\impl\Terminate20Test.h">
       <Filter>Unit Tests\saml2\core\impl</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\metadata\XMLMetadataProviderTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\metadata\XMLMetadataProviderTest.h">
       <Filter>Unit Tests\saml2\metadata</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\binding\SAML2ArtifactTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\binding\SAML2ArtifactTest.h">
       <Filter>Unit Tests\saml2\binding</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\binding\SAML2POSTTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\binding\SAML2POSTTest.h">
       <Filter>Unit Tests\saml2\binding</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\binding\SAML2RedirectTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\binding\SAML2RedirectTest.h">
       <Filter>Unit Tests\saml2\binding</Filter>
     </CustomBuild>
-    <CustomBuild Include="saml2\profile\SAML2PolicyTest.h">
+    <CustomBuild Include="..\..\..\samltest\saml2\profile\SAML2PolicyTest.h">
       <Filter>Unit Tests\saml2\profile</Filter>
     </CustomBuild>
-    <CustomBuild Include="security\ExplicitKeyTrustEngineTest.h">
+    <CustomBuild Include="..\..\..\samltest\security\ExplicitKeyTrustEngineTest.h">
       <Filter>Unit Tests\security</Filter>
     </CustomBuild>
-    <CustomBuild Include="security\StaticPKIXTrustEngineTest.h">
+    <CustomBuild Include="..\..\..\samltest\security\StaticPKIXTrustEngineTest.h">
       <Filter>Unit Tests\security</Filter>
     </CustomBuild>
-    <CustomBuild Include="encryption\EncryptedAssertionTest.h">
+    <CustomBuild Include="..\..\..\samltest\encryption\EncryptedAssertionTest.h">
       <Filter>Unit Tests\encryption</Filter>
     </CustomBuild>
-    <CustomBuild Include="CookieTest.h">
+    <CustomBuild Include="..\..\..\samltest\CookieTest.h">
       <Filter>Unit Tests</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/saml/saml.vcxproj b/saml/saml.vcxproj
deleted file mode 100644
index 682a537..0000000
--- a/saml/saml.vcxproj
+++ /dev/null
@@ -1,345 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{34DE3EA5-EA05-4261-8B63-A850FFB91768}</ProjectGuid>
-    <RootNamespace>saml</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <Import Project="..\..\BuildPath.props" />
-  <Import Project="$(ParentRoot)\Versions.props" />
-  <Import Project="$(ParentRoot)\Includes.props" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <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>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)2_5D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)2_5D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)2_5</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)2_5</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\cpp-xmltooling\Build\VC10\$(Configuration)\xmltooling1D.lib;xerces-c_3D.lib;xsec_1D.lib;log4shib1D.lib;zlib1d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(TargetDir)$(ProjectName)2D.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration)\xmltooling1D.lib;xerces-c_3D.lib;xsec_1D.lib;log4shib1D.lib;zlib1d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(TargetDir)$(ProjectName)2D.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\cpp-xmltooling\Build\VC10\$(Configuration)\xmltooling1.lib;xerces-c_3.lib;xsec_1.lib;log4shib1.lib;zlib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(TargetDir)$(ProjectName)2.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration)\xmltooling1.lib;xerces-c_3.lib;xsec_1.lib;log4shib1.lib;zlib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(TargetDir)$(ProjectName)2.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="saml2\metadata\impl\DiscoverableMetadataProvider.cpp" />
-    <ClCompile Include="saml2\metadata\impl\EntityAttributesEntityMatcher.cpp" />
-    <ClCompile Include="saml2\metadata\impl\EntityAttributesMetadataFilter.cpp" />
-    <ClCompile Include="saml2\metadata\impl\FolderMetadataProvider.cpp" />
-    <ClCompile Include="saml2\metadata\impl\NameEntityMatcher.cpp" />
-    <ClCompile Include="SAMLConfig.cpp" />
-    <ClCompile Include="util\CommonDomainCookie.cpp" />
-    <ClCompile Include="util\SAMLConstants.cpp" />
-    <ClCompile Include="saml1\core\impl\AssertionsImpl.cpp" />
-    <ClCompile Include="saml1\core\impl\AssertionsSchemaValidators.cpp" />
-    <ClCompile Include="saml1\core\impl\ProtocolsImpl.cpp" />
-    <ClCompile Include="saml1\core\impl\ProtocolsSchemaValidators.cpp" />
-    <ClCompile Include="saml1\binding\impl\SAML1ArtifactDecoder.cpp" />
-    <ClCompile Include="saml1\binding\impl\SAML1ArtifactEncoder.cpp" />
-    <ClCompile Include="saml1\binding\impl\SAML1MessageDecoder.cpp" />
-    <ClCompile Include="saml1\binding\impl\SAML1POSTDecoder.cpp" />
-    <ClCompile Include="saml1\binding\impl\SAML1POSTEncoder.cpp" />
-    <ClCompile Include="saml1\binding\impl\SAML1SOAPClient.cpp" />
-    <ClCompile Include="saml1\binding\impl\SAML1SOAPDecoder.cpp" />
-    <ClCompile Include="saml1\binding\impl\SAML1SOAPEncoder.cpp" />
-    <ClCompile Include="saml1\binding\impl\SAMLArtifactType0001.cpp" />
-    <ClCompile Include="saml1\binding\impl\SAMLArtifactType0002.cpp" />
-    <ClCompile Include="saml1\profile\impl\AssertionValidator.cpp" />
-    <ClCompile Include="saml1\profile\impl\BrowserSSOProfileValidator.cpp" />
-    <ClCompile Include="saml1\profile\impl\SAML1BrowserSSORule.cpp" />
-    <ClCompile Include="signature\ContentReference.cpp" />
-    <ClCompile Include="signature\SignatureProfileValidator.cpp" />
-    <ClCompile Include="saml2\core\impl\Assertions.cpp" />
-    <ClCompile Include="saml2\core\impl\Assertions20Impl.cpp" />
-    <ClCompile Include="saml2\core\impl\Assertions20SchemaValidators.cpp" />
-    <ClCompile Include="saml2\core\impl\Protocols20Impl.cpp" />
-    <ClCompile Include="saml2\core\impl\Protocols20SchemaValidators.cpp" />
-    <ClCompile Include="saml2\metadata\impl\AbstractMetadataProvider.cpp" />
-    <ClCompile Include="saml2\metadata\impl\BlacklistMetadataFilter.cpp" />
-    <ClCompile Include="saml2\metadata\impl\ChainingMetadataProvider.cpp" />
-    <ClCompile Include="saml2\metadata\impl\DynamicMetadataProvider.cpp" />
-    <ClCompile Include="saml2\metadata\impl\EntityRoleMetadataFilter.cpp" />
-    <ClCompile Include="saml2\metadata\impl\MetadataCredentialContext.cpp" />
-    <ClCompile Include="saml2\metadata\impl\MetadataCredentialCriteria.cpp" />
-    <ClCompile Include="saml2\metadata\impl\MetadataImpl.cpp" />
-    <ClCompile Include="saml2\metadata\impl\MetadataProvider.cpp" />
-    <ClCompile Include="saml2\metadata\impl\MetadataSchemaValidators.cpp" />
-    <ClCompile Include="saml2\metadata\impl\NullMetadataProvider.cpp" />
-    <ClCompile Include="saml2\metadata\impl\ObservableMetadataProvider.cpp" />
-    <ClCompile Include="saml2\metadata\impl\RequireValidUntilMetadataFilter.cpp" />
-    <ClCompile Include="saml2\metadata\impl\SignatureMetadataFilter.cpp" />
-    <ClCompile Include="saml2\metadata\impl\WhitelistMetadataFilter.cpp" />
-    <ClCompile Include="saml2\metadata\impl\XMLMetadataProvider.cpp" />
-    <ClCompile Include="saml2\binding\impl\SAML2Artifact.cpp">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-    </ClCompile>
-    <ClCompile Include="saml2\binding\impl\SAML2ArtifactDecoder.cpp" />
-    <ClCompile Include="saml2\binding\impl\SAML2ArtifactEncoder.cpp" />
-    <ClCompile Include="saml2\binding\impl\SAML2ArtifactType0004.cpp">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-    </ClCompile>
-    <ClCompile Include="saml2\binding\impl\SAML2ECPDecoder.cpp" />
-    <ClCompile Include="saml2\binding\impl\SAML2ECPEncoder.cpp" />
-    <ClCompile Include="saml2\binding\impl\SAML2MessageDecoder.cpp" />
-    <ClCompile Include="saml2\binding\impl\SAML2POSTDecoder.cpp" />
-    <ClCompile Include="saml2\binding\impl\SAML2POSTEncoder.cpp" />
-    <ClCompile Include="saml2\binding\impl\SAML2Redirect.cpp" />
-    <ClCompile Include="saml2\binding\impl\SAML2RedirectDecoder.cpp" />
-    <ClCompile Include="saml2\binding\impl\SAML2RedirectEncoder.cpp" />
-    <ClCompile Include="saml2\binding\impl\SAML2SOAPClient.cpp" />
-    <ClCompile Include="saml2\binding\impl\SAML2SOAPDecoder.cpp" />
-    <ClCompile Include="saml2\binding\impl\SAML2SOAPEncoder.cpp" />
-    <ClCompile Include="saml2\profile\impl\Assertion20Validator.cpp" />
-    <ClCompile Include="saml2\profile\impl\BearerConfirmationRule.cpp" />
-    <ClCompile Include="saml2\profile\impl\BrowserSSOProfile20Validator.cpp" />
-    <ClCompile Include="saml2\profile\impl\DelegationRestrictionRule.cpp" />
-    <ClCompile Include="saml2\profile\impl\SAML2AssertionPolicy.cpp" />
-    <ClCompile Include="encryption\EncryptedKeyResolver.cpp" />
-    <ClCompile Include="binding\impl\ArtifactMap.cpp" />
-    <ClCompile Include="binding\impl\ClientCertAuthRule.cpp" />
-    <ClCompile Include="binding\impl\MessageDecoder.cpp" />
-    <ClCompile Include="binding\impl\MessageEncoder.cpp" />
-    <ClCompile Include="binding\impl\MessageFlowRule.cpp" />
-    <ClCompile Include="binding\impl\NullSecurityRule.cpp" />
-    <ClCompile Include="binding\impl\SAMLArtifact.cpp" />
-    <ClCompile Include="binding\impl\SecurityPolicy.cpp" />
-    <ClCompile Include="binding\impl\SimpleSigningRule.cpp" />
-    <ClCompile Include="binding\impl\SOAPClient.cpp" />
-    <ClCompile Include="binding\impl\XMLSigningRule.cpp" />
-    <ClCompile Include="profile\impl\AudienceRestrictionRule.cpp" />
-    <ClCompile Include="profile\impl\ConditionsRule.cpp" />
-    <ClCompile Include="profile\impl\IgnoreRule.cpp" />
-    <ClCompile Include="version.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Assertion.h" />
-    <ClInclude Include="base.h" />
-    <ClInclude Include="exceptions.h" />
-    <ClInclude Include="internal.h" />
-    <ClInclude Include="RootObject.h" />
-    <ClInclude Include="saml2\metadata\DiscoverableMetadataProvider.h" />
-    <ClInclude Include="saml2\metadata\EntityMatcher.h" />
-    <ClInclude Include="SAMLConfig.h" />
-    <ClInclude Include="version.h" />
-    <ClInclude Include="util\CommonDomainCookie.h" />
-    <ClInclude Include="util\SAMLConstants.h" />
-    <ClInclude Include="saml1\core\Assertions.h" />
-    <ClInclude Include="saml1\core\Protocols.h" />
-    <ClInclude Include="saml1\binding\SAML1MessageDecoder.h" />
-    <ClInclude Include="saml1\binding\SAML1SOAPClient.h" />
-    <ClInclude Include="saml1\binding\SAMLArtifactType0001.h" />
-    <ClInclude Include="saml1\binding\SAMLArtifactType0002.h" />
-    <ClInclude Include="saml1\profile\AssertionValidator.h" />
-    <ClInclude Include="saml1\profile\BrowserSSOProfileValidator.h" />
-    <ClInclude Include="signature\ContentReference.h" />
-    <ClInclude Include="signature\SignableObject.h" />
-    <ClInclude Include="signature\SignatureProfileValidator.h" />
-    <ClInclude Include="saml2\core\Assertions.h" />
-    <ClInclude Include="saml2\core\Protocols.h" />
-    <ClInclude Include="saml2\metadata\AbstractMetadataProvider.h" />
-    <ClInclude Include="saml2\metadata\DynamicMetadataProvider.h" />
-    <ClInclude Include="saml2\metadata\EndpointManager.h" />
-    <ClInclude Include="saml2\metadata\Metadata.h" />
-    <ClInclude Include="saml2\metadata\MetadataCredentialContext.h" />
-    <ClInclude Include="saml2\metadata\MetadataCredentialCriteria.h" />
-    <ClInclude Include="saml2\metadata\MetadataFilter.h" />
-    <ClInclude Include="saml2\metadata\MetadataProvider.h" />
-    <ClInclude Include="saml2\metadata\ObservableMetadataProvider.h" />
-    <ClInclude Include="saml2\binding\SAML2Artifact.h" />
-    <ClInclude Include="saml2\binding\SAML2ArtifactType0004.h" />
-    <ClInclude Include="saml2\binding\SAML2MessageDecoder.h" />
-    <ClInclude Include="saml2\binding\SAML2Redirect.h" />
-    <ClInclude Include="saml2\binding\SAML2SOAPClient.h" />
-    <ClInclude Include="saml2\profile\AssertionValidator.h" />
-    <ClInclude Include="saml2\profile\BrowserSSOProfileValidator.h" />
-    <ClInclude Include="saml2\profile\SAML2AssertionPolicy.h" />
-    <ClInclude Include="encryption\EncryptedKeyResolver.h" />
-    <ClInclude Include="binding\ArtifactMap.h" />
-    <ClInclude Include="binding\MessageDecoder.h" />
-    <ClInclude Include="binding\MessageEncoder.h" />
-    <ClInclude Include="binding\SAMLArtifact.h" />
-    <ClInclude Include="binding\SecurityPolicy.h" />
-    <ClInclude Include="binding\SecurityPolicyRule.h" />
-    <ClInclude Include="binding\SOAPClient.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="saml.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile.am" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
-- 
2.1.4