X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fsaml.vcproj;h=58783f5c7b13c5f8c00a5f46bd01dbb92a79d1f1;hb=d832e76c5e3e4657231ed9f553fbd869b24de1e9;hp=27b7e031ed2caaa122797c39ad7fa6abb1326d8a;hpb=2bca43f62a6859ce908174d90153b327341214d7;p=shibboleth%2Fcpp-opensaml.git

diff --git a/saml/saml.vcproj b/saml/saml.vcproj
index 27b7e03..58783f5 100644
--- a/saml/saml.vcproj
+++ b/saml/saml.vcproj
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9.00"
 	Name="saml"
 	ProjectGUID="{34DE3EA5-EA05-4261-8B63-A850FFB91768}"
 	RootNamespace="saml"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -40,12 +44,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)&quot;;&quot;..\..\cpp-xmltooling&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)\zlib&quot;;&quot;..\..\cpp-xmltooling&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
 				BrowseInformation="1"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -56,17 +59,21 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;_DEBUG"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\cpp-xmltooling\Debug\xmltooling_1D.lib xerces-c_2D.lib xsec_1D.lib log4cppD.lib libeay32_0_9_8D.lib"
-				OutputFile="$(OutDir)\$(ProjectName)_6D.dll"
+				AdditionalDependencies="..\..\cpp-xmltooling\$(ConfigurationName)\xmltooling1D.lib xerces-c_3D.lib xsec_1D.lib log4shib1D.lib"
+				OutputFile="$(OutDir)\$(ProjectName)2_2D.dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(TargetDir)$(ProjectName)2D.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -88,7 +95,84 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)\zlib&quot;;&quot;..\..\cpp-xmltooling&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BrowseInformation="1"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;_DEBUG"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)\xmltooling1D.lib xerces-c_3D.lib xsec_1D.lib log4shib1D.lib"
+				OutputFile="$(OutDir)\$(ProjectName)2_2D.dll"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(TargetDir)$(ProjectName)2D.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
@@ -119,10 +203,9 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)&quot;;&quot;..\..\cpp-xmltooling&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)\zlib&quot;;&quot;..\..\cpp-xmltooling&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
@@ -138,13 +221,16 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\cpp-xmltooling\Release\xmltooling_1.lib xerces-c_2.lib xsec_1.lib log4cpp.lib libeay32_0_9_8.lib"
-				OutputFile="$(OutDir)\$(ProjectName)_6.dll"
+				AdditionalDependencies="..\..\cpp-xmltooling\$(ConfigurationName)\xmltooling1.lib xerces-c_3.lib xsec_1.lib log4shib1.lib"
+				OutputFile="$(OutDir)\$(ProjectName)2_2.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(TargetDir)$(ProjectName)2.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -166,7 +252,82 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)\zlib&quot;;&quot;..\..\cpp-xmltooling&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)\xmltooling1.lib xerces-c_3.lib xsec_1.lib log4shib1.lib"
+				OutputFile="$(OutDir)\$(ProjectName)2_2.dll"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(TargetDir)$(ProjectName)2.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
@@ -182,10 +343,6 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\SAMLArtifact.cpp"
-				>
-			</File>
-			<File
 				RelativePath=".\SAMLConfig.cpp"
 				>
 			</File>
@@ -193,6 +350,10 @@
 				Name="util"
 				>
 				<File
+					RelativePath=".\util\CommonDomainCookie.cpp"
+					>
+				</File>
+				<File
 					RelativePath=".\util\SAMLConstants.cpp"
 					>
 				</File>
@@ -222,30 +383,74 @@
 							RelativePath=".\saml1\core\impl\ProtocolsSchemaValidators.cpp"
 							>
 						</File>
-						<File
-							RelativePath=".\saml1\core\impl\SAMLArtifactType0001.cpp"
-							>
-						</File>
-						<File
-							RelativePath=".\saml1\core\impl\SAMLArtifactType0002.cpp"
-							>
-						</File>
 					</Filter>
 				</Filter>
 				<Filter
-					Name="profile"
+					Name="binding"
 					>
 					<Filter
 						Name="impl"
 						>
