https://issues.shibboleth.net/jira/browse/SSPCPP-498

[shibboleth/cpp-sp.git] / msi / WiX / Versions.wxi

diff --git a/msi/WiX/Versions.wxi b/msi/WiX/Versions.wxi
index 25c5997..4de06c2 100644 (file)
--- a/msi/WiX/Versions.wxi
+++ b/msi/WiX/Versions.wxi
@@ -1,13 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>\r
-<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <?define BuildDirectory='G:\Downloads\shib\' ?>\r
 \r
+<!-- Licensed to the University Corporation for Advanced Internet\r
+   Development, Inc. (UCAID) under one or more contributor license\r
+   agreements.  See the NOTICE file distributed with this work for\r
+   additional information regarding copyright ownership. The UCAID\r
+   licenses this file to You under the Apache License, Version 2.0\r
+   (the "License"); you may not use this file except in compliance\r
+   with the License.  You may obtain a copy of the License at\r
+ \r
+     http://www.apache.org/licenses/LICENSE-2.0\r
+ \r
+   Unless required by applicable law or agreed to in writing, software\r
+   distributed under the License is distributed on an "AS IS" BASIS,\r
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
+   implied.  See the License for the specific language governing\r
+   permissions and limitations under the License.  -->\r
+\r
+<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+  <?define BuildDirectory='C:\Users\Administrator\Shibboleth\' ?>\r
+  <?define SPBuildDirectory='C:\Users\Administrator\Shibboleth\svn\2.5\' ?>\r
+  \r
   <!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->\r
-  <?define ShibbolethVersion='2.4.186'?>\r
+  <?define ShibbolethVersion='2.5.0'?>\r
   <!-- DO NOT CHANGE UpgradeCode -->\r
   <?define ShibbolethUpgradeCode='{28A4EB62-E860-49CA-BE43-44ADEB91DBF6}' ?>\r
 \r
-  <?define CurlVersion='7.21.2' ?>\r
+  <?define CurlVersion='7.26.0' ?>\r
 \r
   <?define FastCGIVersion='2.4.0' ?>\r
 \r
@@ -15,26 +33,26 @@
 \r
   <?define LogForShibFileVersion='1_0' ?> <!-- '$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\x64\Release\'> -->\r
 \r
-  <?define OpenSAMLVersion='2.4.3' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
-  <?define OpenSAMLFileVersion='2_4' ?><!-- 'saml$(var.OpenSAMLFileVersion).dll' -->\r
+  <?define OpenSAMLVersion='2.5.0' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
+  <?define OpenSAMLFileVersion='2_5' ?><!-- 'saml$(var.OpenSAMLFileVersion).dll' -->\r
 \r
-  <?define OpenSSLVersion='1.0.0.10' ?><!-- 1.0.0a -->\r
-  <?define OpenSSLDirVersion='1.0.0a' ?><!-- '$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'> -->\r
-  <?define OpenSSLFileVersion='1_0_0' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
+  <?define OpenSSLVersion='1.0.1.3' ?><!-- 1.0.1c -->\r
+  <?define OpenSSLDirVersion='1.0.1c' ?><!-- '$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'> -->\r
+  <?define OpenSSLFileVersion='1_0' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
 \r
   <!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->\r
-  <?define ShibbolethDllFileVersion='1_4' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
-  <?define ShibbolethDllVersion='1.4.2' ?>\r
+  <?define ShibbolethDllFileVersion='1_5' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
+  <?define ShibbolethDllVersion='1.5.0' ?>\r
 \r
   <?define XercesVersion='3.1.1' ?><!-- $(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll' -->\r
   <?define XercesFileVersion='3_1' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
 \r
-  <?define XmlSecVersion='1.6.0' ?><!-- '$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan' -->\r
-  <?define XmlSecFileVersion='1_6' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
+  <?define XmlSecVersion='1.7.0' ?><!-- '$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan' -->\r
+  <?define XmlSecFileVersion='1_7' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
 \r
-  <?define XmlToolingVersion='1.4.2' ?>\r
-  <?define XmlToolingFileVersion='1_4' ?><!--'xmltooling$(var.XmlToolingFileVersion)D.dll'-->\r
+  <?define XmlToolingVersion='1.5.1' ?>\r
+  <?define XmlToolingFileVersion='1_5' ?><!--'xmltooling$(var.XmlToolingFileVersion)D.dll'-->\r
 \r
-  <?define ZlibVersion='1.2.5' ?><!--'$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Release\zlib$(var.ZlibFileVersion).dll'-->\r
+  <?define ZlibVersion='1.2.7' ?><!--'$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\Release\zlib$(var.ZlibFileVersion).dll'-->\r
   <?define ZlibFileVersion='1' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
 </Include>\r