[cpp-msbuild] branch main updated: Update zlib and SP patch versions.

Scott Cantor cantor.2 at osu.edu
Wed Mar 8 17:37:44 UTC 2023


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=bcd216cd47dc41b6e0d801a8ce5c25d23ec4c3d8

The following commit(s) were added to refs/heads/main by this push:
     new bcd216c  Update zlib and SP patch versions.
bcd216c is described below

commit bcd216cd47dc41b6e0d801a8ce5c25d23ec4c3d8
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Mar 8 12:37:40 2023 -0500

    Update zlib and SP patch versions.
---
 Versions.props          | 20 ++++++++++----------
 dependencies/config.bat |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Versions.props b/Versions.props
index 0a319d3..ff24478 100644
--- a/Versions.props
+++ b/Versions.props
@@ -12,7 +12,7 @@
 
     <!-- These control the version of the installer -->
     <ShibbolethVersion>3.4.1</ShibbolethVersion>
-    <ShibbolethPatchVersion>1</ShibbolethPatchVersion>
+    <ShibbolethPatchVersion>2</ShibbolethPatchVersion>
 
     <!-- These control the versions in the DLLs and Executables.
          Note that the PatchVersion is left to the individual resource file.
@@ -162,24 +162,24 @@
 
   <PropertyGroup Label="ZLibGeneral">
     <!-- Just for now -->
-	<ZLIB_FILE_VERSION Condition="'$(ZLIB_FILE_VERSION)' == ''">1_2_11</ZLIB_FILE_VERSION>
-    <ZlibVersion Condition="'$(ZLIB_MM_VERSION)'==''">1.2.11</ZlibVersion>
+    <ZLIB_FILE_VERSION Condition="'$(ZLIB_FILE_VERSION)' == ''">1_2_13</ZLIB_FILE_VERSION>
+    <ZlibVersion Condition="'$(ZLIB_MM_VERSION)'==''">1.2.13</ZlibVersion>
     <ZLibVersion Condition="'$(ZLIB_MM_VERSION)'!=''">$(ZLIB_MM_VERSION)</ZLibVersion>
-    <zlib Condition="'$(ZLIB_DIR)'==''">zlib-1.2.11</zlib>
+    <zlib Condition="'$(ZLIB_DIR)'==''">zlib-1.2.13</zlib>
     <zlib Condition="'$(ZLIB_DIR)'!=''">$(ZLIB_DIR)</zlib>
   </PropertyGroup>
 
-  <PropertyGroup Label="ZLibGuidsBad" Condition="'$(ZLIB_FILE_VERSION)' != '1_2_11'">
+  <PropertyGroup Label="ZLibGuidsBad" Condition="'$(ZLIB_FILE_VERSION)' != '1_2_13'">
     <ZlibFileVersion>BAD_ZLIB_FILE_VERSION</ZlibFileVersion>
     <!-- Changing ZLIB_FILE_VERSION version requires changing the GUIDs since it is garnish on the name -->
   </PropertyGroup>
-  <PropertyGroup Label="ZLibGuids " Condition="'$(ZLIB_FILE_VERSION)' == '1_2_11'">
+  <PropertyGroup Label="ZLibGuids " Condition="'$(ZLIB_FILE_VERSION)' == '1_2_13'">
     <ZlibFileVersion>$(ZLIB_FILE_VERSION)</ZlibFileVersion>
     <!-- Change the 4 components below iff ZlibFileVersion changes -->
-    <Zlib32Component>{D594352E-4BB8-49D3-B4F0-B4343F16D8D9}</Zlib32Component>
-    <Zlib32Componentd>{242B3DCA-86BA-4109-A156-7C1AD3A4AC04}</Zlib32Componentd>
-    <Zlib64Component>{D3174E03-4AED-4C32-BC6F-10ADB189B46B}</Zlib64Component>
-    <Zlib64Componentd>{F06717CA-04C3-48B0-BB5B-E7F832D0B7E7}</Zlib64Componentd>
+    <Zlib32Component>{F20C41D9-0040-4CDD-B32C-452BFD36D1CD}</Zlib32Component>
+    <Zlib32Componentd>{B240E8C8-0F81-43A2-8621-C09A001ACFFC}</Zlib32Componentd>
+    <Zlib64Component>{C6B86A4E-477C-4022-9A1E-B482C4137C39}</Zlib64Component>
+    <Zlib64Componentd>{830D7242-6E7F-4662-A1A4-0A5ADC0B3612}</Zlib64Componentd>
   </PropertyGroup>
 
   <PropertyGroup Label="XercesGeneral">
diff --git a/dependencies/config.bat b/dependencies/config.bat
index f7946a9..e305068 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -121,10 +121,10 @@ SET XSEC_MM_VERSION=2.0.4
 REM
 REM ZLIB CONFIG
 REM
-set ZLIB_DIR=zlib-1.2.11
-set ZLIB_MM_VERSION=1.2.11
+set ZLIB_DIR=zlib-1.2.13
+set ZLIB_MM_VERSION=1.2.13
 set ZLIB_IMPLIB=zlib1
-set ZLIB_FILE_VERSION=1_2_11
+set ZLIB_FILE_VERSION=1_2_13
 
 REM
 REM LOG4SHIB CONFIG

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list