diff options
276 files changed, 586 insertions, 586 deletions
diff --git a/config/Make.common.rules b/config/Make.common.rules index e35cb4cda7f..6001dcbce69 100644 --- a/config/Make.common.rules +++ b/config/Make.common.rules @@ -13,11 +13,11 @@ SHELL = /bin/sh VERSION_MAJOR = 3 -VERSION_MINOR = 5 -VERSION_PATCH = 1 -VERSION = 3.5.1 -SHORT_VERSION = 3.5 -SOVERSION = 35 +VERSION_MINOR = 6 +VERSION_PATCH = 51 +VERSION = 3.6.51 +SHORT_VERSION = 3.6 +SOVERSION = 36 INSTALL = cp -fp INSTALL_PROGRAM = ${INSTALL} diff --git a/config/Make.common.rules.mak b/config/Make.common.rules.mak index 26db3353b6c..42798260571 100644 --- a/config/Make.common.rules.mak +++ b/config/Make.common.rules.mak @@ -12,11 +12,11 @@ # ---------------------------------------------------------------------- SHELL = /bin/sh -VERSION = 3.5.1 -INTVERSION = 3.5.1 -SHORT_VERSION = 3.5 -PATCH_VERSION = 1 -SOVERSION = 35 +VERSION = 3.6.51 +INTVERSION = 3.6.51 +SHORT_VERSION = 3.6 +PATCH_VERSION = 51 +SOVERSION = 36 OBJEXT = .obj diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml index c968bc72ac3..6cfed6c142f 100644 --- a/cpp/config/templates.xml +++ b/cpp/config/templates.xml @@ -59,7 +59,7 @@ <parameter name="publish-endpoints" default="default"/> <parameter name="flush-timeout" default="1000"/> - <service name="${instance-name}" entry="IceStormService,35:createIceStorm"> + <service name="${instance-name}" entry="IceStormService,36:createIceStorm"> <dbenv name="${service}"/> @@ -111,7 +111,7 @@ <parameter name="publish-replica-group"/> <parameter name="topic-manager-replica-group"/> - <service name="${instance-name}${node-id}" entry="IceStormService,35:createIceStorm"> + <service name="${instance-name}${node-id}" entry="IceStormService,36:createIceStorm"> <dbenv name="${service}"/> diff --git a/cpp/demo/Ice/MFC/client/HelloClient.rc b/cpp/demo/Ice/MFC/client/HelloClient.rc index a10b0022887..5a349283a8e 100755 --- a/cpp/demo/Ice/MFC/client/HelloClient.rc +++ b/cpp/demo/Ice/MFC/client/HelloClient.rc @@ -101,8 +101,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -119,12 +119,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc." VALUE "FileDescription", "Ice Hello Client" - VALUE "FileVersion", "3.5.1" + VALUE "FileVersion", "3.6.51" VALUE "InternalName", "HelloClient.exe" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved." VALUE "OriginalFilename", "HelloClient.exe" VALUE "ProductName", "Ice" - VALUE "ProductVersion", "3.5.1" + VALUE "ProductVersion", "3.6.51" END END BLOCK "VarFileInfo" diff --git a/cpp/demo/Ice/MFC/server/HelloServer.rc b/cpp/demo/Ice/MFC/server/HelloServer.rc index c186f7bfd37..31e11e30f19 100644 --- a/cpp/demo/Ice/MFC/server/HelloServer.rc +++ b/cpp/demo/Ice/MFC/server/HelloServer.rc @@ -92,8 +92,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -110,12 +110,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Ice Hello Server\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "HelloServer.exe\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "HelloServer.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/demo/Ice/plugin/Ice.plugin.hello.vcxproj b/cpp/demo/Ice/plugin/Ice.plugin.hello.vcxproj index 8c731296dc1..151bde893ca 100644 --- a/cpp/demo/Ice/plugin/Ice.plugin.hello.vcxproj +++ b/cpp/demo/Ice/plugin/Ice.plugin.hello.vcxproj @@ -74,10 +74,10 @@ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\$(PlatformName)\$(ProjectName)\</IntDir> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">helloplugin35d</TargetName> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">helloplugin35d</TargetName> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">helloplugin35</TargetName> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">helloplugin35</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">helloplugin36d</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">helloplugin36d</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">helloplugin36</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">helloplugin36</TargetName> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Midl> @@ -103,13 +103,13 @@ <Link> <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>helloplugin35d.dll</OutputFile> + <OutputFile>helloplugin36d.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>helloplugin35d.lib</ImportLibrary> + <ImportLibrary>helloplugin36d.lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -141,13 +141,13 @@ <Link> <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>helloplugin35d.dll</OutputFile> + <OutputFile>helloplugin36d.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>helloplugin35d.lib</ImportLibrary> + <ImportLibrary>helloplugin36d.lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -175,12 +175,12 @@ <Link> <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>helloplugin35.dll</OutputFile> + <OutputFile>helloplugin36.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>helloplugin35.lib</ImportLibrary> + <ImportLibrary>helloplugin36.lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -212,12 +212,12 @@ <Link> <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>helloplugin35.dll</OutputFile> + <OutputFile>helloplugin36.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>helloplugin35.lib</ImportLibrary> + <ImportLibrary>helloplugin36.lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/cpp/demo/Ice/plugin/Ice.plugin.logger.vcxproj b/cpp/demo/Ice/plugin/Ice.plugin.logger.vcxproj index 2bb1aa6bbf3..a1cb75cf007 100644 --- a/cpp/demo/Ice/plugin/Ice.plugin.logger.vcxproj +++ b/cpp/demo/Ice/plugin/Ice.plugin.logger.vcxproj @@ -74,10 +74,10 @@ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\$(PlatformName)\$(ProjectName)\</IntDir> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">loggerplugin35d</TargetName> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">loggerplugin35d</TargetName> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">loggerplugin35</TargetName> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">loggerplugin35</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">loggerplugin36d</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">loggerplugin36d</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">loggerplugin36</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">loggerplugin36</TargetName> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Midl> @@ -103,13 +103,13 @@ <Link> <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>loggerplugin35d.dll</OutputFile> + <OutputFile>loggerplugin36d.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>loggerplugin35d.lib</ImportLibrary> + <ImportLibrary>loggerplugin36d.lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -141,13 +141,13 @@ <Link> <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>loggerplugin35d.dll</OutputFile> + <OutputFile>loggerplugin36d.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>loggerplugin35d.lib</ImportLibrary> + <ImportLibrary>loggerplugin36d.lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -175,12 +175,12 @@ <Link> <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>loggerplugin35.dll</OutputFile> + <OutputFile>loggerplugin36.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>loggerplugin35.lib</ImportLibrary> + <ImportLibrary>loggerplugin36.lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> </Link> </ItemDefinitionGroup> @@ -212,12 +212,12 @@ <Link> <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>loggerplugin35.dll</OutputFile> + <OutputFile>loggerplugin36.dll</OutputFile> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>loggerplugin35.lib</ImportLibrary> + <ImportLibrary>loggerplugin36.lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> diff --git a/cpp/demo/IcePatch2/MFC/PatchClient.rc b/cpp/demo/IcePatch2/MFC/PatchClient.rc index 71f541c4434..4c4b6f2c817 100644 --- a/cpp/demo/IcePatch2/MFC/PatchClient.rc +++ b/cpp/demo/IcePatch2/MFC/PatchClient.rc @@ -118,8 +118,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -136,12 +136,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Ice Patch Client\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "PatchClient.exe\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "PatchClient.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/demo/IceStorm/clock/config.icebox b/cpp/demo/IceStorm/clock/config.icebox index 22733024a7b..ab01ab72dcd 100644 --- a/cpp/demo/IceStorm/clock/config.icebox +++ b/cpp/demo/IceStorm/clock/config.icebox @@ -11,7 +11,7 @@ IceBox.ServiceManager.Endpoints=tcp -h localhost -p 9998 # The IceStorm service. The service is configured using a separate # configuration file (see config.service). # -IceBox.Service.IceStorm=IceStormService,35:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,36:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions diff --git a/cpp/demo/IceStorm/counter/config.icebox b/cpp/demo/IceStorm/counter/config.icebox index b02967a9479..1314160556f 100644 --- a/cpp/demo/IceStorm/counter/config.icebox +++ b/cpp/demo/IceStorm/counter/config.icebox @@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -h localhost -p 9998 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,35:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,36:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions diff --git a/cpp/demo/IceStorm/counter/expect.py b/cpp/demo/IceStorm/counter/expect.py index ed1f950fa3b..607b3681f76 100755 --- a/cpp/demo/IceStorm/counter/expect.py +++ b/cpp/demo/IceStorm/counter/expect.py @@ -27,7 +27,7 @@ Util.cleanDbDir("db") print("ok") if Util.defaultHost: - args = ' --IceBox.Service.IceStorm="IceStormService,35:createIceStorm --Ice.Config=config.service %s"' \ + args = ' --IceBox.Service.IceStorm="IceStormService,36:createIceStorm --Ice.Config=config.service %s"' \ % Util.defaultHost else: args = '' diff --git a/cpp/demo/IceStorm/replicated/application.xml b/cpp/demo/IceStorm/replicated/application.xml index 1c2be893345..da19d591e81 100644 --- a/cpp/demo/IceStorm/replicated/application.xml +++ b/cpp/demo/IceStorm/replicated/application.xml @@ -32,7 +32,7 @@ <properties refid="mx"/> </properties> - <service name="IceStorm" entry="IceStormService,35:createIceStorm"> + <service name="IceStorm" entry="IceStormService,36:createIceStorm"> <dbenv name="${service}"/> diff --git a/cpp/demo/IceStorm/replicated2/config.ib1 b/cpp/demo/IceStorm/replicated2/config.ib1 index f8c239d5009..70da02fcde9 100644 --- a/cpp/demo/IceStorm/replicated2/config.ib1 +++ b/cpp/demo/IceStorm/replicated2/config.ib1 @@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9990 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,35:createIceStorm --Ice.Config=config.s1 +IceBox.Service.IceStorm=IceStormService,36:createIceStorm --Ice.Config=config.s1 # # Warn about connection exceptions diff --git a/cpp/demo/IceStorm/replicated2/config.ib2 b/cpp/demo/IceStorm/replicated2/config.ib2 index 74f4d9c0eca..bbad33cd40b 100644 --- a/cpp/demo/IceStorm/replicated2/config.ib2 +++ b/cpp/demo/IceStorm/replicated2/config.ib2 @@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9991 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,35:createIceStorm --Ice.Config=config.s2 +IceBox.Service.IceStorm=IceStormService,36:createIceStorm --Ice.Config=config.s2 # # Warn about connection exceptions diff --git a/cpp/demo/IceStorm/replicated2/config.ib3 b/cpp/demo/IceStorm/replicated2/config.ib3 index 5925f8f0634..20a57a2122f 100644 --- a/cpp/demo/IceStorm/replicated2/config.ib3 +++ b/cpp/demo/IceStorm/replicated2/config.ib3 @@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9993 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,35:createIceStorm --Ice.Config=config.s3 +IceBox.Service.IceStorm=IceStormService,36:createIceStorm --Ice.Config=config.s3 # # Warn about connection exceptions diff --git a/cpp/demo/IceStorm/replicated2/expect.py b/cpp/demo/IceStorm/replicated2/expect.py index d6b40b22e05..9b0e11277b4 100755 --- a/cpp/demo/IceStorm/replicated2/expect.py +++ b/cpp/demo/IceStorm/replicated2/expect.py @@ -30,11 +30,11 @@ Util.cleanDbDir("db3") print("ok") if Util.defaultHost: - a1 = ' --IceBox.Service.IceStorm="IceStormService,35:createIceStorm --Ice.Config=config.s1 %s"' \ + a1 = ' --IceBox.Service.IceStorm="IceStormService,36:createIceStorm --Ice.Config=config.s1 %s"' \ % Util.defaultHost - a2 = ' --IceBox.Service.IceStorm="IceStormService,35:createIceStorm --Ice.Config=config.s2 %s"' \ + a2 = ' --IceBox.Service.IceStorm="IceStormService,36:createIceStorm --Ice.Config=config.s2 %s"' \ % Util.defaultHost - a3 = ' --IceBox.Service.IceStorm="IceStormService,35:createIceStorm --Ice.Config=config.s3 %s"' \ + a3 = ' --IceBox.Service.IceStorm="IceStormService,36:createIceStorm --Ice.Config=config.s3 %s"' \ % Util.defaultHost else: a1 = '' diff --git a/cpp/doc/swish/swish.conf b/cpp/doc/swish/swish.conf index 03b749e70b3..57d90010f5f 100644 --- a/cpp/doc/swish/swish.conf +++ b/cpp/doc/swish/swish.conf @@ -1,6 +1,6 @@ Replacerules remove /var/www/html/ -IndexDir /var/www/html/doc/Ice-3.5.1/reference -IndexDir /var/www/html/doc/Ice-3.5.1/manual +IndexDir /var/www/html/doc/Ice-3.6.51/reference +IndexDir /var/www/html/doc/Ice-3.6.51/manual IndexOnly .html FileRules filename is _sindex\.html DefaultContents HTML* diff --git a/cpp/doc/swish/swishcgi.conf b/cpp/doc/swish/swishcgi.conf index be6a080aed6..51a06701b14 100644 --- a/cpp/doc/swish/swishcgi.conf +++ b/cpp/doc/swish/swishcgi.conf @@ -1,6 +1,6 @@ use lib '/var/www/html/doc/swishdir'; -my $ice_version = '3.5.1'; +my $ice_version = '3.6.51'; my $suffix = '-IceTouch'; my $referer = $ENV{HTTP_REFERER} ? $ENV{HTTP_REFERER} : ''; diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index 4e1acb3dd01..d830f49f81c 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -222,7 +222,7 @@ typedef long long Int64; // // The Ice version. // -#define ICE_STRING_VERSION "3.5.1" // "A.B.C", with A=major, B=minor, C=patch -#define ICE_INT_VERSION 30501 // AABBCC, with AA=major, BB=minor, CC=patch +#define ICE_STRING_VERSION "3.6b" // "A.B.C", with A=major, B=minor, C=patch +#define ICE_INT_VERSION 30651 // AABBCC, with AA=major, BB=minor, CC=patch #endif diff --git a/cpp/src/Freeze/Freeze.rc b/cpp/src/Freeze/Freeze.rc index 5a59b250653..d166e058d8d 100644 --- a/cpp/src/Freeze/Freeze.rc +++ b/cpp/src/Freeze/Freeze.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "freeze35d\0" - #define ORIGINALFILENAME "freeze35d.dll\0" + #define INTERNALNAME "freeze36d\0" + #define ORIGINALFILENAME "freeze36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "freeze35\0" - #define ORIGINALFILENAME "freeze35.dll\0" + #define INTERNALNAME "freeze36\0" + #define ORIGINALFILENAME "freeze36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Freeze DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/FreezeScript/DumpDB.rc b/cpp/src/FreezeScript/DumpDB.rc index 122c0130fda..fbfcefd4b89 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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 Database\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "dumpdb\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "dumpdb.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/FreezeScript/TransformDB.rc b/cpp/src/FreezeScript/TransformDB.rc index 68c7b9adbc5..ea44263688c 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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 Database\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "transformdb\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "transformdb.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Glacier2/Glacier2Router.rc b/cpp/src/Glacier2/Glacier2Router.rc index 2cccc25e48e..7fecca6846e 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "glacier2router\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "glacier2router.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc index c8a14cfac12..a7b9ab79bcc 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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 DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Glacier2Lib/Glacier2.rc b/cpp/src/Glacier2Lib/Glacier2.rc index b7e13e060bb..89724b77481 100644 --- a/cpp/src/Glacier2Lib/Glacier2.rc +++ b/cpp/src/Glacier2Lib/Glacier2.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "glacier235d\0" - #define ORIGINALFILENAME "glacier235d.dll\0" + #define INTERNALNAME "glacier236d\0" + #define ORIGINALFILENAME "glacier236d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "glacier235\0" - #define ORIGINALFILENAME "glacier235.dll\0" + #define INTERNALNAME "glacier236\0" + #define ORIGINALFILENAME "glacier236.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Glacier2 DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Ice/Ice.rc b/cpp/src/Ice/Ice.rc index 075f463932c..892d71fb326 100644 --- a/cpp/src/Ice/Ice.rc +++ b/cpp/src/Ice/Ice.rc @@ -2,17 +2,17 @@ #include "EventLoggerMsg.rc" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "ice35d\0" - #define ORIGINALFILENAME "ice35d.dll\0" + #define INTERNALNAME "ice36d\0" + #define ORIGINALFILENAME "ice36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "ice35\0" - #define ORIGINALFILENAME "ice35.dll\0" + #define INTERNALNAME "ice36\0" + #define ORIGINALFILENAME "ice36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -24,12 +24,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Ice Core DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceBox/IceBox.rc b/cpp/src/IceBox/IceBox.rc index 2e9916ff840..cf65b4b030e 100644 --- a/cpp/src/IceBox/IceBox.rc +++ b/cpp/src/IceBox/IceBox.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icebox35d\0" - #define ORIGINALFILENAME "icebox35d.dll\0" + #define INTERNALNAME "icebox36d\0" + #define ORIGINALFILENAME "icebox36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icebox35\0" - #define ORIGINALFILENAME "icebox35.dll\0" + #define INTERNALNAME "icebox36\0" + #define ORIGINALFILENAME "icebox36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceBox DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceBox/IceBoxAdmin.rc b/cpp/src/IceBox/IceBoxAdmin.rc index 8d7df0856a7..b81931378f8 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "iceboxadmin\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "iceboxadmin.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceBox/IceBoxExe.rc b/cpp/src/IceBox/IceBoxExe.rc index c05fb3feb79..f937ffb4244 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceDiscovery/IceDiscovery.rc b/cpp/src/IceDiscovery/IceDiscovery.rc index 5257c6e6dad..6e9631a078f 100755 --- a/cpp/src/IceDiscovery/IceDiscovery.rc +++ b/cpp/src/IceDiscovery/IceDiscovery.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icediscovery35d\0" - #define ORIGINALFILENAME "icediscovery35d.dll\0" + #define INTERNALNAME "icediscovery36d\0" + #define ORIGINALFILENAME "icediscovery36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icediscovery35\0" - #define ORIGINALFILENAME "icediscovery35.dll\0" + #define INTERNALNAME "icediscovery36\0" + #define ORIGINALFILENAME "icediscovery36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Ice Discovery DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceGrid/IceGridAdmin.rc b/cpp/src/IceGrid/IceGridAdmin.rc index 797ba5e3d19..b394665d3cc 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "icegridadmin\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icegridadmin.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceGrid/IceGridNode.rc b/cpp/src/IceGrid/IceGridNode.rc index c2e78d8ffe4..a0cfcc1eaa1 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "icegridnode\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icegridnode.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceGrid/IceGridRegistry.rc b/cpp/src/IceGrid/IceGridRegistry.rc index a3c1bbf2b14..a9d3404e46a 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "icegridregistry\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icegridregistry.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceGridLib/IceGrid.rc b/cpp/src/IceGridLib/IceGrid.rc index 0ea5333dafc..cf01132c31b 100644 --- a/cpp/src/IceGridLib/IceGrid.rc +++ b/cpp/src/IceGridLib/IceGrid.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icegrid35d\0" - #define ORIGINALFILENAME "icegrid35d.dll\0" + #define INTERNALNAME "icegrid36d\0" + #define ORIGINALFILENAME "icegrid36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icegrid35\0" - #define ORIGINALFILENAME "icegrid35.dll\0" + #define INTERNALNAME "icegrid36\0" + #define ORIGINALFILENAME "icegrid36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceGrid DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IcePatch2/IcePatch2Calc.rc b/cpp/src/IcePatch2/IcePatch2Calc.rc index a8fe1c7c308..38ad80d9d91 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "icepatch2calc\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icepatch2calc.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IcePatch2/IcePatch2Client.rc b/cpp/src/IcePatch2/IcePatch2Client.rc index 69f3324a322..4a6a7d63615 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "icepatch2client\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icepatch2client.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IcePatch2/IcePatch2Server.rc b/cpp/src/IcePatch2/IcePatch2Server.rc index 12071f388e6..71324c01b8b 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "icepatch2server\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icepatch2server.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IcePatch2Lib/IcePatch2.rc b/cpp/src/IcePatch2Lib/IcePatch2.rc index d2e345a4ff5..8e4cdbbab5b 100644 --- a/cpp/src/IcePatch2Lib/IcePatch2.rc +++ b/cpp/src/IcePatch2Lib/IcePatch2.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icepatch235d\0" - #define ORIGINALFILENAME "icepatch235d.dll\0" + #define INTERNALNAME "icepatch236d\0" + #define ORIGINALFILENAME "icepatch236d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icepatch235\0" - #define ORIGINALFILENAME "icepatch235.dll\0" + #define INTERNALNAME "icepatch236\0" + #define ORIGINALFILENAME "icepatch236.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IcePatch2 DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceSSL/IceSSL.rc b/cpp/src/IceSSL/IceSSL.rc index 25eeb881845..ac721ac15a8 100644 --- a/cpp/src/IceSSL/IceSSL.rc +++ b/cpp/src/IceSSL/IceSSL.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icessl35d\0" - #define ORIGINALFILENAME "icessl35d.dll\0" + #define INTERNALNAME "icessl36d\0" + #define ORIGINALFILENAME "icessl36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icessl35\0" - #define ORIGINALFILENAME "icessl35.dll\0" + #define INTERNALNAME "icessl36\0" + #define ORIGINALFILENAME "icessl36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceSSL DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStorm/IceStormAdmin.rc b/cpp/src/IceStorm/IceStormAdmin.rc index 6e936a8b363..a761238fc42 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "icestormadmin\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icestormadmin.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStorm/IceStormDB.rc b/cpp/src/IceStorm/IceStormDB.rc index 232549824b7..ef628a9917c 100644 --- a/cpp/src/IceStorm/IceStormDB.rc +++ b/cpp/src/IceStorm/IceStormDB.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icestormdb35d\0" - #define ORIGINALFILENAME "icestormdb35d.dll\0" + #define INTERNALNAME "icestormdb36d\0" + #define ORIGINALFILENAME "icestormdb36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icestormdb35\0" - #define ORIGINALFILENAME "icestormdb35.dll\0" + #define INTERNALNAME "icestormdb36\0" + #define ORIGINALFILENAME "icestormdb36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceStorm DB DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStorm/IceStormMigrate.rc b/cpp/src/IceStorm/IceStormMigrate.rc index 09deb80a7d1..da6d915ee40 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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 Migrate\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "icestormmigrate\0" VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "icestormmigrate.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStorm/IceStormService.rc b/cpp/src/IceStorm/IceStormService.rc index 7c8dd744c63..8741de8cbc6 100644 --- a/cpp/src/IceStorm/IceStormService.rc +++ b/cpp/src/IceStorm/IceStormService.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icestormservice35d\0" - #define ORIGINALFILENAME "icestormservice35d.dll\0" + #define INTERNALNAME "icestormservice36d\0" + #define ORIGINALFILENAME "icestormservice36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icestormservice35\0" - #define ORIGINALFILENAME "icestormservice35.dll\0" + #define INTERNALNAME "icestormservice36\0" + #define ORIGINALFILENAME "icestormservice36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceStorm Service DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceStormLib/IceStorm.rc b/cpp/src/IceStormLib/IceStorm.rc index 6f008531e04..f525f38c54e 100644 --- a/cpp/src/IceStormLib/IceStorm.rc +++ b/cpp/src/IceStormLib/IceStorm.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icestorm35d\0" - #define ORIGINALFILENAME "icestorm35d.dll\0" + #define INTERNALNAME "icestorm36d\0" + #define ORIGINALFILENAME "icestorm36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icestorm35\0" - #define ORIGINALFILENAME "icestorm35.dll\0" + #define INTERNALNAME "icestorm36\0" + #define ORIGINALFILENAME "icestorm36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceStorm DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceUtil/IceUtil.rc b/cpp/src/IceUtil/IceUtil.rc index d11904e2b9e..f79c945947b 100644 --- a/cpp/src/IceUtil/IceUtil.rc +++ b/cpp/src/IceUtil/IceUtil.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "iceutil35d\0" - #define ORIGINALFILENAME "iceutil35d.dll\0" + #define INTERNALNAME "iceutil36d\0" + #define ORIGINALFILENAME "iceutil36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "iceutil35\0" - #define ORIGINALFILENAME "iceutil35.dll\0" + #define INTERNALNAME "iceutil36\0" + #define ORIGINALFILENAME "iceutil36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Ice Utilities DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/IceXML/IceXML.rc b/cpp/src/IceXML/IceXML.rc index 528b1385a40..63b51f3283d 100644 --- a/cpp/src/IceXML/IceXML.rc +++ b/cpp/src/IceXML/IceXML.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "icexml35d\0" - #define ORIGINALFILENAME "icexml35d.dll\0" + #define INTERNALNAME "icexml36d\0" + #define ORIGINALFILENAME "icexml36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "icexml35\0" - #define ORIGINALFILENAME "icexml35.dll\0" + #define INTERNALNAME "icexml36\0" + #define ORIGINALFILENAME "icexml36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "IceXML DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/Slice/Slice.rc b/cpp/src/Slice/Slice.rc index 897db62f504..0608f63aafd 100644 --- a/cpp/src/Slice/Slice.rc +++ b/cpp/src/Slice/Slice.rc @@ -1,17 +1,17 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "slice35d\0" - #define ORIGINALFILENAME "slice35d.dll\0" + #define INTERNALNAME "slice36d\0" + #define ORIGINALFILENAME "slice36d.dll\0" #else FILEFLAGS 0x0L - #define INTERNALNAME "slice35\0" - #define ORIGINALFILENAME "slice35.dll\0" + #define INTERNALNAME "slice36\0" + #define ORIGINALFILENAME "slice36.dll\0" #endif FILEOS 0x4L FILETYPE VFT_DLL @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Slice Utilities DLL\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/ca/iceca b/cpp/src/ca/iceca index 0d551890688..c5202052a90 100755 --- a/cpp/src/ca/iceca +++ b/cpp/src/ca/iceca @@ -118,7 +118,7 @@ if sys.argv[script] == "import": checkLocations = [".", os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "..", "lib")), os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "..", "..", "lib")), - "/usr/share/Ice-3.5.1"] + "/usr/share/Ice-3.6.51"] for bindir in checkLocations: bindir = os.path.normpath(bindir) if os.path.exists(os.path.join(bindir, "ImportKey.class")): diff --git a/cpp/src/iceserviceinstall/IceServiceInstall.rc b/cpp/src/iceserviceinstall/IceServiceInstall.rc index a89717b2038..3a491560937 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" VALUE "FileDescription", "Service Installer\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "iceserviceinstall\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "iceserviceinstall.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2confluence/Slice2Confluence.rc b/cpp/src/slice2confluence/Slice2Confluence.rc index e76e2bed9b5..61441721e1a 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "slice2confluence\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2confluence.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2cpp/Slice2Cpp.rc b/cpp/src/slice2cpp/Slice2Cpp.rc index 8d712fc48a0..b8c4a81990d 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "slice2cpp\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2cpp.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2cs/Slice2Cs.rc b/cpp/src/slice2cs/Slice2Cs.rc index 5a380ae0cd4..a17225d7b07 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "slice2cs\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2cs.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2freeze/Slice2Freeze.rc b/cpp/src/slice2freeze/Slice2Freeze.rc index 495fb566fe8..21855c6583c 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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 Translator\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "slice2freeze\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2freeze.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2freezej/Slice2FreezeJ.rc b/cpp/src/slice2freezej/Slice2FreezeJ.rc index 5d28887a062..7651683659a 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "slice2freezej\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2freezej.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2html/Slice2Html.rc b/cpp/src/slice2html/Slice2Html.rc index b823efeaab6..9b2bd34f836 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "slice2html\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2html.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2java/Slice2Java.rc b/cpp/src/slice2java/Slice2Java.rc index b0261534424..1285929f80d 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "slice2java\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2java.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2js/Slice2Js.rc b/cpp/src/slice2js/Slice2Js.rc index d24779820df..d0d6f893e57 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "slice2js\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2js.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2php/Slice2PHP.rc b/cpp/src/slice2php/Slice2PHP.rc index 7c3da5f9eab..18c4514a0df 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "slice2py\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2py.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2py/Slice2Py.rc b/cpp/src/slice2py/Slice2Py.rc index 7c3da5f9eab..18c4514a0df 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "slice2py\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2py.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/src/slice2rb/Slice2Rb.rc b/cpp/src/slice2rb/Slice2Rb.rc index d510a714f46..86e158affcf 100644 --- a/cpp/src/slice2rb/Slice2Rb.rc +++ b/cpp/src/slice2rb/Slice2Rb.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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 Ruby Translator\0" - VALUE "FileVersion", "3.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", "slice2rb\0" VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2rb.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/cpp/test/IceStorm/repgrid/application.xml b/cpp/test/IceStorm/repgrid/application.xml index f69bd3136b3..cbfdeb0acaa 100644 --- a/cpp/test/IceStorm/repgrid/application.xml +++ b/cpp/test/IceStorm/repgrid/application.xml @@ -28,7 +28,7 @@ <parameter name="publish-replica-group"/> <parameter name="topic-manager-replica-group"/> - <service name="${instance-name}${node-id}" entry="IceStormService,35:createIceStorm"> + <service name="${instance-name}${node-id}" entry="IceStormService,36:createIceStorm"> <dbenv name="${service}"/> diff --git a/cs/demo/Glacier2/callback/client.csproj b/cs/demo/Glacier2/callback/client.csproj index 74bcc15bb5b..8e4ddffb367 100644 --- a/cs/demo/Glacier2/callback/client.csproj +++ b/cs/demo/Glacier2/callback/client.csproj @@ -79,13 +79,13 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Glacier2, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Glacier2, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Glacier2/callback/server.csproj b/cs/demo/Glacier2/callback/server.csproj index 11601ad3397..a1993ea3ae3 100644 --- a/cs/demo/Glacier2/callback/server.csproj +++ b/cs/demo/Glacier2/callback/server.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Glacier2/chat/Properties/AssemblyInfo.cs b/cs/demo/Glacier2/chat/Properties/AssemblyInfo.cs index c9ad309bae8..911f37b30ac 100644 --- a/cs/demo/Glacier2/chat/Properties/AssemblyInfo.cs +++ b/cs/demo/Glacier2/chat/Properties/AssemblyInfo.cs @@ -60,5 +60,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/demo/Glacier2/chat/client.csproj b/cs/demo/Glacier2/chat/client.csproj index cce95b4e4e9..61a986ba99d 100644 --- a/cs/demo/Glacier2/chat/client.csproj +++ b/cs/demo/Glacier2/chat/client.csproj @@ -39,9 +39,9 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Glacier2, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Glacier2, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> diff --git a/cs/demo/Glacier2/sl/chat.Web/Properties/AssemblyInfo.cs b/cs/demo/Glacier2/sl/chat.Web/Properties/AssemblyInfo.cs index 4a46b395f2b..6f2fdc00e6e 100644 --- a/cs/demo/Glacier2/sl/chat.Web/Properties/AssemblyInfo.cs +++ b/cs/demo/Glacier2/sl/chat.Web/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/demo/Glacier2/sl/chat/Properties/AssemblyInfo.cs b/cs/demo/Glacier2/sl/chat/Properties/AssemblyInfo.cs index ec5969d86ff..c8628f8402d 100644 --- a/cs/demo/Glacier2/sl/chat/Properties/AssemblyInfo.cs +++ b/cs/demo/Glacier2/sl/chat/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/demo/Glacier2/sl/chat/chat.csproj b/cs/demo/Glacier2/sl/chat/chat.csproj index 71b9f2571a3..b4e8ab587fb 100644 --- a/cs/demo/Glacier2/sl/chat/chat.csproj +++ b/cs/demo/Glacier2/sl/chat/chat.csproj @@ -60,8 +60,8 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Glacier2, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Glacier2, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/demo/Ice/async/client.csproj b/cs/demo/Ice/async/client.csproj index c872b9f0ce4..cc4c911e820 100644 --- a/cs/demo/Ice/async/client.csproj +++ b/cs/demo/Ice/async/client.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/async/server.csproj b/cs/demo/Ice/async/server.csproj index 12165916382..46dd0b1114d 100644 --- a/cs/demo/Ice/async/server.csproj +++ b/cs/demo/Ice/async/server.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/bidir/client.csproj b/cs/demo/Ice/bidir/client.csproj index 6ebf7c82e87..d8e4b1f7932 100644 --- a/cs/demo/Ice/bidir/client.csproj +++ b/cs/demo/Ice/bidir/client.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/bidir/server.csproj b/cs/demo/Ice/bidir/server.csproj index 9e956b1ec55..63795060614 100644 --- a/cs/demo/Ice/bidir/server.csproj +++ b/cs/demo/Ice/bidir/server.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/callback/client.csproj b/cs/demo/Ice/callback/client.csproj index f3a04b16bed..fa50b19c50c 100644 --- a/cs/demo/Ice/callback/client.csproj +++ b/cs/demo/Ice/callback/client.csproj @@ -79,10 +79,10 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/callback/server.csproj b/cs/demo/Ice/callback/server.csproj index 76fe0fb6c0c..f69b270343d 100644 --- a/cs/demo/Ice/callback/server.csproj +++ b/cs/demo/Ice/callback/server.csproj @@ -79,10 +79,10 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/context/client.csproj b/cs/demo/Ice/context/client.csproj index ef1a3c14ca5..f059bf6b338 100644 --- a/cs/demo/Ice/context/client.csproj +++ b/cs/demo/Ice/context/client.csproj @@ -79,10 +79,10 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/context/server.csproj b/cs/demo/Ice/context/server.csproj index bf6942db61e..bce23fd5ada 100644 --- a/cs/demo/Ice/context/server.csproj +++ b/cs/demo/Ice/context/server.csproj @@ -81,10 +81,10 @@ <UseVSHostingProcess>true</UseVSHostingProcess> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/hello/client.csproj b/cs/demo/Ice/hello/client.csproj index d3dc8b3278a..cd5ea18a857 100644 --- a/cs/demo/Ice/hello/client.csproj +++ b/cs/demo/Ice/hello/client.csproj @@ -79,10 +79,10 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/hello/server.csproj b/cs/demo/Ice/hello/server.csproj index fbd68ae9538..2bd7f7bf931 100644 --- a/cs/demo/Ice/hello/server.csproj +++ b/cs/demo/Ice/hello/server.csproj @@ -81,10 +81,10 @@ <UseVSHostingProcess>true</UseVSHostingProcess> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/invoke/client.csproj b/cs/demo/Ice/invoke/client.csproj index fb56ece140d..6e9e1dc7b1f 100644 --- a/cs/demo/Ice/invoke/client.csproj +++ b/cs/demo/Ice/invoke/client.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/invoke/server.csproj b/cs/demo/Ice/invoke/server.csproj index 19a00c153d5..355d9d69858 100644 --- a/cs/demo/Ice/invoke/server.csproj +++ b/cs/demo/Ice/invoke/server.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/latency/client.csproj b/cs/demo/Ice/latency/client.csproj index 359494a4830..964ceb62333 100644 --- a/cs/demo/Ice/latency/client.csproj +++ b/cs/demo/Ice/latency/client.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/latency/server.csproj b/cs/demo/Ice/latency/server.csproj index f695b28fad8..b66b853f52a 100644 --- a/cs/demo/Ice/latency/server.csproj +++ b/cs/demo/Ice/latency/server.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/minimal/client.csproj b/cs/demo/Ice/minimal/client.csproj index 1f881ff2b1a..3bebaac28fa 100644 --- a/cs/demo/Ice/minimal/client.csproj +++ b/cs/demo/Ice/minimal/client.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> <EmbedInteropTypes>False</EmbedInteropTypes> </Reference> diff --git a/cs/demo/Ice/minimal/server.csproj b/cs/demo/Ice/minimal/server.csproj index fd31dc4e4e3..091ae140f68 100644 --- a/cs/demo/Ice/minimal/server.csproj +++ b/cs/demo/Ice/minimal/server.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/multicast/client.csproj b/cs/demo/Ice/multicast/client.csproj index a85f966dfc7..a8e035d15b9 100644 --- a/cs/demo/Ice/multicast/client.csproj +++ b/cs/demo/Ice/multicast/client.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/multicast/server.csproj b/cs/demo/Ice/multicast/server.csproj index 879281e7c43..3eaf782b7c1 100644 --- a/cs/demo/Ice/multicast/server.csproj +++ b/cs/demo/Ice/multicast/server.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/nested/client.csproj b/cs/demo/Ice/nested/client.csproj index cb863da2a09..ef1a6d215a4 100644 --- a/cs/demo/Ice/nested/client.csproj +++ b/cs/demo/Ice/nested/client.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/nested/server.csproj b/cs/demo/Ice/nested/server.csproj index fb9b8b43342..f1246f6840e 100644 --- a/cs/demo/Ice/nested/server.csproj +++ b/cs/demo/Ice/nested/server.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/optional/client.csproj b/cs/demo/Ice/optional/client.csproj index a9ec4ce8ea4..873d5dc0adb 100644 --- a/cs/demo/Ice/optional/client.csproj +++ b/cs/demo/Ice/optional/client.csproj @@ -79,10 +79,10 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/optional/server.csproj b/cs/demo/Ice/optional/server.csproj index 48b81ef330f..3229f3d05d8 100644 --- a/cs/demo/Ice/optional/server.csproj +++ b/cs/demo/Ice/optional/server.csproj @@ -81,10 +81,10 @@ <UseVSHostingProcess>true</UseVSHostingProcess> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/plugin/client.csproj b/cs/demo/Ice/plugin/client.csproj index 3ee3bfe62b7..96c2ceb562e 100644 --- a/cs/demo/Ice/plugin/client.csproj +++ b/cs/demo/Ice/plugin/client.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/plugin/helloplugin.csproj b/cs/demo/Ice/plugin/helloplugin.csproj index d7cab48aca4..4d68e474a4d 100644 --- a/cs/demo/Ice/plugin/helloplugin.csproj +++ b/cs/demo/Ice/plugin/helloplugin.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System"> <Name>System</Name> </Reference> diff --git a/cs/demo/Ice/plugin/loggerplugin.csproj b/cs/demo/Ice/plugin/loggerplugin.csproj index 00e96c73bfb..4f8a5911cfc 100644 --- a/cs/demo/Ice/plugin/loggerplugin.csproj +++ b/cs/demo/Ice/plugin/loggerplugin.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System"> <Name>System</Name> </Reference> diff --git a/cs/demo/Ice/plugin/server.csproj b/cs/demo/Ice/plugin/server.csproj index de2119e631c..e4406cddded 100644 --- a/cs/demo/Ice/plugin/server.csproj +++ b/cs/demo/Ice/plugin/server.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/properties/client.csproj b/cs/demo/Ice/properties/client.csproj index 5c30768df4e..2bb29b92643 100644 --- a/cs/demo/Ice/properties/client.csproj +++ b/cs/demo/Ice/properties/client.csproj @@ -79,10 +79,10 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/properties/server.csproj b/cs/demo/Ice/properties/server.csproj index 67470a4cc10..6599b8a6ff9 100644 --- a/cs/demo/Ice/properties/server.csproj +++ b/cs/demo/Ice/properties/server.csproj @@ -81,10 +81,10 @@ <UseVSHostingProcess>true</UseVSHostingProcess> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/serialize/client.csproj b/cs/demo/Ice/serialize/client.csproj index c488687e131..5ed91c685f9 100644 --- a/cs/demo/Ice/serialize/client.csproj +++ b/cs/demo/Ice/serialize/client.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="MyGreeting, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL" /> diff --git a/cs/demo/Ice/serialize/serializable.csproj b/cs/demo/Ice/serialize/serializable.csproj index 1b6ebe0a48e..921761ad011 100644 --- a/cs/demo/Ice/serialize/serializable.csproj +++ b/cs/demo/Ice/serialize/serializable.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System"> <Name>System</Name> </Reference> diff --git a/cs/demo/Ice/serialize/server.csproj b/cs/demo/Ice/serialize/server.csproj index a7d5d7d868e..b9668f66b12 100644 --- a/cs/demo/Ice/serialize/server.csproj +++ b/cs/demo/Ice/serialize/server.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="MyGreeting, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL" /> diff --git a/cs/demo/Ice/session/client.csproj b/cs/demo/Ice/session/client.csproj index fda6e787a4a..4dd38786a9c 100644 --- a/cs/demo/Ice/session/client.csproj +++ b/cs/demo/Ice/session/client.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/session/server.csproj b/cs/demo/Ice/session/server.csproj index 7236d0fa856..826495dbe53 100644 --- a/cs/demo/Ice/session/server.csproj +++ b/cs/demo/Ice/session/server.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/sl/bidir/bidir.Web/Properties/AssemblyInfo.cs b/cs/demo/Ice/sl/bidir/bidir.Web/Properties/AssemblyInfo.cs index 02bce4c208b..563831b2bd5 100644 --- a/cs/demo/Ice/sl/bidir/bidir.Web/Properties/AssemblyInfo.cs +++ b/cs/demo/Ice/sl/bidir/bidir.Web/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/demo/Ice/sl/bidir/bidir/Properties/AssemblyInfo.cs b/cs/demo/Ice/sl/bidir/bidir/Properties/AssemblyInfo.cs index 638bbaf18bd..f641fb88e3c 100644 --- a/cs/demo/Ice/sl/bidir/bidir/Properties/AssemblyInfo.cs +++ b/cs/demo/Ice/sl/bidir/bidir/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/demo/Ice/sl/bidir/bidir/bidir.csproj b/cs/demo/Ice/sl/bidir/bidir/bidir.csproj index 9bf06383a84..68d9fe70c28 100644 --- a/cs/demo/Ice/sl/bidir/bidir/bidir.csproj +++ b/cs/demo/Ice/sl/bidir/bidir/bidir.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/demo/Ice/sl/hello/hello.Web/Properties/AssemblyInfo.cs b/cs/demo/Ice/sl/hello/hello.Web/Properties/AssemblyInfo.cs index 42f8291aa6c..3b1e903a515 100644 --- a/cs/demo/Ice/sl/hello/hello.Web/Properties/AssemblyInfo.cs +++ b/cs/demo/Ice/sl/hello/hello.Web/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/demo/Ice/sl/hello/hello/Properties/AssemblyInfo.cs b/cs/demo/Ice/sl/hello/hello/Properties/AssemblyInfo.cs index d69c318cd69..7d501979bf2 100644 --- a/cs/demo/Ice/sl/hello/hello/Properties/AssemblyInfo.cs +++ b/cs/demo/Ice/sl/hello/hello/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/demo/Ice/sl/hello/hello/hello.csproj b/cs/demo/Ice/sl/hello/hello/hello.csproj index 25a2f376055..d7f5f69effa 100644 --- a/cs/demo/Ice/sl/hello/hello/hello.csproj +++ b/cs/demo/Ice/sl/hello/hello/hello.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/demo/Ice/throughput/client.csproj b/cs/demo/Ice/throughput/client.csproj index 87af7b43199..3fa79a1734a 100644 --- a/cs/demo/Ice/throughput/client.csproj +++ b/cs/demo/Ice/throughput/client.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/throughput/server.csproj b/cs/demo/Ice/throughput/server.csproj index a67a3407e1d..7619bea62b8 100644 --- a/cs/demo/Ice/throughput/server.csproj +++ b/cs/demo/Ice/throughput/server.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/value/client.csproj b/cs/demo/Ice/value/client.csproj index 9d23f0b8999..36baaf40172 100644 --- a/cs/demo/Ice/value/client.csproj +++ b/cs/demo/Ice/value/client.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/value/server.csproj b/cs/demo/Ice/value/server.csproj index 42f393a6cec..6da04e9e4cf 100644 --- a/cs/demo/Ice/value/server.csproj +++ b/cs/demo/Ice/value/server.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/Ice/wpf/Properties/AssemblyInfo.cs b/cs/demo/Ice/wpf/Properties/AssemblyInfo.cs index 370486c591a..d353507a120 100644 --- a/cs/demo/Ice/wpf/Properties/AssemblyInfo.cs +++ b/cs/demo/Ice/wpf/Properties/AssemblyInfo.cs @@ -60,5 +60,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/demo/Ice/wpf/client.csproj b/cs/demo/Ice/wpf/client.csproj index 0748cc47093..b57436f3493 100644 --- a/cs/demo/Ice/wpf/client.csproj +++ b/cs/demo/Ice/wpf/client.csproj @@ -54,8 +54,8 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> diff --git a/cs/demo/IceBox/hello/client.csproj b/cs/demo/IceBox/hello/client.csproj index 3a630057e3b..965cfbdce2a 100644 --- a/cs/demo/IceBox/hello/client.csproj +++ b/cs/demo/IceBox/hello/client.csproj @@ -79,13 +79,13 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceBox, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceBox, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/IceBox/hello/config.service b/cs/demo/IceBox/hello/config.service index fc5155105b6..7549fb608af 100644 --- a/cs/demo/IceBox/hello/config.service +++ b/cs/demo/IceBox/hello/config.service @@ -30,7 +30,7 @@ Ice.Warn.Connections=1 # # SSL plug-in configuration # -Ice.Plugin.IceSSL="IceSSL,Version=3.5.1.0":IceSSL.PluginFactory +Ice.Plugin.IceSSL="IceSSL,Version=3.6.51.0":IceSSL.PluginFactory IceSSL.DefaultDir=../../../../certs IceSSL.CertAuthFile=cacert.pem IceSSL.CertFile=s_rsa1024.pfx diff --git a/cs/demo/IceBox/hello/helloservice.csproj b/cs/demo/IceBox/hello/helloservice.csproj index d3b6419d655..f38b8c9a31a 100644 --- a/cs/demo/IceBox/hello/helloservice.csproj +++ b/cs/demo/IceBox/hello/helloservice.csproj @@ -79,9 +79,9 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> - <Reference Include="IceBox, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="IceBox, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System"> <Name>System</Name> </Reference> diff --git a/cs/demo/IceDiscovery/hello/client.csproj b/cs/demo/IceDiscovery/hello/client.csproj index 4b29c3acbbd..7ae05e4093f 100644 --- a/cs/demo/IceDiscovery/hello/client.csproj +++ b/cs/demo/IceDiscovery/hello/client.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL"> <Private>False</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/IceDiscovery/hello/server.csproj b/cs/demo/IceDiscovery/hello/server.csproj index 595c4894c51..8157420c526 100644 --- a/cs/demo/IceDiscovery/hello/server.csproj +++ b/cs/demo/IceDiscovery/hello/server.csproj @@ -81,7 +81,7 @@ <UseVSHostingProcess>true</UseVSHostingProcess> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL"> <Private>False</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/IceDiscovery/replication/client.csproj b/cs/demo/IceDiscovery/replication/client.csproj index 81216b99324..56bb643ad23 100644 --- a/cs/demo/IceDiscovery/replication/client.csproj +++ b/cs/demo/IceDiscovery/replication/client.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL"> <Private>False</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/IceDiscovery/replication/server.csproj b/cs/demo/IceDiscovery/replication/server.csproj index ec38a3cba3c..1e3ebbe752e 100644 --- a/cs/demo/IceDiscovery/replication/server.csproj +++ b/cs/demo/IceDiscovery/replication/server.csproj @@ -81,7 +81,7 @@ <UseVSHostingProcess>true</UseVSHostingProcess> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL"> <Private>False</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/IceGrid/icebox/client.csproj b/cs/demo/IceGrid/icebox/client.csproj index e277b3ab2c8..c2a726aaa58 100644 --- a/cs/demo/IceGrid/icebox/client.csproj +++ b/cs/demo/IceGrid/icebox/client.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/IceGrid/icebox/helloservice.csproj b/cs/demo/IceGrid/icebox/helloservice.csproj index 06ce4f53786..2ae27f50e9e 100644 --- a/cs/demo/IceGrid/icebox/helloservice.csproj +++ b/cs/demo/IceGrid/icebox/helloservice.csproj @@ -79,9 +79,9 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> - <Reference Include="IceBox, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="IceBox, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System"> <Name>System</Name> </Reference> diff --git a/cs/demo/IceGrid/simple/client.csproj b/cs/demo/IceGrid/simple/client.csproj index 669c47eb67c..e18f622b43c 100644 --- a/cs/demo/IceGrid/simple/client.csproj +++ b/cs/demo/IceGrid/simple/client.csproj @@ -79,10 +79,10 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceGrid, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceGrid, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/IceGrid/simple/server.csproj b/cs/demo/IceGrid/simple/server.csproj index 6d316cf5ba2..3039c530000 100644 --- a/cs/demo/IceGrid/simple/server.csproj +++ b/cs/demo/IceGrid/simple/server.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/IceStorm/clock/config.icebox b/cs/demo/IceStorm/clock/config.icebox index 397a8c44cb6..c260c69f67c 100644 --- a/cs/demo/IceStorm/clock/config.icebox +++ b/cs/demo/IceStorm/clock/config.icebox @@ -11,7 +11,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998 -h localhost # The IceStorm service. The service is configured using a separate # configuration file (see config.service). # -IceBox.Service.IceStorm=IceStormService,35:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,36:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions diff --git a/cs/demo/IceStorm/clock/publisher.csproj b/cs/demo/IceStorm/clock/publisher.csproj index 5a6533d1a65..73bfdad366f 100644 --- a/cs/demo/IceStorm/clock/publisher.csproj +++ b/cs/demo/IceStorm/clock/publisher.csproj @@ -79,10 +79,10 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceStorm, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceStorm, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/IceStorm/clock/subscriber.csproj b/cs/demo/IceStorm/clock/subscriber.csproj index 0cc6d4beb44..6f316dd4a71 100644 --- a/cs/demo/IceStorm/clock/subscriber.csproj +++ b/cs/demo/IceStorm/clock/subscriber.csproj @@ -79,10 +79,10 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceStorm, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceStorm, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/book/lifecycle/client.csproj b/cs/demo/book/lifecycle/client.csproj index 632a411c5dd..3fa8a2a95d8 100644 --- a/cs/demo/book/lifecycle/client.csproj +++ b/cs/demo/book/lifecycle/client.csproj @@ -37,7 +37,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System" /> diff --git a/cs/demo/book/lifecycle/server.csproj b/cs/demo/book/lifecycle/server.csproj index b7f4c46fa53..65e428eab2b 100644 --- a/cs/demo/book/lifecycle/server.csproj +++ b/cs/demo/book/lifecycle/server.csproj @@ -37,7 +37,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System" /> diff --git a/cs/demo/book/printer/client.csproj b/cs/demo/book/printer/client.csproj index d3e10786e3e..ec424293c10 100644 --- a/cs/demo/book/printer/client.csproj +++ b/cs/demo/book/printer/client.csproj @@ -37,7 +37,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System" /> diff --git a/cs/demo/book/printer/server.csproj b/cs/demo/book/printer/server.csproj index 6adc12ccbab..c67b15270db 100644 --- a/cs/demo/book/printer/server.csproj +++ b/cs/demo/book/printer/server.csproj @@ -37,7 +37,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System" /> diff --git a/cs/demo/book/simple_filesystem/client.csproj b/cs/demo/book/simple_filesystem/client.csproj index eaf3e99725e..c14043f0279 100644 --- a/cs/demo/book/simple_filesystem/client.csproj +++ b/cs/demo/book/simple_filesystem/client.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/demo/book/simple_filesystem/server.csproj b/cs/demo/book/simple_filesystem/server.csproj index 02b16d07a49..253e87d0363 100644 --- a/cs/demo/book/simple_filesystem/server.csproj +++ b/cs/demo/book/simple_filesystem/server.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/cs/lib/pkgconfig/Glacier2.pc b/cs/lib/pkgconfig/Glacier2.pc index 6e886b7cc2b..f88cd8a1301 100644 --- a/cs/lib/pkgconfig/Glacier2.pc +++ b/cs/lib/pkgconfig/Glacier2.pc @@ -1,4 +1,4 @@ -version = 3.5.1 +version = 3.6.51 mono_root = /usr name = Glacier2 diff --git a/cs/lib/pkgconfig/Ice.pc b/cs/lib/pkgconfig/Ice.pc index d113d80c72d..94078bb4f16 100644 --- a/cs/lib/pkgconfig/Ice.pc +++ b/cs/lib/pkgconfig/Ice.pc @@ -1,4 +1,4 @@ -version = 3.5.1 +version = 3.6.51 mono_root = /usr name = Ice diff --git a/cs/lib/pkgconfig/IceBox.pc b/cs/lib/pkgconfig/IceBox.pc index 687f531a61a..e9241e46fe4 100644 --- a/cs/lib/pkgconfig/IceBox.pc +++ b/cs/lib/pkgconfig/IceBox.pc @@ -1,4 +1,4 @@ -version = 3.5.1 +version = 3.6.51 mono_root = /usr name = IceBox diff --git a/cs/lib/pkgconfig/IceGrid.pc b/cs/lib/pkgconfig/IceGrid.pc index 8c5c39ebc22..5bf0eb81cf5 100644 --- a/cs/lib/pkgconfig/IceGrid.pc +++ b/cs/lib/pkgconfig/IceGrid.pc @@ -1,4 +1,4 @@ -version = 3.5.1 +version = 3.6.51 mono_root = /usr name = IceGrid diff --git a/cs/lib/pkgconfig/IcePatch2.pc b/cs/lib/pkgconfig/IcePatch2.pc index 0cc55fc4b61..d63d888adce 100644 --- a/cs/lib/pkgconfig/IcePatch2.pc +++ b/cs/lib/pkgconfig/IcePatch2.pc @@ -1,4 +1,4 @@ -version = 3.5.1 +version = 3.6.51 mono_root = /usr name = IcePatch2 diff --git a/cs/lib/pkgconfig/IceStorm.pc b/cs/lib/pkgconfig/IceStorm.pc index a7ca539eea2..ed7b4003fe1 100644 --- a/cs/lib/pkgconfig/IceStorm.pc +++ b/cs/lib/pkgconfig/IceStorm.pc @@ -1,4 +1,4 @@ -version = 3.5.1 +version = 3.6.51 mono_root = /usr name = IceStorm diff --git a/cs/src/Glacier2/AssemblyInfo.cs b/cs/src/Glacier2/AssemblyInfo.cs index 495898bc7a3..5579be6c5f2 100644 --- a/cs/src/Glacier2/AssemblyInfo.cs +++ b/cs/src/Glacier2/AssemblyInfo.cs @@ -22,7 +22,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright (c) 2003-2014 ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/cs/src/Ice/AssemblyInfo.cs b/cs/src/Ice/AssemblyInfo.cs index 4ec3967c82c..e2297975ba4 100644 --- a/cs/src/Ice/AssemblyInfo.cs +++ b/cs/src/Ice/AssemblyInfo.cs @@ -22,7 +22,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright (c) 2003-2014 ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/cs/src/Ice/Util.cs b/cs/src/Ice/Util.cs index 57aeee49574..b8c45d296dd 100644 --- a/cs/src/Ice/Util.cs +++ b/cs/src/Ice/Util.cs @@ -550,7 +550,7 @@ namespace Ice /// <returns>The Ice version.</returns> public static string stringVersion() { - return "3.5.1"; // "A.B.C", with A=major, B=minor, C=patch + return "3.6.51"; // "A.B.C", with A=major, B=minor, C=patch } /// <summary> @@ -561,7 +561,7 @@ namespace Ice /// <returns>The Ice version.</returns> public static int intVersion() { - return 30501; // AABBCC, with AA=major, BB=minor, CC=patch + return 30651; // AABBCC, with AA=major, BB=minor, CC=patch } /// <summary> diff --git a/cs/src/IceBox/AssemblyInfo.cs b/cs/src/IceBox/AssemblyInfo.cs index 321b755b682..cc83168a410 100644 --- a/cs/src/IceBox/AssemblyInfo.cs +++ b/cs/src/IceBox/AssemblyInfo.cs @@ -22,7 +22,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright (c) 2003-2014 ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/cs/src/IceBox/AssemblyInfoExe.cs b/cs/src/IceBox/AssemblyInfoExe.cs index 7f9889f2cea..6a34127a234 100644 --- a/cs/src/IceBox/AssemblyInfoExe.cs +++ b/cs/src/IceBox/AssemblyInfoExe.cs @@ -22,7 +22,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright (c) 2003-2014 ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/cs/src/IceBox/Makefile.mak b/cs/src/IceBox/Makefile.mak index 3e462287cda..30f8fbc8ac4 100644 --- a/cs/src/IceBox/Makefile.mak +++ b/cs/src/IceBox/Makefile.mak @@ -76,11 +76,11 @@ iceboxnetconfig: <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <dependentAssembly> <assemblyIdentity name="Ice" culture="neutral" publicKeyToken="$(publicKeyToken)"/> - <codeBase version="3.5.1.0" href="$(assembliesRelativeDir)\Ice.dll"/> + <codeBase version="3.6.51.0" href="$(assembliesRelativeDir)\Ice.dll"/> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="IceBox" culture="neutral" publicKeyToken="$(publicKeyToken)"/> - <codeBase version="3.5.1.0" href="$(assembliesRelativeDir)\IceBox.dll"/> + <codeBase version="3.6.51.0" href="$(assembliesRelativeDir)\IceBox.dll"/> </dependentAssembly> <!-- This allows iceboxnet to load the IceSSL plug-in using a strong name. We omit the @@ -89,7 +89,7 @@ iceboxnetconfig: --> <dependentAssembly> <assemblyIdentity name="IceSSL"/> - <codeBase version="3.5.1.0" href="$(assembliesRelativeDir)\IceSSL.dll"/> + <codeBase version="3.6.51.0" href="$(assembliesRelativeDir)\IceSSL.dll"/> </dependentAssembly> </assemblyBinding> </runtime> diff --git a/cs/src/IceGrid/AssemblyInfo.cs b/cs/src/IceGrid/AssemblyInfo.cs index b4e3bebb611..b62c9fc1fa0 100644 --- a/cs/src/IceGrid/AssemblyInfo.cs +++ b/cs/src/IceGrid/AssemblyInfo.cs @@ -22,7 +22,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright (c) 2003-2014 ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/cs/src/IcePatch2/AssemblyInfo.cs b/cs/src/IcePatch2/AssemblyInfo.cs index a7fc6bfb6f3..7dbad335cb8 100644 --- a/cs/src/IcePatch2/AssemblyInfo.cs +++ b/cs/src/IcePatch2/AssemblyInfo.cs @@ -22,7 +22,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright (c) 2003-2014 ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/cs/src/IceSSL/AssemblyInfo.cs b/cs/src/IceSSL/AssemblyInfo.cs index d11c68cd821..c85810fafe2 100644 --- a/cs/src/IceSSL/AssemblyInfo.cs +++ b/cs/src/IceSSL/AssemblyInfo.cs @@ -22,7 +22,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright (c) 2003-2014 ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/cs/src/IceStorm/AssemblyInfo.cs b/cs/src/IceStorm/AssemblyInfo.cs index 25aa2f79874..a9305d71bd2 100644 --- a/cs/src/IceStorm/AssemblyInfo.cs +++ b/cs/src/IceStorm/AssemblyInfo.cs @@ -22,7 +22,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright (c) 2003-2014 ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/cs/src/PolicyServer/AssemblyInfo.cs b/cs/src/PolicyServer/AssemblyInfo.cs index 99608efcf60..d294bb182b1 100644 --- a/cs/src/PolicyServer/AssemblyInfo.cs +++ b/cs/src/PolicyServer/AssemblyInfo.cs @@ -22,7 +22,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright © 2012-2014 ZeroC, Inc.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] [assembly: ComVisible(false)] [assembly: Guid("ddd45a23-8a57-4389-aad4-401a2ae2a7fa")] diff --git a/cs/test/Ice/adapterDeactivation/Properties/AssemblyInfo.cs b/cs/test/Ice/adapterDeactivation/Properties/AssemblyInfo.cs index 4465f89ac51..bf68682ba7c 100644 --- a/cs/test/Ice/adapterDeactivation/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/adapterDeactivation/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/adapterDeactivation/adapterDeactivation.csproj b/cs/test/Ice/adapterDeactivation/adapterDeactivation.csproj index 860bc158599..cdb6f71671c 100644 --- a/cs/test/Ice/adapterDeactivation/adapterDeactivation.csproj +++ b/cs/test/Ice/adapterDeactivation/adapterDeactivation.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/ami/Properties/AssemblyInfo.cs b/cs/test/Ice/ami/Properties/AssemblyInfo.cs index 5621bd6b508..7cc9a72711d 100644 --- a/cs/test/Ice/ami/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/ami/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/ami/ami.csproj b/cs/test/Ice/ami/ami.csproj index d39c68cc706..7f7afdb7b56 100644 --- a/cs/test/Ice/ami/ami.csproj +++ b/cs/test/Ice/ami/ami.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/binding/Properties/AssemblyInfo.cs b/cs/test/Ice/binding/Properties/AssemblyInfo.cs index c3f5c2a5eca..c99491f0260 100644 --- a/cs/test/Ice/binding/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/binding/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/binding/binding.csproj b/cs/test/Ice/binding/binding.csproj index 239c7dcb48d..e43d45c5b5a 100644 --- a/cs/test/Ice/binding/binding.csproj +++ b/cs/test/Ice/binding/binding.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/defaultServant/Properties/AssemblyInfo.cs b/cs/test/Ice/defaultServant/Properties/AssemblyInfo.cs index be79bb255db..dde3756bb06 100644 --- a/cs/test/Ice/defaultServant/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/defaultServant/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/defaultValue/Properties/AssemblyInfo.cs b/cs/test/Ice/defaultValue/Properties/AssemblyInfo.cs index be79bb255db..dde3756bb06 100644 --- a/cs/test/Ice/defaultValue/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/defaultValue/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/defaultValue/defaultValue.csproj b/cs/test/Ice/defaultValue/defaultValue.csproj index 9f8d07bd5b2..91160a285ae 100644 --- a/cs/test/Ice/defaultValue/defaultValue.csproj +++ b/cs/test/Ice/defaultValue/defaultValue.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/dictMapping/Properties/AssemblyInfo.cs b/cs/test/Ice/dictMapping/Properties/AssemblyInfo.cs index 1c0d205e49f..c9e8b95d67e 100644 --- a/cs/test/Ice/dictMapping/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/dictMapping/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/dictMapping/dictMapping.csproj b/cs/test/Ice/dictMapping/dictMapping.csproj index 6eb202c9305..2bda502e407 100644 --- a/cs/test/Ice/dictMapping/dictMapping.csproj +++ b/cs/test/Ice/dictMapping/dictMapping.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/dispatcher/Properties/AssemblyInfo.cs b/cs/test/Ice/dispatcher/Properties/AssemblyInfo.cs index 51ab08d5edc..1521c6ec043 100644 --- a/cs/test/Ice/dispatcher/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/dispatcher/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/dispatcher/dispatcher.csproj b/cs/test/Ice/dispatcher/dispatcher.csproj index b4d8e6999ae..1b44fa0aba3 100644 --- a/cs/test/Ice/dispatcher/dispatcher.csproj +++ b/cs/test/Ice/dispatcher/dispatcher.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/enums/Properties/AssemblyInfo.cs b/cs/test/Ice/enums/Properties/AssemblyInfo.cs index ac81e15d7fc..f061bb1a8bb 100644 --- a/cs/test/Ice/enums/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/enums/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/enums/enums.csproj b/cs/test/Ice/enums/enums.csproj index 3e4f1121ae3..004a44a5efc 100644 --- a/cs/test/Ice/enums/enums.csproj +++ b/cs/test/Ice/enums/enums.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/exceptions/Properties/AssemblyInfo.cs b/cs/test/Ice/exceptions/Properties/AssemblyInfo.cs index a1fd46fe959..ef0d4523133 100644 --- a/cs/test/Ice/exceptions/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/exceptions/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/exceptions/exceptions.csproj b/cs/test/Ice/exceptions/exceptions.csproj index 726a29bdb0f..87eb087de6b 100644 --- a/cs/test/Ice/exceptions/exceptions.csproj +++ b/cs/test/Ice/exceptions/exceptions.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/facets/Properties/AssemblyInfo.cs b/cs/test/Ice/facets/Properties/AssemblyInfo.cs index 6a2dadf73d0..d9125425912 100644 --- a/cs/test/Ice/facets/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/facets/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/facets/facets.csproj b/cs/test/Ice/facets/facets.csproj index b0bac28aad1..fcb08bcaa15 100644 --- a/cs/test/Ice/facets/facets.csproj +++ b/cs/test/Ice/facets/facets.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/faultTolerance/Properties/AssemblyInfo.cs b/cs/test/Ice/faultTolerance/Properties/AssemblyInfo.cs index cb121727362..160bd06be29 100644 --- a/cs/test/Ice/faultTolerance/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/faultTolerance/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/faultTolerance/faultTolerance.csproj b/cs/test/Ice/faultTolerance/faultTolerance.csproj index 85dfb477364..b4a1bf7b34f 100644 --- a/cs/test/Ice/faultTolerance/faultTolerance.csproj +++ b/cs/test/Ice/faultTolerance/faultTolerance.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/hold/Properties/AssemblyInfo.cs b/cs/test/Ice/hold/Properties/AssemblyInfo.cs index 24cf6d2d659..34df18f957c 100644 --- a/cs/test/Ice/hold/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/hold/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/hold/hold.csproj b/cs/test/Ice/hold/hold.csproj index 52fa13b2bbb..6d6b3b1f7a7 100644 --- a/cs/test/Ice/hold/hold.csproj +++ b/cs/test/Ice/hold/hold.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/info/Properties/AssemblyInfo.cs b/cs/test/Ice/info/Properties/AssemblyInfo.cs index b77ad5a949e..d749d467ca1 100644 --- a/cs/test/Ice/info/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/info/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/info/info.csproj b/cs/test/Ice/info/info.csproj index e598ecfc23c..8de0b728847 100644 --- a/cs/test/Ice/info/info.csproj +++ b/cs/test/Ice/info/info.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/inheritance/Properties/AssemblyInfo.cs b/cs/test/Ice/inheritance/Properties/AssemblyInfo.cs index 477bd5975d9..21a9055e05d 100644 --- a/cs/test/Ice/inheritance/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/inheritance/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/inheritance/inheritance.csproj b/cs/test/Ice/inheritance/inheritance.csproj index 2914eefb550..01501bbfe54 100644 --- a/cs/test/Ice/inheritance/inheritance.csproj +++ b/cs/test/Ice/inheritance/inheritance.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/invoke/Properties/AssemblyInfo.cs b/cs/test/Ice/invoke/Properties/AssemblyInfo.cs index cb2fa5441b1..fdbebca3eeb 100644 --- a/cs/test/Ice/invoke/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/invoke/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/invoke/invoke.csproj b/cs/test/Ice/invoke/invoke.csproj index dd4fe13a888..e9d154f9d96 100644 --- a/cs/test/Ice/invoke/invoke.csproj +++ b/cs/test/Ice/invoke/invoke.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/location/Properties/AssemblyInfo.cs b/cs/test/Ice/location/Properties/AssemblyInfo.cs index 3453fbf6314..65fe4cf6522 100644 --- a/cs/test/Ice/location/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/location/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/location/location.csproj b/cs/test/Ice/location/location.csproj index 78c769c94e0..ae6fd8460bd 100644 --- a/cs/test/Ice/location/location.csproj +++ b/cs/test/Ice/location/location.csproj @@ -62,7 +62,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/objects/Properties/AssemblyInfo.cs b/cs/test/Ice/objects/Properties/AssemblyInfo.cs index 43dd6ca1ad6..4f01a20582b 100644 --- a/cs/test/Ice/objects/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/objects/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/objects/objects.csproj b/cs/test/Ice/objects/objects.csproj index 13c207d7ca2..bfd193dc141 100644 --- a/cs/test/Ice/objects/objects.csproj +++ b/cs/test/Ice/objects/objects.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/operations/Properties/AssemblyInfo.cs b/cs/test/Ice/operations/Properties/AssemblyInfo.cs index ea0b87f9845..f4efcb1c916 100644 --- a/cs/test/Ice/operations/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/operations/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/operations/operations.csproj b/cs/test/Ice/operations/operations.csproj index 72531b4c955..7f11d5ceb94 100644 --- a/cs/test/Ice/operations/operations.csproj +++ b/cs/test/Ice/operations/operations.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/optional/Properties/AssemblyInfo.cs b/cs/test/Ice/optional/Properties/AssemblyInfo.cs index 3cdebaa80f1..e23e13cf72e 100644 --- a/cs/test/Ice/optional/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/optional/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/optional/optional.csproj b/cs/test/Ice/optional/optional.csproj index db3f081906b..ef63e17c806 100644 --- a/cs/test/Ice/optional/optional.csproj +++ b/cs/test/Ice/optional/optional.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/proxy/Properties/AssemblyInfo.cs b/cs/test/Ice/proxy/Properties/AssemblyInfo.cs index 5d6b58d5a73..8987f14f3d4 100644 --- a/cs/test/Ice/proxy/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/proxy/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/proxy/proxy.csproj b/cs/test/Ice/proxy/proxy.csproj index 0924c104711..bcf7a01eac6 100644 --- a/cs/test/Ice/proxy/proxy.csproj +++ b/cs/test/Ice/proxy/proxy.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/retry/Properties/AssemblyInfo.cs b/cs/test/Ice/retry/Properties/AssemblyInfo.cs index 3f8486fabc2..64ce503260d 100644 --- a/cs/test/Ice/retry/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/retry/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/retry/retry.csproj b/cs/test/Ice/retry/retry.csproj index 9d7b723d21e..98b5c139bb2 100644 --- a/cs/test/Ice/retry/retry.csproj +++ b/cs/test/Ice/retry/retry.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/seqMapping/Properties/AssemblyInfo.cs b/cs/test/Ice/seqMapping/Properties/AssemblyInfo.cs index 795a09721cb..f387fd3fa94 100644 --- a/cs/test/Ice/seqMapping/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/seqMapping/Properties/AssemblyInfo.cs @@ -33,5 +33,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/seqMapping/seqMapping.csproj b/cs/test/Ice/seqMapping/seqMapping.csproj index ef87773d030..18dc8491ec5 100644 --- a/cs/test/Ice/seqMapping/seqMapping.csproj +++ b/cs/test/Ice/seqMapping/seqMapping.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/serialize/Properties/AssemblyInfo.cs b/cs/test/Ice/serialize/Properties/AssemblyInfo.cs index 4e211b023d2..4ef19eddfc3 100644 --- a/cs/test/Ice/serialize/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/serialize/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/serialize/serialize.csproj b/cs/test/Ice/serialize/serialize.csproj index a2d0af667a4..3f9f6eca5f9 100644 --- a/cs/test/Ice/serialize/serialize.csproj +++ b/cs/test/Ice/serialize/serialize.csproj @@ -62,7 +62,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/servantLocator/Properties/AssemblyInfo.cs b/cs/test/Ice/servantLocator/Properties/AssemblyInfo.cs index bbe4287ff4a..de04d936283 100644 --- a/cs/test/Ice/servantLocator/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/servantLocator/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/servantLocator/servantLocator.csproj b/cs/test/Ice/servantLocator/servantLocator.csproj index 93491f7c5ae..5ef3b65b122 100644 --- a/cs/test/Ice/servantLocator/servantLocator.csproj +++ b/cs/test/Ice/servantLocator/servantLocator.csproj @@ -62,7 +62,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/slicing/exceptions/Properties/AssemblyInfo.cs b/cs/test/Ice/slicing/exceptions/Properties/AssemblyInfo.cs index 46270cfa87c..9b840db3371 100644 --- a/cs/test/Ice/slicing/exceptions/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/slicing/exceptions/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/slicing/exceptions/exceptions.csproj b/cs/test/Ice/slicing/exceptions/exceptions.csproj index 9baf006515c..7246e9b7c1d 100644 --- a/cs/test/Ice/slicing/exceptions/exceptions.csproj +++ b/cs/test/Ice/slicing/exceptions/exceptions.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/slicing/objects/Properties/AssemblyInfo.cs b/cs/test/Ice/slicing/objects/Properties/AssemblyInfo.cs index d41f2ba6f41..58aeedaa23d 100644 --- a/cs/test/Ice/slicing/objects/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/slicing/objects/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/slicing/objects/objects.csproj b/cs/test/Ice/slicing/objects/objects.csproj index 2e3531176af..40c21fccba4 100644 --- a/cs/test/Ice/slicing/objects/objects.csproj +++ b/cs/test/Ice/slicing/objects/objects.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/stream/Properties/AssemblyInfo.cs b/cs/test/Ice/stream/Properties/AssemblyInfo.cs index 3656fbfce90..7e907c0e8f4 100644 --- a/cs/test/Ice/stream/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/stream/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/stream/stream.csproj b/cs/test/Ice/stream/stream.csproj index ca3d4f9114f..93b492af0a3 100644 --- a/cs/test/Ice/stream/stream.csproj +++ b/cs/test/Ice/stream/stream.csproj @@ -62,7 +62,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/Ice/timeout/Properties/AssemblyInfo.cs b/cs/test/Ice/timeout/Properties/AssemblyInfo.cs index 36231802655..668c5da81e3 100644 --- a/cs/test/Ice/timeout/Properties/AssemblyInfo.cs +++ b/cs/test/Ice/timeout/Properties/AssemblyInfo.cs @@ -40,5 +40,5 @@ 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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] diff --git a/cs/test/Ice/timeout/timeout.csproj b/cs/test/Ice/timeout/timeout.csproj index 64a4c92408c..0bd798cff02 100644 --- a/cs/test/Ice/timeout/timeout.csproj +++ b/cs/test/Ice/timeout/timeout.csproj @@ -60,7 +60,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/cs/test/TestCommon/Properties/AssemblyInfo.cs b/cs/test/TestCommon/Properties/AssemblyInfo.cs index 5ddd7bb6a99..cad088623a8 100644 --- a/cs/test/TestCommon/Properties/AssemblyInfo.cs +++ b/cs/test/TestCommon/Properties/AssemblyInfo.cs @@ -40,7 +40,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.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] +[assembly: AssemblyFileVersion("3.6.51")] [assembly: System.CLSCompliant(true)]
\ No newline at end of file diff --git a/cs/test/TestCommon/TestCommon.csproj b/cs/test/TestCommon/TestCommon.csproj index 60f3477a268..7f5cf5fefcf 100644 --- a/cs/test/TestCommon/TestCommon.csproj +++ b/cs/test/TestCommon/TestCommon.csproj @@ -46,7 +46,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="mscorlib" /> <Reference Include="System.Windows" /> <Reference Include="system" /> diff --git a/demoscript/IceStorm/clock.py b/demoscript/IceStorm/clock.py index 48782154c62..2e98bd5deef 100755 --- a/demoscript/IceStorm/clock.py +++ b/demoscript/IceStorm/clock.py @@ -42,7 +42,7 @@ def run(subCmd, pubCmd): print("ok") if Util.defaultHost: - args = ' --IceBox.Service.IceStorm="IceStormService,35:createIceStorm --Ice.Config=config.service %s"' % Util.defaultHost + args = ' --IceBox.Service.IceStorm="IceStormService,36:createIceStorm --Ice.Config=config.service %s"' % Util.defaultHost else: args = '' diff --git a/distribution/bin/makethirdpartiesmsi.py b/distribution/bin/makethirdpartiesmsi.py index c06ef9d6175..535f49de785 100755 --- a/distribution/bin/makethirdpartiesmsi.py +++ b/distribution/bin/makethirdpartiesmsi.py @@ -15,7 +15,7 @@ import textwrap resources = os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), "..", "src", "windows") sys.path.append(resources) -iceVersion = '3.5.1' +iceVersion = '3.6.51' # # Current default third party library versions. diff --git a/distribution/src/common/build.properties b/distribution/src/common/build.properties index dd382ed7a72..24aa249393d 100644 --- a/distribution/src/common/build.properties +++ b/distribution/src/common/build.properties @@ -7,7 +7,7 @@ # # ********************************************************************** -ice.version = 3.5.1 +ice.version = 3.6.51 # # Define debug as on if you want to build with debug information. diff --git a/distribution/src/rpm/ice.spec b/distribution/src/rpm/ice.spec index c5ef1cab26b..0f69d1946b7 100644 --- a/distribution/src/rpm/ice.spec +++ b/distribution/src/rpm/ice.spec @@ -45,7 +45,7 @@ %endif Name: ice -Version: 3.5.1 +Version: 3.6.51 Summary: Files common to all Ice packages Release: 1%{?dist} License: GPL with exceptions @@ -58,8 +58,8 @@ Source1: Ice-rpmbuild-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%define soversion 35 -%define dotnetversion 3.5.1 +%define soversion 36 +%define dotnetversion 3.6.51 %define mmversion 3.5 %define commonversion 1.4.0 diff --git a/distribution/src/windows/docs/thirdparty/README.txt b/distribution/src/windows/docs/thirdparty/README.txt index e440e8a249d..0376c73a0fc 100644 --- a/distribution/src/windows/docs/thirdparty/README.txt +++ b/distribution/src/windows/docs/thirdparty/README.txt @@ -1,9 +1,9 @@ -Ice 3.5.1 Third Party Packages +Ice 3.6.51 Third Party Packages ------------------------------ This distribution contains the development kit (including binaries) -for the open-source packages used by Ice 3.5.1 on Windows. Its primary -purpose is to simplify building Ice 3.5.1 from sources. +for the open-source packages used by Ice 3.6.51 on Windows. Its primary +purpose is to simplify building Ice 3.6.51 from sources. The following versions of the third party software were used to create this package: diff --git a/eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/messages.properties b/eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/messages.properties index 9eff5694428..54af0fcf91c 100644 --- a/eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/messages.properties +++ b/eclipse/java/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/preferences/messages.properties @@ -1 +1 @@ -IceStringVersion=3.5.1 +IceStringVersion=3.6.51 diff --git a/java/bin/icegridgui.deb b/java/bin/icegridgui.deb index b06c0c4188b..1141303b6de 100755 --- a/java/bin/icegridgui.deb +++ b/java/bin/icegridgui.deb @@ -9,4 +9,4 @@ # # ********************************************************************** -exec java -jar /usr/share/java/IceGridGUI-3.5.1.jar $@ +exec java -jar /usr/share/java/IceGridGUI-3.6.51.jar $@ diff --git a/java/config/build.properties b/java/config/build.properties index 5249125ce55..2ff52e07a8d 100644 --- a/java/config/build.properties +++ b/java/config/build.properties @@ -7,7 +7,7 @@ # # ********************************************************************** -ice.version = 3.5.1 +ice.version = 3.6.51 # # Oracle Berkeley DB version, only needed if you want to build diff --git a/java/demo/IceStorm/clock/config.icebox b/java/demo/IceStorm/clock/config.icebox index 22733024a7b..ab01ab72dcd 100644 --- a/java/demo/IceStorm/clock/config.icebox +++ b/java/demo/IceStorm/clock/config.icebox @@ -11,7 +11,7 @@ IceBox.ServiceManager.Endpoints=tcp -h localhost -p 9998 # The IceStorm service. The service is configured using a separate # configuration file (see config.service). # -IceBox.Service.IceStorm=IceStormService,35:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,36:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions diff --git a/java/src/Ice/Util.java b/java/src/Ice/Util.java index e591f4b75af..29d6b76b89d 100644 --- a/java/src/Ice/Util.java +++ b/java/src/Ice/Util.java @@ -575,7 +575,7 @@ public final class Util public static String stringVersion() { - return "3.5.1"; // "A.B.C", with A=major, B=minor, C=patch + return "3.6.51"; // "A.B.C", with A=major, B=minor, C=patch } /** @@ -588,7 +588,7 @@ public final class Util public static int intVersion() { - return 30501; // AABBCC, with AA=major, BB=minor, CC=patch + return 30651; // AABBCC, with AA=major, BB=minor, CC=patch } /** diff --git a/java/src/IceUtil/Version.java b/java/src/IceUtil/Version.java index ca76ae37216..c87a387a222 100644 --- a/java/src/IceUtil/Version.java +++ b/java/src/IceUtil/Version.java @@ -19,6 +19,6 @@ public final class Version // // The Ice version. // - public final static String ICE_STRING_VERSION = "3.5.1"; // "A.B.C", with A=major, B=minor, C=patch - public final static int ICE_INT_VERSION = 30501; // AABBCC, with AA=major, BB=minor, CC=patch + public final static String ICE_STRING_VERSION = "3.6.51"; // "A.B.C", with A=major, B=minor, C=patch + public final static int ICE_INT_VERSION = 30651; // AABBCC, with AA=major, BB=minor, CC=patch } diff --git a/php/src/IcePHP/IcePHP.rc b/php/src/IcePHP/IcePHP.rc index acf87659ddc..de710cc1901 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,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/py/demo/IceStorm/clock/config.icebox b/py/demo/IceStorm/clock/config.icebox index 22733024a7b..ab01ab72dcd 100644 --- a/py/demo/IceStorm/clock/config.icebox +++ b/py/demo/IceStorm/clock/config.icebox @@ -11,7 +11,7 @@ IceBox.ServiceManager.Endpoints=tcp -h localhost -p 9998 # The IceStorm service. The service is configured using a separate # configuration file (see config.service). # -IceBox.Service.IceStorm=IceStormService,35:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,36:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions diff --git a/py/modules/IcePy/IcePy.rc b/py/modules/IcePy/IcePy.rc index 953cbb5102f..4f038077605 100644 --- a/py/modules/IcePy/IcePy.rc +++ b/py/modules/IcePy/IcePy.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1,0 - PRODUCTVERSION 3,5,1,0 + FILEVERSION 3,6,51,0 + PRODUCTVERSION 3,6,51,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.5.1\0" + VALUE "FileVersion", "3.6.51\0" VALUE "InternalName", INTERNALNAME VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", ORIGINALFILENAME VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.5.1\0" + VALUE "ProductVersion", "3.6.51\0" END END BLOCK "VarFileInfo" diff --git a/vb/demo/Glacier2/callback/client.vbproj b/vb/demo/Glacier2/callback/client.vbproj index 81860a072e6..571f5ab1396 100644 --- a/vb/demo/Glacier2/callback/client.vbproj +++ b/vb/demo/Glacier2/callback/client.vbproj @@ -73,13 +73,13 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Glacier2, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Glacier2, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Glacier2/callback/server.vbproj b/vb/demo/Glacier2/callback/server.vbproj index 94f3359dec9..47b32bf0120 100644 --- a/vb/demo/Glacier2/callback/server.vbproj +++ b/vb/demo/Glacier2/callback/server.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Glacier2/callback/slice.csproj b/vb/demo/Glacier2/callback/slice.csproj index 450d386c886..dc8f47b2575 100644 --- a/vb/demo/Glacier2/callback/slice.csproj +++ b/vb/demo/Glacier2/callback/slice.csproj @@ -35,7 +35,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> diff --git a/vb/demo/Ice/async/client.vbproj b/vb/demo/Ice/async/client.vbproj index 1f20c97733e..dddb88a0be9 100644 --- a/vb/demo/Ice/async/client.vbproj +++ b/vb/demo/Ice/async/client.vbproj @@ -74,7 +74,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Ice/async/server.vbproj b/vb/demo/Ice/async/server.vbproj index fb2c94d5038..1c9cf217f7d 100644 --- a/vb/demo/Ice/async/server.vbproj +++ b/vb/demo/Ice/async/server.vbproj @@ -74,7 +74,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Ice/async/slice.csproj b/vb/demo/Ice/async/slice.csproj index b23a42922a8..395c8a3d598 100644 --- a/vb/demo/Ice/async/slice.csproj +++ b/vb/demo/Ice/async/slice.csproj @@ -35,7 +35,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> diff --git a/vb/demo/Ice/bidir/client.vbproj b/vb/demo/Ice/bidir/client.vbproj index c0da25121a5..18edad425ca 100644 --- a/vb/demo/Ice/bidir/client.vbproj +++ b/vb/demo/Ice/bidir/client.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Ice/bidir/server.vbproj b/vb/demo/Ice/bidir/server.vbproj index 63e06aa08ba..8a2c8c227cd 100644 --- a/vb/demo/Ice/bidir/server.vbproj +++ b/vb/demo/Ice/bidir/server.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Ice/bidir/slice.csproj b/vb/demo/Ice/bidir/slice.csproj index de1aac9290b..50eab5c56bd 100644 --- a/vb/demo/Ice/bidir/slice.csproj +++ b/vb/demo/Ice/bidir/slice.csproj @@ -49,7 +49,7 @@ </PostBuildEvent> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> diff --git a/vb/demo/Ice/callback/client.vbproj b/vb/demo/Ice/callback/client.vbproj index 27f3f299ad3..114346c73a9 100644 --- a/vb/demo/Ice/callback/client.vbproj +++ b/vb/demo/Ice/callback/client.vbproj @@ -74,10 +74,10 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Ice/callback/server.vbproj b/vb/demo/Ice/callback/server.vbproj index 46dc6b93f69..22976f26c4b 100644 --- a/vb/demo/Ice/callback/server.vbproj +++ b/vb/demo/Ice/callback/server.vbproj @@ -74,10 +74,10 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Ice/callback/slice.csproj b/vb/demo/Ice/callback/slice.csproj index 0ed3f765cc5..f21fca329fe 100644 --- a/vb/demo/Ice/callback/slice.csproj +++ b/vb/demo/Ice/callback/slice.csproj @@ -35,7 +35,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> diff --git a/vb/demo/Ice/hello/client.vbproj b/vb/demo/Ice/hello/client.vbproj index 21c4fc76cff..2c6798ec443 100644 --- a/vb/demo/Ice/hello/client.vbproj +++ b/vb/demo/Ice/hello/client.vbproj @@ -74,10 +74,10 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Ice/hello/server.vbproj b/vb/demo/Ice/hello/server.vbproj index 0485bdebc9a..16f2682fa32 100644 --- a/vb/demo/Ice/hello/server.vbproj +++ b/vb/demo/Ice/hello/server.vbproj @@ -74,10 +74,10 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Ice/hello/slice.csproj b/vb/demo/Ice/hello/slice.csproj index ba10a400f4a..c1d05693018 100644 --- a/vb/demo/Ice/hello/slice.csproj +++ b/vb/demo/Ice/hello/slice.csproj @@ -35,8 +35,8 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> diff --git a/vb/demo/Ice/invoke/client.vbproj b/vb/demo/Ice/invoke/client.vbproj index e205604a8f8..1b2677eefd6 100644 --- a/vb/demo/Ice/invoke/client.vbproj +++ b/vb/demo/Ice/invoke/client.vbproj @@ -74,7 +74,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Ice/invoke/server.vbproj b/vb/demo/Ice/invoke/server.vbproj index 91c9aeef8d0..3dec1dd6fdc 100644 --- a/vb/demo/Ice/invoke/server.vbproj +++ b/vb/demo/Ice/invoke/server.vbproj @@ -74,7 +74,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Ice/invoke/slice.csproj b/vb/demo/Ice/invoke/slice.csproj index 2bf0cc38dd1..5dbd0943d9b 100644 --- a/vb/demo/Ice/invoke/slice.csproj +++ b/vb/demo/Ice/invoke/slice.csproj @@ -35,7 +35,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> diff --git a/vb/demo/Ice/latency/client.vbproj b/vb/demo/Ice/latency/client.vbproj index 7d36641e24f..992152636a2 100644 --- a/vb/demo/Ice/latency/client.vbproj +++ b/vb/demo/Ice/latency/client.vbproj @@ -74,7 +74,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Ice/latency/server.vbproj b/vb/demo/Ice/latency/server.vbproj index 66b91252dbd..1d4ef2547d3 100644 --- a/vb/demo/Ice/latency/server.vbproj +++ b/vb/demo/Ice/latency/server.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Ice/latency/slice.csproj b/vb/demo/Ice/latency/slice.csproj index 163a34c676e..5cea2e834dd 100644 --- a/vb/demo/Ice/latency/slice.csproj +++ b/vb/demo/Ice/latency/slice.csproj @@ -35,7 +35,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> diff --git a/vb/demo/Ice/minimal/client.vbproj b/vb/demo/Ice/minimal/client.vbproj index 59211182ebb..74ac812d722 100644 --- a/vb/demo/Ice/minimal/client.vbproj +++ b/vb/demo/Ice/minimal/client.vbproj @@ -74,7 +74,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Ice/minimal/server.vbproj b/vb/demo/Ice/minimal/server.vbproj index 17203bfff6b..28370cfe16c 100644 --- a/vb/demo/Ice/minimal/server.vbproj +++ b/vb/demo/Ice/minimal/server.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Ice/minimal/slice.csproj b/vb/demo/Ice/minimal/slice.csproj index 67eb6a83bb5..2945d8aae1a 100644 --- a/vb/demo/Ice/minimal/slice.csproj +++ b/vb/demo/Ice/minimal/slice.csproj @@ -35,7 +35,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> diff --git a/vb/demo/Ice/nested/client.vbproj b/vb/demo/Ice/nested/client.vbproj index 9f9139fd110..2f55c5eb714 100644 --- a/vb/demo/Ice/nested/client.vbproj +++ b/vb/demo/Ice/nested/client.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Ice/nested/server.vbproj b/vb/demo/Ice/nested/server.vbproj index 031869607a2..1ec3ecaddff 100644 --- a/vb/demo/Ice/nested/server.vbproj +++ b/vb/demo/Ice/nested/server.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Ice/nested/slice.csproj b/vb/demo/Ice/nested/slice.csproj index f2d5b0089ac..31764052207 100644 --- a/vb/demo/Ice/nested/slice.csproj +++ b/vb/demo/Ice/nested/slice.csproj @@ -35,7 +35,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> diff --git a/vb/demo/Ice/session/client.vbproj b/vb/demo/Ice/session/client.vbproj index 3ec279d6593..ce8c7b114e4 100644 --- a/vb/demo/Ice/session/client.vbproj +++ b/vb/demo/Ice/session/client.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Ice/session/server.vbproj b/vb/demo/Ice/session/server.vbproj index 581208a30a1..e5ce91c4c81 100644 --- a/vb/demo/Ice/session/server.vbproj +++ b/vb/demo/Ice/session/server.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Ice/session/slice.csproj b/vb/demo/Ice/session/slice.csproj index 7fa84e0b862..f8e45ca2828 100644 --- a/vb/demo/Ice/session/slice.csproj +++ b/vb/demo/Ice/session/slice.csproj @@ -35,7 +35,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> diff --git a/vb/demo/Ice/throughput/client.vbproj b/vb/demo/Ice/throughput/client.vbproj index 739f9f672c1..89ebe64c71c 100644 --- a/vb/demo/Ice/throughput/client.vbproj +++ b/vb/demo/Ice/throughput/client.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Ice/throughput/server.vbproj b/vb/demo/Ice/throughput/server.vbproj index 301494e201c..f01d65b8dc2 100644 --- a/vb/demo/Ice/throughput/server.vbproj +++ b/vb/demo/Ice/throughput/server.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Ice/throughput/slice.csproj b/vb/demo/Ice/throughput/slice.csproj index 4c42cf2951e..0526bed8098 100644 --- a/vb/demo/Ice/throughput/slice.csproj +++ b/vb/demo/Ice/throughput/slice.csproj @@ -35,7 +35,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> diff --git a/vb/demo/Ice/value/client.vbproj b/vb/demo/Ice/value/client.vbproj index 93220179376..83d30021f0f 100644 --- a/vb/demo/Ice/value/client.vbproj +++ b/vb/demo/Ice/value/client.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Ice/value/server.vbproj b/vb/demo/Ice/value/server.vbproj index c07441a8d0d..7c8dd8a7d2b 100644 --- a/vb/demo/Ice/value/server.vbproj +++ b/vb/demo/Ice/value/server.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/Ice/value/slice.csproj b/vb/demo/Ice/value/slice.csproj index ce834ec7b06..5a1166b46c5 100644 --- a/vb/demo/Ice/value/slice.csproj +++ b/vb/demo/Ice/value/slice.csproj @@ -35,7 +35,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> diff --git a/vb/demo/IceBox/hello/client.vbproj b/vb/demo/IceBox/hello/client.vbproj index 28f5a040f05..540ccec9fd4 100644 --- a/vb/demo/IceBox/hello/client.vbproj +++ b/vb/demo/IceBox/hello/client.vbproj @@ -74,10 +74,10 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/IceBox/hello/config.service b/vb/demo/IceBox/hello/config.service index 25d7d0d79a2..0cb162cddd3 100644 --- a/vb/demo/IceBox/hello/config.service +++ b/vb/demo/IceBox/hello/config.service @@ -31,7 +31,7 @@ Ice.Warn.Connections=1 # # SSL plug-in configuration # -Ice.Plugin.IceSSL="IceSSL,Version=3.5.1.0":IceSSL.PluginFactory +Ice.Plugin.IceSSL="IceSSL,Version=3.6.51.0":IceSSL.PluginFactory IceSSL.DefaultDir=../../../../certs IceSSL.ImportCert.CurrentUser.Root=cacert.pem IceSSL.CertFile=s_rsa1024.pfx diff --git a/vb/demo/IceBox/hello/helloservice.vbproj b/vb/demo/IceBox/hello/helloservice.vbproj index d02544648d8..e7a38cc9916 100644 --- a/vb/demo/IceBox/hello/helloservice.vbproj +++ b/vb/demo/IceBox/hello/helloservice.vbproj @@ -73,11 +73,11 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> - <Reference Include="IceBox, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="IceBox, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> </Reference> - <Reference Include="IceSSL, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="IceSSL, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System"> <Name>System</Name> </Reference> diff --git a/vb/demo/IceBox/hello/slice.csproj b/vb/demo/IceBox/hello/slice.csproj index 357a57e31f0..7923769a0b3 100644 --- a/vb/demo/IceBox/hello/slice.csproj +++ b/vb/demo/IceBox/hello/slice.csproj @@ -35,7 +35,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> diff --git a/vb/demo/IceGrid/simple/client.vbproj b/vb/demo/IceGrid/simple/client.vbproj index 47c169f1eb3..8beab6ff88b 100644 --- a/vb/demo/IceGrid/simple/client.vbproj +++ b/vb/demo/IceGrid/simple/client.vbproj @@ -74,10 +74,10 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceGrid, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceGrid, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/IceGrid/simple/server.vbproj b/vb/demo/IceGrid/simple/server.vbproj index 49f63e87969..5a57a5544b0 100644 --- a/vb/demo/IceGrid/simple/server.vbproj +++ b/vb/demo/IceGrid/simple/server.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/IceGrid/simple/slice.csproj b/vb/demo/IceGrid/simple/slice.csproj index b761de53356..f926be788a7 100644 --- a/vb/demo/IceGrid/simple/slice.csproj +++ b/vb/demo/IceGrid/simple/slice.csproj @@ -35,7 +35,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> diff --git a/vb/demo/IceStorm/clock/config.icebox b/vb/demo/IceStorm/clock/config.icebox index b02967a9479..1314160556f 100644 --- a/vb/demo/IceStorm/clock/config.icebox +++ b/vb/demo/IceStorm/clock/config.icebox @@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -h localhost -p 9998 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,35:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,36:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions diff --git a/vb/demo/IceStorm/clock/publisher.vbproj b/vb/demo/IceStorm/clock/publisher.vbproj index 7d3f3b3825c..ddc300a31c3 100644 --- a/vb/demo/IceStorm/clock/publisher.vbproj +++ b/vb/demo/IceStorm/clock/publisher.vbproj @@ -73,10 +73,10 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceStorm, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceStorm, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/IceStorm/clock/slice.csproj b/vb/demo/IceStorm/clock/slice.csproj index 27c2a10f2b6..b461b9410bd 100644 --- a/vb/demo/IceStorm/clock/slice.csproj +++ b/vb/demo/IceStorm/clock/slice.csproj @@ -35,7 +35,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> diff --git a/vb/demo/IceStorm/clock/subscriber.vbproj b/vb/demo/IceStorm/clock/subscriber.vbproj index 704309a86a6..e07e84d3b54 100644 --- a/vb/demo/IceStorm/clock/subscriber.vbproj +++ b/vb/demo/IceStorm/clock/subscriber.vbproj @@ -88,10 +88,10 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> - <Reference Include="IceStorm, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="IceStorm, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/book/printer/client.vbproj b/vb/demo/book/printer/client.vbproj index 36bff64d956..99a8b181ea8 100644 --- a/vb/demo/book/printer/client.vbproj +++ b/vb/demo/book/printer/client.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System"> <Name>System</Name> </Reference> diff --git a/vb/demo/book/printer/server.vbproj b/vb/demo/book/printer/server.vbproj index 73354bab1a6..a754342cc1c 100644 --- a/vb/demo/book/printer/server.vbproj +++ b/vb/demo/book/printer/server.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/book/printer/slice.csproj b/vb/demo/book/printer/slice.csproj index e5a4cf9ecae..8e4174b4f65 100644 --- a/vb/demo/book/printer/slice.csproj +++ b/vb/demo/book/printer/slice.csproj @@ -35,7 +35,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> diff --git a/vb/demo/book/simple_filesystem/client.vbproj b/vb/demo/book/simple_filesystem/client.vbproj index db8a21c2bbe..22cd703d056 100644 --- a/vb/demo/book/simple_filesystem/client.vbproj +++ b/vb/demo/book/simple_filesystem/client.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/book/simple_filesystem/server.vbproj b/vb/demo/book/simple_filesystem/server.vbproj index 022b2b6d8f2..c301baaf9bd 100644 --- a/vb/demo/book/simple_filesystem/server.vbproj +++ b/vb/demo/book/simple_filesystem/server.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL"> <Private>True</Private> </Reference> <Reference Include="System"> diff --git a/vb/demo/book/simple_filesystem/slice.csproj b/vb/demo/book/simple_filesystem/slice.csproj index d2fc6fd6c78..0856824e88c 100644 --- a/vb/demo/book/simple_filesystem/slice.csproj +++ b/vb/demo/book/simple_filesystem/slice.csproj @@ -35,7 +35,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Ice, Version=3.5.1.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> + <Reference Include="Ice, Version=3.6.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> diff --git a/vsaddin/config/Ice.props b/vsaddin/config/Ice.props index 1509d763474..a8c65dba28d 100644 --- a/vsaddin/config/Ice.props +++ b/vsaddin/config/Ice.props @@ -2,7 +2,7 @@ <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Condition="!Exists('$(IceSourceHome)')"> - <IceHome>$(Registry:HKEY_LOCAL_MACHINE\Software\ZeroC\Ice 3.5.1@InstallDir)</IceHome> + <IceHome>$(Registry:HKEY_LOCAL_MACHINE\Software\ZeroC\Ice 3.6.51@InstallDir)</IceHome> <IceInclude>$(IceHome)\include</IceInclude> </PropertyGroup> diff --git a/vsaddin/src/AssemblyInfo.cs b/vsaddin/src/AssemblyInfo.cs index b2be9148b93..616ceb0cdc6 100644 --- a/vsaddin/src/AssemblyInfo.cs +++ b/vsaddin/src/AssemblyInfo.cs @@ -21,7 +21,7 @@ using System.Resources; [assembly: AssemblyCopyright("Copyright (c) 2003-2014 ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.5.1")] +[assembly: AssemblyVersion("3.6.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] [assembly: NeutralResourcesLanguageAttribute("en-US")] |