X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=shibsp%2Fshibsp.vcproj;h=baea45df6e26932d5faa5b3701c61358f93703f1;hb=864f01be16d0390d36ac6c664a6bd38911f13467;hp=bb58f7e53631eb8b1eae18d803c30ed4f26aef75;hpb=976d581e5877406874b6f4e705a07c4c7102f2e3;p=shibboleth%2Fcpp-sp.git

diff --git a/shibsp/shibsp.vcproj b/shibsp/shibsp.vcproj
index bb58f7e..baea45d 100644
--- a/shibsp/shibsp.vcproj
+++ b/shibsp/shibsp.vcproj
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9.00"
 	Name="shibsp"
 	ProjectGUID="{81F0F7A6-DC36-46EF-957F-F9E81D4403F6}"
 	RootNamespace="shibsp"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -23,7 +24,7 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
-			CharacterSet="1"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -65,12 +66,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="log4shib1D.lib xerces-c_2D.lib xsec_1D.lib saml2D.lib xmltooling1D.lib wsock32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_1D.dll"
+				AdditionalDependencies="log4shib1D.lib xerces-c_3D.lib xsec_1D.lib saml2D.lib xmltooling1D.lib wsock32.lib"
+				OutputFile="$(OutDir)\$(ProjectName)1_4D.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(ConfigurationName);..\..\cpp-xmltooling\$(ConfigurationName)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(TargetDir)$(ProjectName)1D.lib"
 				TargetMachine="1"
 			/>
@@ -93,9 +96,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -104,7 +104,7 @@
 			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
-			CharacterSet="1"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -147,12 +147,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="log4shib1D.lib xerces-c_2D.lib xsec_1D.lib saml2D.lib xmltooling1D.lib wsock32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_1D.dll"
+				AdditionalDependencies="log4shib1D.lib xerces-c_3D.lib xsec_1D.lib saml2D.lib xmltooling1D.lib wsock32.lib"
+				OutputFile="$(OutDir)\$(ProjectName)1_4D.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(PlatformName)\$(ConfigurationName);..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(TargetDir)$(ProjectName)1D.lib"
 				TargetMachine="17"
 			/>
@@ -175,9 +177,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -186,7 +185,7 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
-			CharacterSet="1"
+			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
 			<Tool
@@ -224,13 +223,15 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="log4shib1.lib xerces-c_2.lib xsec_1.lib saml2.lib xmltooling1.lib wsock32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_1.dll"
+				AdditionalDependencies="log4shib1.lib xerces-c_3.lib xsec_1.lib saml2.lib xmltooling1.lib wsock32.lib"
+				OutputFile="$(OutDir)\$(ProjectName)1_4.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(ConfigurationName);..\..\cpp-xmltooling\$(ConfigurationName)"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(TargetDir)$(ProjectName)1.lib"
 				TargetMachine="1"
 			/>
@@ -253,9 +254,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -264,7 +262,7 @@
 			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
-			CharacterSet="1"
+			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
 			<Tool
@@ -303,14 +301,16 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="log4shib1.lib xerces-c_2.lib xsec_1.lib saml2.lib xmltooling1.lib wsock32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)1_1.dll"
+				AdditionalDependencies="log4shib1.lib xerces-c_3.lib xsec_1.lib saml2.lib xmltooling1.lib wsock32.lib"
+				OutputFile="$(OutDir)\$(ProjectName)1_4.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(PlatformName)\$(ConfigurationName);..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(TargetDir)$(ProjectName)1.lib"
 				TargetMachine="17"
 			/>
@@ -333,9 +333,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -411,6 +408,10 @@
 					RelativePath=".\metadata\MetadataExtSchemaValidators.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\metadata\MetadataProviderCriteria.cpp"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="remoting"
@@ -444,6 +445,10 @@
 				Name="impl"
 				>
 				<File
+					RelativePath=".\impl\ChainingAccessControl.cpp"
+					>
+				</File>
+				<File
 					RelativePath=".\impl\StorageServiceSessionCache.cpp"
 					>
 				</File>
@@ -468,6 +473,22 @@
 					>
 				</File>
 				<File
+					RelativePath=".\attribute\DOMAttributeDecoder.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\attribute\ExtensibleAttribute.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\attribute\KeyInfoAttributeDecoder.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\attribute\NameIDAttribute.cpp"
+					>
+				</File>
+				<File
 					RelativePath=".\attribute\NameIDAttributeDecoder.cpp"
 					>
 				</File>
@@ -476,13 +497,29 @@
 					>
 				</File>
 				<File
+					RelativePath=".\attribute\ScopedAttribute.cpp"
+					>
+				</File>
+				<File
 					RelativePath=".\attribute\ScopedAttributeDecoder.cpp"
 					>
 				</File>
 				<File
+					RelativePath=".\attribute\SimpleAttribute.cpp"
+					>
+				</File>
+				<File
 					RelativePath=".\attribute\StringAttributeDecoder.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\attribute\XMLAttribute.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\attribute\XMLAttributeDecoder.cpp"
+					>
+				</File>
 				<Filter
 					Name="resolver"
 					>
@@ -498,10 +535,22 @@
 							>
 						</File>
 						<File
+							RelativePath=".\attribute\resolver\impl\DelegationAttributeExtractor.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\resolver\impl\KeyDescriptorAttributeExtractor.cpp"
+							>
+						</File>
+						<File
 							RelativePath=".\attribute\resolver\impl\QueryAttributeResolver.cpp"
 							>
 						</File>
 						<File
+							RelativePath=".\attribute\resolver\impl\SimpleAggregationAttributeResolver.cpp"
+							>
+						</File>
+						<File
 							RelativePath=".\attribute\resolver\impl\XMLAttributeExtractor.cpp"
 							>
 						</File>
@@ -578,6 +627,10 @@
 							>
 						</File>
 						<File
+							RelativePath=".\attribute\filtering\impl\BasicFilteringContext.cpp"
+							>
+						</File>
+						<File
 							RelativePath=".\attribute\filtering\impl\ChainingAttributeFilter.cpp"
 							>
 						</File>
@@ -747,10 +800,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\ApplicationAwarePlugin.h"
-				>
-			</File>
-			<File
 				RelativePath=".\base.h"
 				>
 			</File>
@@ -858,6 +907,10 @@
 					>
 				</File>
 				<File
+					RelativePath=".\attribute\ExtensibleAttribute.h"
+					>
+				</File>
+				<File
 					RelativePath=".\attribute\NameIDAttribute.h"
 					>
 				</File>
@@ -869,6 +922,10 @@
 					RelativePath=".\attribute\SimpleAttribute.h"
 					>
 				</File>
+				<File
+					RelativePath=".\attribute\XMLAttribute.h"
+					>
+				</File>
 				<Filter
 					Name="resolver"
 					>
@@ -973,6 +1030,14 @@
 				>
 			</File>
 		</Filter>
+		<File
+			RelativePath=".\Makefile.am"
+			>
+		</File>
+		<File
+			RelativePath=".\paths.h.in"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>