[cpp-xmltooling COMMIT] /branches/REL_1/msbuild/Versions.props

[noreply at shibboleth.net]

Author: rdw
Date: Tue Oct 23 06:05:36 2012
New Revision: 1004

URL: http://svn.shibboleth.net/view/cpp-xmltooling?rev=1004&view=rev
Log:
Fix broken macro which was breaking the C++ build.

This checkin also contains some macros which will be used for the installer build.

Modified:
    branches/REL_1/msbuild/Versions.props

Modified: branches/REL_1/msbuild/Versions.props
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/msbuild/Versions.props?rev=1004&r1=1003&r2=1004&view=diff
==============================================================================
--- branches/REL_1/msbuild/Versions.props (original)
+++ branches/REL_1/msbuild/Versions.props Tue Oct 23 06:05:36 2012
@@ -3,6 +3,14 @@
   <PropertyGroup Label="VersionMacros">
     <CxxTestRoot>$(BuildRoot)\cxxtest</CxxTestRoot>
     <ApacheRoot>E:\</ApacheRoot>
+
+    <ShibbolethVersion>2.5.0</ShibbolethVersion>
+
+    <!-- Change the Ids below AT LEAST on every change to ShibbolethVersion -->
+    <ShibbolethId32>{68D3C057-1C6D-4C3C-9E5B-7A6A8CA0BA74}</ShibbolethId32>
+    <ShibbolethId64>{65F34F66-573F-432D-A6F4-B5E1D417A6DA}</ShibbolethId64>
+    <!-- NEVER CHANGE THE UPGRADE CODE UNLESS YOU REALLY REALLY KNOW WHAT YOU ARE DOING -->
+    <ShibbolethUpgradeCode>{28A4EB62-E860-49CA-BE43-44ADEB91DBF6}</ShibbolethUpgradeCode>
 
     <CurlVersion>7.26.0</CurlVersion>
     <curl>curl-$(CurlVersion)</curl>
@@ -15,7 +23,7 @@
     <Log4ShibComponent32d>{B8D2E797-F5A8-4E0D-B57F-9A7D4E699942}</Log4ShibComponent32d>
     <Log4ShibComponent64>{DA7E5213-363E-4E13-B05D-90905BE9FB94}</Log4ShibComponent64>
     <Log4ShibComponent64d>{792E6762-70FE-418A-9336-39DDF1A6BAE7}</Log4ShibComponent64d>
-    <log4shib>log4shib-$(LogForShibVersion)</log4shib>
+    <log4shib>log4shib-$(Log4ShibVersion)</log4shib>
 
     <OpenSAMLVersion>2.5.0</OpenSAMLVersion>
     <OpenSAMLFileVersion>2_5</OpenSAMLFileVersion>