[cpp-sp] branch master updated: SSPCPP-737 Rev Copyright date to 2018 and versions all to 3.0.0

[Rod Widdowson]

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=75433abca9db763bbfa0e29f66fd9a8b2b9b959e

The following commit(s) were added to refs/heads/master by this push:
       new  75433ab   SSPCPP-737 Rev Copyright date to 2018 and versions all to 3.0.0
75433ab is described below

commit 75433abca9db763bbfa0e29f66fd9a8b2b9b959e
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Jan 29 15:42:02 2018 +0000

    SSPCPP-737 Rev Copyright date to 2018 and versions all to 3.0.0
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-737
---
 adfs/adfs.rc            |   1 -
 iis7_shib/iis7_shib.rc  |   8 ++------
 util/messageResource.rc | Bin 1490 -> 1466 bytes
 util/resourceCommon.rci |  12 ++++--------
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/adfs/adfs.rc b/adfs/adfs.rc
index 52a1556..9dfb602 100644
--- a/adfs/adfs.rc
+++ b/adfs/adfs.rc
@@ -72,7 +72,6 @@ BEGIN
         BEGIN
 #include "..\util\resourceCommon.rci"
             VALUE "FileDescription", "Shibboleth ADFSv1 Plugin\0"
-            VALUE "FileVersion", "2, 6, 0, 0\0"
 #ifdef SHIBSP_LITE
             VALUE "InternalName", "adfs-lite\0"
 #else
diff --git a/iis7_shib/iis7_shib.rc b/iis7_shib/iis7_shib.rc
index dace537..2f7c835 100644
--- a/iis7_shib/iis7_shib.rc
+++ b/iis7_shib/iis7_shib.rc
@@ -67,14 +67,10 @@ BEGIN
     BEGIN
         BLOCK "080904b0"
         BEGIN
-            VALUE "CompanyName", "Shibboleth Consortium"
+#include "..\util\resourceCommon.rci"
             VALUE "FileDescription", "Shibboleth IIIS7 Native Filter / Extension"
-            VALUE "FileVersion", "0.0.1.0"
-            VALUE "InternalName", "iis7_shib.rc"
-            VALUE "LegalCopyright", "Copyright (C) 2017  UCAID"
+            VALUE "InternalName", "iis7_shib"
             VALUE "OriginalFilename", "iis7_shib.dll"
-            VALUE "ProductName", "Shibboleth 2.6.0"
-            VALUE "ProductVersion", "0.0.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/util/messageResource.rc b/util/messageResource.rc
index 5c07679..e6640c1 100644
Binary files a/util/messageResource.rc and b/util/messageResource.rc differ
diff --git a/util/resourceCommon.rci b/util/resourceCommon.rci
index 0842a24..9a665e1 100644
--- a/util/resourceCommon.rci
+++ b/util/resourceCommon.rci
@@ -1,14 +1,10 @@
 
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Shibboleth Consortium\0"
-#ifdef RC_IS_SP
-            VALUE "FileVersion", "2,7,0,0\0"
-#else
-            VALUE "FileVersion", "2,7,0,0\0"
-#endif
-            VALUE "LegalCopyright", "Copyright � 2017 UCAID\0"
+            VALUE "FileVersion", "3,0,0,0\0"
+            VALUE "LegalCopyright", "Copyright � 2018 UCAID\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.7.0\0"
-            VALUE "ProductVersion", "2, 7, 0, 0\0"
+            VALUE "ProductName", "Shibboleth 3.0.0\0"
+            VALUE "ProductVersion", "0, 0, 0, 0\0"
             VALUE "SpecialBuild", "\0"

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