diff options
75 files changed, 216 insertions, 216 deletions
diff --git a/README.md b/README.md index a43a5860352..cdc063b38e5 100644 --- a/README.md +++ b/README.md @@ -82,5 +82,5 @@ The Ice software itself remains the same: the only difference between an open-so ## Documentation -- [Ice Release Notes](https://doc.zeroc.com/display/Rel/Ice+3.6.1+Release+Notes) +- [Ice Release Notes](https://doc.zeroc.com/display/Rel/Ice+3.6.2+Release+Notes) - [Ice Manual](https://doc.zeroc.com/display/Ice36/Home) diff --git a/android/gradle.properties b/android/gradle.properties index b0587ed143f..b74338956ff 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -7,7 +7,7 @@ // // ********************************************************************** -iceVersion = 3.6.1 +iceVersion = 3.6.2 // The Android versions used for the Ice build. ice_buildToolsVersion = 21.1.1 diff --git a/config/Make.common.rules b/config/Make.common.rules index e562754a211..4e742f9ee26 100644 --- a/config/Make.common.rules +++ b/config/Make.common.rules @@ -14,8 +14,8 @@ SHELL = /bin/sh VERSION_MAJOR = 3 VERSION_MINOR = 6 -VERSION_PATCH = 1 -VERSION = 3.6.1 +VERSION_PATCH = 2 +VERSION = 3.6.2 SHORT_VERSION = 3.6 SOVERSION = 36 diff --git a/config/Make.common.rules.mak b/config/Make.common.rules.mak index 299602df8b7..a1ff76bc50f 100644 --- a/config/Make.common.rules.mak +++ b/config/Make.common.rules.mak @@ -12,10 +12,10 @@ # ---------------------------------------------------------------------- SHELL = /bin/sh -VERSION = 3.6.1 -INTVERSION = 3.6.1 +VERSION = 3.6.2 +INTVERSION = 3.6.2 SHORT_VERSION = 3.6 -PATCH_VERSION = 1 +PATCH_VERSION = 2 SOVERSION = 36 OBJEXT = .obj diff --git a/cpp/config/Ice.props b/cpp/config/Ice.props index 5ff834412b1..fa8e37de99d 100644 --- a/cpp/config/Ice.props +++ b/cpp/config/Ice.props @@ -3,8 +3,8 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Label="IceHome" Condition="'$(ICE_HOME)' != ''"> <IceHome>$(ICE_HOME)</IceHome> - <IceVersion>3.6.1</IceVersion> - <IceIntVersion>30601</IceIntVersion> + <IceVersion>3.6.2</IceVersion> + <IceIntVersion>30602</IceIntVersion> <IceVersionMM>3.6</IceVersionMM> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index bdfb71345d3..30afc768892 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -239,7 +239,7 @@ typedef long long Int64; // // The Ice version. // -#define ICE_STRING_VERSION "3.6.1" // "A.B.C", with A=major, B=minor, C=patch -#define ICE_INT_VERSION 30601 // AABBCC, with AA=major, BB=minor, CC=patch +#define ICE_STRING_VERSION "3.6.2" // "A.B.C", with A=major, B=minor, C=patch +#define ICE_INT_VERSION 30602 // AABBCC, with AA=major, BB=minor, CC=patch #endif diff --git a/cpp/src/Freeze/Freeze.rc b/cpp/src/Freeze/Freeze.rc index 36eba16c3ca..16423321cad 100644 --- a/cpp/src/Freeze/Freeze.rc +++ b/cpp/src/Freeze/Freeze.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Freeze C++ Library\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/FreezeScript/DumpDB.rc b/cpp/src/FreezeScript/DumpDB.rc index ac6c81110ed..86b833edaab 100644 --- a/cpp/src/FreezeScript/DumpDB.rc +++ b/cpp/src/FreezeScript/DumpDB.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Dump Freeze Database\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "dumpdb\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "dumpdb.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/FreezeScript/TransformDB.rc b/cpp/src/FreezeScript/TransformDB.rc index cc98bc8fb99..a3d69395884 100644 --- a/cpp/src/FreezeScript/TransformDB.rc +++ b/cpp/src/FreezeScript/TransformDB.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Transform Freeze Database\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "transformdb\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "transformdb.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Glacier2/Glacier2Router.rc b/cpp/src/Glacier2/Glacier2Router.rc index af50bb8b7e2..e299ec97c24 100644 --- a/cpp/src/Glacier2/Glacier2Router.rc +++ b/cpp/src/Glacier2/Glacier2Router.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Glacier2 Router\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "glacier2router\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "glacier2router.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc index b6530f17388..8bbcad44052 100644 --- a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc +++ b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Glacier2CryptPermissionsVerifier C++ Plug-in\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Glacier2Lib/Glacier2.rc b/cpp/src/Glacier2Lib/Glacier2.rc index 314e2ba7cde..bbbc580825c 100644 --- a/cpp/src/Glacier2Lib/Glacier2.rc +++ b/cpp/src/Glacier2Lib/Glacier2.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Glacier2 C++ Client Library\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Ice/Ice.rc b/cpp/src/Ice/Ice.rc index 91a3630e490..bbbd822a1f1 100644 --- a/cpp/src/Ice/Ice.rc +++ b/cpp/src/Ice/Ice.rc @@ -2,8 +2,8 @@ #include "EventLoggerMsg.rc" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -24,12 +24,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Ice C++ Core Library\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceBox/IceBox.rc b/cpp/src/IceBox/IceBox.rc index f66000bf7c3..11a7097a184 100644 --- a/cpp/src/IceBox/IceBox.rc +++ b/cpp/src/IceBox/IceBox.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceBox C++ Library\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceBox/IceBoxAdmin.rc b/cpp/src/IceBox/IceBoxAdmin.rc index 1972ffe185d..c7dbe72ee13 100644 --- a/cpp/src/IceBox/IceBoxAdmin.rc +++ b/cpp/src/IceBox/IceBoxAdmin.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceBox Admin\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "iceboxadmin\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "iceboxadmin.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceBox/IceBoxExe.rc b/cpp/src/IceBox/IceBoxExe.rc index 335c147b6b7..e252ff49023 100644 --- a/cpp/src/IceBox/IceBoxExe.rc +++ b/cpp/src/IceBox/IceBoxExe.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceBox C++ Server\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceDiscovery/IceDiscovery.rc b/cpp/src/IceDiscovery/IceDiscovery.rc index 8def744926d..47326d80b2c 100755 --- a/cpp/src/IceDiscovery/IceDiscovery.rc +++ b/cpp/src/IceDiscovery/IceDiscovery.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceDiscovery C++ Plug-in\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceGrid/IceGridAdmin.rc b/cpp/src/IceGrid/IceGridAdmin.rc index df788338e12..9876d9124ff 100644 --- a/cpp/src/IceGrid/IceGridAdmin.rc +++ b/cpp/src/IceGrid/IceGridAdmin.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceGrid Admin\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "icegridadmin\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "icegridadmin.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceGrid/IceGridDB.rc b/cpp/src/IceGrid/IceGridDB.rc index 228baecda41..499bed1fb7a 100644 --- a/cpp/src/IceGrid/IceGridDB.rc +++ b/cpp/src/IceGrid/IceGridDB.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceGridDB\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "icegriddb\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "icegriddb.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceGrid/IceGridNode.rc b/cpp/src/IceGrid/IceGridNode.rc index 3aa75f64ea0..663a59a7331 100644 --- a/cpp/src/IceGrid/IceGridNode.rc +++ b/cpp/src/IceGrid/IceGridNode.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceGrid Node\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "icegridnode\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "icegridnode.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceGrid/IceGridRegistry.rc b/cpp/src/IceGrid/IceGridRegistry.rc index 542e1816532..67031ebddb2 100644 --- a/cpp/src/IceGrid/IceGridRegistry.rc +++ b/cpp/src/IceGrid/IceGridRegistry.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceGrid Registry\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "icegridregistry\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "icegridregistry.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceGridLib/IceGrid.rc b/cpp/src/IceGridLib/IceGrid.rc index 7a8c7b68bfb..f6be3ff9139 100644 --- a/cpp/src/IceGridLib/IceGrid.rc +++ b/cpp/src/IceGridLib/IceGrid.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceGrid C++ Client Library\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.rc b/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.rc index 1ac0ac1dcfe..757ae84be78 100755 --- a/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.rc +++ b/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceLocatorDiscovery C++ Plug-in\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IcePatch2/IcePatch2Calc.rc b/cpp/src/IcePatch2/IcePatch2Calc.rc index 1095c2d8f04..9cb67dc9fde 100644 --- a/cpp/src/IcePatch2/IcePatch2Calc.rc +++ b/cpp/src/IcePatch2/IcePatch2Calc.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IcePatch2 Calc\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "icepatch2calc\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "icepatch2calc.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IcePatch2/IcePatch2Client.rc b/cpp/src/IcePatch2/IcePatch2Client.rc index 191c88fb1a8..fcf9ca02c9c 100644 --- a/cpp/src/IcePatch2/IcePatch2Client.rc +++ b/cpp/src/IcePatch2/IcePatch2Client.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IcePatch2 Client\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "icepatch2client\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "icepatch2client.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IcePatch2/IcePatch2Server.rc b/cpp/src/IcePatch2/IcePatch2Server.rc index b9f6d8168f1..662dbce1656 100644 --- a/cpp/src/IcePatch2/IcePatch2Server.rc +++ b/cpp/src/IcePatch2/IcePatch2Server.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IcePatch2 Server\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "icepatch2server\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "icepatch2server.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IcePatch2Lib/IcePatch2.rc b/cpp/src/IcePatch2Lib/IcePatch2.rc index 02cfc352d97..89398fe503d 100644 --- a/cpp/src/IcePatch2Lib/IcePatch2.rc +++ b/cpp/src/IcePatch2Lib/IcePatch2.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IcePatch2 Client Library\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceSSL/IceSSL.rc b/cpp/src/IceSSL/IceSSL.rc index 7f759ef0122..5e91bedd9f2 100644 --- a/cpp/src/IceSSL/IceSSL.rc +++ b/cpp/src/IceSSL/IceSSL.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceSSL C++ Plug-in\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStorm/IceStormAdmin.rc b/cpp/src/IceStorm/IceStormAdmin.rc index 263f74752f9..c66fbf5ac57 100644 --- a/cpp/src/IceStorm/IceStormAdmin.rc +++ b/cpp/src/IceStorm/IceStormAdmin.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceStorm Admin\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "icestormadmin\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "icestormadmin.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStorm/IceStormDB.rc b/cpp/src/IceStorm/IceStormDB.rc index 90b00213ff5..b9fbd0b228e 100644 --- a/cpp/src/IceStorm/IceStormDB.rc +++ b/cpp/src/IceStorm/IceStormDB.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceStormDB\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "icestormdb\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "icestormdb.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStorm/IceStormMigrate.rc b/cpp/src/IceStorm/IceStormMigrate.rc index 11815a8905f..abe3c68f499 100644 --- a/cpp/src/IceStorm/IceStormMigrate.rc +++ b/cpp/src/IceStorm/IceStormMigrate.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Migration Utility for IceStorm Database\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "icestormmigrate\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "icestormmigrate.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStorm/IceStormService.rc b/cpp/src/IceStorm/IceStormService.rc index 11af4abdf10..1fa6fa16f84 100644 --- a/cpp/src/IceStorm/IceStormService.rc +++ b/cpp/src/IceStorm/IceStormService.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceStorm C++ Service for IceBox\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStormLib/IceStorm.rc b/cpp/src/IceStormLib/IceStorm.rc index 2bd2f57fc74..23b2093410c 100644 --- a/cpp/src/IceStormLib/IceStorm.rc +++ b/cpp/src/IceStormLib/IceStorm.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceStorm C++ Client Library\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceUtil/IceUtil.rc b/cpp/src/IceUtil/IceUtil.rc index c4228be4913..3810f0aa3ea 100644 --- a/cpp/src/IceUtil/IceUtil.rc +++ b/cpp/src/IceUtil/IceUtil.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Ice C++ Utility Library\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceXML/IceXML.rc b/cpp/src/IceXML/IceXML.rc index ec1d41e4c38..e99c5efafeb 100644 --- a/cpp/src/IceXML/IceXML.rc +++ b/cpp/src/IceXML/IceXML.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceXML C++ Library\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Slice/Slice.rc b/cpp/src/Slice/Slice.rc index 241f8a6f48c..fdf1ed46132 100644 --- a/cpp/src/Slice/Slice.rc +++ b/cpp/src/Slice/Slice.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Slice C++ Library\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/iceserviceinstall/IceServiceInstall.rc b/cpp/src/iceserviceinstall/IceServiceInstall.rc index 128d57ffc06..eabea615a3b 100644 --- a/cpp/src/iceserviceinstall/IceServiceInstall.rc +++ b/cpp/src/iceserviceinstall/IceServiceInstall.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Install Ice Services as Windows Services\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "iceserviceinstall\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "iceserviceinstall.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2confluence/Slice2Confluence.rc b/cpp/src/slice2confluence/Slice2Confluence.rc index 28820b1aedb..d111abf9674 100644 --- a/cpp/src/slice2confluence/Slice2Confluence.rc +++ b/cpp/src/slice2confluence/Slice2Confluence.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Slice to Confluence Markup Translator\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "slice2confluence\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "slice2confluence.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2cpp/Slice2Cpp.rc b/cpp/src/slice2cpp/Slice2Cpp.rc index b88391827ab..7cbc107d57e 100644 --- a/cpp/src/slice2cpp/Slice2Cpp.rc +++ b/cpp/src/slice2cpp/Slice2Cpp.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Slice to C++ Translator\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "slice2cpp\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "slice2cpp.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2cs/Slice2Cs.rc b/cpp/src/slice2cs/Slice2Cs.rc index e26bbbee350..4b935adc752 100644 --- a/cpp/src/slice2cs/Slice2Cs.rc +++ b/cpp/src/slice2cs/Slice2Cs.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Slice to C# Translator\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "slice2cs\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "slice2cs.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2freeze/Slice2Freeze.rc b/cpp/src/slice2freeze/Slice2Freeze.rc index d80094a6af9..0c894708bb1 100644 --- a/cpp/src/slice2freeze/Slice2Freeze.rc +++ b/cpp/src/slice2freeze/Slice2Freeze.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Slice to Freeze for C++ Translator\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "slice2freeze\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "slice2freeze.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2freezej/Slice2FreezeJ.rc b/cpp/src/slice2freezej/Slice2FreezeJ.rc index ca7d4144913..bf4ebd81097 100644 --- a/cpp/src/slice2freezej/Slice2FreezeJ.rc +++ b/cpp/src/slice2freezej/Slice2FreezeJ.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Slice to Freeze for Java Translator\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "slice2freezej\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "slice2freezej.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2html/Slice2Html.rc b/cpp/src/slice2html/Slice2Html.rc index 132d2c5e0e6..ced3bb32952 100644 --- a/cpp/src/slice2html/Slice2Html.rc +++ b/cpp/src/slice2html/Slice2Html.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Slice to HTML Translator\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "slice2html\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "slice2html.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2java/Slice2Java.rc b/cpp/src/slice2java/Slice2Java.rc index 25bb9d3df5e..ac1a8cde05f 100644 --- a/cpp/src/slice2java/Slice2Java.rc +++ b/cpp/src/slice2java/Slice2Java.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Slice to Java Translator\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "slice2java\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "slice2java.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2js/Slice2Js.rc b/cpp/src/slice2js/Slice2Js.rc index 3803469acf7..855d1667576 100644 --- a/cpp/src/slice2js/Slice2Js.rc +++ b/cpp/src/slice2js/Slice2Js.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Slice to JavaScript Translator\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "slice2js\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "slice2js.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2php/Slice2PHP.rc b/cpp/src/slice2php/Slice2PHP.rc index 3442354e28a..9c4f8362217 100644 --- a/cpp/src/slice2php/Slice2PHP.rc +++ b/cpp/src/slice2php/Slice2PHP.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Slice to PHP Translator\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "slice2php\0" VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" VALUE "OriginalFilename", "slice2php.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2py/Slice2Py.rc b/cpp/src/slice2py/Slice2Py.rc index a6fcb0c9793..e6cc7f9f4b9 100644 --- a/cpp/src/slice2py/Slice2Py.rc +++ b/cpp/src/slice2py/Slice2Py.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,0,0 - PRODUCTVERSION 3,6,0,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Slice To Python Translator\0" - VALUE "FileVersion", "3.6.0\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", "slice2py\0" VALUE "LegalCopyright", "Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2py.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.0\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX b/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX index e572d2c3d7d..8e81ec2aeb3 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX +++ b/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX @@ -1,6 +1,6 @@ - 0 IceUtil::Exception::Exception(char const*, int) in libIceUtil.3.6.1.dylib - 1 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.6.1.dylib - 2 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.6.1.dylib + 0 IceUtil::Exception::Exception(char const*, int) in libIceUtil.3.6.2.dylib + 1 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.6.2.dylib + 2 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.6.2.dylib 3 (anonymous namespace)::Thrower::fifth() in client 4 (anonymous namespace)::Thrower::forth() in client 5 (anonymous namespace)::Thrower::third() in client diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX b/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX index 0ee4c34acd6..a3c867c8e26 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX +++ b/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX @@ -1,3 +1,3 @@ - 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.6.1.dylib + 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.6.2.dylib 1 main() in client 2 start() in libdyld.dylib
\ No newline at end of file diff --git a/csharp/lib/pkgconfig/Glacier2.pc b/csharp/lib/pkgconfig/Glacier2.pc index 1f00e0b6e0e..2a0ce2a70cc 100644 --- a/csharp/lib/pkgconfig/Glacier2.pc +++ b/csharp/lib/pkgconfig/Glacier2.pc @@ -1,4 +1,4 @@ -version = 3.6.1 +version = 3.6.2 mono_root = /usr name = Glacier2 diff --git a/csharp/lib/pkgconfig/Ice.pc b/csharp/lib/pkgconfig/Ice.pc index 37433063b89..1eae5cc089c 100644 --- a/csharp/lib/pkgconfig/Ice.pc +++ b/csharp/lib/pkgconfig/Ice.pc @@ -1,4 +1,4 @@ -version = 3.6.1 +version = 3.6.2 mono_root = /usr name = Ice diff --git a/csharp/lib/pkgconfig/IceBox.pc b/csharp/lib/pkgconfig/IceBox.pc index 70a0e365bc4..37da7ca719b 100644 --- a/csharp/lib/pkgconfig/IceBox.pc +++ b/csharp/lib/pkgconfig/IceBox.pc @@ -1,4 +1,4 @@ -version = 3.6.1 +version = 3.6.2 mono_root = /usr name = IceBox diff --git a/csharp/lib/pkgconfig/IceGrid.pc b/csharp/lib/pkgconfig/IceGrid.pc index 8146b13a100..7a7abefa04e 100644 --- a/csharp/lib/pkgconfig/IceGrid.pc +++ b/csharp/lib/pkgconfig/IceGrid.pc @@ -1,4 +1,4 @@ -version = 3.6.1 +version = 3.6.2 mono_root = /usr name = IceGrid diff --git a/csharp/lib/pkgconfig/IcePatch2.pc b/csharp/lib/pkgconfig/IcePatch2.pc index e64bb4b03df..d386356cb14 100644 --- a/csharp/lib/pkgconfig/IcePatch2.pc +++ b/csharp/lib/pkgconfig/IcePatch2.pc @@ -1,4 +1,4 @@ -version = 3.6.1 +version = 3.6.2 mono_root = /usr name = IcePatch2 diff --git a/csharp/lib/pkgconfig/IceStorm.pc b/csharp/lib/pkgconfig/IceStorm.pc index 6b53cce5cb8..9fad9bf6800 100644 --- a/csharp/lib/pkgconfig/IceStorm.pc +++ b/csharp/lib/pkgconfig/IceStorm.pc @@ -1,4 +1,4 @@ -version = 3.6.1 +version = 3.6.2 mono_root = /usr name = IceStorm diff --git a/csharp/src/Glacier2/AssemblyInfo.cs b/csharp/src/Glacier2/AssemblyInfo.cs index 4d410c8496d..4efee6e48af 100644 --- a/csharp/src/Glacier2/AssemblyInfo.cs +++ b/csharp/src/Glacier2/AssemblyInfo.cs @@ -21,7 +21,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("Ice")] [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.6.1")] +[assembly: AssemblyVersion("3.6.2")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/csharp/src/Ice/AssemblyInfo.cs b/csharp/src/Ice/AssemblyInfo.cs index 1dc07184971..afe1d8ca2fd 100644 --- a/csharp/src/Ice/AssemblyInfo.cs +++ b/csharp/src/Ice/AssemblyInfo.cs @@ -21,7 +21,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("Ice")] [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.6.1")] +[assembly: AssemblyVersion("3.6.2")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/csharp/src/Ice/Util.cs b/csharp/src/Ice/Util.cs index f1f6d2170ca..b5ba9879420 100644 --- a/csharp/src/Ice/Util.cs +++ b/csharp/src/Ice/Util.cs @@ -555,7 +555,7 @@ namespace Ice /// <returns>The Ice version.</returns> public static string stringVersion() { - return "3.6.1"; // "A.B.C", with A=major, B=minor, C=patch + return "3.6.2"; // "A.B.C", with A=major, B=minor, C=patch } /// <summary> @@ -566,7 +566,7 @@ namespace Ice /// <returns>The Ice version.</returns> public static int intVersion() { - return 30601; // AABBCC, with AA=major, BB=minor, CC=patch + return 30602; // AABBCC, with AA=major, BB=minor, CC=patch } /// <summary> diff --git a/csharp/src/IceBox/AssemblyInfo.cs b/csharp/src/IceBox/AssemblyInfo.cs index 387cd583441..5663af338f4 100644 --- a/csharp/src/IceBox/AssemblyInfo.cs +++ b/csharp/src/IceBox/AssemblyInfo.cs @@ -21,7 +21,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("Ice")] [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.6.1")] +[assembly: AssemblyVersion("3.6.2")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/csharp/src/IceBox/AssemblyInfoExe.cs b/csharp/src/IceBox/AssemblyInfoExe.cs index c35c1949f93..06d217d9389 100644 --- a/csharp/src/IceBox/AssemblyInfoExe.cs +++ b/csharp/src/IceBox/AssemblyInfoExe.cs @@ -21,7 +21,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("Ice")] [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.6.1")] +[assembly: AssemblyVersion("3.6.2")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/csharp/src/IceBox/Makefile.mak b/csharp/src/IceBox/Makefile.mak index 744421f30e9..acefe63a2d5 100644 --- a/csharp/src/IceBox/Makefile.mak +++ b/csharp/src/IceBox/Makefile.mak @@ -74,11 +74,11 @@ iceboxnetconfig: <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <dependentAssembly> <assemblyIdentity name="Ice" culture="neutral" publicKeyToken="$(publicKeyToken)"/> - <codeBase version="3.6.1.0" href="..\Assemblies\Ice.dll"/> + <codeBase version="3.6.2.0" href="..\Assemblies\Ice.dll"/> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="IceBox" culture="neutral" publicKeyToken="$(publicKeyToken)"/> - <codeBase version="3.6.1.0" href="..\Assemblies\IceBox.dll"/> + <codeBase version="3.6.2.0" href="..\Assemblies\IceBox.dll"/> </dependentAssembly> <!-- This allows iceboxnet to load the IceSSL plug-in using a strong name. We omit the @@ -87,7 +87,7 @@ iceboxnetconfig: --> <dependentAssembly> <assemblyIdentity name="IceSSL"/> - <codeBase version="3.6.1.0" href="..\Assemblies\IceSSL.dll"/> + <codeBase version="3.6.2.0" href="..\Assemblies\IceSSL.dll"/> </dependentAssembly> </assemblyBinding> </runtime> diff --git a/csharp/src/IceDiscovery/AssemblyInfo.cs b/csharp/src/IceDiscovery/AssemblyInfo.cs index 2e9263a7be0..8335539b4cc 100644 --- a/csharp/src/IceDiscovery/AssemblyInfo.cs +++ b/csharp/src/IceDiscovery/AssemblyInfo.cs @@ -21,7 +21,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("Ice")] [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.6.1")] +[assembly: AssemblyVersion("3.6.2")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/csharp/src/IceGrid/AssemblyInfo.cs b/csharp/src/IceGrid/AssemblyInfo.cs index cf6b3ce57b9..8374dcba033 100644 --- a/csharp/src/IceGrid/AssemblyInfo.cs +++ b/csharp/src/IceGrid/AssemblyInfo.cs @@ -21,7 +21,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("Ice")] [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.6.1")] +[assembly: AssemblyVersion("3.6.2")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs b/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs index de516247373..5850f929d22 100644 --- a/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs +++ b/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs @@ -21,7 +21,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("Ice")] [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.6.1")] +[assembly: AssemblyVersion("3.6.2")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/csharp/src/IcePatch2/AssemblyInfo.cs b/csharp/src/IcePatch2/AssemblyInfo.cs index 7f3f2b88fe2..bf9e76dac3a 100644 --- a/csharp/src/IcePatch2/AssemblyInfo.cs +++ b/csharp/src/IcePatch2/AssemblyInfo.cs @@ -21,7 +21,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("Ice")] [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.6.1")] +[assembly: AssemblyVersion("3.6.2")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/csharp/src/IceSSL/AssemblyInfo.cs b/csharp/src/IceSSL/AssemblyInfo.cs index eac1d413e00..589ec21f02e 100644 --- a/csharp/src/IceSSL/AssemblyInfo.cs +++ b/csharp/src/IceSSL/AssemblyInfo.cs @@ -21,7 +21,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("Ice")] [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.6.1")] +[assembly: AssemblyVersion("3.6.2")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/csharp/src/IceStorm/AssemblyInfo.cs b/csharp/src/IceStorm/AssemblyInfo.cs index 4dbae0e0730..5de3716f215 100644 --- a/csharp/src/IceStorm/AssemblyInfo.cs +++ b/csharp/src/IceStorm/AssemblyInfo.cs @@ -21,7 +21,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("Ice")] [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.6.1")] +[assembly: AssemblyVersion("3.6.2")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/csharp/test/TestCommon/Properties/AssemblyInfo.cs b/csharp/test/TestCommon/Properties/AssemblyInfo.cs index a8fcc8b051b..2ffa982f400 100644 --- a/csharp/test/TestCommon/Properties/AssemblyInfo.cs +++ b/csharp/test/TestCommon/Properties/AssemblyInfo.cs @@ -39,7 +39,7 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("3.6.1")] -[assembly: AssemblyFileVersion("3.6.1")] +[assembly: AssemblyVersion("3.6.2")] +[assembly: AssemblyFileVersion("3.6.2")] [assembly: System.CLSCompliant(true)] diff --git a/java/gradle.properties b/java/gradle.properties index 77ff25a756c..49737925e6b 100644 --- a/java/gradle.properties +++ b/java/gradle.properties @@ -7,7 +7,7 @@ // // ********************************************************************** -iceVersion = 3.6.1 +iceVersion = 3.6.2 // // The directory that contains Oracle Berkeley DB's db.jar file. When not diff --git a/java/src/Ice/src/main/java/Ice/Util.java b/java/src/Ice/src/main/java/Ice/Util.java index d6dd9f753e4..b2cc28106a3 100644 --- a/java/src/Ice/src/main/java/Ice/Util.java +++ b/java/src/Ice/src/main/java/Ice/Util.java @@ -571,7 +571,7 @@ public final class Util public static String stringVersion() { - return "3.6.1"; // "A.B.C", with A=major, B=minor, C=patch + return "3.6.2"; // "A.B.C", with A=major, B=minor, C=patch } /** @@ -584,7 +584,7 @@ public final class Util public static int intVersion() { - return 30601; // AABBCC, with AA=major, BB=minor, CC=patch + return 30602; // AABBCC, with AA=major, BB=minor, CC=patch } /** diff --git a/java/test/ejb/README.md b/java/test/ejb/README.md index e3d80f85fe6..9d044971941 100644 --- a/java/test/ejb/README.md +++ b/java/test/ejb/README.md @@ -42,7 +42,7 @@ directory, for example: $ export JBOSS_HOME=$HOME/EnterprisePlatform-5.1.2/jboss-eap-5.1/jboss-as/ If Ice isn't installed in the default location set the ICE_HOME -environment variable to your Ice 3.6.1 installation directory. +environment variable to your Ice 3.6.2 installation directory. Run ant to build and deploy the application: diff --git a/js/package.json b/js/package.json index c50d36ebc60..ead94b0c952 100644 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "ice", - "version": "3.6.1", + "version": "3.6.2", "description": "Ice for JavaScript runtime", "author": "Zeroc, Inc.", "homepage": "https://zeroc.com", diff --git a/php/src/IcePHP/IcePHP.rc b/php/src/IcePHP/IcePHP.rc index 89b80fef057..ee77391769a 100644 --- a/php/src/IcePHP/IcePHP.rc +++ b/php/src/IcePHP/IcePHP.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Ice for PHP Extension\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/python/modules/IcePy/IcePy.rc b/python/modules/IcePy/IcePy.rc index 460ac630a15..0dc5be2b271 100644 --- a/python/modules/IcePy/IcePy.rc +++ b/python/modules/IcePy/IcePy.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,0 - PRODUCTVERSION 3,6,1,0 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Ice for Python Extension\0" - VALUE "FileVersion", "3.6.1\0" + VALUE "FileVersion", "3.6.2\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.1\0" + VALUE "ProductVersion", "3.6.2\0" END END BLOCK "VarFileInfo" diff --git a/scripts/TestController.py b/scripts/TestController.py index 87d658b5840..e3ad3ed4325 100644 --- a/scripts/TestController.py +++ b/scripts/TestController.py @@ -45,7 +45,7 @@ if TestUtil.isDarwin(): except getopt.GetoptError: pass -iceVersion = "3.6.1" +iceVersion = "3.6.2" jar = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "java/test/controller/build/libs/testController-%(iceVersion)s.jar" % {"iceVersion": iceVersion}) |