X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=samltest%2Fsamltest.vcproj;h=f247932af454fc1708451ced5a167c1f972bcbb0;hb=HEAD;hp=75f8f9450e571cf92f119027672a39a2eb9d753b;hpb=4ec095484c9769ef2545bbcb188f56282aebfafb;p=shibboleth%2Fopensaml2.git

diff --git a/samltest/samltest.vcproj b/samltest/samltest.vcproj
index 75f8f94..f247932 100644
--- a/samltest/samltest.vcproj
+++ b/samltest/samltest.vcproj
@@ -45,7 +45,6 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
 				BrowseInformation="1"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -62,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\cpp-xmltooling\Debug\xmltooling1D.lib xerces-c_2D.lib xsec_1D.lib"
+				AdditionalDependencies="..\..\cpp-xmltooling\$(ConfigurationName)\xmltooling1D.lib xerces-c_2D.lib xsec_1D.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -121,7 +120,6 @@
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)&quot;;&quot;..\..\cpp-xmltooling&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE=1"
 				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
@@ -137,7 +135,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\cpp-xmltooling\Release\xmltooling1.lib xerces-c_2.lib xsec_1.lib"
+				AdditionalDependencies="..\..\cpp-xmltooling\$(ConfigurationName)\xmltooling1.lib xerces-c_2.lib xsec_1.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -530,7 +528,7 @@
 					Name="metadata"
 					>
 					<File
-						RelativePath=".\saml2\metadata\FilesystemMetadataProviderTest.cpp"
+						RelativePath=".\saml2\metadata\XMLMetadataProviderTest.cpp"
 						>
 					</File>
 				</Filter>
@@ -555,11 +553,19 @@
 				Name="security"
 				>
 				<File
-					RelativePath=".\security\AbstractPKIXTrustEngineTest.cpp"
+					RelativePath=".\security\ExplicitKeyTrustEngineTest.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\security\ExplicitKeyTrustEngineTest.cpp"
+					RelativePath=".\security\StaticPKIXTrustEngineTest.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="encryption"
+				>
+				<File
+					RelativePath=".\encryption\EncryptedAssertionTest.cpp"
 					>
 				</File>
 			</Filter>
@@ -577,7 +583,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 						Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 					/>
 				</FileConfiguration>
@@ -586,7 +592,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 						Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 					/>
 				</FileConfiguration>
@@ -599,7 +605,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 						Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 					/>
 				</FileConfiguration>
@@ -608,7 +614,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 						Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 					/>
 				</FileConfiguration>
@@ -621,7 +627,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 						Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 					/>
 				</FileConfiguration>
@@ -630,7 +636,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 						Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 					/>
 				</FileConfiguration>
@@ -643,7 +649,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 						Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 					/>
 				</FileConfiguration>
@@ -652,7 +658,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 						Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 					/>
 				</FileConfiguration>
@@ -665,7 +671,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 						Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 					/>
 				</FileConfiguration>
@@ -674,7 +680,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 						Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 					/>
 				</FileConfiguration>
@@ -687,7 +693,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --error-printer --have-eh --have-std --abort-on-fail -o &quot;$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --error-printer --have-eh --have-std --abort-on-fail -o &quot;$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 						Outputs="$(InputName).cpp"
 					/>
 				</FileConfiguration>
@@ -696,7 +702,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --error-printer --have-eh --have-std --abort-on-fail -o &quot;$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --error-printer --have-eh --have-std --abort-on-fail -o &quot;$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 						Outputs="$(InputName).cpp"
 					/>
 				</FileConfiguration>
@@ -718,7 +724,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -727,7 +733,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -740,7 +746,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -749,7 +755,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -762,7 +768,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -771,7 +777,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -784,7 +790,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -793,7 +799,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -806,7 +812,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -815,7 +821,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -828,7 +834,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -837,7 +843,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -850,7 +856,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -859,7 +865,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -872,7 +878,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -881,7 +887,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -894,7 +900,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -903,7 +909,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -916,7 +922,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -925,7 +931,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -943,7 +949,7 @@
 							>
 							<Tool
 								Name="VCCustomBuildTool"
-								CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+								CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 								Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 							/>
 						</FileConfiguration>
@@ -952,7 +958,7 @@
 							>
 							<Tool
 								Name="VCCustomBuildTool"
-								CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+								CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 								Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 							/>
 						</FileConfiguration>
@@ -965,7 +971,7 @@
 							>
 							<Tool
 								Name="VCCustomBuildTool"
-								CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+								CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 								Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 							/>
 						</FileConfiguration>
@@ -974,7 +980,7 @@
 							>
 							<Tool
 								Name="VCCustomBuildTool"
-								CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+								CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 								Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 							/>
 						</FileConfiguration>
@@ -992,7 +998,7 @@
 						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 							Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 						/>
 					</FileConfiguration>
@@ -1001,7 +1007,7 @@
 						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 							Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 						/>
 					</FileConfiguration>
@@ -1014,7 +1020,7 @@
 						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 							Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 						/>
 					</FileConfiguration>
@@ -1023,7 +1029,7 @@
 						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 							Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 						/>
 					</FileConfiguration>
@@ -1036,7 +1042,7 @@
 						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 							Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 						/>
 					</FileConfiguration>
@@ -1045,7 +1051,7 @@
 						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 							Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 						/>
 					</FileConfiguration>
@@ -1058,7 +1064,7 @@
 						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 							Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 						/>
 					</FileConfiguration>
@@ -1067,7 +1073,7 @@
 						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 							Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 						/>
 					</FileConfiguration>
