[cpp-msbuild] branch main updated: Update all file versions and GUIDs
Scott Cantor
cantor.2 at osu.edu
Tue Sep 24 20:28:54 UTC 2024
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository cpp-msbuild.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-msbuild.git;a=commit;h=9aadd7e601bbf50b19b23e481256c195a7f44902
The following commit(s) were added to refs/heads/main by this push:
new 9aadd7e Update all file versions and GUIDs
9aadd7e is described below
commit 9aadd7e601bbf50b19b23e481256c195a7f44902
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Sep 24 16:28:50 2024 -0400
Update all file versions and GUIDs
---
Versions.props | 124 ++++++++++++++++++++++++------------------------
dependencies/config.bat | 16 +++----
2 files changed, 70 insertions(+), 70 deletions(-)
diff --git a/Versions.props b/Versions.props
index 9ea18ee..e30605b 100644
--- a/Versions.props
+++ b/Versions.props
@@ -11,16 +11,16 @@
<CxxTestRoot>$(BuildRoot)\cxxtest</CxxTestRoot>
<!-- These control the version of the installer -->
- <ShibbolethVersion>3.4.1</ShibbolethVersion>
- <ShibbolethPatchVersion>5</ShibbolethPatchVersion>
+ <ShibbolethVersion>3.5.0</ShibbolethVersion>
+ <ShibbolethPatchVersion>0</ShibbolethPatchVersion>
<!-- These control the versions in the DLLs and Executables.
Note that the PatchVersion is left to the individual resource file.
If you change this you probably need to change ../cpp-sp/util/resourceCommon.rci
-->
- <SPFileVersion>3,4,1</SPFileVersion> <!-- FILEVERSION in the SP projects -->
- <SPFileVersionSP>3,4,1</SPFileVersionSP> <!-- Special for ShibSp.dll -->
- <SPProductVersion>3,4,1</SPProductVersion> <!-- PRODUCTVERSION in the SP projects (but overidden by resourceCommon.rci on output-->
+ <SPFileVersion>3,5,0</SPFileVersion> <!-- FILEVERSION in the SP projects -->
+ <SPFileVersionSP>3,5,0</SPFileVersionSP> <!-- Special for ShibSp.dll -->
+ <SPProductVersion>3,5,0</SPProductVersion> <!-- PRODUCTVERSION in the SP projects (but overidden by resourceCommon.rci on output-->
<!-- XMLTooling only has one RC file. Edit that by hand -->
<!-- OpemSAML has two RC files (saml.rc and samlsign.rc). Edit them by hand -->
@@ -35,40 +35,40 @@
<!-- NEVER CHANGE THE UPGRADE CODE UNLESS YOU REALLY REALLY KNOW WHAT YOU ARE DOING -->
<ShibbolethUpgradeCode>{28A4EB62-E860-49CA-BE43-44ADEB91DBF6}</ShibbolethUpgradeCode>
- <boost>boost_1_80_0</boost>
+ <boost>boost_1_86_0</boost>
- <OpenSAMLVersion>3.2.1</OpenSAMLVersion>
- <OpenSAMLFileVersion>3_2</OpenSAMLFileVersion>
+ <OpenSAMLVersion>3.3.0</OpenSAMLVersion>
+ <OpenSAMLFileVersion>3_3</OpenSAMLFileVersion>
<!-- Change the 4 components below iff the OpenSAMLFileVersion name changes -->
- <SamlComponent32>{BC96A8F8-3912-4EC2-B50D-070A79CF435D}</SamlComponent32>
- <SamlComponent32d>{CDC62F9A-C799-4B1D-B7B1-8C6C63EEC473}</SamlComponent32d>
- <SamlComponent64>{736A2364-9438-4202-A45C-7BA09FF904E8}</SamlComponent64>
- <SamlComponent64d>{6999381F-B18B-4F49-B414-DB9FB97EEEF8}</SamlComponent64d>
+ <SamlComponent32>{7D36AA67-65F7-4CF6-BFCF-98696F540ABC}</SamlComponent32>
+ <SamlComponent32d>{D5334B4C-4991-4AF2-AE80-23BDA35EABC5}</SamlComponent32d>
+ <SamlComponent64>{A808F23A-23F2-43B9-83CE-0DBCBDEE8905}</SamlComponent64>
+ <SamlComponent64d>{F23D2591-6F79-4AD9-AE76-6F6E1E368CFB}</SamlComponent64d>
- <XmlToolingVersion>3.2.4</XmlToolingVersion>
- <XmlToolingFileVersion>3_2</XmlToolingFileVersion>
+ <XmlToolingVersion>3.3.0</XmlToolingVersion>
+ <XmlToolingFileVersion>3_3</XmlToolingFileVersion>
<!-- Change the 8 components below iff the XmlToolingFileVersion name changes -->
- <XMLToolingComponent32>{A7D6E8D5-34DA-477A-A5C6-B887FE960C86}</XMLToolingComponent32>
- <XMLToolingLiteComponent32>{BFD0C0CC-AC83-4780-B32E-54D6E02AAADA}</XMLToolingLiteComponent32>
- <XMLToolingComponent32d>{4AB60FC3-3637-47D7-8ED5-BEE47636A917}</XMLToolingComponent32d>
- <XMLToolingLiteComponent32d>{FECAF47E-D39B-4395-B61E-37E37AA30D24}</XMLToolingLiteComponent32d>
- <XMLToolingComponent64>{7284C104-8319-43F5-9F25-3D65D6E577B4}</XMLToolingComponent64>
- <XMLToolingLiteComponent64>{0850D30D-3892-4C86-9BCC-5BA66E89F53C}</XMLToolingLiteComponent64>
- <XMLToolingComponent64d>{773087DE-F788-4A72-B2FE-A2E7067F1C62}</XMLToolingComponent64d>
- <XMLToolingLiteComponent64d>{44B1284A-2AB9-4DA8-BDD9-C83EF3E3EAE0}</XMLToolingLiteComponent64d>
-
-
- <ShibbolethDllVersion>3.4.1</ShibbolethDllVersion>
- <ShibbolethDllFileVersion>3_4</ShibbolethDllFileVersion>
+ <XMLToolingComponent32>{C660CF31-0BD3-4FA9-9868-CD7090703421}</XMLToolingComponent32>
+ <XMLToolingLiteComponent32>{4B28739E-D154-4E3D-BA2F-9C36677F6E24}</XMLToolingLiteComponent32>
+ <XMLToolingComponent32d>{988A9063-5066-497A-BB2A-7F932C394E6E}</XMLToolingComponent32d>
+ <XMLToolingLiteComponent32d>{F456F165-B843-45AE-ADA1-70F107BE22CB}</XMLToolingLiteComponent32d>
+ <XMLToolingComponent64>{22E99C10-A92D-4F85-9A2F-4F2F3A86F3B3}</XMLToolingComponent64>
+ <XMLToolingLiteComponent64>{F1D47F81-5E56-49A1-8F23-9063448CE807}</XMLToolingLiteComponent64>
+ <XMLToolingComponent64d>{DAE71799-A9CD-49E3-B89E-44B25C481D8F}</XMLToolingComponent64d>
+ <XMLToolingLiteComponent64d>{3583349E-D363-4942-8D98-7030097C6C39}</XMLToolingLiteComponent64d>
+
+
+ <ShibbolethDllVersion>3.5.0</ShibbolethDllVersion>
+ <ShibbolethDllFileVersion>3_5</ShibbolethDllFileVersion>
<!-- Change the 8 components below iff ShibbolethDllFileVersion changes -->
- <ShibDll32Component>{5DA8E2FF-F46B-4490-8285-D64A7AB4F9FE}</ShibDll32Component>
- <ShibDllLite32Component>{C05F6E4B-27E0-46D4-9C12-03F4E4196575}</ShibDllLite32Component>
- <ShibDll32Componentd>{B8045330-FD7E-49BB-BCDE-4AAFDDFD7CF9}</ShibDll32Componentd>
- <ShibDllLite32Componentd>{8FCE3E6C-96DB-44E3-9EA1-E76565756A07}</ShibDllLite32Componentd>
- <ShibDll64Component>{90D22F2C-D4F0-48A3-99DC-C2EE939CD82B}</ShibDll64Component>
- <ShibDllLite64Component>{B6D57AA0-CA3C-4E27-B3F9-62088C009179}</ShibDllLite64Component>
- <ShibDll64Componentd>{D96DED9F-604F-45A0-A8CA-E1EB2990E6F1}</ShibDll64Componentd>
- <ShibDllLite64Componentd>{BDD405D2-67FA-4938-B79D-DE0508CF8E4A}</ShibDllLite64Componentd>
+ <ShibDll32Component>{238F0A55-6BCB-46DE-A7A6-5FB2BD137803}</ShibDll32Component>
+ <ShibDllLite32Component>{BDC79896-281A-4E06-B612-D728E931CD73}</ShibDllLite32Component>
+ <ShibDll32Componentd>{FAAF3458-EF19-4BE3-917C-9AB91D2581B0}</ShibDll32Componentd>
+ <ShibDllLite32Componentd>{AC51BE75-8B49-49A1-BC63-83B80FF1DB3F}</ShibDllLite32Componentd>
+ <ShibDll64Component>{92CA3769-043A-49A7-8BB1-0A52D99C5454}</ShibDll64Component>
+ <ShibDllLite64Component>{6CB20BA2-6353-4E7D-BA64-668D907CB572}</ShibDllLite64Component>
+ <ShibDll64Componentd>{06BAF95D-25C1-434D-BCBF-95479FB594FB}</ShibDll64Componentd>
+ <ShibDllLite64Componentd>{CBF9045B-6A76-4E21-8CF6-5FE165C73C51}</ShibDllLite64Componentd>
<FastCGIVersion>2.4.0</FastCGIVersion>
<fcgi>fcgi-$(FastCGIVersion)-VC10</fcgi>
@@ -83,21 +83,21 @@
<CppMmDir>$(VCToolsRedistDir)MergeModules</CppMmDir>
</PropertyGroup>
- <PropertyGroup Label="CurlGuidsBad" Condition="'$(LIBCURL_FILE_VERSION)' != '11'">
+ <PropertyGroup Label="CurlGuidsBad" Condition="'$(LIBCURL_FILE_VERSION)' != '12'">
<CurlFileVersion>BAD_LIBCURL_FILE_VERSION</CurlFileVersion>
<!-- Changing LIBCURL_FILE_VERSION version requires changing the GUIDs since it is garnish on the name -->
</PropertyGroup>
- <PropertyGroup Label="CurlGuids" Condition="'$(LIBCURL_FILE_VERSION)' == '11'">
+ <PropertyGroup Label="CurlGuids" Condition="'$(LIBCURL_FILE_VERSION)' == '12'">
<CurlVersion Condition="'$(LIBCURL_DIR)'!=''">$(LIBCURL_VERSION)</CurlVersion>
- <CurlVersion Condition="'$(LIBCURL_DIR)'==''">8.4.0</CurlVersion>
+ <CurlVersion Condition="'$(LIBCURL_DIR)'==''">8.10.1</CurlVersion>
<curl Condition="'$(LIBCURL_DIR)'!=''">$(LIBCURL_DIR)</curl>
<curl Condition="'$(LIBCURL_DIR)'==''">curl-$(CurlVersion)</curl>
<CurlFileVersion>$(LIBCURL_FILE_VERSION)</CurlFileVersion>
- <LibCurlGuid32>{8E4545D5-E907-4D03-8BC4-9D20CAC9F894}</LibCurlGuid32>
- <LibCurlGuid64>{B64D63AB-77D6-47E2-8B25-82DCF20B041B}</LibCurlGuid64>
- <LibCurlGuid32d>{C28EAEC5-9A11-4912-8FEF-AA3DC06E1CA3}</LibCurlGuid32d>
- <LibCurlGuid64d>{C9E4A233-B0EF-4344-9AD7-5A9768AFC801}</LibCurlGuid64d>
+ <LibCurlGuid32>{B69B45CA-BD17-4E97-9B77-EE9850FEB5AF}</LibCurlGuid32>
+ <LibCurlGuid64>{E7F92449-DD84-492E-8590-0338155DAB2E}</LibCurlGuid64>
+ <LibCurlGuid32d>{B83BFF04-E781-4CC5-8839-31558B03D579}</LibCurlGuid32d>
+ <LibCurlGuid64d>{3732F8DD-3C8E-4946-AA2B-CB1B5ACB3F74}</LibCurlGuid64d>
</PropertyGroup>
<PropertyGroup Label="Apache">
@@ -111,29 +111,29 @@
<PropertyGroup Label="OpenSSLGeneral">
<!-- Just for now -->
- <OPENSSL_FILE_VERSION Condition="'$(OPENSSL_FILE_VERSION)' == ''">3_0_9</OPENSSL_FILE_VERSION>
+ <OPENSSL_FILE_VERSION Condition="'$(OPENSSL_FILE_VERSION)' == ''">3_3</OPENSSL_FILE_VERSION>
- <openssl Condition="'$(OPENSSL_DIR)'==''">openssl-3.0.9</openssl>
+ <openssl Condition="'$(OPENSSL_DIR)'==''">openssl-3.3.2</openssl>
<openssl Condition="'$(OPENSSL_DIR)'!=''">$(OPENSSL_DIR)</openssl>
</PropertyGroup>
- <PropertyGroup Label="OpenSSLGuidsBad" Condition="'$(OPENSSL_FILE_VERSION)' != '3_0_9'">
+ <PropertyGroup Label="OpenSSLGuidsBad" Condition="'$(OPENSSL_FILE_VERSION)' != '3_3'">
<!--- If you revert to a pre-V3.0 version of OpenSSL you need to change the name of the
License file in cpp-sp/msi/WiX/MergeModules/OpenSSL-x64/x86.wxs -->
<OpenSSLFileVersion>BAD_OPENSSL_FILE_VERSION</OpenSSLFileVersion>
<!-- Changing OPENSSL_FILE_VERSION version requires changing the GUIDs since it is garnish on the name -->
</PropertyGroup>
- <PropertyGroup Label="OpenSSLGuids" Condition="'$(OPENSSL_FILE_VERSION)' == '3_0_9'">
+ <PropertyGroup Label="OpenSSLGuids" Condition="'$(OPENSSL_FILE_VERSION)' == '3_3'">
<OpenSSLFileVersion>$(OPENSSL_FILE_VERSION)</OpenSSLFileVersion>
<!-- Change the 8 components below iff OpenSSLFileVersion changes -->
- <LibEay32Component>{169757BD-7382-4153-879E-04113526FFEB}</LibEay32Component>
- <SSlEay32Component>{F85783DE-F930-4637-A1BD-ACCB6EA5B67D}</SSlEay32Component>
- <LibEay32Componentd>{D755CE41-7232-4050-A15A-384BA9DBC936}</LibEay32Componentd>
- <SSlEay32Componentd>{21A51CF7-09CF-4DCA-9DC8-F383B1C3EBD3}</SSlEay32Componentd>
- <LibEay64Component>{123E19FA-D393-4A09-8AF6-2699017F6F00}</LibEay64Component>
- <SSlEay64Component>{D456407C-C9E6-4B90-B1A3-D5F4C9F2E2CE}</SSlEay64Component>
- <LibEay64Componentd>{9040D982-1CB9-4587-86AD-8286C3639548}</LibEay64Componentd>
- <SSlEay64Componentd>{7E743A35-DFD6-4FA9-A869-E4B40D5100DC}</SSlEay64Componentd>
+ <LibEay32Component>{9EE1483E-C7E2-4319-8D0C-273FC7C719A8}</LibEay32Component>
+ <SSlEay32Component>{C5DF1F38-175C-4899-B026-A52361023E68}</SSlEay32Component>
+ <LibEay32Componentd>{F0D4FE91-E9CB-427E-B595-6CA321CDBD25}</LibEay32Componentd>
+ <SSlEay32Componentd>{9DB60090-5CAF-4843-8C44-76E39B2F0648}</SSlEay32Componentd>
+ <LibEay64Component>{CE5FC218-4F96-4B92-99F4-19B5EA5C4F15}</LibEay64Component>
+ <SSlEay64Component>{66E8A5FA-7B6E-4B3F-8A7D-7DF4E648F33F}</SSlEay64Component>
+ <LibEay64Componentd>{0DF18F0A-F492-4701-B289-B43856B24577}</LibEay64Componentd>
+ <SSlEay64Componentd>{D2C51528-6C12-4620-9A76-3946D076BBC3}</SSlEay64Componentd>
</PropertyGroup>
<PropertyGroup Label="XSecGeneral">
@@ -184,23 +184,23 @@
<PropertyGroup Label="XercesGeneral">
<!-- Just for now -->
- <XERCES_FILE_VERSION Condition="'$(XERCES_FILE_VERSION)' == ''">3_2</XERCES_FILE_VERSION>
- <XercesVersion Condition="'$(XERCES_MM_VERSION)'==''">3.2.4</XercesVersion>
+ <XERCES_FILE_VERSION Condition="'$(XERCES_FILE_VERSION)' == ''">3_3</XERCES_FILE_VERSION>
+ <XercesVersion Condition="'$(XERCES_MM_VERSION)'==''">3.3.0</XercesVersion>
<XercesVersion Condition="'$(XERCES_MM_VERSION)'!=''">$(XERCES_MM_VERSION)</XercesVersion>
- <xerces Condition="'$(XERCES_DIR)'==''">xerces-c-3.2.4</xerces>
+ <xerces Condition="'$(XERCES_DIR)'==''">xerces-c-3.3.0</xerces>
<xerces Condition="'$(XERCES_DIR)'!=''">$(XERCES_DIR)</xerces>
</PropertyGroup>
- <PropertyGroup Label="XercesGuidsBad" Condition="'$(XERCES_FILE_VERSION)' != '3_2'">
+ <PropertyGroup Label="XercesGuidsBad" Condition="'$(XERCES_FILE_VERSION)' != '3_3'">
<XercesFileVersion>BAD_XERCES_FILE_VERSION</XercesFileVersion>
</PropertyGroup>
- <PropertyGroup Label="XercesGuids " Condition="'$(XERCES_FILE_VERSION)' == '3_2'">
+ <PropertyGroup Label="XercesGuids " Condition="'$(XERCES_FILE_VERSION)' == '3_3'">
<XercesFileVersion>$(XERCES_FILE_VERSION)</XercesFileVersion>
<!-- Change the 4 components below iff XercesFileVersion changes -->
- <Xerces32Component>{703F33E0-715F-4301-8554-2D3F9AE2CD4B}</Xerces32Component>
- <Xerces32Componentd>{568D5E45-9E2B-44ED-8ECE-E5E61B658733}</Xerces32Componentd>
- <Xerces64Component>{C43D408D-ADB6-4C19-986C-18B4E5DE1315}</Xerces64Component>
- <Xerces64Componentd>{3D0F7C56-196D-4BAA-BEF7-56A747C110DA}</Xerces64Componentd>
+ <Xerces32Component>{985F4EF6-C9BE-4DBA-825F-D557C56E8244}</Xerces32Component>
+ <Xerces32Componentd>{EBAB9BF3-900D-44CF-8653-149EEAEE42ED}</Xerces32Componentd>
+ <Xerces64Component>{5B34CF19-E5AD-4DCA-8EB5-85864B623C57}</Xerces64Component>
+ <Xerces64Componentd>{DF40C525-DEAE-4A88-A222-D76EF0C3E335}</Xerces64Componentd>
</PropertyGroup>
<PropertyGroup Label="Log4ShibGeneral">
diff --git a/dependencies/config.bat b/dependencies/config.bat
index ac31044..eb18f1a 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -93,9 +93,9 @@ REM OPENSSL_DIR is the directory name
REM OPENSSL_MM_VERSION is the Merge Module version (and so have to be 3 or 4 dot separated numbers)
REM OPENSSL_FILE_VERSION is the distinction on the name of the DLLS
REM if it changes you *MUST* change Version.props
-set OPENSSL_DIR=openssl-3.0.9
-set OPENSSL_MM_VERSION=3.0.9.0
-set OPENSSL_FILE_VERSION=3_0_9
+set OPENSSL_DIR=openssl-3.3.2
+set OPENSSL_MM_VERSION=3.3.2.0
+set OPENSSL_FILE_VERSION=3_3
REM
REM CURL CONFIG
@@ -103,9 +103,9 @@ REM
REM CURL_DIR is the directory name
REM CURL_VERSION is the version
REM
-set LIBCURL_VERSION=8.4.0
+set LIBCURL_VERSION=8.10.1
set LIBCURL_DIR=curl-%LIBCURL_VERSION%
-set LIBCURL_FILE_VERSION=11
+set LIBCURL_FILE_VERSION=12
REM
REM XML SECURITY CONFIG
@@ -136,9 +136,9 @@ set LOG4SHIB_FILE_VERSION=2_0
REM
REM XERCES CONFIG
REM
-set XERCES_DIR=xerces-c-3.2.4
-set XERCES_FILE_VERSION=3_2
-set XERCES_MM_VERSION=3.2.4
+set XERCES_DIR=xerces-c-3.3.0
+set XERCES_FILE_VERSION=3_3
+set XERCES_MM_VERSION=3.3.0
SET MsVCVersionNum=15
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list