+						<File
+							RelativePath=".\saml1\binding\impl\SAML1ArtifactDecoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml1\binding\impl\SAML1ArtifactEncoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml1\binding\impl\SAML1MessageDecoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml1\binding\impl\SAML1POSTDecoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml1\binding\impl\SAML1POSTEncoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml1\binding\impl\SAML1SOAPClient.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml1\binding\impl\SAML1SOAPDecoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml1\binding\impl\SAML1SOAPEncoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml1\binding\impl\SAMLArtifactType0001.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml1\binding\impl\SAMLArtifactType0002.cpp"
+							>
+						</File>
 					</Filter>
 				</Filter>
 				<Filter
-					Name="binding"
+					Name="profile"
 					>
 					<Filter
 						Name="impl"
 						>
+						<File
+							RelativePath=".\saml1\profile\impl\AssertionValidator.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml1\profile\impl\BrowserSSOProfileValidator.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml1\profile\impl\SAML1BrowserSSORule.cpp"
+							>
+						</File>
 					</Filter>
 				</Filter>
 			</Filter>
@@ -271,6 +476,10 @@
 						Name="impl"
 						>
 						<File
+							RelativePath=".\saml2\core\impl\Assertions.cpp"
+							>
+						</File>
+						<File
 							RelativePath=".\saml2\core\impl\Assertions20Impl.cpp"
 							>
 						</File>
@@ -286,14 +495,6 @@
 							RelativePath=".\saml2\core\impl\Protocols20SchemaValidators.cpp"
 							>
 						</File>
-						<File
-							RelativePath=".\saml2\core\impl\SAML2Artifact.cpp"
-							>
-						</File>
-						<File
-							RelativePath=".\saml2\core\impl\SAML2ArtifactType0004.cpp"
-							>
-						</File>
 					</Filter>
 				</Filter>
 				<Filter
@@ -303,11 +504,19 @@
 						Name="impl"
 						>
 						<File
+							RelativePath=".\saml2\metadata\impl\AbstractMetadataProvider.cpp"
+							>
+						</File>
+						<File
 							RelativePath=".\saml2\metadata\impl\BlacklistMetadataFilter.cpp"
 							>
 						</File>
 						<File
-							RelativePath=".\saml2\metadata\impl\FilesystemMetadataProvider.cpp"
+							RelativePath=".\saml2\metadata\impl\ChainingMetadataProvider.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\metadata\impl\DynamicMetadataProvider.cpp"
 							>
 						</File>
 						<File
@@ -323,7 +532,11 @@
 							>
 						</File>
 						<File
-							RelativePath=".\saml2\metadata\impl\ObservableMetadataProvider.cpp"
+							RelativePath=".\saml2\metadata\impl\NullMetadataProvider.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\metadata\impl\RequireValidUntilMetadataFilter.cpp"
 							>
 						</File>
 						<File
@@ -334,6 +547,10 @@
 							RelativePath=".\saml2\metadata\impl\WhitelistMetadataFilter.cpp"
 							>
 						</File>
+						<File
+							RelativePath=".\saml2\metadata\impl\XMLMetadataProvider.cpp"
+							>
+						</File>
 					</Filter>
 				</Filter>
 				<Filter
@@ -342,6 +559,162 @@
 					<Filter
 						Name="impl"
 						>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2Artifact.cpp"