@@ -1094,7 +1100,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1103,7 +1109,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1116,7 +1122,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1125,7 +1131,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1138,7 +1144,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1147,7 +1153,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1160,7 +1166,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1169,7 +1175,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1182,7 +1188,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1191,7 +1197,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1204,7 +1210,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1213,7 +1219,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1226,7 +1232,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1235,7 +1241,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1248,7 +1254,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1257,7 +1263,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1270,7 +1276,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1279,7 +1285,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1292,7 +1298,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1301,7 +1307,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1314,7 +1320,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1323,7 +1329,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1336,7 +1342,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1345,7 +1351,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1358,7 +1364,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1367,7 +1373,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1380,7 +1386,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1389,7 +1395,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1402,7 +1408,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1411,7 +1417,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1424,7 +1430,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1433,7 +1439,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1446,7 +1452,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1455,7 +1461,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1468,7 +1474,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1477,7 +1483,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1490,7 +1496,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1499,7 +1505,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1512,7 +1518,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1521,7 +1527,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1534,7 +1540,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1543,7 +1549,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1556,7 +1562,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1565,7 +1571,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1578,7 +1584,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1587,7 +1593,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1600,7 +1606,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1609,7 +1615,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1622,7 +1628,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1631,7 +1637,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1644,7 +1650,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1653,7 +1659,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1666,7 +1672,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1675,7 +1681,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1688,7 +1694,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1697,7 +1703,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1710,7 +1716,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1719,7 +1725,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1732,7 +1738,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1741,7 +1747,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1754,7 +1760,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1763,7 +1769,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1776,7 +1782,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1785,7 +1791,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1798,7 +1804,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1807,7 +1813,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1820,7 +1826,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1829,7 +1835,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1842,7 +1848,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1851,7 +1857,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1864,7 +1870,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1873,7 +1879,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1886,7 +1892,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1895,7 +1901,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1908,7 +1914,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1917,7 +1923,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1930,7 +1936,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1939,7 +1945,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1952,7 +1958,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1961,7 +1967,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1974,7 +1980,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1983,7 +1989,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -1996,7 +2002,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2005,7 +2011,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2018,7 +2024,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2027,7 +2033,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2040,7 +2046,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2049,7 +2055,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2062,7 +2068,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2071,7 +2077,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2084,7 +2090,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2093,7 +2099,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2106,7 +2112,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2115,7 +2121,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2128,7 +2134,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2137,7 +2143,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2150,7 +2156,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2159,7 +2165,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2172,7 +2178,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2181,7 +2187,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2194,7 +2200,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2203,7 +2209,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2216,7 +2222,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2225,7 +2231,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2238,7 +2244,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2247,7 +2253,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2260,7 +2266,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2269,7 +2275,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2282,7 +2288,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2291,7 +2297,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2304,7 +2310,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2313,7 +2319,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2326,7 +2332,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2335,7 +2341,7 @@
 								>
 								<Tool
 									Name="VCCustomBuildTool"
-									CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+									CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 									Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 								/>
 							</FileConfiguration>
@@ -2346,14 +2352,14 @@
 					Name="metadata"
 					>
 					<File
-						RelativePath=".\saml2\metadata\FilesystemMetadataProviderTest.h"
+						RelativePath=".\saml2\metadata\XMLMetadataProviderTest.h"
 						>
 						<FileConfiguration
 							Name="Debug|Win32"
 							>
 							<Tool
 								Name="VCCustomBuildTool"
-								CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+								CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 								Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 							/>
 						</FileConfiguration>
@@ -2362,7 +2368,7 @@
 							>
 							<Tool
 								Name="VCCustomBuildTool"
-								CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+								CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 								Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 							/>
 						</FileConfiguration>
@@ -2379,7 +2385,7 @@
 							>
 							<Tool
 								Name="VCCustomBuildTool"
-								CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+								CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 								Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 							/>
 						</FileConfiguration>
@@ -2388,7 +2394,7 @@
 							>
 							<Tool
 								Name="VCCustomBuildTool"
-								CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+								CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 								Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 							/>
 						</FileConfiguration>
@@ -2401,7 +2407,7 @@
 							>
 							<Tool
 								Name="VCCustomBuildTool"
-								CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+								CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 								Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 							/>
 						</FileConfiguration>
@@ -2410,7 +2416,7 @@
 							>
 							<Tool
 								Name="VCCustomBuildTool"
-								CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+								CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 								Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 							/>
 						</FileConfiguration>
@@ -2423,7 +2429,7 @@
 							>
 							<Tool
 								Name="VCCustomBuildTool"
-								CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+								CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 								Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 							/>
 						</FileConfiguration>
@@ -2432,7 +2438,7 @@
 							>
 							<Tool
 								Name="VCCustomBuildTool"
-								CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+								CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 								Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 							/>
 						</FileConfiguration>
@@ -2443,14 +2449,14 @@
 				Name="security"
 				>
 				<File
-					RelativePath=".\security\AbstractPKIXTrustEngineTest.h"
+					RelativePath=".\security\ExplicitKeyTrustEngineTest.h"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 							Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 						/>
 					</FileConfiguration>
@@ -2459,20 +2465,46 @@
 						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 							Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\security\ExplicitKeyTrustEngineTest.h"
+					RelativePath=".\security\StaticPKIXTrustEngineTest.h"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+			<Filter
+				Name="encryption"
+				>
+				<File
+					RelativePath=".\encryption\EncryptedAssertionTest.h"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 							Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 						/>
 					</FileConfiguration>
@@ -2481,7 +2513,7 @@
 						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							CommandLine="perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 							Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"
 						/>
 					</FileConfiguration>