[cpp-msbuild] branch maint-1 updated: Rollback Xerces version for this release.
Scott Cantor
cantor.2 at osu.edu
Mon Nov 13 11:12:19 EST 2017
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch maint-1
in repository cpp-msbuild.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-msbuild.git;a=commit;h=4bb95716689da15e5bb2048a192c868af2c20bce
The following commit(s) were added to refs/heads/maint-1 by this push:
new 4bb9571 Rollback Xerces version for this release.
4bb9571 is described below
commit 4bb95716689da15e5bb2048a192c868af2c20bce
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Nov 13 11:12:15 2017 -0500
Rollback Xerces version for this release.
---
Includes.props | 182 ++++++++++++++++++++++++++++-----------------------------
Versions.props | 18 +++---
2 files changed, 100 insertions(+), 100 deletions(-)
diff --git a/Includes.props b/Includes.props
index ee3465f..2270050 100644
--- a/Includes.props
+++ b/Includes.props
@@ -1,91 +1,91 @@
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Label="Wibble">
- <LibCurlLib Condition="'$(NewCurlBuild)' == '1'">libcurl5.lib</LibCurlLib>
- <LibCurlLibD Condition="'$(NewCurlBuild)' == '1'">libcurl5d.lib</LibCurlLibD>
- <LibCurlLib Condition="'$(NewCurlBuild)' != '1'">libcurl5_imp.lib</LibCurlLib>
- <LibCurlLibD Condition="'$(NewCurlBuild)' != '1'">libcurl5d_imp.lib</LibCurlLibD>
-
- <SSLLib Condition="'$(OpenSSL1_1Libs)' == '0'">ssleay32.lib;libeay32.lib</SSLLib>
- <SSLLibD Condition="'$(OpenSSL1_1Libs)' == '0'">ssleay32D.lib;libeay32D.lib</SSLLibD>
- <SSLLib Condition="'$(OpenSSL1_1Libs)' == '1'">libcrypto.lib;libssl.lib</SSLLib>
- <SSLLibD Condition="'$(OpenSSL1_1Libs)' == '1'">libcrypto.lib;libssl.lib</SSLLibD>
- <ExecutablePath>$(ExecutablePath)</ExecutablePath>
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(BuildRoot)\$(openssl)\inc32;$(BuildRoot)\$(openssl)\X86Debug\include;$(BuildRoot)\$(openssl)\include;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\src;$(BuildRoot)\$(xerces)\buildx86\$(MSVCVERSION)\src;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
-
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(BuildRoot)\$(openssl)\inc32;$(BuildRoot)\$(openssl)\x86\include;$(BuildRoot)\$(openssl)\include;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\src;$(BuildRoot)\$(xerces)\buildx86\$(MSVCVERSION)\src;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
-
-
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(BuildRoot)\$(openssl)\inc64;$(BuildRoot)\x64Debug\$(openssl)\include;$(BuildRoot)\$(openssl)\include;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\src;$(BuildRoot)\$(xerces)\buildx64\$(MSVCVERSION)\src;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
-
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(BuildRoot)\$(openssl)\inc64;$(BuildRoot)\x64\$(openssl)\include;$(BuildRoot)\$(openssl)\include;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\src;$(BuildRoot)\$(xerces)\buildx64\$(MSVCVERSION)\src;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
-
- <ReferencePath>$(ReferencePath)</ReferencePath>
-
- <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(BuildRoot)\$(openssl)\out32dll.dbg;$(BuildRoot)\$(openssl)\x86debug\lib;$(BuildRoot)\$(curl)\builds\libcurl-$(MsVCVersion)-x86-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\Debug;$(BuildRoot)\$(xerces)\buildx86\$(MSVCVERSION)\src\Debug;$(BuildRoot)\$(xmlsec)\Build\Win32\$(MSVCVERSION)\Debug No Xalan;$(BuildRoot)\nsapi\lib;$( [...]
-
- <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(BuildRoot)\$(openssl)\out32dll;$(BuildRoot)\$(openssl)\x86\lib;$(BuildRoot)\$(curl)\builds\libcurl-$(MsVCVersion)-x86-release-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(openssl)\x64debug\lib;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\Release;$(BuildRoot)\$(xerces)\buildx86\$(MSVCVERSION)\src\Release;$(BuildRoot)\$(xmlsec)\Build\Win32\$(MSVCVERSION)\Re [...]
-
- <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(BuildRoot)\$(openssl)\out64dll.dbg;$(BuildRoot)\$(openssl)\x64debug\lib;$(BuildRoot)\$(curl)\builds\libcurl-$(MsVCVersion)-x64-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\x64\Debug;$(BuildRoot)\$(xerces)\buildx64\$(MSVCVERSION)\src\Debug;$(BuildRoot)\$(xmlsec)\Build\x64\$(MSVCVERSION)\Debug No Xalan;$(BuildRoot)\$(fcgi)\ [...]
-
- <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(BuildRoot)\$(openssl)\out64dll;$(BuildRoot)\$(openssl)\x64\lib;$(BuildRoot)\$(curl)\builds\libcurl-$(MsVCVersion)-x64-release-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\x64\Release;$(BuildRoot)\$(xerces)\buildx64\$(MSVCVERSION)\src\Release;$(BuildRoot)\$(xmlsec)\Build\x64\$(MSVCVERSION)\Release No Xalan;$(BuildRoot)\$(fcg [...]
- <SourcePath>$(SourcePath)</SourcePath>
-
- <ExcludePath>$(ExcludePath)</ExcludePath>
- </PropertyGroup>
- <ItemGroup>
- <BuildMacro Include="BuildRoot">
- <Value>$(BuildRoot)</Value>
- </BuildMacro>
- <BuildMacro Include="CxxTestRoot">
- <Value>$(CxxTestRoot)</Value>
- </BuildMacro>
- <BuildMacro Include="Apache13Root">
- <Value>$(Apache13Root)</Value>
- </BuildMacro>
- <BuildMacro Include="Apache20Root">
- <Value>$(Apache20Root)</Value>
- </BuildMacro>
- <BuildMacro Include="Apache22Root">
- <Value>$(Apache22Root)</Value>
- </BuildMacro>
- <BuildMacro Include="Apache24Root">
- <Value>$(Apache24Root)</Value>
- </BuildMacro>
- <BuildMacro Include="Apache22Root64">
- <Value>$(Apache22Root64)</Value>
- </BuildMacro>
- <BuildMacro Include="Apache24Root64">
- <Value>$(Apache24Root64)</Value>
- </BuildMacro>
- <BuildMacro Include="openssl">
- <Value>$(openssl)</Value>
- </BuildMacro>
- <BuildMacro Include="curl">
- <Value>$(curl)</Value>
- </BuildMacro>
- <BuildMacro Include="xerces">
- <Value>$(xerces)</Value>
- </BuildMacro>
- <BuildMacro Include="xmlsec">
- <Value>$(xmlsec)</Value>
- </BuildMacro>
- <BuildMacro Include="boost">
- <Value>$(boost)</Value>
- </BuildMacro>
- <BuildMacro Include="log4shib">
- <Value>$(log4shib)</Value>
- </BuildMacro>
- <BuildMacro Include="zlib">
- <Value>$(zlib)</Value>
- </BuildMacro>
- <BuildMacro Include="fcgi">
- <Value>$(fcgi)</Value>
- </BuildMacro>
- </ItemGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- </ItemDefinitionGroup>
-</Project>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup Label="Wibble">
+ <LibCurlLib Condition="'$(NewCurlBuild)' == '1'">libcurl5.lib</LibCurlLib>
+ <LibCurlLibD Condition="'$(NewCurlBuild)' == '1'">libcurl5d.lib</LibCurlLibD>
+ <LibCurlLib Condition="'$(NewCurlBuild)' != '1'">libcurl5_imp.lib</LibCurlLib>
+ <LibCurlLibD Condition="'$(NewCurlBuild)' != '1'">libcurl5d_imp.lib</LibCurlLibD>
+
+ <SSLLib Condition="'$(OpenSSL1_1Libs)' == '0'">ssleay32.lib;libeay32.lib</SSLLib>
+ <SSLLibD Condition="'$(OpenSSL1_1Libs)' == '0'">ssleay32D.lib;libeay32D.lib</SSLLibD>
+ <SSLLib Condition="'$(OpenSSL1_1Libs)' == '1'">libcrypto.lib;libssl.lib</SSLLib>
+ <SSLLibD Condition="'$(OpenSSL1_1Libs)' == '1'">libcrypto.lib;libssl.lib</SSLLibD>
+ <ExecutablePath>$(ExecutablePath)</ExecutablePath>
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(BuildRoot)\$(openssl)\inc32;$(BuildRoot)\$(openssl)\X86Debug\include;$(BuildRoot)\$(openssl)\include;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\src;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
+
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(BuildRoot)\$(openssl)\inc32;$(BuildRoot)\$(openssl)\x86\include;$(BuildRoot)\$(openssl)\include;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\src;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
+
+
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(BuildRoot)\$(openssl)\inc64;$(BuildRoot)\x64Debug\$(openssl)\include;$(BuildRoot)\$(openssl)\include;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\src;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
+
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(BuildRoot)\$(openssl)\inc64;$(BuildRoot)\x64\$(openssl)\include;$(BuildRoot)\$(openssl)\include;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\src;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
+
+ <ReferencePath>$(ReferencePath)</ReferencePath>
+
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(BuildRoot)\$(openssl)\out32dll.dbg;$(BuildRoot)\$(openssl)\x86debug\lib;$(BuildRoot)\$(curl)\builds\libcurl-$(MsVCVersion)-x86-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\Debug;$(BuildRoot)\$(xerces)\Build\Win32\$(MSVCVERSION)\Debug;$(BuildRoot)\$(xmlsec)\Build\Win32\$(MSVCVERSION)\Debug No Xalan;$(BuildRoot)\nsapi\lib;$(B [...]
+
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(BuildRoot)\$(openssl)\out32dll;$(BuildRoot)\$(openssl)\x86\lib;$(BuildRoot)\$(curl)\builds\libcurl-$(MsVCVersion)-x86-release-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(openssl)\x64debug\lib;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\Release;$(BuildRoot)\$(xerces)\Build\Win32\$(MSVCVERSION)\Release;$(BuildRoot)\$(xmlsec)\Build\Win32\$(MSVCVERSION)\Rel [...]
+
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(BuildRoot)\$(openssl)\out64dll.dbg;$(BuildRoot)\$(openssl)\x64debug\lib;$(BuildRoot)\$(curl)\builds\libcurl-$(MsVCVersion)-x64-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\x64\Debug;$(BuildRoot)\$(xerces)\Build\Win64\$(MSVCVERSION)\Debug;$(BuildRoot)\$(xmlsec)\Build\x64\$(MSVCVERSION)\Debug No Xalan;$(BuildRoot)\$(fcgi)\W [...]
+
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(BuildRoot)\$(openssl)\out64dll;$(BuildRoot)\$(openssl)\x64\lib;$(BuildRoot)\$(curl)\builds\libcurl-$(MsVCVersion)-x64-release-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\x64\Release;$(BuildRoot)\$(xerces)\Build\Win64\$(MSVCVERSION)\Release;$(BuildRoot)\$(xmlsec)\Build\x64\$(MSVCVERSION)\Release No Xalan;$(BuildRoot)\$(fcgi [...]
+ <SourcePath>$(SourcePath)</SourcePath>
+
+ <ExcludePath>$(ExcludePath)</ExcludePath>
+ </PropertyGroup>
+ <ItemGroup>
+ <BuildMacro Include="BuildRoot">
+ <Value>$(BuildRoot)</Value>
+ </BuildMacro>
+ <BuildMacro Include="CxxTestRoot">
+ <Value>$(CxxTestRoot)</Value>
+ </BuildMacro>
+ <BuildMacro Include="Apache13Root">
+ <Value>$(Apache13Root)</Value>
+ </BuildMacro>
+ <BuildMacro Include="Apache20Root">
+ <Value>$(Apache20Root)</Value>
+ </BuildMacro>
+ <BuildMacro Include="Apache22Root">
+ <Value>$(Apache22Root)</Value>
+ </BuildMacro>
+ <BuildMacro Include="Apache24Root">
+ <Value>$(Apache24Root)</Value>
+ </BuildMacro>
+ <BuildMacro Include="Apache22Root64">
+ <Value>$(Apache22Root64)</Value>
+ </BuildMacro>
+ <BuildMacro Include="Apache24Root64">
+ <Value>$(Apache24Root64)</Value>
+ </BuildMacro>
+ <BuildMacro Include="openssl">
+ <Value>$(openssl)</Value>
+ </BuildMacro>
+ <BuildMacro Include="curl">
+ <Value>$(curl)</Value>
+ </BuildMacro>
+ <BuildMacro Include="xerces">
+ <Value>$(xerces)</Value>
+ </BuildMacro>
+ <BuildMacro Include="xmlsec">
+ <Value>$(xmlsec)</Value>
+ </BuildMacro>
+ <BuildMacro Include="boost">
+ <Value>$(boost)</Value>
+ </BuildMacro>
+ <BuildMacro Include="log4shib">
+ <Value>$(log4shib)</Value>
+ </BuildMacro>
+ <BuildMacro Include="zlib">
+ <Value>$(zlib)</Value>
+ </BuildMacro>
+ <BuildMacro Include="fcgi">
+ <Value>$(fcgi)</Value>
+ </BuildMacro>
+ </ItemGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
+ </ClCompile>
+ </ItemDefinitionGroup>
+</Project>
diff --git a/Versions.props b/Versions.props
index 193a8d8..bbd4344 100644
--- a/Versions.props
+++ b/Versions.props
@@ -6,8 +6,8 @@
<CxxTestRoot>$(BuildRoot)\cxxtest</CxxTestRoot>
<!-- These control the version of the installer -->
- <ShibbolethVersion>2.6.1</ShibbolethVersion>
- <ShibbolethPatchVersion>0</ShibbolethPatchVersion>
+ <ShibbolethVersion>2.6.0</ShibbolethVersion>
+ <ShibbolethPatchVersion>1</ShibbolethPatchVersion>
<!-- These control the versions in the DLLs and Executables.
Note that the PatchVersion is left to the individual resource file.
@@ -80,7 +80,7 @@
<LibEay64Componentd>{9F1F56BE-ECB5-4781-AA61-7FC6D32088DA}</LibEay64Componentd>
<SSlEay64Componentd>{2E89918B-D5B7-43EC-AE3F-8076C76229A9}</SSlEay64Componentd>
- <ShibbolethDllVersion>1.6.0</ShibbolethDllVersion>
+ <ShibbolethDllVersion>1.6.1</ShibbolethDllVersion>
<ShibbolethDllFileVersion>1_6</ShibbolethDllFileVersion>
<!-- Change the 8 components below if ShibbolethDllFileVersion changes -->
<ShibDll32Component>{0752E11B-2B91-419F-A281-592B0181D4E0}</ShibDll32Component>
@@ -92,14 +92,14 @@
<ShibDll64Componentd>{7652F12D-7107-4D3E-AA1A-AF654BD83970}</ShibDll64Componentd>
<ShibDllLite64Componentd>{7F44CD6F-64F9-40AE-B06C-76A25C95F1CC}</ShibDllLite64Componentd>
- <XercesVersion>3.2.0</XercesVersion>
+ <XercesVersion>3.1.4</XercesVersion>
<xerces>xerces-c-$(XercesVersion)</xerces>
- <XercesFileVersion>3_2</XercesFileVersion>
+ <XercesFileVersion>3_1</XercesFileVersion>
<!-- Change the 4 components below if XercesFileVersion changes -->
- <Xerces32Component>{5CBC069E-2B95-45ED-9622-FC355CBDF622}</Xerces32Component>
- <Xerces32Componentd>{74A8681A-D917-4FBA-A823-CD63FC1015D5}</Xerces32Componentd>
- <Xerces64Component>{AB0C9967-EF54-42ED-BD27-7BC027339F59}</Xerces64Component>
- <Xerces64Componentd>{5ADDC198-B03F-41EC-86E6-512D5EC50D3F}</Xerces64Componentd>
+ <Xerces32Component>{64C16FA9-685C-4612-B9C2-0B56C84A69E1}</Xerces32Component>
+ <Xerces32Componentd>{3F92209F-35C7-4D7C-BAC3-B0A96DF0CBDF}</Xerces32Componentd>
+ <Xerces64Component>{5C2BA2C6-36EC-4EB3-A343-8C1C9D499B9C}</Xerces64Component>
+ <Xerces64Componentd>{236B6A7F-73C0-4EBF-9C06-90C1BE160ACE}</Xerces64Componentd>
<XmlSecVersion>1.7.3</XmlSecVersion>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list