+							>
+							<FileConfiguration
+								Name="Debug|Win32"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+									ObjectFile="$(IntDir)\$(InputName)1.obj"
+									XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Debug|x64"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+									ObjectFile="$(IntDir)\$(InputName)1.obj"
+									XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|Win32"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+									ObjectFile="$(IntDir)\$(InputName)1.obj"
+									XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|x64"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+									ObjectFile="$(IntDir)\$(InputName)1.obj"
+									XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+								/>
+							</FileConfiguration>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2ArtifactDecoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2ArtifactEncoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2ArtifactType0004.cpp"
+							>
+							<FileConfiguration
+								Name="Debug|Win32"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+									ObjectFile="$(IntDir)\$(InputName)1.obj"
+									XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Debug|x64"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+									ObjectFile="$(IntDir)\$(InputName)1.obj"
+									XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|Win32"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+									ObjectFile="$(IntDir)\$(InputName)1.obj"
+									XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+								/>
+							</FileConfiguration>
+							<FileConfiguration
+								Name="Release|x64"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+									ObjectFile="$(IntDir)\$(InputName)1.obj"
+									XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+								/>
+							</FileConfiguration>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2ECPDecoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2ECPEncoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2MessageDecoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2POSTDecoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2POSTEncoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2Redirect.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2RedirectDecoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2RedirectEncoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2SOAPClient.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2SOAPDecoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2SOAPEncoder.cpp"
+							>
+						</File>
+					</Filter>
+				</Filter>
+				<Filter
+					Name="profile"
+					>
+					<Filter
+						Name="impl"
+						>
+						<File
+							RelativePath=".\saml2\profile\impl\Assertion20Validator.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\profile\impl\BearerConfirmationRule.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\profile\impl\BrowserSSOProfile20Validator.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\profile\impl\SAML2AssertionPolicy.cpp"
+							>
+						</File>
 					</Filter>
 				</Filter>
 			</Filter>
@@ -354,21 +727,113 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="security"
+				Name="binding"
+				>
+				<Filter
+					Name="impl"
+					>
+					<File
+						RelativePath=".\binding\impl\ArtifactMap.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\binding\impl\ClientCertAuthRule.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\binding\impl\MessageDecoder.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\binding\impl\MessageEncoder.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\binding\impl\MessageFlowRule.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\binding\impl\NullSecurityRule.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\binding\impl\SAMLArtifact.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\binding\impl\SecurityPolicy.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\binding\impl\SimpleSigningRule.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\binding\impl\SOAPClient.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\binding\impl\XMLSigningRule.cpp"
+						>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="zlib"
+				>
+				<File
+					RelativePath=".\zlib\adler32.c"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\compress.c"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\crc32.c"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\deflate.c"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\inffast.c"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\inflate.c"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\inftrees.c"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\trees.c"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\zutil.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="profile"
 				>
 				<Filter
 					Name="impl"
 					>
 					<File
-						RelativePath=".\security\impl\AbstractPKIXTrustEngine.cpp"
+						RelativePath=".\profile\impl\AudienceRestrictionRule.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\security\impl\ExplicitKeyTrustEngine.cpp"
+						RelativePath=".\profile\impl\ConditionsRule.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\security\impl\TrustEngine.cpp"
+						RelativePath=".\profile\impl\IgnoreRule.cpp"
 						>
 					</File>
 				</Filter>
@@ -380,6 +845,10 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
+				RelativePath=".\Assertion.h"
+				>
+			</File>
+			<File
 				RelativePath=".\base.h"
 				>
 			</File>
@@ -392,7 +861,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\SAMLArtifact.h"
+				RelativePath=".\RootObject.h"
 				>
 			</File>
 			<File
@@ -407,6 +876,10 @@
 				Name="util"
 				>
 				<File
+					RelativePath=".\util\CommonDomainCookie.h"
+					>
+				</File>
+				<File
 					RelativePath=".\util\SAMLConstants.h"
 					>
 				</File>
@@ -425,22 +898,38 @@
 						RelativePath=".\saml1\core\Protocols.h"
 						>
 					</File>
+				</Filter>
+				<Filter
+					Name="binding"
+					>
 					<File
-						RelativePath=".\saml1\core\SAMLArtifactType0001.h"
+						RelativePath=".\saml1\binding\SAML1MessageDecoder.h"
 						>
 					</File>
 					<File
-						RelativePath=".\saml1\core\SAMLArtifactType0002.h"
+						RelativePath=".\saml1\binding\SAML1SOAPClient.h"
+						>
+					</File>
+					<File
+						RelativePath=".\saml1\binding\SAMLArtifactType0001.h"
+						>
+					</File>
+					<File
+						RelativePath=".\saml1\binding\SAMLArtifactType0002.h"
 						>
 					</File>
 				</Filter>
 				<Filter
 					Name="profile"
 					>
