[cpp-msbuild] branch master updated: Update xmlsec and SP versions.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-msbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-msbuild.git;a=commit;h=2d5d5e52ea3c2cab18edfe898ebd2747fe8894f5

The following commit(s) were added to refs/heads/master by this push:
       new  2d5d5e5   Update xmlsec and SP versions.
2d5d5e5 is described below

commit 2d5d5e52ea3c2cab18edfe898ebd2747fe8894f5
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Aug 1 10:57:40 2018 -0400

    Update xmlsec and SP versions.
---
 Versions.props          | 16 ++++++++--------
 dependencies/config.bat |  7 +++----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Versions.props b/Versions.props
index 72e02d5..8a0d3f2 100644
--- a/Versions.props
+++ b/Versions.props
@@ -12,16 +12,16 @@
     <CxxTestRoot>$(BuildRoot)\cxxtest</CxxTestRoot>
 
     <!-- These control the version of the installer -->
-    <ShibbolethVersion>3.0.1</ShibbolethVersion>
+    <ShibbolethVersion>3.0.2</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,0,1</SPFileVersion>       <!-- FILEVERSION in the SP projects -->
-    <SPFileVersionSP>3,0,1</SPFileVersionSP>   <!-- Special for ShibSp.dll -->
-    <SPProductVersion>3,0,1</SPProductVersion> <!-- PRODUCTVERSION  in the SP projects (but overidden by resourceCommon.rci on output-->
+    <SPFileVersion>3,0,2</SPFileVersion>       <!-- FILEVERSION in the SP projects -->
+    <SPFileVersionSP>3,0,2</SPFileVersionSP>   <!-- Special for ShibSp.dll -->
+    <SPProductVersion>3,0,2</SPProductVersion> <!-- PRODUCTVERSION  in the SP projects (but overidden by resourceCommon.rci on output-->
 
     <!-- XML Tooling only has one RC file.  Edit that by hand -->
     <!-- OpemSAML has two RC files (saml.rc and samlsign.rc).  Edit them by hand -->
@@ -46,7 +46,7 @@
     <SamlComponent64>{E935A801-7D01-4996-A69D-46AF25D8C817}</SamlComponent64>
     <SamlComponent64d>{C453CD74-4CAE-4506-9695-F2BF0649CD9D}</SamlComponent64d>
 
-    <XmlToolingVersion>3.0.1</XmlToolingVersion>
+    <XmlToolingVersion>3.0.2</XmlToolingVersion>
     <XmlToolingFileVersion>3_0</XmlToolingFileVersion>
     <!-- Change the 8 components below iff the XmlToolingFileVersion name changes -->
     <XMLToolingComponent32>{07395646-06CE-436E-B57A-1420924257BC}</XMLToolingComponent32>
@@ -59,7 +59,7 @@
     <XMLToolingLiteComponent64d>{356BA4A0-2C00-489F-8274-18692A237DDB}</XMLToolingLiteComponent64d>
 
 
-    <ShibbolethDllVersion>3.0.1</ShibbolethDllVersion>
+    <ShibbolethDllVersion>3.0.2</ShibbolethDllVersion>
     <ShibbolethDllFileVersion>3_0</ShibbolethDllFileVersion>
     <!-- Change the 8 components below iff ShibbolethDllFileVersion changes -->
     <ShibDll32Component>{94B5CADC-299E-41A3-9653-DFD948800E0F}</ShibDll32Component>
@@ -131,9 +131,9 @@
   <PropertyGroup Label="XSecGeneral">
     <!-- Just for now -->
     <XSEC_FILE_VERSION Condition="'$(XSEC_FILE_VERSION)' == ''">2_0</XSEC_FILE_VERSION>
-    <XmlSecVersion Condition="'$(XSEC_MM_VERSION)'==''">2.0.0</XmlSecVersion>
+    <XmlSecVersion Condition="'$(XSEC_MM_VERSION)'==''">2.0.1</XmlSecVersion>
     <XmlSecVersion Condition="'$(XSEC_MM_VERSION)'!=''">$(XSEC_MM_VERSION)</XmlSecVersion>
-    <xmlsec Condition="'$(XSEC_DIR)'==''">xml-security-c-2.0.0</xmlsec>
+    <xmlsec Condition="'$(XSEC_DIR)'==''">xml-security-c-2.0.1</xmlsec>
     <xmlsec Condition="'$(XSEC_DIR)'!=''">$(XSEC_DIR)</xmlsec>
   </PropertyGroup>
 
diff --git a/dependencies/config.bat b/dependencies/config.bat
index 8e30de1..949d36f 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -1,3 +1,4 @@
+ at echo off
 rem ROOT_DIR HAS TO HAVE TRAILING SLASH
 
 if "%1" NEQ "" goto %1%
@@ -107,9 +108,9 @@ REM XSEC_DIR              is the directory name
 REM XSEC_MM_VERSION       is the Merge Module version (and so have to be 3 or 4 dot separated numbers)
 REM XSEC_FILE_VERSION     is the distinction on the name of the DLLS
 REM                       if it changes you *MUST* change Version.props
-set XSEC_DIR=xml-security-c-2.0.0
+set XSEC_DIR=xml-security-c-2.0.1
 SET XSEC_FILE_VERSION=2_0
-SET XSEC_MM_VERSION=2.0.0
+SET XSEC_MM_VERSION=2.0.1
 
 REM
 REM ZLIB CONFIG
@@ -144,8 +145,6 @@ set MsVCVersion=VC%MsVCVersionNum%
 set ForceImportBeforeCppTargets=%SCRIPTS_DIR%\xsec.props
 set SCRIPTS_DIR=%ROOT_DIR%cpp-msbuild\dependencies
 
-
 rem 
 rem The following is only needed if you want to run things.
 rem set path=%PATH%;%ROOT_DIR%%OPENSSL_DIR%\out32dll.dbg;%ROOT_DIR%%XERCES_DIR%\BUILD\WIN32\VC10\DEBUG;%ROOT_DIR%%XSEC_DIR%\Build\Win32\VC10\Debug No Xalan;%ROOT_DIR%%libcurl_dir%\lib\debug-dll-ssl-dll-zlib-dll;%ROOT_DIR%%LOGSHIB_DIR%\msvc10\Debug;%ROOT_DIR%%ZLIB_DIR%\Debug
-

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