Set native EOL on all wxs, make and vcxproj files. Revert the ones which had become...
[shibboleth/cpp-sp.git] / msi / WiX / MergeModules / MergeModules.vcxproj
index ed75f5a..e219853 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup Label="ProjectConfigurations">\r
-    <ProjectConfiguration Include="Debug|Win32">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Debug|Win32">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|Win32">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|Win32">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-  </ItemGroup>\r
-  <PropertyGroup Label="Globals">\r
-    <ProjectGuid>{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}</ProjectGuid>\r
-    <Keyword>MakeFileProj</Keyword>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <PropertyGroup Label="Configuration">\r
-    <ConfigurationType>Makefile</ConfigurationType>\r
-    <UseDebugLibraries>false</UseDebugLibraries>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <ImportGroup Label="ExtensionSettings">\r
-  </ImportGroup>\r
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <Import Project="..\..\..\..\BuildPath.props" />\r
-  <Import Project="..\..\..\MsBuild\Versions.props" />\r
-  <PropertyGroup Label="UserMacros" />\r
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">\r
-    <NMakeBuildCommandLine>nmake /f MergeModules.make clean</NMakeBuildCommandLine>\r
-    <NMakeCleanCommandLine>del *.wixobj</NMakeCleanCommandLine>\r
-    <NMakeReBuildCommandLine>nmake /f MergeModules.make clean</NMakeReBuildCommandLine>\r
-    <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <NMakeBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(XMLToolingComponent32) XMLToolingLiteComponent32=$(XMLToolingLiteComponent32) SamlComponent32d=$(SamlComponent32d) XMLToolingComponent32d=$(XMLToolingComponent32d) XMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay32Component=$(LibEay32Component) SSlEay32Component=$(SSlEay32Component) LibEay32Componentd=$(LibEay32Componentd) SSlEay32Componentd=$(SSlEay32Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll32Component=$(ShibDll32Component) ShibDllLite32Component=$(ShibDllLite32Component) ShibDll32Componentd=$(ShibDll32Componentd) ShibDllLite32Componentd=$(ShibDllLite32Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces32Component=$(Xerces32Component) Xerces32Componentd=$(Xerces32Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec32Component=$(XmlSec32Component) XmlSec32Componentd=$(XmlSec32Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib32Component=$(Zlib32Component) Zlib32Componentd=$(Zlib32Componentd) all32</NMakeBuildCommandLine>\r
-    <NMakeCleanCommandLine>del *86.wixobj\r
-del *86.msm\r
-del *x86.wixpdb\r
-del OpenSAML-schemas.wixpdb\r
-del OpenSAML-schemas.wixobj\r
-del OpenSAML-schemas.msm</NMakeCleanCommandLine>\r
-    <NMakeReBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion)  FastCGIVersion=$(FastCGIVersion)  Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d)  SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(XMLToolingComponent32) XMLToolingLiteComponent32=$(XMLToolingLiteComponent32) SamlComponent32d=$(SamlComponent32d) XMLToolingComponent32d=$(XMLToolingComponent32d) XMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay32Component=$(LibEay32Component) SSlEay32Component=$(SSlEay32Component) LibEay32Componentd=$(LibEay32Componentd) SSlEay32Componentd=$(SSlEay32Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll32Component=$(ShibDll32Component) ShibDllLite32Component=$(ShibDllLite32Component) ShibDll32Componentd=$(ShibDll32Componentd) ShibDllLite32Componentd=$(ShibDllLite32Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces32Component=$(Xerces32Component) Xerces32Componentd=$(Xerces32Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec32Component=$(XmlSec32Component) XmlSec32Componentd=$(XmlSec32Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib32Component=$(Zlib32Component) Zlib32Componentd=$(Zlib32Componentd) rebuild32</NMakeReBuildCommandLine>\r
-    <NMakePreprocessorDefinitions>\r
-    </NMakePreprocessorDefinitions>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <NMakeBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion)  FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(XMLToolingComponent64) XMLToolingLiteComponent64=$(XMLToolingLiteComponent64) SamlComponent64d=$(SamlComponent64d) XMLToolingComponent64d=$(XMLToolingComponent64d) XMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay64Component=$(LibEay64Component) SSlEay64Component=$(SSlEay64Component) LibEay64Componentd=$(LibEay64Componentd) SSlEay64Componentd=$(SSlEay64Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll64Component=$(ShibDll64Component) ShibDllLite64Component=$(ShibDllLite64Component) ShibDll64Componentd=$(ShibDll64Componentd) ShibDllLite64Componentd=$(ShibDllLite64Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces64Component=$(Xerces64Component) Xerces64Componentd=$(Xerces64Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec64Component=$(XmlSec64Component) XmlSec64Componentd=$(XmlSec64Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib64Component=$(Zlib64Component) Zlib64Componentd=$(Zlib64Componentd) all64</NMakeBuildCommandLine>\r
-    <NMakeCleanCommandLine>del *64.wixobj\r
-del *64.msm \r
-del *64.wixpdb \r
-del OpenSAML-schemas.wixpdb \r
-del OpenSAML-schemas.wixobj\r
-del OpenSAML-schemas.msm</NMakeCleanCommandLine>\r
-    <NMakeReBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(XMLToolingComponent64) XMLToolingLiteComponent64=$(XMLToolingLiteComponent64) SamlComponent64d=$(SamlComponent64d) XMLToolingComponent64d=$(XMLToolingComponent64d) XMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay64Component=$(LibEay64Component) SSlEay64Component=$(SSlEay64Component) LibEay64Componentd=$(LibEay64Componentd) SSlEay64Componentd=$(SSlEay64Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll64Component=$(ShibDll64Component) ShibDllLite64Component=$(ShibDllLite64Component) ShibDll64Componentd=$(ShibDll64Componentd) ShibDllLite64Componentd=$(ShibDllLite64Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces64Component=$(Xerces64Component) Xerces64Componentd=$(Xerces64Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec64Component=$(XmlSec64Component) XmlSec64Componentd=$(XmlSec64Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib64Component=$(Zlib64Component) Zlib64Componentd=$(Zlib64Componentd) rebuild64</NMakeReBuildCommandLine>\r
-    <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
-  </PropertyGroup>\r
-  <ItemDefinitionGroup>\r
-  </ItemDefinitionGroup>\r
-  <ItemGroup>\r
-    <None Include="Curl-x64.wxs" />\r
-    <None Include="Curl-x86.wxs" />\r
-    <None Include="Curl.vcxproj.user" />\r
-    <None Include="FastCGI-x86.wxs" />\r
-    <None Include="FastCGI-x64.wxs" />\r
-    <None Include="MergeModules.make" />\r
-    <None Include="Log4Shib-x64.wxs" />\r
-    <None Include="Log4Shib-x86.wxs" />\r
-    <None Include="OpenSAML-schemas.wxs" />\r
-    <None Include="OpenSAML-x64.wxs" />\r
-    <None Include="OpenSAML-x86.wxs" />\r
-    <None Include="OpenSSL-x64.wxs" />\r
-    <None Include="OpenSSL-x86.wxs" />\r
-    <None Include="Shibboleth-schemas.wxs" />\r
-    <None Include="Shibboleth-x64.wxs" />\r
-    <None Include="Shibboleth-x86.wxs" />\r
-    <None Include="Xerces-x64.wxs" />\r
-    <None Include="Xerces-x86.wxs" />\r
-    <None Include="XmlSec-x64.wxs" />\r
-    <None Include="XmlSec-x86.wxs" />\r
-    <None Include="Zlib-x64.wxs" />\r
-    <None Include="Zlib-x86.wxs" />\r
-  </ItemGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-  <ImportGroup Label="ExtensionTargets">\r
-  </ImportGroup>\r
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}</ProjectGuid>
+    <Keyword>MakeFileProj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <Import Project="..\..\..\..\BuildPath.props" />
+  <Import Project="..\..\..\MsBuild\Versions.props" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <NMakeBuildCommandLine>nmake /f MergeModules.make clean</NMakeBuildCommandLine>
+    <NMakeCleanCommandLine>del *.wixobj</NMakeCleanCommandLine>
+    <NMakeReBuildCommandLine>nmake /f MergeModules.make clean</NMakeReBuildCommandLine>
+    <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <NMakeBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(XMLToolingComponent32) XMLToolingLiteComponent32=$(XMLToolingLiteComponent32) SamlComponent32d=$(SamlComponent32d) XMLToolingComponent32d=$(XMLToolingComponent32d) XMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay32Component=$(LibEay32Component) SSlEay32Component=$(SSlEay32Component) LibEay32Componentd=$(LibEay32Componentd) SSlEay32Componentd=$(SSlEay32Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll32Component=$(ShibDll32Component) ShibDllLite32Component=$(ShibDllLite32Component) ShibDll32Componentd=$(ShibDll32Componentd) ShibDllLite32Componentd=$(ShibDllLite32Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces32Component=$(Xerces32Component) Xerces32Componentd=$(Xerces32Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec32Component=$(XmlSec32Component) XmlSec32Componentd=$(XmlSec32Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib32Component=$(Zlib32Component) Zlib32Componentd=$(Zlib32Componentd) all32</NMakeBuildCommandLine>
+    <NMakeCleanCommandLine>del *86.wixobj
+del *86.msm
+del *x86.wixpdb
+del OpenSAML-schemas.wixpdb
+del OpenSAML-schemas.wixobj
+del OpenSAML-schemas.msm</NMakeCleanCommandLine>
+    <NMakeReBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion)  FastCGIVersion=$(FastCGIVersion)  Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d)  SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(XMLToolingComponent32) XMLToolingLiteComponent32=$(XMLToolingLiteComponent32) SamlComponent32d=$(SamlComponent32d) XMLToolingComponent32d=$(XMLToolingComponent32d) XMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay32Component=$(LibEay32Component) SSlEay32Component=$(SSlEay32Component) LibEay32Componentd=$(LibEay32Componentd) SSlEay32Componentd=$(SSlEay32Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll32Component=$(ShibDll32Component) ShibDllLite32Component=$(ShibDllLite32Component) ShibDll32Componentd=$(ShibDll32Componentd) ShibDllLite32Componentd=$(ShibDllLite32Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces32Component=$(Xerces32Component) Xerces32Componentd=$(Xerces32Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec32Component=$(XmlSec32Component) XmlSec32Componentd=$(XmlSec32Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib32Component=$(Zlib32Component) Zlib32Componentd=$(Zlib32Componentd) rebuild32</NMakeReBuildCommandLine>
+    <NMakePreprocessorDefinitions>
+    </NMakePreprocessorDefinitions>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <NMakeBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion)  FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(XMLToolingComponent64) XMLToolingLiteComponent64=$(XMLToolingLiteComponent64) SamlComponent64d=$(SamlComponent64d) XMLToolingComponent64d=$(XMLToolingComponent64d) XMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay64Component=$(LibEay64Component) SSlEay64Component=$(SSlEay64Component) LibEay64Componentd=$(LibEay64Componentd) SSlEay64Componentd=$(SSlEay64Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll64Component=$(ShibDll64Component) ShibDllLite64Component=$(ShibDllLite64Component) ShibDll64Componentd=$(ShibDll64Componentd) ShibDllLite64Componentd=$(ShibDllLite64Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces64Component=$(Xerces64Component) Xerces64Componentd=$(Xerces64Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec64Component=$(XmlSec64Component) XmlSec64Componentd=$(XmlSec64Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib64Component=$(Zlib64Component) Zlib64Componentd=$(Zlib64Componentd) all64</NMakeBuildCommandLine>
+    <NMakeCleanCommandLine>del *64.wixobj
+del *64.msm 
+del *64.wixpdb 
+del OpenSAML-schemas.wixpdb 
+del OpenSAML-schemas.wixobj
+del OpenSAML-schemas.msm</NMakeCleanCommandLine>
+    <NMakeReBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(XMLToolingComponent64) XMLToolingLiteComponent64=$(XMLToolingLiteComponent64) SamlComponent64d=$(SamlComponent64d) XMLToolingComponent64d=$(XMLToolingComponent64d) XMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay64Component=$(LibEay64Component) SSlEay64Component=$(SSlEay64Component) LibEay64Componentd=$(LibEay64Componentd) SSlEay64Componentd=$(SSlEay64Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll64Component=$(ShibDll64Component) ShibDllLite64Component=$(ShibDllLite64Component) ShibDll64Componentd=$(ShibDll64Componentd) ShibDllLite64Componentd=$(ShibDllLite64Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces64Component=$(Xerces64Component) Xerces64Componentd=$(Xerces64Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec64Component=$(XmlSec64Component) XmlSec64Componentd=$(XmlSec64Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib64Component=$(Zlib64Component) Zlib64Componentd=$(Zlib64Componentd) rebuild64</NMakeReBuildCommandLine>
+    <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="Curl-x64.wxs" />
+    <None Include="Curl-x86.wxs" />
+    <None Include="Curl.vcxproj.user" />
+    <None Include="FastCGI-x86.wxs" />
+    <None Include="FastCGI-x64.wxs" />
+    <None Include="MergeModules.make" />
+    <None Include="Log4Shib-x64.wxs" />
+    <None Include="Log4Shib-x86.wxs" />
+    <None Include="OpenSAML-schemas.wxs" />
+    <None Include="OpenSAML-x64.wxs" />
+    <None Include="OpenSAML-x86.wxs" />
+    <None Include="OpenSSL-x64.wxs" />
+    <None Include="OpenSSL-x86.wxs" />
+    <None Include="Shibboleth-schemas.wxs" />
+    <None Include="Shibboleth-x64.wxs" />
+    <None Include="Shibboleth-x86.wxs" />
+    <None Include="Xerces-x64.wxs" />
+    <None Include="Xerces-x86.wxs" />
+    <None Include="XmlSec-x64.wxs" />
+    <None Include="XmlSec-x86.wxs" />
+    <None Include="Zlib-x64.wxs" />
+    <None Include="Zlib-x86.wxs" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file