[cpp-sp] 01/02: SSPCPP-737 Windows msi/msm builds Update Installer version to Vista.
Rod Widdowson
rdw at steadingsoftware.com
Tue Mar 20 12:43:35 EDT 2018
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository cpp-sp.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=d6b9358ac5cc68e0808b20efc4b7e9ce6a61dcb1
commit d6b9358ac5cc68e0808b20efc4b7e9ce6a61dcb1
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Mar 20 11:26:02 2018 +0000
SSPCPP-737 Windows msi/msm builds Update Installer version to Vista.
https://issues.shibboleth.net/jira/browse/SSPCPP-737
We already check that we install on >= Vista.
For clarity move our minimum required installer up to the one
shipped in that release.
---
msi/WiX/MergeModules/Curl-x64.wxs | 2 +-
msi/WiX/MergeModules/Curl-x86.wxs | 2 +-
msi/WiX/MergeModules/FastCGI-x64.wxs | 2 +-
msi/WiX/MergeModules/FastCGI-x86.wxs | 2 +-
msi/WiX/MergeModules/Log4Shib-x64.wxs | 2 +-
msi/WiX/MergeModules/Log4Shib-x86.wxs | 2 +-
msi/WiX/MergeModules/OpenSAML-schemas.wxs | 2 +-
msi/WiX/MergeModules/OpenSAML-x64.wxs | 2 +-
msi/WiX/MergeModules/OpenSAML-x86.wxs | 2 +-
msi/WiX/MergeModules/OpenSSL-x64.wxs | 2 +-
msi/WiX/MergeModules/OpenSSL-x86.wxs | 2 +-
msi/WiX/MergeModules/Shibboleth-schemas.wxs | 2 +-
msi/WiX/MergeModules/Shibboleth-x64.wxs | 2 +-
msi/WiX/MergeModules/Shibboleth-x86.wxs | 2 +-
msi/WiX/MergeModules/Xerces-x64.wxs | 2 +-
msi/WiX/MergeModules/Xerces-x86.wxs | 2 +-
msi/WiX/MergeModules/XmlSec-x64.wxs | 2 +-
msi/WiX/MergeModules/XmlSec-x86.wxs | 2 +-
msi/WiX/MergeModules/Zlib-x64.wxs | 2 +-
msi/WiX/MergeModules/Zlib-x86.wxs | 2 +-
msi/WiX/ShibbolethSP-main-x64.wxs | 2 +-
msi/WiX/ShibbolethSP-main-x86.wxs | 2 +-
22 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/msi/WiX/MergeModules/Curl-x64.wxs b/msi/WiX/MergeModules/Curl-x64.wxs
index 38bcb3f..06b780f 100644
--- a/msi/WiX/MergeModules/Curl-x64.wxs
+++ b/msi/WiX/MergeModules/Curl-x64.wxs
@@ -24,7 +24,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="CurlMergeModule_x64" Language="1033" Version="$(var.CurlVersion)">
- <Package Id="{DB1A5E0D-0052-40F3-9D7B-469CCD0CEB2D}" Description="Merge Module for CURL (x64)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="300" Platform="x64" />
+ <Package Id="{DB1A5E0D-0052-40F3-9D7B-469CCD0CEB2D}" Description="Merge Module for CURL (x64)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFiles64Folder" Name="ProgramFiles">
diff --git a/msi/WiX/MergeModules/Curl-x86.wxs b/msi/WiX/MergeModules/Curl-x86.wxs
index 055922a..5adafbd 100644
--- a/msi/WiX/MergeModules/Curl-x86.wxs
+++ b/msi/WiX/MergeModules/Curl-x86.wxs
@@ -23,7 +23,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="CurlMergeModule_x86" Language="1033" Version="$(var.CurlVersion)">
- <Package Id="10467105-6375-49E1-AC35-045084BD8FA4" Description="Merge Module for CURL (x86)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="300" />
+ <Package Id="10467105-6375-49E1-AC35-045084BD8FA4" Description="Merge Module for CURL (x86)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="400" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder" Name="ProgramFiles">
diff --git a/msi/WiX/MergeModules/FastCGI-x64.wxs b/msi/WiX/MergeModules/FastCGI-x64.wxs
index d5f2aa4..d6995ed 100644
--- a/msi/WiX/MergeModules/FastCGI-x64.wxs
+++ b/msi/WiX/MergeModules/FastCGI-x64.wxs
@@ -18,7 +18,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="FastCGIMergeModule_x64" Language="1033" Version="$(var.FastCGIVersion)">
- <Package Id="{4820855A-68B9-4EBB-94CD-4C1F9DA6EB02}" Description="Merge Module for FastCGI (x64)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="300" Platform="x64" />
+ <Package Id="{4820855A-68B9-4EBB-94CD-4C1F9DA6EB02}" Description="Merge Module for FastCGI (x64)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFiles64Folder" Name="ProgramFiles">
diff --git a/msi/WiX/MergeModules/FastCGI-x86.wxs b/msi/WiX/MergeModules/FastCGI-x86.wxs
index 225a7a9..fc6ca7a 100644
--- a/msi/WiX/MergeModules/FastCGI-x86.wxs
+++ b/msi/WiX/MergeModules/FastCGI-x86.wxs
@@ -18,7 +18,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="FastCGIMergeModule_x86" Language="1033" Version="$(var.FastCGIVersion)">
- <Package Id="{2C0C288C-D24D-48E0-9BAD-DEFD6A8D8D64}" Description="Merge Module for FastCGI (x86)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="300" Platform="x86" />
+ <Package Id="{2C0C288C-D24D-48E0-9BAD-DEFD6A8D8D64}" Description="Merge Module for FastCGI (x86)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x86" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder" Name="ProgramFiles">
diff --git a/msi/WiX/MergeModules/Log4Shib-x64.wxs b/msi/WiX/MergeModules/Log4Shib-x64.wxs
index bcdea39..befb4e0 100644
--- a/msi/WiX/MergeModules/Log4Shib-x64.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x64.wxs
@@ -18,7 +18,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="Log4ShibMergeModule_x86" Language="1033" Version="$(var.Log4ShibVersion)">
- <Package Id="{A2D51A0D-847A-4941-80FC-C8C8E697565F}" Description="Merge Module for Log4Shib (x64)" Comments="This module is built by the Shibboleth Consortium. Includes log4cpp/shib and NTEventLogAppender." Manufacturer="Shibboleth Consortium" InstallerVersion="300" Platform="x64" />
+ <Package Id="{A2D51A0D-847A-4941-80FC-C8C8E697565F}" Description="Merge Module for Log4Shib (x64)" Comments="This module is built by the Shibboleth Consortium. Includes log4cpp/shib and NTEventLogAppender." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFiles64Folder" Name="ProgramFiles">
diff --git a/msi/WiX/MergeModules/Log4Shib-x86.wxs b/msi/WiX/MergeModules/Log4Shib-x86.wxs
index 374693d..81ea691 100644
--- a/msi/WiX/MergeModules/Log4Shib-x86.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x86.wxs
@@ -18,7 +18,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="Log4ShibMergeModule_x86" Language="1033" Version="$(var.Log4ShibVersion)">
- <Package Id="1AD64745-CA05-41AF-B5E9-A59AA4A1C134" Description="Merge Module for Log4Shib (x86)" Comments="This module is built by the Shibboleth Consortium. Includes log4cpp/shib and NTEventLogAppender." Manufacturer="Shibboleth Consortium" InstallerVersion="300" Platform="x86" />
+ <Package Id="1AD64745-CA05-41AF-B5E9-A59AA4A1C134" Description="Merge Module for Log4Shib (x86)" Comments="This module is built by the Shibboleth Consortium. Includes log4cpp/shib and NTEventLogAppender." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x86" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder" Name="ProgramFiles">
diff --git a/msi/WiX/MergeModules/OpenSAML-schemas.wxs b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
index 72d6b8b..44767dc 100644
--- a/msi/WiX/MergeModules/OpenSAML-schemas.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
@@ -19,7 +19,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="OpenSAMLSchemasMergeModule" Language="1033" Version="$(var.OpenSAMLVersion)">
- <Package Id="{8567178A-EEA1-4798-9D20-C2E2F7247D0F}" Description="Merge Module for OpenSAML schemas" Comments="This module is built by the Shibboleth Consortium" Manufacturer="Shibboleth Consortium" InstallerVersion="300" Platform="x86" />
+ <Package Id="{8567178A-EEA1-4798-9D20-C2E2F7247D0F}" Description="Merge Module for OpenSAML schemas" Comments="This module is built by the Shibboleth Consortium" Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x86" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="CommonAppDataFolder" Name="CommonFiles">
diff --git a/msi/WiX/MergeModules/OpenSAML-x64.wxs b/msi/WiX/MergeModules/OpenSAML-x64.wxs
index 02b8dc9..7aa0902 100644
--- a/msi/WiX/MergeModules/OpenSAML-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x64.wxs
@@ -18,7 +18,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="OpenSAMLMergeModule_x64" Language="1033" Version="$(var.OpenSAMLVersion)">
- <Package Id="{C4A8AAF1-D263-4361-9695-CE0F56B5D3C6}" Description="Merge Module for OpenSAML (x64)" Comments="This module is built by the Shibboleth Consortium. Includes XMLTooling library." Manufacturer="Shibboleth Consortium" InstallerVersion="300" Platform="x64" />
+ <Package Id="{C4A8AAF1-D263-4361-9695-CE0F56B5D3C6}" Description="Merge Module for OpenSAML (x64)" Comments="This module is built by the Shibboleth Consortium. Includes XMLTooling library." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFiles64Folder" Name="ProgramFiles">
diff --git a/msi/WiX/MergeModules/OpenSAML-x86.wxs b/msi/WiX/MergeModules/OpenSAML-x86.wxs
index e1f1e71..c8ca63b 100644
--- a/msi/WiX/MergeModules/OpenSAML-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x86.wxs
@@ -18,7 +18,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="OpenSAMLMergeModule_x86" Language="1033" Version="$(var.OpenSAMLVersion)">
- <Package Id="{D6367F80-6B31-4554-ABE4-53404DD46F35}" Description="Merge Module for OpenSAML (x86)" Comments="This module is built by the Shibboleth Consortium. Includes XMLTooling library." Manufacturer="Shibboleth Consortium" InstallerVersion="300" Platform="x86" />
+ <Package Id="{D6367F80-6B31-4554-ABE4-53404DD46F35}" Description="Merge Module for OpenSAML (x86)" Comments="This module is built by the Shibboleth Consortium. Includes XMLTooling library." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x86" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder" Name="ProgramFiles">
diff --git a/msi/WiX/MergeModules/OpenSSL-x64.wxs b/msi/WiX/MergeModules/OpenSSL-x64.wxs
index d497eb1..e84fd74 100644
--- a/msi/WiX/MergeModules/OpenSSL-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x64.wxs
@@ -25,7 +25,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="OpenSSLMergeModule_x64" Language="1033" Version="$(var.OpenSSLVersion)">
- <Package Id="{EEB21422-347C-4AFA-A347-DCA0E5D61572}" Description="Merge Module for OpenSSL (x64)" Comments="This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32." Manufacturer="Shibboleth Consortium" InstallerVersion="300" Platform="x64" />
+ <Package Id="{EEB21422-347C-4AFA-A347-DCA0E5D61572}" Description="Merge Module for OpenSSL (x64)" Comments="This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFiles64Folder">
<Directory Id="shibboleth" Name="Shibboleth">
diff --git a/msi/WiX/MergeModules/OpenSSL-x86.wxs b/msi/WiX/MergeModules/OpenSSL-x86.wxs
index 2667193..b718d91 100644
--- a/msi/WiX/MergeModules/OpenSSL-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x86.wxs
@@ -27,7 +27,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="OpenSSLMergeModule_x86" Language="1033" Version="$(var.OpenSSLVersion)">
- <Package Id="11FD68EE-607E-4755-98AA-1C7EE5E03652" Description="Merge Module for OpenSSL (x86)" Comments="This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32." Manufacturer="Shibboleth Consortium" InstallerVersion="300" Platform="x86" />
+ <Package Id="11FD68EE-607E-4755-98AA-1C7EE5E03652" Description="Merge Module for OpenSSL (x86)" Comments="This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x86" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder" Name="ProgramFiles">
<Directory Id="shibboleth" Name="Shibboleth">
diff --git a/msi/WiX/MergeModules/Shibboleth-schemas.wxs b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
index ea95554..099a09b 100644
--- a/msi/WiX/MergeModules/Shibboleth-schemas.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
@@ -17,7 +17,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="ShibbolethSPSchemasMergeModule" Language="1033" Version="$(var.ShibbolethDllVersion)">
- <Package Id="{5AC5161D-114D-4BFB-AF7C-4E8E7F964965}" Description="Merge Module for Shibboleth SP schemas" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="300" Platform="x86" />
+ <Package Id="{5AC5161D-114D-4BFB-AF7C-4E8E7F964965}" Description="Merge Module for Shibboleth SP schemas" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x86" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="CommonAppDataFolder" Name="CommonFiles">
diff --git a/msi/WiX/MergeModules/Shibboleth-x64.wxs b/msi/WiX/MergeModules/Shibboleth-x64.wxs
index 6c7fbd4..c215df2 100644
--- a/msi/WiX/MergeModules/Shibboleth-x64.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x64.wxs
@@ -17,7 +17,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="ShibbolethSPMergeModule_x64" Language="1033" Version="$(var.ShibbolethDllVersion)">
- <Package Id="{DF6FAD40-5EF8-43F2-BBE1-BD42B9E9ACAB}" Description="Merge Module for Shibboleth SP DLLs (x64)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="300" Platform="x64" />
+ <Package Id="{DF6FAD40-5EF8-43F2-BBE1-BD42B9E9ACAB}" Description="Merge Module for Shibboleth SP DLLs (x64)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFiles64Folder" Name="ProgramFiles">
diff --git a/msi/WiX/MergeModules/Shibboleth-x86.wxs b/msi/WiX/MergeModules/Shibboleth-x86.wxs
index 73c19f0..c9da61a 100644
--- a/msi/WiX/MergeModules/Shibboleth-x86.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x86.wxs
@@ -17,7 +17,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="ShibbolethSPMergeModule_x86" Language="1033" Version="$(var.ShibbolethDllVersion)">
- <Package Id="{AD8C7CB1-94D5-4C8E-88D0-040F817E1802}" Description="Merge Module for Shibboleth SP DLLs (x86)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="300" Platform="x86" />
+ <Package Id="{AD8C7CB1-94D5-4C8E-88D0-040F817E1802}" Description="Merge Module for Shibboleth SP DLLs (x86)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x86" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder" Name="ProgramFiles">
diff --git a/msi/WiX/MergeModules/Xerces-x64.wxs b/msi/WiX/MergeModules/Xerces-x64.wxs
index fa95a0c..1fb509f 100644
--- a/msi/WiX/MergeModules/Xerces-x64.wxs
+++ b/msi/WiX/MergeModules/Xerces-x64.wxs
@@ -18,7 +18,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="XercesMergeModule_x86" Language="1033" Version="$(var.XercesVersion)">
- <Package Id="{72CA15B1-CEB8-4C9B-A5CB-5254759E4B3A}" Description="Merge Module for Xerces (x64)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="300" Platform="x64" />
+ <Package Id="{72CA15B1-CEB8-4C9B-A5CB-5254759E4B3A}" Description="Merge Module for Xerces (x64)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFiles64Folder" Name="ProgramFiles">
<Directory Id="shibboleth" Name="Shibboleth">
diff --git a/msi/WiX/MergeModules/Xerces-x86.wxs b/msi/WiX/MergeModules/Xerces-x86.wxs
index 905d9c8..3fe9ac6 100644
--- a/msi/WiX/MergeModules/Xerces-x86.wxs
+++ b/msi/WiX/MergeModules/Xerces-x86.wxs
@@ -18,7 +18,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="XercesMergeModule_x86" Language="1033" Version="$(var.XercesVersion)">
- <Package Id="{5A32778E-B904-4828-90CD-A317B4F6DF7D}" Description="Merge Module for Xerces (x86)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="300" Platform="x86" />
+ <Package Id="{5A32778E-B904-4828-90CD-A317B4F6DF7D}" Description="Merge Module for Xerces (x86)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x86" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder" Name="ProgramFiles">
<Directory Id="shibboleth" Name="Shibboleth">
diff --git a/msi/WiX/MergeModules/XmlSec-x64.wxs b/msi/WiX/MergeModules/XmlSec-x64.wxs
index 2a1a3f1..cfa0ee6 100644
--- a/msi/WiX/MergeModules/XmlSec-x64.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x64.wxs
@@ -18,7 +18,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="XmlSecmergemodule_x64" Language="1033" Version="$(var.XmlSecVersion)">
- <Package Id="{B94AFB16-A52E-4C88-9011-FF0C897ABDE1}" Description="Merge Module for Santuario (x64)" Comments="This module is built by the Shibboleth Consortium. Includes several executable utilities." Manufacturer="Shibboleth Consortium" InstallerVersion="300" Platform="x64" />
+ <Package Id="{B94AFB16-A52E-4C88-9011-FF0C897ABDE1}" Description="Merge Module for Santuario (x64)" Comments="This module is built by the Shibboleth Consortium. Includes several executable utilities." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFiles64Folder" Name="ProgramFiles">
<Directory Id="shibboleth" Name="Shibboleth">
diff --git a/msi/WiX/MergeModules/XmlSec-x86.wxs b/msi/WiX/MergeModules/XmlSec-x86.wxs
index 008b582..4bffd76 100644
--- a/msi/WiX/MergeModules/XmlSec-x86.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x86.wxs
@@ -18,7 +18,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="XmlSecMergeModule_x86" Language="1033" Version="$(var.XmlSecVersion)">
- <Package Id="{D1678DAE-81D9-4756-ABE6-7D1218F0D350}" Description="Merge Module for Santuario (x86)" Comments="This module is built by the Shibboleth Consortium. Includes Several executable utilities." Manufacturer="Shibboleth Consortium" InstallerVersion="300" Platform="x86" />
+ <Package Id="{D1678DAE-81D9-4756-ABE6-7D1218F0D350}" Description="Merge Module for Santuario (x86)" Comments="This module is built by the Shibboleth Consortium. Includes Several executable utilities." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x86" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder" Name="ProgramFiles">
<Directory Id="shibboleth" Name="Shibboleth">
diff --git a/msi/WiX/MergeModules/Zlib-x64.wxs b/msi/WiX/MergeModules/Zlib-x64.wxs
index f376e64..2d8c666 100644
--- a/msi/WiX/MergeModules/Zlib-x64.wxs
+++ b/msi/WiX/MergeModules/Zlib-x64.wxs
@@ -17,7 +17,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="ZlibMergeModule_x86" Language="1033" Version="$(var.ZlibVersion)">
- <Package Id="{68821F70-8952-4778-8149-85A93E4BF426}" Description="Merge Module for Zlib (x64)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="300" Platform="x64" />
+ <Package Id="{68821F70-8952-4778-8149-85A93E4BF426}" Description="Merge Module for Zlib (x64)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFiles64Folder" Name="ProgramFiles">
diff --git a/msi/WiX/MergeModules/Zlib-x86.wxs b/msi/WiX/MergeModules/Zlib-x86.wxs
index 6fa4266..0ffd201 100644
--- a/msi/WiX/MergeModules/Zlib-x86.wxs
+++ b/msi/WiX/MergeModules/Zlib-x86.wxs
@@ -17,7 +17,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="ZlibMergeModule_x86" Language="1033" Version="$(var.ZlibVersion)">
- <Package Id="{F5C689A2-A72F-417E-B0F8-CF9B1450EE97}" Description="Merge Module for Zlib (x86)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="300" Platform="x86" />
+ <Package Id="{F5C689A2-A72F-417E-B0F8-CF9B1450EE97}" Description="Merge Module for Zlib (x86)" Comments="This module is built by the Shibboleth Consortium." Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x86" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder" Name="ProgramFiles">
diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index ea33ec1..388e2eb 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -18,7 +18,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="$(var.ShibbolethId64)" Language="1033" Manufacturer="Shibboleth Consortium" Name="Shibboleth Service Provider" UpgradeCode="$(var.ShibbolethUpgradeCode)" Version="$(var.ShibbolethVersion).$(var.ShibbolethPatchVersion)">
- <Package Description="Shibboleth SP (x86 and x64) V$(var.ShibbolethVersion) Patch Level $(var.ShibbolethPatchVersion)" Compressed="yes" Manufacturer="Shibboleth Consortium" InstallerVersion="301" Platform="x64" />
+ <Package Description="Shibboleth SP (x86 and x64) V$(var.ShibbolethVersion) Patch Level $(var.ShibbolethPatchVersion)" Compressed="yes" Manufacturer="Shibboleth Consortium" InstallerVersion="400" Platform="x64" />
<MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." MigrateFeatures="yes" Schedule="afterInstallExecute" AllowSameVersionUpgrades="yes" />
diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index 3882195..a155ef9 100644
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -18,7 +18,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="$(var.ShibbolethId32)" Language="1033" Manufacturer="Shibboleth Consortium" Name="Shibboleth Service Provider" UpgradeCode="$(var.ShibbolethUpgradeCode)" Version="$(var.ShibbolethVersion).$(var.ShibbolethPatchVersion)">
- <Package Description="Shibboleth SP (x86) V$(var.ShibbolethVersion) Patch Level $(var.ShibbolethPatchVersion)" Compressed="yes" Manufacturer="Shibboleth Consortium" InstallerVersion="301" />
+ <Package Description="Shibboleth SP (x86) V$(var.ShibbolethVersion) Patch Level $(var.ShibbolethPatchVersion)" Compressed="yes" Manufacturer="Shibboleth Consortium" InstallerVersion="400" />
<MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." MigrateFeatures="yes" Schedule="afterInstallExecute" AllowSameVersionUpgrades="yes" />
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list