-				</Filter>
-				<Filter
-					Name="binding"
-					>
+					<File
+						RelativePath=".\saml1\profile\AssertionValidator.h"
+						>
+					</File>
+					<File
+						RelativePath=".\saml1\profile\BrowserSSOProfileValidator.h"
+						>
+					</File>
 				</Filter>
 			</Filter>
 			<Filter
@@ -473,23 +962,39 @@
 						RelativePath=".\saml2\core\Protocols.h"
 						>
 					</File>
+				</Filter>
+				<Filter
+					Name="metadata"
+					>
 					<File
-						RelativePath=".\saml2\core\SAML2Artifact.h"
+						RelativePath=".\saml2\metadata\AbstractMetadataProvider.h"
 						>
 					</File>
 					<File
-						RelativePath=".\saml2\core\SAML2ArtifactType0004.h"
+						RelativePath=".\saml2\metadata\ChainingMetadataProvider.h"
+						>
+					</File>
+					<File
+						RelativePath=".\saml2\metadata\DynamicMetadataProvider.h"
+						>
+					</File>
+					<File
+						RelativePath=".\saml2\metadata\EndpointManager.h"
 						>
 					</File>
-				</Filter>
-				<Filter
-					Name="metadata"
-					>
 					<File
 						RelativePath=".\saml2\metadata\Metadata.h"
 						>
 					</File>
 					<File
+						RelativePath=".\saml2\metadata\MetadataCredentialContext.h"
+						>
+					</File>
+					<File
+						RelativePath=".\saml2\metadata\MetadataCredentialCriteria.h"
+						>
+					</File>
+					<File
 						RelativePath=".\saml2\metadata\MetadataFilter.h"
 						>
 					</File>
@@ -505,6 +1010,42 @@
 				<Filter
 					Name="binding"
 					>
+					<File
+						RelativePath=".\saml2\binding\SAML2Artifact.h"
+						>
+					</File>
+					<File
+						RelativePath=".\saml2\binding\SAML2ArtifactType0004.h"
+						>
+					</File>
+					<File
+						RelativePath=".\saml2\binding\SAML2MessageDecoder.h"
+						>
+					</File>
+					<File
+						RelativePath=".\saml2\binding\SAML2Redirect.h"
+						>
+					</File>
+					<File
+						RelativePath=".\saml2\binding\SAML2SOAPClient.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="profile"
+					>
+					<File
+						RelativePath=".\saml2\profile\AssertionValidator.h"
+						>
+					</File>
+					<File
+						RelativePath=".\saml2\profile\BrowserSSOProfileValidator.h"
+						>
+					</File>
+					<File
+						RelativePath=".\saml2\profile\SAML2AssertionPolicy.h"
+						>
+					</File>
 				</Filter>
 			</Filter>
 			<Filter
@@ -516,22 +1057,78 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="security"
+				Name="binding"
 				>
 				<File
-					RelativePath=".\security\AbstractPKIXTrustEngine.h"
+					RelativePath=".\binding\ArtifactMap.h"
+					>
+				</File>
+				<File
+					RelativePath=".\binding\MessageDecoder.h"
 					>
 				</File>
 				<File
-					RelativePath=".\security\MetadataKeyInfoIterator.h"
+					RelativePath=".\binding\MessageEncoder.h"
 					>
 				</File>
 				<File
-					RelativePath=".\security\TrustEngine.h"
+					RelativePath=".\binding\SAMLArtifact.h"
 					>
 				</File>
 				<File
-					RelativePath=".\security\X509TrustEngine.h"
+					RelativePath=".\binding\SecurityPolicy.h"
+					>
+				</File>
+				<File
+					RelativePath=".\binding\SecurityPolicyRule.h"
+					>
+				</File>
+				<File
+					RelativePath=".\binding\SOAPClient.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="zlib"
+				>
+				<File
+					RelativePath=".\zlib\crc32.h"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\deflate.h"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\inffast.h"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\inffixed.h"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\inflate.h"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\inftrees.h"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\trees.h"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\zconf.h"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\zlib.h"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\zutil.h"
 					>
 				</File>
 			</Filter>
@@ -541,6 +1138,10 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
+			<File
+				RelativePath=".\saml.rc"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>