diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-10-23 15:03:49 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-10-23 15:03:49 -0400 |
| commit | ef571f80c545d30a5a2330b2d835f9c6441616a1 (patch) | |
| tree | fce9620a538899c44d8471a0e798c4ff134dead8 | |
| parent | Java/C# factory fix (diff) | |
| download | ice-ef571f80c545d30a5a2330b2d835f9c6441616a1.tar.bz2 ice-ef571f80c545d30a5a2330b2d835f9c6441616a1.tar.xz ice-ef571f80c545d30a5a2330b2d835f9c6441616a1.zip | |
Fixed ICE-4884:
Updated version to 3.5b
Some fixes to distribution/bin/fixVersion.py
236 files changed, 586 insertions, 557 deletions
diff --git a/RELEASE_NOTES b/RELEASE_NOTES index c4c9e00c03a..1687dcdcb24 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -1 +1 @@ -See http://doc.zeroc.com/display/Rel/Ice+3.4.2+Release+Notes +See http://doc.zeroc.com/display/Rel/Ice+3.5b+Release+Notes diff --git a/config/Make.common.rules b/config/Make.common.rules index 93f778728df..52b01c8d47c 100644 --- a/config/Make.common.rules +++ b/config/Make.common.rules @@ -13,11 +13,11 @@ SHELL = /bin/sh VERSION_MAJOR = 3 -VERSION_MINOR = 4 -VERSION_PATCH = 2 -VERSION = 3.4.2 -SHORT_VERSION = 3.4 -SOVERSION = 34 +VERSION_MINOR = 5b +VERSION_PATCH = 51 +VERSION = 3.5b +SHORT_VERSION = 3.5 +SOVERSION = 35b INSTALL = cp -fp INSTALL_PROGRAM = ${INSTALL} diff --git a/config/Make.common.rules.mak b/config/Make.common.rules.mak index 4238fc5cea0..d7096c89e08 100644 --- a/config/Make.common.rules.mak +++ b/config/Make.common.rules.mak @@ -12,11 +12,11 @@ # ----------------------------------------------------------------------
SHELL = /bin/sh
-VERSION = 3.4.2
-INTVERSION = 3.4.2
-SHORT_VERSION = 3.4
-PATCH_VERSION = 2
-SOVERSION = 34
+VERSION = 3.5b
+INTVERSION = 3.5.51
+SHORT_VERSION = 3.5
+PATCH_VERSION = 51
+SOVERSION = 35b
OBJEXT = .obj
diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml index 7a84c9a1445..0d5dba324fd 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,34:createIceStorm"> + <service name="${instance-name}" entry="IceStormService,35b: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,34:createIceStorm"> + <service name="${instance-name}${node-id}" entry="IceStormService,35b:createIceStorm"> <dbenv name="${service}"/> diff --git a/cpp/demo/Glacier2/winrt/chat/chat.vcxproj b/cpp/demo/Glacier2/winrt/chat/chat.vcxproj index e0ea9cfdefe..a670ecd9ca0 100644 --- a/cpp/demo/Glacier2/winrt/chat/chat.vcxproj +++ b/cpp/demo/Glacier2/winrt/chat/chat.vcxproj @@ -73,27 +73,27 @@ </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -235,7 +235,7 @@ <Text Include="README.txt" />
</ItemGroup>
<ItemGroup>
- <SDKReference Include="IceWinRT, Version=3.4" />
+ <SDKReference Include="IceWinRT, Version=3.5" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/cpp/demo/Ice/MFC/client/HelloClient.rc b/cpp/demo/Ice/MFC/client/HelloClient.rc index 87f1877bf41..80403dc3054 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2"
+ VALUE "FileVersion", "3.5b"
VALUE "InternalName", "HelloClient.exe"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved."
VALUE "OriginalFilename", "HelloClient.exe"
VALUE "ProductName", "Ice"
- VALUE "ProductVersion", "3.4.2"
+ VALUE "ProductVersion", "3.5b"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/demo/Ice/MFC/server/HelloServer.rc b/cpp/demo/Ice/MFC/server/HelloServer.rc index cfae432f3dc..06f732a9ef2 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "HelloServer.exe\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "HelloServer.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/demo/Ice/plugin/Ice.plugin.hello.vcproj b/cpp/demo/Ice/plugin/Ice.plugin.hello.vcproj index 33d7aa74a7b..5443f0b9325 100755 --- a/cpp/demo/Ice/plugin/Ice.plugin.hello.vcproj +++ b/cpp/demo/Ice/plugin/Ice.plugin.hello.vcproj @@ -72,13 +72,13 @@ Name="VCLinkerTool"
AdditionalOptions="/FIXED:NO"
AdditionalDependencies="Iced.lib IceUtild.lib setargv.obj"
- OutputFile="helloplugin34d.dll"
+ OutputFile="helloplugin35bd.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(IceHome)\lib""
GenerateDebugInformation="true"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- ImportLibrary="helloplugin34d.lib"
+ ImportLibrary="helloplugin35bd.lib"
TargetMachine="1"
/>
<Tool
@@ -158,13 +158,13 @@ Name="VCLinkerTool"
AdditionalOptions="/FIXED:NO"
AdditionalDependencies="Iced.lib IceUtild.lib setargv.obj"
- OutputFile="helloplugin34d.dll"
+ OutputFile="helloplugin35bd.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(IceHome)\lib\x64""
GenerateDebugInformation="true"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- ImportLibrary="helloplugin34d.lib"
+ ImportLibrary="helloplugin35bd.lib"
TargetMachine="17"
/>
<Tool
@@ -243,12 +243,12 @@ Name="VCLinkerTool"
AdditionalOptions="/FIXED:NO /IGNORE:4089"
AdditionalDependencies="Ice.lib IceUtil.lib setargv.obj"
- OutputFile="helloplugin34.dll"
+ OutputFile="helloplugin35b.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(IceHome)\lib""
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- ImportLibrary="helloplugin34.lib"
+ ImportLibrary="helloplugin35b.lib"
TargetMachine="1"
/>
<Tool
@@ -328,12 +328,12 @@ Name="VCLinkerTool"
AdditionalOptions="/FIXED:NO /IGNORE:4089"
AdditionalDependencies="Ice.lib IceUtil.lib setargv.obj"
- OutputFile="helloplugin34.dll"
+ OutputFile="helloplugin35b.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(IceHome)\lib\x64""
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- ImportLibrary="helloplugin34.lib"
+ ImportLibrary="helloplugin35b.lib"
TargetMachine="17"
/>
<Tool
diff --git a/cpp/demo/Ice/plugin/Ice.plugin.logger.vcproj b/cpp/demo/Ice/plugin/Ice.plugin.logger.vcproj index 38b722db5e3..5129030b25c 100755 --- a/cpp/demo/Ice/plugin/Ice.plugin.logger.vcproj +++ b/cpp/demo/Ice/plugin/Ice.plugin.logger.vcproj @@ -72,13 +72,13 @@ Name="VCLinkerTool"
AdditionalOptions="/FIXED:NO"
AdditionalDependencies="Iced.lib IceUtild.lib setargv.obj"
- OutputFile="loggerplugin34d.dll"
+ OutputFile="loggerplugin35bd.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(IceHome)\lib""
GenerateDebugInformation="true"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- ImportLibrary="loggerplugin34d.lib"
+ ImportLibrary="loggerplugin35bd.lib"
TargetMachine="1"
/>
<Tool
@@ -158,13 +158,13 @@ Name="VCLinkerTool"
AdditionalOptions="/FIXED:NO"
AdditionalDependencies="Iced.lib IceUtild.lib setargv.obj"
- OutputFile="loggerplugin34d.dll"
+ OutputFile="loggerplugin35bd.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(IceHome)\lib\x64""
GenerateDebugInformation="true"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- ImportLibrary="loggerplugin34d.lib"
+ ImportLibrary="loggerplugin35bd.lib"
TargetMachine="17"
/>
<Tool
@@ -243,12 +243,12 @@ Name="VCLinkerTool"
AdditionalOptions="/FIXED:NO /IGNORE:4089"
AdditionalDependencies="Ice.lib IceUtil.lib setargv.obj"
- OutputFile="loggerplugin34.dll"
+ OutputFile="loggerplugin35b.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(IceHome)\lib""
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- ImportLibrary="loggerplugin34.lib"
+ ImportLibrary="loggerplugin35b.lib"
TargetMachine="1"
/>
<Tool
@@ -328,12 +328,12 @@ Name="VCLinkerTool"
AdditionalOptions="/FIXED:NO /IGNORE:4089"
AdditionalDependencies="Ice.lib IceUtil.lib setargv.obj"
- OutputFile="loggerplugin34.dll"
+ OutputFile="loggerplugin35b.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(IceHome)\lib\x64""
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
- ImportLibrary="loggerplugin34.lib"
+ ImportLibrary="loggerplugin35b.lib"
TargetMachine="17"
/>
<Tool
diff --git a/cpp/demo/Ice/winrt/bidir/bidir.vcxproj b/cpp/demo/Ice/winrt/bidir/bidir.vcxproj index f9d55797968..f7e18fb02bd 100644 --- a/cpp/demo/Ice/winrt/bidir/bidir.vcxproj +++ b/cpp/demo/Ice/winrt/bidir/bidir.vcxproj @@ -73,27 +73,27 @@ </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -214,7 +214,7 @@ <Text Include="README.txt" />
</ItemGroup>
<ItemGroup>
- <SDKReference Include="IceWinRT, Version=3.4" />
+ <SDKReference Include="IceWinRT, Version=3.5" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/cpp/demo/Ice/winrt/hello/hello.vcxproj b/cpp/demo/Ice/winrt/hello/hello.vcxproj index aa56278ee1d..e7ef524b73e 100644 --- a/cpp/demo/Ice/winrt/hello/hello.vcxproj +++ b/cpp/demo/Ice/winrt/hello/hello.vcxproj @@ -73,27 +73,27 @@ </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -217,7 +217,7 @@ <Text Include="README.txt" />
</ItemGroup>
<ItemGroup>
- <SDKReference Include="IceWinRT, Version=3.4" />
+ <SDKReference Include="IceWinRT, Version=3.5" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/cpp/demo/IcePatch2/MFC/PatchClient.rc b/cpp/demo/IcePatch2/MFC/PatchClient.rc index 144d100df2f..9e2e00c40d5 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "PatchClient.exe\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "PatchClient.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/demo/IceStorm/clock/config.icebox b/cpp/demo/IceStorm/clock/config.icebox index 7f866a8021f..1ef67c260be 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,34:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,35b: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 0019ad9f81b..845b3d42090 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,34:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,35b: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 40d1dc55d64..cc7b52a984f 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,34:createIceStorm --Ice.Config=config.service %s"' \ + args = ' --IceBox.Service.IceStorm="IceStormService,35b: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 1bfb5950ced..0be46486840 100644 --- a/cpp/demo/IceStorm/replicated/application.xml +++ b/cpp/demo/IceStorm/replicated/application.xml @@ -21,7 +21,7 @@ <icebox id="${instance-name}-${index}" exe="icebox" activation="on-demand"> - <service name="IceStorm" entry="IceStormService,34:createIceStorm"> + <service name="IceStorm" entry="IceStormService,35b:createIceStorm"> <dbenv name="${service}"/> diff --git a/cpp/demo/IceStorm/replicated2/config.ib1 b/cpp/demo/IceStorm/replicated2/config.ib1 index 67044a09270..66251b6516d 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,34:createIceStorm --Ice.Config=config.s1 +IceBox.Service.IceStorm=IceStormService,35b: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 49b7c67b3c5..8bb5752441a 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,34:createIceStorm --Ice.Config=config.s2 +IceBox.Service.IceStorm=IceStormService,35b: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 2059f75d38c..b693b48b09d 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,34:createIceStorm --Ice.Config=config.s3 +IceBox.Service.IceStorm=IceStormService,35b: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 748440d2ea6..5d6259393b6 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,34:createIceStorm --Ice.Config=config.s1 %s"' \ + a1 = ' --IceBox.Service.IceStorm="IceStormService,35b:createIceStorm --Ice.Config=config.s1 %s"' \ % Util.defaultHost - a2 = ' --IceBox.Service.IceStorm="IceStormService,34:createIceStorm --Ice.Config=config.s2 %s"' \ + a2 = ' --IceBox.Service.IceStorm="IceStormService,35b:createIceStorm --Ice.Config=config.s2 %s"' \ % Util.defaultHost - a3 = ' --IceBox.Service.IceStorm="IceStormService,34:createIceStorm --Ice.Config=config.s3 %s"' \ + a3 = ' --IceBox.Service.IceStorm="IceStormService,35b: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 96b449026ef..782f3c227d8 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.4.2/reference -IndexDir /var/www/html/doc/Ice-3.4.2/manual +IndexDir /var/www/html/doc/Ice-3.5b/reference +IndexDir /var/www/html/doc/Ice-3.5b/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 96043c9df65..f9506cf916f 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.4.2'; +my $ice_version = '3.5b'; 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 927964224b2..570174b8b78 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -198,7 +198,7 @@ typedef long long Int64; // // The Ice version. // -#define ICE_STRING_VERSION "3.4.2" // "A.B.C", with A=major, B=minor, C=patch -#define ICE_INT_VERSION 30402 // AABBCC, with AA=major, BB=minor, CC=patch +#define ICE_STRING_VERSION "3.5b" // "A.B.C", with A=major, B=minor, C=patch +#define ICE_INT_VERSION 30551 // AABBCC, with AA=major, BB=minor, CC=patch #endif diff --git a/cpp/src/Freeze/Freeze.rc b/cpp/src/Freeze/Freeze.rc index 1c7b4aae5a3..132d6591c47 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "freeze34d\0"
- #define ORIGINALFILENAME "freeze34d.dll\0"
+ #define INTERNALNAME "freeze35bd\0"
+ #define ORIGINALFILENAME "freeze35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "freeze34\0"
- #define ORIGINALFILENAME "freeze34.dll\0"
+ #define INTERNALNAME "freeze35b\0"
+ #define ORIGINALFILENAME "freeze35b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/FreezeScript/DumpDB.rc b/cpp/src/FreezeScript/DumpDB.rc index da56258db3f..c0376bae646 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "dumpdb\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "dumpdb.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/FreezeScript/TransformDB.rc b/cpp/src/FreezeScript/TransformDB.rc index 13b4b6ae10e..2487c3494c9 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "transformdb\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "transformdb.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/Glacier2/Glacier2Router.rc b/cpp/src/Glacier2/Glacier2Router.rc index 883a2147820..ec6a49f30f3 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "glacier2router\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "glacier2router.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/Glacier2Lib/Glacier2.rc b/cpp/src/Glacier2Lib/Glacier2.rc index fada42bbc58..b37d90d020d 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "glacier234d\0"
- #define ORIGINALFILENAME "glacier234d.dll\0"
+ #define INTERNALNAME "glacier235bd\0"
+ #define ORIGINALFILENAME "glacier235bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "glacier234\0"
- #define ORIGINALFILENAME "glacier234.dll\0"
+ #define INTERNALNAME "glacier235b\0"
+ #define ORIGINALFILENAME "glacier235b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/Ice/Ice.rc b/cpp/src/Ice/Ice.rc index 1f4d3b26048..f4751cbb31d 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "ice34d\0"
- #define ORIGINALFILENAME "ice34d.dll\0"
+ #define INTERNALNAME "ice35bd\0"
+ #define ORIGINALFILENAME "ice35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "ice34\0"
- #define ORIGINALFILENAME "ice34.dll\0"
+ #define INTERNALNAME "ice35b\0"
+ #define ORIGINALFILENAME "ice35b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceBox/IceBox.rc b/cpp/src/IceBox/IceBox.rc index 33b6a6a5436..647d29d8b15 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icebox34d\0"
- #define ORIGINALFILENAME "icebox34d.dll\0"
+ #define INTERNALNAME "icebox35bd\0"
+ #define ORIGINALFILENAME "icebox35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icebox34\0"
- #define ORIGINALFILENAME "icebox34.dll\0"
+ #define INTERNALNAME "icebox35b\0"
+ #define ORIGINALFILENAME "icebox35b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceBox/IceBoxAdmin.rc b/cpp/src/IceBox/IceBoxAdmin.rc index 15935cd2e14..d7db9467e86 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "iceboxadmin\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "iceboxadmin.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceBox/IceBoxExe.rc b/cpp/src/IceBox/IceBoxExe.rc index b3046f9fecf..46be64acc4d 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceDB/IceDB.rc b/cpp/src/IceDB/IceDB.rc index 26843f94c9f..9884c59873b 100644 --- a/cpp/src/IceDB/IceDB.rc +++ b/cpp/src/IceDB/IceDB.rc @@ -1,17 +1,17 @@ #include "winver.h"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icedb34d\0"
- #define ORIGINALFILENAME "icedb34d.dll\0"
+ #define INTERNALNAME "icedb35bd\0"
+ #define ORIGINALFILENAME "icedb35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icedb34\0"
- #define ORIGINALFILENAME "icedb34.dll\0"
+ #define INTERNALNAME "icedb35b\0"
+ #define ORIGINALFILENAME "icedb35b.dll\0"
#endif
FILEOS 0x4L
FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN BEGIN
VALUE "CompanyName", "ZeroC, Inc.\0"
VALUE "FileDescription", "IceDB DLL\0"
- VALUE "FileVersion", "3.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/FreezeDB/IceGridFreezeDB.rc b/cpp/src/IceGrid/FreezeDB/IceGridFreezeDB.rc index eeb50b582c6..6cebf26f9c8 100644 --- a/cpp/src/IceGrid/FreezeDB/IceGridFreezeDB.rc +++ b/cpp/src/IceGrid/FreezeDB/IceGridFreezeDB.rc @@ -1,17 +1,17 @@ #include "winver.h"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormfreezedb34d\0"
- #define ORIGINALFILENAME "icestormfreezedb34d.dll\0"
+ #define INTERNALNAME "icestormfreezedb35bd\0"
+ #define ORIGINALFILENAME "icestormfreezedb35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icegridfreezedb34\0"
- #define ORIGINALFILENAME "icegridfreezedb34.dll\0"
+ #define INTERNALNAME "icegridfreezedb35b\0"
+ #define ORIGINALFILENAME "icegridfreezedb35b.dll\0"
#endif
FILEOS 0x4L
FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN BEGIN
VALUE "CompanyName", "ZeroC, Inc.\0"
VALUE "FileDescription", "IceGrid Freeze DB DLL\0"
- VALUE "FileVersion", "3.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/IceGridAdmin.rc b/cpp/src/IceGrid/IceGridAdmin.rc index fdae34b89d9..8184cf0c7f2 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "icegridadmin\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "icegridadmin.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/IceGridNode.rc b/cpp/src/IceGrid/IceGridNode.rc index ef87a68df5f..88285e134f2 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "icegridnode\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "icegridnode.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/IceGridRegistry.rc b/cpp/src/IceGrid/IceGridRegistry.rc index 0f33a2eb1a0..6d8cfc00377 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "icegridregistry\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "icegridregistry.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp index e17cdc115c3..15b9f2f5b4a 100644 --- a/cpp/src/IceGrid/Parser.cpp +++ b/cpp/src/IceGrid/Parser.cpp @@ -2263,7 +2263,7 @@ Parser::getInput(char* buf, int& result, int maxSize) } } - result = line.length(); + result = static_cast<int>(line.length()); if(result > maxSize) { error("input line too long"); diff --git a/cpp/src/IceGrid/SqlDB/IceGridSqlDB.rc b/cpp/src/IceGrid/SqlDB/IceGridSqlDB.rc index 1946a793145..205ae236733 100644 --- a/cpp/src/IceGrid/SqlDB/IceGridSqlDB.rc +++ b/cpp/src/IceGrid/SqlDB/IceGridSqlDB.rc @@ -1,17 +1,17 @@ #include "winver.h"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icegridsqldb34d\0"
- #define ORIGINALFILENAME "icegridsqldb34d.dll\0"
+ #define INTERNALNAME "icegridsqldb35bd\0"
+ #define ORIGINALFILENAME "icegridsqldb35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icegridsqldb34\0"
- #define ORIGINALFILENAME "icegridsqldb34.dll\0"
+ #define INTERNALNAME "icegridsqldb35b\0"
+ #define ORIGINALFILENAME "icegridsqldb35b.dll\0"
#endif
FILEOS 0x4L
FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN BEGIN
VALUE "CompanyName", "ZeroC, Inc.\0"
VALUE "FileDescription", "IceGrid Sql DB DLL\0"
- VALUE "FileVersion", "3.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGridLib/IceGrid.rc b/cpp/src/IceGridLib/IceGrid.rc index 9c427bdd616..48d6fb63a25 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icegrid34d\0"
- #define ORIGINALFILENAME "icegrid34d.dll\0"
+ #define INTERNALNAME "icegrid35bd\0"
+ #define ORIGINALFILENAME "icegrid35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icegrid34\0"
- #define ORIGINALFILENAME "icegrid34.dll\0"
+ #define INTERNALNAME "icegrid35b\0"
+ #define ORIGINALFILENAME "icegrid35b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2/IcePatch2Calc.rc b/cpp/src/IcePatch2/IcePatch2Calc.rc index 6739a3786cd..44b581211ea 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "icepatch2calc\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "icepatch2calc.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2/IcePatch2Client.rc b/cpp/src/IcePatch2/IcePatch2Client.rc index 4f6322135a4..956fbeeb31d 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "icepatch2client\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "icepatch2client.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2/IcePatch2Server.rc b/cpp/src/IcePatch2/IcePatch2Server.rc index ca4ce0f11e2..008bdf969f1 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "icepatch2server\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "icepatch2server.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2Lib/IcePatch2.rc b/cpp/src/IcePatch2Lib/IcePatch2.rc index fb26f368a2c..1665e7b12db 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icepatch234d\0"
- #define ORIGINALFILENAME "icepatch234d.dll\0"
+ #define INTERNALNAME "icepatch235bd\0"
+ #define ORIGINALFILENAME "icepatch235bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icepatch234\0"
- #define ORIGINALFILENAME "icepatch234.dll\0"
+ #define INTERNALNAME "icepatch235b\0"
+ #define ORIGINALFILENAME "icepatch235b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceSSL/IceSSL.rc b/cpp/src/IceSSL/IceSSL.rc index cdb78bb48ba..a75720055df 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icessl34d\0"
- #define ORIGINALFILENAME "icessl34d.dll\0"
+ #define INTERNALNAME "icessl35bd\0"
+ #define ORIGINALFILENAME "icessl35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icessl34\0"
- #define ORIGINALFILENAME "icessl34.dll\0"
+ #define INTERNALNAME "icessl35b\0"
+ #define ORIGINALFILENAME "icessl35b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/FreezeDB/IceStormFreezeDB.rc b/cpp/src/IceStorm/FreezeDB/IceStormFreezeDB.rc index fc4b351eed0..32748f319ef 100644 --- a/cpp/src/IceStorm/FreezeDB/IceStormFreezeDB.rc +++ b/cpp/src/IceStorm/FreezeDB/IceStormFreezeDB.rc @@ -1,17 +1,17 @@ #include "winver.h"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormfreezedb34d\0"
- #define ORIGINALFILENAME "icestormfreezedb34d.dll\0"
+ #define INTERNALNAME "icestormfreezedb35bd\0"
+ #define ORIGINALFILENAME "icestormfreezedb35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icestormfreezedb34\0"
- #define ORIGINALFILENAME "icestormfreezedb34.dll\0"
+ #define INTERNALNAME "icestormfreezedb35b\0"
+ #define ORIGINALFILENAME "icestormfreezedb35b.dll\0"
#endif
FILEOS 0x4L
FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN BEGIN
VALUE "CompanyName", "ZeroC, Inc.\0"
VALUE "FileDescription", "IceStorm Freeze DB DLL\0"
- VALUE "FileVersion", "3.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/FreezeDB/IceStormMigrate.rc b/cpp/src/IceStorm/FreezeDB/IceStormMigrate.rc index 77268d064bd..5bb5f2fd568 100644 --- a/cpp/src/IceStorm/FreezeDB/IceStormMigrate.rc +++ b/cpp/src/IceStorm/FreezeDB/IceStormMigrate.rc @@ -1,8 +1,8 @@ #include "winver.h"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "icestormmigrate\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "icestormmigrate.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/IceStormAdmin.rc b/cpp/src/IceStorm/IceStormAdmin.rc index 75a084a92c8..c3d83f149ea 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "icestormadmin\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "icestormadmin.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/IceStormDB.rc b/cpp/src/IceStorm/IceStormDB.rc index 1388eb06870..cde321c9ba1 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormdb34d\0"
- #define ORIGINALFILENAME "icestormdb34d.dll\0"
+ #define INTERNALNAME "icestormdb35bd\0"
+ #define ORIGINALFILENAME "icestormdb35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icestormdb34\0"
- #define ORIGINALFILENAME "icestormdb34.dll\0"
+ #define INTERNALNAME "icestormdb35b\0"
+ #define ORIGINALFILENAME "icestormdb35b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/IceStormService.rc b/cpp/src/IceStorm/IceStormService.rc index 00f1e9478f4..62202db7f9d 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormservice34d\0"
- #define ORIGINALFILENAME "icestormservice34d.dll\0"
+ #define INTERNALNAME "icestormservice35bd\0"
+ #define ORIGINALFILENAME "icestormservice35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icestormservice34\0"
- #define ORIGINALFILENAME "icestormservice34.dll\0"
+ #define INTERNALNAME "icestormservice35b\0"
+ #define ORIGINALFILENAME "icestormservice35b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/SqlDB/IceStormSqlDB.rc b/cpp/src/IceStorm/SqlDB/IceStormSqlDB.rc index e681d3c3306..1531305e1f5 100644 --- a/cpp/src/IceStorm/SqlDB/IceStormSqlDB.rc +++ b/cpp/src/IceStorm/SqlDB/IceStormSqlDB.rc @@ -1,17 +1,17 @@ #include "winver.h"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormsqldb34d\0"
- #define ORIGINALFILENAME "icestormsqldb34d.dll\0"
+ #define INTERNALNAME "icestormsqldb35bd\0"
+ #define ORIGINALFILENAME "icestormsqldb35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icestormsqldb34\0"
- #define ORIGINALFILENAME "icestormsqldb34.dll\0"
+ #define INTERNALNAME "icestormsqldb35b\0"
+ #define ORIGINALFILENAME "icestormsqldb35b.dll\0"
#endif
FILEOS 0x4L
FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN BEGIN
VALUE "CompanyName", "ZeroC, Inc.\0"
VALUE "FileDescription", "IceStorm Sql DB DLL\0"
- VALUE "FileVersion", "3.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStormLib/IceStorm.rc b/cpp/src/IceStormLib/IceStorm.rc index 59692f147b4..bec2e981187 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestorm34d\0"
- #define ORIGINALFILENAME "icestorm34d.dll\0"
+ #define INTERNALNAME "icestorm35bd\0"
+ #define ORIGINALFILENAME "icestorm35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icestorm34\0"
- #define ORIGINALFILENAME "icestorm34.dll\0"
+ #define INTERNALNAME "icestorm35b\0"
+ #define ORIGINALFILENAME "icestorm35b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceUtil/IceUtil.rc b/cpp/src/IceUtil/IceUtil.rc index d315692a642..52cfdaf4c3a 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "iceutil34d\0"
- #define ORIGINALFILENAME "iceutil34d.dll\0"
+ #define INTERNALNAME "iceutil35bd\0"
+ #define ORIGINALFILENAME "iceutil35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "iceutil34\0"
- #define ORIGINALFILENAME "iceutil34.dll\0"
+ #define INTERNALNAME "iceutil35b\0"
+ #define ORIGINALFILENAME "iceutil35b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/IceXML/IceXML.rc b/cpp/src/IceXML/IceXML.rc index 713aec7e69a..2d19a7377b3 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icexml34d\0"
- #define ORIGINALFILENAME "icexml34d.dll\0"
+ #define INTERNALNAME "icexml35bd\0"
+ #define ORIGINALFILENAME "icexml35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "icexml34\0"
- #define ORIGINALFILENAME "icexml34.dll\0"
+ #define INTERNALNAME "icexml35b\0"
+ #define ORIGINALFILENAME "icexml35b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/Slice/Slice.rc b/cpp/src/Slice/Slice.rc index e5957b1fdab..e814a6f5f38 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,51,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "slice34d\0"
- #define ORIGINALFILENAME "slice34d.dll\0"
+ #define INTERNALNAME "slice35bd\0"
+ #define ORIGINALFILENAME "slice35bd.dll\0"
#else
FILEFLAGS 0x0L
- #define INTERNALNAME "slice34\0"
- #define ORIGINALFILENAME "slice34.dll\0"
+ #define INTERNALNAME "slice35b\0"
+ #define ORIGINALFILENAME "slice35b.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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/ca/iceca b/cpp/src/ca/iceca index 02666ec3ff8..f2b09ef76b4 100755 --- a/cpp/src/ca/iceca +++ b/cpp/src/ca/iceca @@ -116,7 +116,7 @@ if sys.argv[script] == "import": # script ../lib). For development purposes we also check ".". # checkLocations = [".", os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "..", "lib")), - "/usr/share/Ice-3.4.2"] + "/usr/share/Ice-3.5b"] 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 684aaa1a466..0adef7c2faf 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "iceserviceinstall\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "iceserviceinstall.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2confluence/Slice2Confluence.rc b/cpp/src/slice2confluence/Slice2Confluence.rc index a94c686d17c..495d935ca2d 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "slice2confluence\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "slice2confluence.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2cpp/Slice2Cpp.rc b/cpp/src/slice2cpp/Slice2Cpp.rc index 359cada57cf..d14b0c8edad 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "slice2cpp\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "slice2cpp.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2cs/Slice2Cs.rc b/cpp/src/slice2cs/Slice2Cs.rc index 78cb392ba14..b5dca87f0df 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "slice2cs\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "slice2cs.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2freeze/Slice2Freeze.rc b/cpp/src/slice2freeze/Slice2Freeze.rc index 11bf06a8640..edeba107dab 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "slice2freeze\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "slice2freeze.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2freezej/Slice2FreezeJ.rc b/cpp/src/slice2freezej/Slice2FreezeJ.rc index 3c275e984d3..24aa8d8d5ba 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "slice2freezej\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "slice2freezej.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2html/Slice2Html.rc b/cpp/src/slice2html/Slice2Html.rc index df0a55c032e..f19b8809111 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "slice2html\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "slice2html.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2java/Slice2Java.rc b/cpp/src/slice2java/Slice2Java.rc index 362a58dd266..ff85f68c975 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "slice2java\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "slice2java.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2php/Slice2PHP.rc b/cpp/src/slice2php/Slice2PHP.rc index 6dfc59e565a..95c768def6e 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "slice2py\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "slice2py.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2py/Slice2Py.rc b/cpp/src/slice2py/Slice2Py.rc index 6dfc59e565a..95c768def6e 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "slice2py\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "slice2py.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2rb/Slice2Rb.rc b/cpp/src/slice2rb/Slice2Rb.rc index 15fb99062ca..241d315a905 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", "slice2rb\0"
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "slice2rb.exe\0"
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/cpp/test/IceGrid/fileLock/run.py b/cpp/test/IceGrid/fileLock/run.py index 2b75cd0d533..188ac04014e 100755 --- a/cpp/test/IceGrid/fileLock/run.py +++ b/cpp/test/IceGrid/fileLock/run.py @@ -27,7 +27,7 @@ IceGridAdmin.nreplicas = 0 def runIceGridRegistry(): iceGrid = "" - if TestUtil.isVC6(): + if TestUtil.isVC90(): iceGrid = os.path.join(TestUtil.getServiceDir(), "icegridregistry") else: iceGrid = os.path.join(TestUtil.getCppBinDir(), "icegridregistry") diff --git a/cpp/test/IceStorm/repgrid/application.xml b/cpp/test/IceStorm/repgrid/application.xml index 5e9a3909543..fd9be048675 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,34:createIceStorm"> + <service name="${instance-name}${node-id}" entry="IceStormService,35b:createIceStorm"> <dbenv name="${service}"/> diff --git a/cpp/test/WinRT/TestSuite/TestSuite.vcxproj b/cpp/test/WinRT/TestSuite/TestSuite.vcxproj index 6d3963e6e4d..4a1b656a144 100644 --- a/cpp/test/WinRT/TestSuite/TestSuite.vcxproj +++ b/cpp/test/WinRT/TestSuite/TestSuite.vcxproj @@ -73,27 +73,27 @@ </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+ <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.5@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -399,7 +399,7 @@ </ClCompile>
</ItemGroup>
<ItemGroup>
- <SDKReference Include="IceWinRT, Version=3.4" />
+ <SDKReference Include="IceWinRT, Version=3.5" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/cs/demo/Glacier2/callback/client.csproj b/cs/demo/Glacier2/callback/client.csproj index a549e868b87..0301e2d7f47 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Glacier2, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
- <Reference Include="IceSSL, Version=3.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="IceSSL, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Glacier2/callback/server.csproj b/cs/demo/Glacier2/callback/server.csproj index 2848a0bcc97..8677f0d6033 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Glacier2/chat/client.csproj b/cs/demo/Glacier2/chat/client.csproj index f2b23100d58..edea2dfdfa3 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
- <Reference Include="IceSSL, Version=3.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Glacier2, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="IceSSL, Version=3.5b.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/chat.csproj b/cs/demo/Glacier2/sl/chat/chat.csproj index ab60e631dda..a0eed44f459 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Glacier2, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.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 7c08c3912de..867c144b407 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/async/server.csproj b/cs/demo/Ice/async/server.csproj index 067913b33ee..c2736f49736 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/bidir/client.csproj b/cs/demo/Ice/bidir/client.csproj index 8fc8cbd70f0..dac8a4cf513 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/bidir/server.csproj b/cs/demo/Ice/bidir/server.csproj index 696ad68612f..cd832190320 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/callback/client.csproj b/cs/demo/Ice/callback/client.csproj index 4aea82bdeac..1e3748fef97 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
- <Reference Include="IceSSL, Version=3.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="IceSSL, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/callback/server.csproj b/cs/demo/Ice/callback/server.csproj index d907ae96857..d60f1580492 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
- <Reference Include="IceSSL, Version=3.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="IceSSL, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/compact/bidir/server.csproj b/cs/demo/Ice/compact/bidir/server.csproj index 3e10dca53f1..536c8860d5c 100644 --- a/cs/demo/Ice/compact/bidir/server.csproj +++ b/cs/demo/Ice/compact/bidir/server.csproj @@ -45,7 +45,7 @@ <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
diff --git a/cs/demo/Ice/compact/hello/client.csproj b/cs/demo/Ice/compact/hello/client.csproj index 255657f4b27..aa05fa9e852 100644 --- a/cs/demo/Ice/compact/hello/client.csproj +++ b/cs/demo/Ice/compact/hello/client.csproj @@ -45,7 +45,7 @@ <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="mscorlib" />
diff --git a/cs/demo/Ice/hello/client.csproj b/cs/demo/Ice/hello/client.csproj index 246e7a83d5e..9e0e0b5b0eb 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
- <Reference Include="IceSSL, Version=3.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="IceSSL, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/hello/server.csproj b/cs/demo/Ice/hello/server.csproj index 52994e06d90..17a6ce3cfe2 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
- <Reference Include="IceSSL, Version=3.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="IceSSL, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/invoke/client.csproj b/cs/demo/Ice/invoke/client.csproj index 89f1847a0b0..78f0a5bf930 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/invoke/server.csproj b/cs/demo/Ice/invoke/server.csproj index c9a41fe3974..3aa0fb37186 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/latency/client.csproj b/cs/demo/Ice/latency/client.csproj index 3cb1f1eab0e..0c415ae946b 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/latency/server.csproj b/cs/demo/Ice/latency/server.csproj index 38c3b3f2379..a7c569dbaf4 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/minimal/client.csproj b/cs/demo/Ice/minimal/client.csproj index bac327ab9f2..973acfce7b3 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/minimal/server.csproj b/cs/demo/Ice/minimal/server.csproj index 309149eb70b..8c9f5edbdde 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/multicast/client.csproj b/cs/demo/Ice/multicast/client.csproj index 604e011add1..8b177751849 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/multicast/server.csproj b/cs/demo/Ice/multicast/server.csproj index e77715c3c44..d5a488659ad 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/nested/client.csproj b/cs/demo/Ice/nested/client.csproj index e0c0bb92a59..b99a494cd76 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/nested/server.csproj b/cs/demo/Ice/nested/server.csproj index 16d22d58384..860c80942f2 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/plugin/client.csproj b/cs/demo/Ice/plugin/client.csproj index 119a3b75dbe..261d91ba500 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/plugin/helloplugin.csproj b/cs/demo/Ice/plugin/helloplugin.csproj index 84a2480a5bf..e2d38935544 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.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 b3d9acb2949..003630bd478 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="System">
<Name>System</Name>
</Reference>
diff --git a/cs/demo/Ice/plugin/sever.csproj b/cs/demo/Ice/plugin/sever.csproj index 4f212ec5276..e423442671f 100644 --- a/cs/demo/Ice/plugin/sever.csproj +++ b/cs/demo/Ice/plugin/sever.csproj @@ -79,7 +79,7 @@ <ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/serialize/client.csproj b/cs/demo/Ice/serialize/client.csproj index 6da56f16bda..c56479f3d8c 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</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 7e92082c7fd..f206a7d5f88 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.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 5fc747d7484..c16fe85116c 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</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 258eaa3b2ba..2dd6276f802 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/session/server.csproj b/cs/demo/Ice/session/server.csproj index f26dfd3fe75..f028d06286f 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/sl/bidir/bidir/bidir.csproj b/cs/demo/Ice/sl/bidir/bidir/bidir.csproj index 2e7738a11e6..9c8c6947f35 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.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/hello.csproj b/cs/demo/Ice/sl/hello/hello/hello.csproj index cd4eb3dd9d9..89c36fd217d 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.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 2cb90644a4c..eeee247c44c 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/throughput/server.csproj b/cs/demo/Ice/throughput/server.csproj index 82b0f604ae3..9272b67967d 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/value/client.csproj b/cs/demo/Ice/value/client.csproj index 742bc30ec27..99ff52e0014 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/value/server.csproj b/cs/demo/Ice/value/server.csproj index 3fdf8c1b1f7..136563c81ef 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/Ice/wpf/client.csproj b/cs/demo/Ice/wpf/client.csproj index 35147775801..dd946bcbc07 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
- <Reference Include="IceSSL, Version=3.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="IceSSL, Version=3.5b.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 ba40f14f8c0..47a7c9a8b1c 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
- <Reference Include="IceBox, Version=3.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="IceBox, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
- <Reference Include="IceSSL, Version=3.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="IceSSL, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/IceBox/hello/helloservice.csproj b/cs/demo/IceBox/hello/helloservice.csproj index e5e9a599cee..5601f155b9b 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
- <Reference Include="IceBox, Version=3.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
- <Reference Include="IceSSL, Version=3.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="IceBox, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="IceSSL, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="System">
<Name>System</Name>
</Reference>
diff --git a/cs/demo/IceGrid/icebox/client.csproj b/cs/demo/IceGrid/icebox/client.csproj index 3a8a6186d02..a45d90fafb8 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/IceGrid/icebox/helloservice.csproj b/cs/demo/IceGrid/icebox/helloservice.csproj index eac595eb1f6..2fcaf19e978 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
- <Reference Include="IceBox, Version=3.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
- <Reference Include="IceSSL, Version=3.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="IceBox, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="IceSSL, Version=3.5b.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 d7b2fd5eafe..ca0bdcb21c4 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
- <Reference Include="IceGrid, Version=3.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="IceGrid, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/IceGrid/simple/server.csproj b/cs/demo/IceGrid/simple/server.csproj index 9f6dc1cb864..a65a45ffadf 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/IceStorm/clock/config.icebox b/cs/demo/IceStorm/clock/config.icebox index ce626d39b59..e8353a978b9 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,34:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,35b: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 f742fa123ec..4da728293c8 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
- <Reference Include="IceStorm, Version=3.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="IceStorm, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/IceStorm/clock/subscriber.csproj b/cs/demo/IceStorm/clock/subscriber.csproj index 2d18808e698..97ad03a0e0b 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
- <Reference Include="IceStorm, Version=3.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="IceStorm, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/book/lifecycle/client.csproj b/cs/demo/book/lifecycle/client.csproj index 385cdaa6707..3b5ed3c8692 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System" />
diff --git a/cs/demo/book/lifecycle/server.csproj b/cs/demo/book/lifecycle/server.csproj index 31cb1ad494d..7db2efac0f2 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System" />
diff --git a/cs/demo/book/printer/client.csproj b/cs/demo/book/printer/client.csproj index 391b22f3c91..5c1f8c97d9c 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System" />
diff --git a/cs/demo/book/printer/server.csproj b/cs/demo/book/printer/server.csproj index b47f1a10ae5..4b242031973 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System" />
diff --git a/cs/demo/book/simple_filesystem/client.csproj b/cs/demo/book/simple_filesystem/client.csproj index 661dd5a350c..190e7fba717 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/demo/book/simple_filesystem/server.csproj b/cs/demo/book/simple_filesystem/server.csproj index 3bd564924f7..7cce0690b72 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System">
diff --git a/cs/lib/pkgconfig/Glacier2.pc b/cs/lib/pkgconfig/Glacier2.pc index 737f79f6f54..87f81a3bfd1 100644 --- a/cs/lib/pkgconfig/Glacier2.pc +++ b/cs/lib/pkgconfig/Glacier2.pc @@ -1,4 +1,4 @@ -version = 3.4.2 +version = 3.5.51 mono_root = /usr name = Glacier2 diff --git a/cs/lib/pkgconfig/Ice.pc b/cs/lib/pkgconfig/Ice.pc index 55fbf595d2f..8df02001bb6 100644 --- a/cs/lib/pkgconfig/Ice.pc +++ b/cs/lib/pkgconfig/Ice.pc @@ -1,4 +1,4 @@ -version = 3.4.2 +version = 3.5.51 mono_root = /usr name = Ice diff --git a/cs/lib/pkgconfig/IceBox.pc b/cs/lib/pkgconfig/IceBox.pc index 4507bf36a50..10699592e4d 100644 --- a/cs/lib/pkgconfig/IceBox.pc +++ b/cs/lib/pkgconfig/IceBox.pc @@ -1,4 +1,4 @@ -version = 3.4.2 +version = 3.5.51 mono_root = /usr name = IceBox diff --git a/cs/lib/pkgconfig/IceGrid.pc b/cs/lib/pkgconfig/IceGrid.pc index 5b47f7ab58e..4c41286c009 100644 --- a/cs/lib/pkgconfig/IceGrid.pc +++ b/cs/lib/pkgconfig/IceGrid.pc @@ -1,4 +1,4 @@ -version = 3.4.2 +version = 3.5.51 mono_root = /usr name = IceGrid diff --git a/cs/lib/pkgconfig/IcePatch2.pc b/cs/lib/pkgconfig/IcePatch2.pc index f49703d6cca..915926b9da2 100644 --- a/cs/lib/pkgconfig/IcePatch2.pc +++ b/cs/lib/pkgconfig/IcePatch2.pc @@ -1,4 +1,4 @@ -version = 3.4.2 +version = 3.5.51 mono_root = /usr name = IcePatch2 diff --git a/cs/lib/pkgconfig/IceStorm.pc b/cs/lib/pkgconfig/IceStorm.pc index 26f47f71b3c..825c684cd17 100644 --- a/cs/lib/pkgconfig/IceStorm.pc +++ b/cs/lib/pkgconfig/IceStorm.pc @@ -1,4 +1,4 @@ -version = 3.4.2 +version = 3.5.51 mono_root = /usr name = IceStorm diff --git a/cs/src/Glacier2/AssemblyInfo.cs b/cs/src/Glacier2/AssemblyInfo.cs index db5931cb75d..7c1cb6fbdf7 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-2012 ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.4.2")] +[assembly: AssemblyVersion("3.5.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/cs/src/Ice/AssemblyInfo.cs b/cs/src/Ice/AssemblyInfo.cs index a04d31a13c8..e1af2db7b4c 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-2012 ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.4.2")] +[assembly: AssemblyVersion("3.5.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/cs/src/Ice/Util.cs b/cs/src/Ice/Util.cs index ea97a5bef92..99000283b54 100644 --- a/cs/src/Ice/Util.cs +++ b/cs/src/Ice/Util.cs @@ -479,7 +479,7 @@ namespace Ice /// <returns>The Ice version.</returns> public static string stringVersion() { - return "3.4.2"; // "A.B.C", with A=major, B=minor, C=patch + return "3.5b"; // "A.B.C", with A=major, B=minor, C=patch } /// <summary> @@ -490,7 +490,7 @@ namespace Ice /// <returns>The Ice version.</returns> public static int intVersion() { - return 30402; // AABBCC, with AA=major, BB=minor, CC=patch + return 30551; // AABBCC, with AA=major, BB=minor, CC=patch } /// <summary> diff --git a/cs/src/IceBox/AssemblyInfo.cs b/cs/src/IceBox/AssemblyInfo.cs index 5eceddbdc0f..289dbf8be1f 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-2012 ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.4.2")] +[assembly: AssemblyVersion("3.5.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/cs/src/IceBox/AssemblyInfoExe.cs b/cs/src/IceBox/AssemblyInfoExe.cs index f25c6e5ea20..222897c0d8c 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-2012 ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.4.2")] +[assembly: AssemblyVersion("3.5.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/cs/src/IceBox/Makefile.mak b/cs/src/IceBox/Makefile.mak index 3441a8f6c62..b2a5ae8ef78 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="$(VERSION).0" href="$(assembliesRelativeDir)\Ice.dll"/>
+ <codeBase version="3.5.51.0" href="$(assembliesRelativeDir)\Ice.dll"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IceBox" culture="neutral" publicKeyToken="$(publicKeyToken)"/>
- <codeBase version="3.4.2.0" href="$(assembliesRelativeDir)\IceBox.dll"/>
+ <codeBase version="3.5.51.0" href="$(assembliesRelativeDir)\IceBox.dll"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
diff --git a/cs/src/IceGrid/AssemblyInfo.cs b/cs/src/IceGrid/AssemblyInfo.cs index 53c8e6b2f88..39c57b500f9 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-2012 ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.4.2")] +[assembly: AssemblyVersion("3.5.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/cs/src/IcePatch2/AssemblyInfo.cs b/cs/src/IcePatch2/AssemblyInfo.cs index 83d7d4b6f50..c2c6baba50c 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-2012 ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.4.2")] +[assembly: AssemblyVersion("3.5.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/cs/src/IceSSL/AssemblyInfo.cs b/cs/src/IceSSL/AssemblyInfo.cs index 7e56a84be38..90e4535da4a 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-2012 ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.4.2")] +[assembly: AssemblyVersion("3.5.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/cs/src/IceStorm/AssemblyInfo.cs b/cs/src/IceStorm/AssemblyInfo.cs index 26d9cf34f98..bcc48a0ce25 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-2012 ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.4.2")] +[assembly: AssemblyVersion("3.5.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] diff --git a/cs/src/PolicyServer/AssemblyInfo.cs b/cs/src/PolicyServer/AssemblyInfo.cs index c4de5e4a96f..130111346a9 100644 --- a/cs/src/PolicyServer/AssemblyInfo.cs +++ b/cs/src/PolicyServer/AssemblyInfo.cs @@ -41,5 +41,4 @@ using System.Runtime.InteropServices; // 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.4.2.0")]
-[assembly: AssemblyFileVersion("3.4.2.0")]
+[assembly: AssemblyVersion("3.5.51")]
diff --git a/cs/test/Ice/adapterDeactivation/adapterDeactivation.csproj b/cs/test/Ice/adapterDeactivation/adapterDeactivation.csproj index bf764667a9f..b9e3fb09f7d 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System.Windows" />
<Reference Include="system" />
diff --git a/cs/test/Ice/ami/ami.csproj b/cs/test/Ice/ami/ami.csproj index fe24c598a2c..7615889acc6 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System.Windows" />
<Reference Include="system" />
diff --git a/cs/test/Ice/binding/binding.csproj b/cs/test/Ice/binding/binding.csproj index b93e155f869..678dea94998 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System.Windows" />
<Reference Include="system" />
diff --git a/cs/test/Ice/defaultValue/defaultValue.csproj b/cs/test/Ice/defaultValue/defaultValue.csproj index e79610cf482..a92c3cb15ba 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System.Windows" />
<Reference Include="system" />
diff --git a/cs/test/Ice/dictMapping/dictMapping.csproj b/cs/test/Ice/dictMapping/dictMapping.csproj index 70ef3040d38..ad3d621ebab 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System.Windows" />
<Reference Include="system" />
diff --git a/cs/test/Ice/dispatcher/dispatcher.csproj b/cs/test/Ice/dispatcher/dispatcher.csproj index efd7175b98c..e878d211f1d 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System.Windows" />
<Reference Include="system" />
diff --git a/cs/test/Ice/exceptions/exceptions.csproj b/cs/test/Ice/exceptions/exceptions.csproj index b22d43d4d3b..06ec17b131f 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System.Windows" />
<Reference Include="system" />
diff --git a/cs/test/Ice/facets/facets.csproj b/cs/test/Ice/facets/facets.csproj index db7ed5b9b44..525f6630bfd 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System.Windows" />
<Reference Include="system" />
diff --git a/cs/test/Ice/faultTolerance/faultTolerance.csproj b/cs/test/Ice/faultTolerance/faultTolerance.csproj index 3a3b604c420..7baa39338c7 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System.Windows" />
<Reference Include="system" />
diff --git a/cs/test/Ice/hold/hold.csproj b/cs/test/Ice/hold/hold.csproj index 25b252e7ae1..09bda8be09d 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System.Windows" />
<Reference Include="system" />
diff --git a/cs/test/Ice/info/info.csproj b/cs/test/Ice/info/info.csproj index 7deb7c7ccf0..401f07f0568 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System.Windows" />
<Reference Include="system" />
diff --git a/cs/test/Ice/inheritance/inheritance.csproj b/cs/test/Ice/inheritance/inheritance.csproj index d6f2fb0c9b3..2e9d4776afb 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System.Windows" />
<Reference Include="system" />
diff --git a/cs/test/Ice/invoke/invoke.csproj b/cs/test/Ice/invoke/invoke.csproj index e6799d54580..63cc9ac7b85 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System.Windows" />
<Reference Include="system" />
diff --git a/cs/test/Ice/location/location.csproj b/cs/test/Ice/location/location.csproj index 5e700f93fe1..98d6bb7415b 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System.Windows" />
<Reference Include="system" />
diff --git a/cs/test/Ice/objects/objects.csproj b/cs/test/Ice/objects/objects.csproj index 973da0116a9..d79ca5eeaef 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System.Windows" />
<Reference Include="system" />
diff --git a/cs/test/Ice/operations/operations.csproj b/cs/test/Ice/operations/operations.csproj index 58b2dbfd6f7..65b0564f70f 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System.Windows" />
<Reference Include="system" />
diff --git a/cs/test/Ice/proxy/proxy.csproj b/cs/test/Ice/proxy/proxy.csproj index f5597c419c4..59b69f81f17 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System.Windows" />
<Reference Include="system" />
diff --git a/cs/test/Ice/retry/retry.csproj b/cs/test/Ice/retry/retry.csproj index 1d558c3f1ec..5dccf297e7f 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System.Windows" />
<Reference Include="system" />
diff --git a/cs/test/Ice/seqMapping/seqMapping.csproj b/cs/test/Ice/seqMapping/seqMapping.csproj index c362444d511..7274f2cdb86 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System.Windows" />
<Reference Include="system" />
diff --git a/cs/test/Ice/servantLocator/servantLocator.csproj b/cs/test/Ice/servantLocator/servantLocator.csproj index afe1e947094..b47c664b7ca 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.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/exceptions.csproj b/cs/test/Ice/slicing/exceptions/exceptions.csproj index f2f026a9d05..a3166574a67 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.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/objects.csproj b/cs/test/Ice/slicing/objects/objects.csproj index 9db7700d23f..5e7b6a11695 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System.Windows" />
<Reference Include="system" />
diff --git a/cs/test/Ice/stream/stream.csproj b/cs/test/Ice/stream/stream.csproj index 03d39beb439..74201968363 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System.Windows" />
<Reference Include="system" />
diff --git a/cs/test/Ice/timeout/timeout.csproj b/cs/test/Ice/timeout/timeout.csproj index 7fe47e627fd..bf85d44416f 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
<Reference Include="mscorlib" />
<Reference Include="System.Windows" />
<Reference Include="system" />
diff --git a/cs/test/TestCommon/TestCommon.csproj b/cs/test/TestCommon/TestCommon.csproj index 996dfaf763d..1679b7c1b91 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.4.2.0, Culture=neutral, PublicKeyToken=1f998c50fec78381, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.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 8200bebe24b..879bf46e039 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,34:createIceStorm --Ice.Config=config.service %s"' % Util.defaultHost + args = ' --IceBox.Service.IceStorm="IceStormService,35b:createIceStorm --Ice.Config=config.service %s"' % Util.defaultHost else: args = '' diff --git a/demoscript/Util.py b/demoscript/Util.py index 0a9f1c7fb58..e096ebb58b9 100644 --- a/demoscript/Util.py +++ b/demoscript/Util.py @@ -122,7 +122,7 @@ def configurePaths(): # Only add the lib directory to the shared library path if we're # not using the embedded location. - if libDir and iceHome != "/opt/Ice-3.4": + if libDir and iceHome != "/opt/Ice-3.5": addLdPath(libDir) if not iceHome: diff --git a/distribution/bin/fixVersion.py b/distribution/bin/fixVersion.py index e2b30cdb210..5850460f433 100755 --- a/distribution/bin/fixVersion.py +++ b/distribution/bin/fixVersion.py @@ -75,9 +75,12 @@ FixUtil.fileMatchAndReplace(os.path.join(ice_dir, "distribution", "src", "rpm", FixUtil.fileMatchAndReplace(os.path.join(ice_dir, "distribution", "src", "common", "build.properties"), [("ice\.version[\t\s]*= " + FixUtil.vpatMatch, version)]) -FixUtil.fileMatchAndReplace(os.path.join("distribution", "src", "common", "README.DEMOS.txt"), +FixUtil.fileMatchAndReplace(os.path.join(ice_dir, "distribution", "src", "common", "README.DEMOS.txt"), [("Ice-" + FixUtil.vpatMatch, version)]) +FixUtil.fileMatchAndReplace(os.path.join(ice_dir, "distribution", "src", "windows", "docs", "thirdparty", "README.txt"), + [("Ice " + FixUtil.vpatMatch, version)]) + for f in FixUtil.find("*.py"): FixUtil.fileMatchAndReplace(f, [("iceVersion[\t\s]*= '" + FixUtil.vpatMatch, version)], False) @@ -90,6 +93,9 @@ for f in FixUtil.find("*.py"): FixUtil.fileMatchAndReplace(os.path.join(ice_dir, "demoscript", "IceStorm", "clock.py"), [("IceStormService,([0-9]+b?)", FixUtil.soVersion(version))]) +FixUtil.fileMatchAndReplace(os.path.join(ice_dir, "demoscript", "Util.py"), + [("/opt/Ice-([0-9]+\.[0-9]+)", FixUtil.shortVersion(version))]) + for f in FixUtil.find("config.icebox"): FixUtil.fileMatchAndReplace(f, [("IceStormService,([0-9]+b?)", FixUtil.soVersion(version))]) @@ -129,6 +135,9 @@ FixUtil.fileMatchAndReplace(os.path.join(ice_home, "demo", "IceStorm", "replicat FixUtil.fileMatchAndReplace(os.path.join(ice_home, "demo", "IceStorm", "replicated", "application.xml"), [("IceStormService,([0-9]+b?)", FixUtil.soVersion(version))]) +FixUtil.fileMatchAndReplace(os.path.join(ice_home, "demo", "IceStorm", "repgrid", "application.xml"), + [("IceStormService,([0-9]+b?)", FixUtil.soVersion(version))]) + FixUtil.fileMatchAndReplace(os.path.join(ice_home, "config", "templates.xml"), [("IceStormService,([0-9]+b?)", FixUtil.soVersion(version))]) @@ -138,6 +147,10 @@ FixUtil.fileMatchAndReplace(os.path.join(ice_home, "demo", "Ice", "plugin", "Ice FixUtil.fileMatchAndReplace(os.path.join(ice_home, "demo", "Ice", "plugin", "Ice.plugin.logger.vcproj"), [("loggerplugin([0-9]+b?)", FixUtil.soVersion(version))]) +for f in FixUtil.find("*.vcxproj"): + FixUtil.fileMatchAndReplace(f, [("IceWinRT\\\\([0-9]+\.[0-9]+)@", FixUtil.shortVersion(version)), + ("IceWinRT, Version=([0-9]+\.[0-9]+)", FixUtil.shortVersion(version))]) + for f in FixUtil.find("*.rc"): FixUtil.fileMatchAndReplace(f, [("\"FileVersion\", \"" + FixUtil.vpatMatch, version), \ ("\"ProductVersion\", \"" + FixUtil.vpatMatch, version), \ @@ -170,6 +183,12 @@ FixUtil.fileMatchAndReplace(os.path.join(icej_home, "src", "Ice", "Util.java"), # C# specific files # icecs_home = os.path.join(ice_dir, "cs") + +FixUtil.fileMatchAndReplace(os.path.join(icecs_home, "src", "IceBox", "Makefile.mak"), + [("codeBase version=\"" + FixUtil.vpatMatch + "\.0\"", + FixUtil.majorVersion(version) + "." + FixUtil.minorVersion(version) + "." + FixUtil.patchVersion(version))]) + + for f in FixUtil.find("AssemblyInfo*.cs"): if f.find("generate") < 0 and f.find("ConsoleApplication") < 0: FixUtil.fileMatchAndReplace(f, [("AssemblyVersion\(\"" + FixUtil.vpatMatch + "\"", @@ -189,21 +208,32 @@ FixUtil.fileMatchAndReplace(os.path.join(icecs_home, "src", "Ice", "Util.cs"), # Fix C# and VB projects # for f in FixUtil.find("*.vbproj"): - FixUtil.fileMatchAndReplace(f, [("Glacier2, Version=" + FixUtil.vpatMatch, version)]) - FixUtil.fileMatchAndReplace(f, [("Ice, Version=" + FixUtil.vpatMatch, version)]) - FixUtil.fileMatchAndReplace(f, [("IceBox, Version=" + FixUtil.vpatMatch, version)]) - FixUtil.fileMatchAndReplace(f, [("IceGrid, Version=" + FixUtil.vpatMatch, version)]) - FixUtil.fileMatchAndReplace(f, [("IcePatch2, Version=" + FixUtil.vpatMatch, version)]) - FixUtil.fileMatchAndReplace(f, [("IceSSL, Version=" + FixUtil.vpatMatch, version)]) - FixUtil.fileMatchAndReplace(f, [("IceStorm, Version=" + FixUtil.vpatMatch, version)]) - FixUtil.fileMatchAndReplace(f, [("IceGlacier2, Version=" + FixUtil.vpatMatch, version)]) + FixUtil.fileMatchAndReplace(f, [("Glacier2, Version=" + FixUtil.vpatMatch, version)], False) + FixUtil.fileMatchAndReplace(f, [("Ice, Version=" + FixUtil.vpatMatch, version)], False) + FixUtil.fileMatchAndReplace(f, [("IceBox, Version=" + FixUtil.vpatMatch, version)], False) + FixUtil.fileMatchAndReplace(f, [("IceGrid, Version=" + FixUtil.vpatMatch, version)], False) + FixUtil.fileMatchAndReplace(f, [("IcePatch2, Version=" + FixUtil.vpatMatch, version)], False) + FixUtil.fileMatchAndReplace(f, [("IceSSL, Version=" + FixUtil.vpatMatch, version)], False) + FixUtil.fileMatchAndReplace(f, [("IceStorm, Version=" + FixUtil.vpatMatch, version)], False) + FixUtil.fileMatchAndReplace(f, [("IceGlacier2, Version=" + FixUtil.vpatMatch, version)], False) for f in FixUtil.find("*.csproj"): if f.find("addin-") < 0: - FixUtil.fileMatchAndReplace(f, [("Glacier2, Version=" + FixUtil.vpatMatch, version)]) - FixUtil.fileMatchAndReplace(f, [("Ice, Version=" + FixUtil.vpatMatch, version)]) - FixUtil.fileMatchAndReplace(f, [("IceBox, Version=" + FixUtil.vpatMatch, version)]) - FixUtil.fileMatchAndReplace(f, [("IceGrid, Version=" + FixUtil.vpatMatch, version)]) - FixUtil.fileMatchAndReplace(f, [("IcePatch2, Version=" + FixUtil.vpatMatch, version)]) - FixUtil.fileMatchAndReplace(f, [("IceSSL, Version=" + FixUtil.vpatMatch, version)]) - FixUtil.fileMatchAndReplace(f, [("IceStorm, Version=" + FixUtil.vpatMatch, version)]) - FixUtil.fileMatchAndReplace(f, [("IceGlacier2, Version=" + FixUtil.vpatMatch, version)]) + FixUtil.fileMatchAndReplace(f, [("Glacier2, Version=" + FixUtil.vpatMatch, version)], False) + FixUtil.fileMatchAndReplace(f, [("Ice, Version=" + FixUtil.vpatMatch, version)], False) + FixUtil.fileMatchAndReplace(f, [("IceBox, Version=" + FixUtil.vpatMatch, version)], False) + FixUtil.fileMatchAndReplace(f, [("IceGrid, Version=" + FixUtil.vpatMatch, version)], False) + FixUtil.fileMatchAndReplace(f, [("IcePatch2, Version=" + FixUtil.vpatMatch, version)], False) + FixUtil.fileMatchAndReplace(f, [("IceSSL, Version=" + FixUtil.vpatMatch, version)], False) + FixUtil.fileMatchAndReplace(f, [("IceStorm, Version=" + FixUtil.vpatMatch, version)], False) + FixUtil.fileMatchAndReplace(f, [("IceGlacier2, Version=" + FixUtil.vpatMatch, version)], False) + + +# VS add-in + +FixUtil.fileMatchAndReplace(os.path.join(ice_dir, "vsaddin", "config", "Ice.props"), + [("ZeroC\\\\Ice " + FixUtil.vpatMatch + "@InstallDir", version)]) + + +# Release notes +FixUtil.fileMatchAndReplace(os.path.join(ice_dir, "RELEASE_NOTES"), + [("Ice\+" + FixUtil.vpatMatch, version)]) diff --git a/distribution/bin/makemsi.py b/distribution/bin/makemsi.py index e856f30d8ae..fb2786da11c 100755 --- a/distribution/bin/makemsi.py +++ b/distribution/bin/makemsi.py @@ -12,7 +12,7 @@ import getopt, os, re, shutil, string, sys, zipfile, fileinput import logging, cStringIO, glob import textwrap -iceVersion = '3.4.2' +iceVersion = '3.5b' looksVersion = '2.2.2' formsVersion = '1.2.1' diff --git a/distribution/bin/makethirdpartiesmsi.py b/distribution/bin/makethirdpartiesmsi.py index b9b2442f81d..b4638bb5f95 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.4.2' +iceVersion = '3.5b' # # Current default third party library versions. diff --git a/distribution/src/common/build.properties b/distribution/src/common/build.properties index 50bc3258755..218b7e33c00 100644 --- a/distribution/src/common/build.properties +++ b/distribution/src/common/build.properties @@ -7,7 +7,7 @@ # # ********************************************************************** -ice.version = 3.4.2 +ice.version = 3.5b # # 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 3ff31f291e1..b2c465cb922 100644 --- a/distribution/src/rpm/ice.spec +++ b/distribution/src/rpm/ice.spec @@ -56,7 +56,7 @@ %endif Name: ice -Version: 3.4.2 +Version: 3.5b Summary: Files common to all Ice packages Release: 1%{?dist} License: GPL with exceptions @@ -68,9 +68,9 @@ Source1: Ice-rpmbuild-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%define soversion 34 -%define dotnetversion 3.4.2 -%define dotnetpolicyversion 3.4 +%define soversion 35b +%define dotnetversion 3.5.51 +%define dotnetpolicyversion 3.5 %define commonversion 1.2.0 %define formsversion 1.4.1 diff --git a/distribution/src/windows/docs/thirdparty/README.txt b/distribution/src/windows/docs/thirdparty/README.txt index 8671316a7d6..53df3c276cb 100644 --- a/distribution/src/windows/docs/thirdparty/README.txt +++ b/distribution/src/windows/docs/thirdparty/README.txt @@ -1,9 +1,9 @@ -Ice 3.4.2 Third Party Packages
+Ice 3.5b Third Party Packages
-----------------------------
This distribution contains the development kit (including binaries)
-for the open-source packages used by Ice 3.4.2 on Windows. Its primary
-purpose is to simplify building Ice 3.4.2 from sources.
+for the open-source packages used by Ice 3.5b on Windows. Its primary
+purpose is to simplify building Ice 3.5b from sources.
The following versions of the third party software were used to
create this package:
diff --git a/java/config/build.properties b/java/config/build.properties index b0c720f982b..0de3e3dd3a8 100644 --- a/java/config/build.properties +++ b/java/config/build.properties @@ -7,7 +7,7 @@ # # ********************************************************************** -ice.version = 3.4.2 +ice.version = 3.5b # # 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 7f866a8021f..1ef67c260be 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,34:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,35b:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions diff --git a/java/src/Ice/Util.java b/java/src/Ice/Util.java index 193c747508c..822e8559efc 100644 --- a/java/src/Ice/Util.java +++ b/java/src/Ice/Util.java @@ -500,7 +500,7 @@ public final class Util public static String stringVersion() { - return "3.4.2"; // "A.B.C", with A=major, B=minor, C=patch + return "3.5b"; // "A.B.C", with A=major, B=minor, C=patch } /** @@ -513,7 +513,7 @@ public final class Util public static int intVersion() { - return 30402; // AABBCC, with AA=major, BB=minor, CC=patch + return 30551; // AABBCC, with AA=major, BB=minor, CC=patch } /** diff --git a/java/src/IceUtil/Version.java b/java/src/IceUtil/Version.java index 11acebb0c3c..a1b1f5e82e1 100644 --- a/java/src/IceUtil/Version.java +++ b/java/src/IceUtil/Version.java @@ -18,6 +18,6 @@ public final class Version // // The Ice version. // - public final static String ICE_STRING_VERSION = "3.4.2"; // "A.B.C", with A=major, B=minor, C=patch - public final static int ICE_INT_VERSION = 30402; // AABBCC, with AA=major, BB=minor, CC=patch + public final static String ICE_STRING_VERSION = "3.5b"; // "A.B.C", with A=major, B=minor, C=patch + public final static int ICE_INT_VERSION = 30551; // AABBCC, with AA=major, BB=minor, CC=patch } diff --git a/php/src/IcePHP/IcePHP.rc b/php/src/IcePHP/IcePHP.rc index d50ea4824ea..3302a45163d 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/py/demo/IceStorm/clock/config.icebox b/py/demo/IceStorm/clock/config.icebox index 7f866a8021f..1ef67c260be 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,34:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,35b:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions diff --git a/py/modules/IcePy/IcePy.rc b/py/modules/IcePy/IcePy.rc index 63215a6860f..06bc19b3f65 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,4,2,0
- PRODUCTVERSION 3,4,2,0
+ FILEVERSION 3,5,51,0
+ PRODUCTVERSION 3,5,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.4.2\0"
+ VALUE "FileVersion", "3.5b\0"
VALUE "InternalName", INTERNALNAME
VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
VALUE "OriginalFilename", ORIGINALFILENAME
VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.4.2\0"
+ VALUE "ProductVersion", "3.5b\0"
END
END
BLOCK "VarFileInfo"
diff --git a/vb/demo/Glacier2/callback/client.vbproj b/vb/demo/Glacier2/callback/client.vbproj index 4dacdd18443..062eda18072 100644 --- a/vb/demo/Glacier2/callback/client.vbproj +++ b/vb/demo/Glacier2/callback/client.vbproj @@ -72,13 +72,13 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Glacier2, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Glacier2, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
<Private>True</Private>
</Reference>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
<Private>True</Private>
</Reference>
- <Reference Include="IceSSL, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="IceSSL, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 bd66b4c5bda..bd2590d70a7 100644 --- a/vb/demo/Glacier2/callback/server.vbproj +++ b/vb/demo/Glacier2/callback/server.vbproj @@ -72,7 +72,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 1708847dd0b..e60aeae164b 100644 --- a/vb/demo/Glacier2/callback/slice.csproj +++ b/vb/demo/Glacier2/callback/slice.csproj @@ -34,7 +34,7 @@ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 808d19ec069..cf29f6002c2 100644 --- a/vb/demo/Ice/async/client.vbproj +++ b/vb/demo/Ice/async/client.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 e648d8f6d5b..d6345a63a1b 100644 --- a/vb/demo/Ice/async/server.vbproj +++ b/vb/demo/Ice/async/server.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 72f0f50951b..381cdcbf1ff 100644 --- a/vb/demo/Ice/async/slice.csproj +++ b/vb/demo/Ice/async/slice.csproj @@ -34,7 +34,7 @@ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 3762405d5db..4817c8fbe4c 100644 --- a/vb/demo/Ice/bidir/client.vbproj +++ b/vb/demo/Ice/bidir/client.vbproj @@ -72,7 +72,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 61f1be750ec..34e6a0d875c 100644 --- a/vb/demo/Ice/bidir/server.vbproj +++ b/vb/demo/Ice/bidir/server.vbproj @@ -72,7 +72,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 1967bb1d127..8e3e5023fe7 100644 --- a/vb/demo/Ice/bidir/slice.csproj +++ b/vb/demo/Ice/bidir/slice.csproj @@ -48,7 +48,7 @@ </PostBuildEvent>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 38b78c7d015..3a29c858369 100644 --- a/vb/demo/Ice/callback/client.vbproj +++ b/vb/demo/Ice/callback/client.vbproj @@ -73,10 +73,10 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
<Private>True</Private>
</Reference>
- <Reference Include="IceSSL, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="IceSSL, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 1320c6dd290..65fac69e6db 100644 --- a/vb/demo/Ice/callback/server.vbproj +++ b/vb/demo/Ice/callback/server.vbproj @@ -73,10 +73,10 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
<Private>True</Private>
</Reference>
- <Reference Include="IceSSL, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="IceSSL, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 07d40722e32..567894972ba 100644 --- a/vb/demo/Ice/callback/slice.csproj +++ b/vb/demo/Ice/callback/slice.csproj @@ -34,7 +34,7 @@ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 c3e03b8acc1..94e344df631 100644 --- a/vb/demo/Ice/hello/client.vbproj +++ b/vb/demo/Ice/hello/client.vbproj @@ -73,10 +73,10 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
<Private>True</Private>
</Reference>
- <Reference Include="IceSSL, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="IceSSL, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 72420534c1c..138aac52a80 100644 --- a/vb/demo/Ice/hello/server.vbproj +++ b/vb/demo/Ice/hello/server.vbproj @@ -73,10 +73,10 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
<Private>True</Private>
</Reference>
- <Reference Include="IceSSL, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="IceSSL, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 75b720421a2..587126fb8ab 100644 --- a/vb/demo/Ice/hello/slice.csproj +++ b/vb/demo/Ice/hello/slice.csproj @@ -34,7 +34,7 @@ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 5d8d44df479..48dee76e9d3 100644 --- a/vb/demo/Ice/invoke/client.vbproj +++ b/vb/demo/Ice/invoke/client.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 28bc099abf1..1cc73ad3462 100644 --- a/vb/demo/Ice/invoke/server.vbproj +++ b/vb/demo/Ice/invoke/server.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 f63b013bf9f..d11038afc67 100644 --- a/vb/demo/Ice/invoke/slice.csproj +++ b/vb/demo/Ice/invoke/slice.csproj @@ -34,7 +34,7 @@ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 0d9fade487e..f6cb75b8384 100644 --- a/vb/demo/Ice/latency/client.vbproj +++ b/vb/demo/Ice/latency/client.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 9eaf04085d4..0cc0720d7dc 100644 --- a/vb/demo/Ice/latency/server.vbproj +++ b/vb/demo/Ice/latency/server.vbproj @@ -72,7 +72,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 de2ef50ecd0..03d54af6806 100644 --- a/vb/demo/Ice/latency/slice.csproj +++ b/vb/demo/Ice/latency/slice.csproj @@ -34,7 +34,7 @@ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 431da57fda0..d26b84f4f3b 100644 --- a/vb/demo/Ice/minimal/client.vbproj +++ b/vb/demo/Ice/minimal/client.vbproj @@ -73,7 +73,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 17fba245216..9505b2d96fd 100644 --- a/vb/demo/Ice/minimal/server.vbproj +++ b/vb/demo/Ice/minimal/server.vbproj @@ -72,7 +72,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 baf8ee98f17..e152b077dfc 100644 --- a/vb/demo/Ice/minimal/slice.csproj +++ b/vb/demo/Ice/minimal/slice.csproj @@ -34,7 +34,7 @@ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 c3fa1e7a286..1b00984dd8c 100644 --- a/vb/demo/Ice/nested/client.vbproj +++ b/vb/demo/Ice/nested/client.vbproj @@ -72,7 +72,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 166c2a21a4d..cd4eea636b6 100644 --- a/vb/demo/Ice/nested/server.vbproj +++ b/vb/demo/Ice/nested/server.vbproj @@ -72,7 +72,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 65ff3e85055..49786768ca4 100644 --- a/vb/demo/Ice/nested/slice.csproj +++ b/vb/demo/Ice/nested/slice.csproj @@ -34,7 +34,7 @@ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 fe40d3c300d..82dbc6304d6 100644 --- a/vb/demo/Ice/session/client.vbproj +++ b/vb/demo/Ice/session/client.vbproj @@ -72,7 +72,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 7d635c94c14..6fa6328c5c3 100644 --- a/vb/demo/Ice/session/server.vbproj +++ b/vb/demo/Ice/session/server.vbproj @@ -72,7 +72,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 9fa9d91a2c6..857286cec4c 100644 --- a/vb/demo/Ice/session/slice.csproj +++ b/vb/demo/Ice/session/slice.csproj @@ -34,7 +34,7 @@ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 9904524f2e0..bd9ce95955d 100644 --- a/vb/demo/Ice/throughput/client.vbproj +++ b/vb/demo/Ice/throughput/client.vbproj @@ -72,7 +72,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 0f6f1e92ffd..2dc159e80a0 100644 --- a/vb/demo/Ice/throughput/server.vbproj +++ b/vb/demo/Ice/throughput/server.vbproj @@ -72,7 +72,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 d407f614703..8c8714859ad 100644 --- a/vb/demo/Ice/throughput/slice.csproj +++ b/vb/demo/Ice/throughput/slice.csproj @@ -34,7 +34,7 @@ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 98d147bb45f..313a1a754ac 100644 --- a/vb/demo/Ice/value/client.vbproj +++ b/vb/demo/Ice/value/client.vbproj @@ -72,7 +72,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 f4478adb0ec..8790f2aca21 100644 --- a/vb/demo/Ice/value/server.vbproj +++ b/vb/demo/Ice/value/server.vbproj @@ -72,7 +72,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 0a9c7df4108..e7aef970490 100644 --- a/vb/demo/Ice/value/slice.csproj +++ b/vb/demo/Ice/value/slice.csproj @@ -34,7 +34,7 @@ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 15e10176965..5cee849df68 100644 --- a/vb/demo/IceBox/hello/client.vbproj +++ b/vb/demo/IceBox/hello/client.vbproj @@ -73,10 +73,10 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
<Private>True</Private>
</Reference>
- <Reference Include="IceSSL, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="IceSSL, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
<Private>True</Private>
</Reference>
<Reference Include="System">
diff --git a/vb/demo/IceBox/hello/helloservice.vbproj b/vb/demo/IceBox/hello/helloservice.vbproj index 033ec26fb26..c884f4b0924 100644 --- a/vb/demo/IceBox/hello/helloservice.vbproj +++ b/vb/demo/IceBox/hello/helloservice.vbproj @@ -72,11 +72,11 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL" />
- <Reference Include="IceBox, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL" />
+ <Reference Include="IceBox, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
</Reference>
- <Reference Include="IceSSL, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL" />
+ <Reference Include="IceSSL, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 a814c338d2a..50063c405a0 100644 --- a/vb/demo/IceBox/hello/slice.csproj +++ b/vb/demo/IceBox/hello/slice.csproj @@ -34,7 +34,7 @@ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 d12d33a258f..272567f7ffc 100644 --- a/vb/demo/IceGrid/simple/client.vbproj +++ b/vb/demo/IceGrid/simple/client.vbproj @@ -73,10 +73,10 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
<Private>True</Private>
</Reference>
- <Reference Include="IceGrid, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="IceGrid, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 54371781c5e..6722a5d8bf1 100644 --- a/vb/demo/IceGrid/simple/server.vbproj +++ b/vb/demo/IceGrid/simple/server.vbproj @@ -72,7 +72,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 97339968104..79f151f152a 100644 --- a/vb/demo/IceGrid/simple/slice.csproj +++ b/vb/demo/IceGrid/simple/slice.csproj @@ -34,7 +34,7 @@ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 0019ad9f81b..845b3d42090 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,34:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,35b: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 ab628608341..15ecb91a05c 100644 --- a/vb/demo/IceStorm/clock/publisher.vbproj +++ b/vb/demo/IceStorm/clock/publisher.vbproj @@ -72,10 +72,10 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
<Private>True</Private>
</Reference>
- <Reference Include="IceStorm, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="IceStorm, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 6667dcdf23e..021c0612d92 100644 --- a/vb/demo/IceStorm/clock/slice.csproj +++ b/vb/demo/IceStorm/clock/slice.csproj @@ -34,7 +34,7 @@ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 5fa27337472..b7858766fa2 100644 --- a/vb/demo/IceStorm/clock/subscriber.vbproj +++ b/vb/demo/IceStorm/clock/subscriber.vbproj @@ -87,10 +87,10 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
<Private>True</Private>
</Reference>
- <Reference Include="IceStorm, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="IceStorm, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 2a131ee18b1..757d784599d 100644 --- a/vb/demo/book/printer/client.vbproj +++ b/vb/demo/book/printer/client.vbproj @@ -72,7 +72,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
<Private>True</Private>
</Reference>
<Reference Include="System">
diff --git a/vb/demo/book/printer/server.vbproj b/vb/demo/book/printer/server.vbproj index da9b1a09362..20ceb128485 100644 --- a/vb/demo/book/printer/server.vbproj +++ b/vb/demo/book/printer/server.vbproj @@ -72,7 +72,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 c4d7a35c687..03cdde05836 100644 --- a/vb/demo/book/printer/slice.csproj +++ b/vb/demo/book/printer/slice.csproj @@ -34,7 +34,7 @@ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 4f842106bbf..4521fd3d41f 100644 --- a/vb/demo/book/simple_filesystem/client.vbproj +++ b/vb/demo/book/simple_filesystem/client.vbproj @@ -72,7 +72,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 f2de9ed87ae..4d40d2be6d0 100644 --- a/vb/demo/book/simple_filesystem/server.vbproj +++ b/vb/demo/book/simple_filesystem/server.vbproj @@ -72,7 +72,7 @@ <DebugType>none</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 5498343e285..9e645526ba1 100644 --- a/vb/demo/book/simple_filesystem/slice.csproj +++ b/vb/demo/book/simple_filesystem/slice.csproj @@ -34,7 +34,7 @@ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ice, Version=3.4.2.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL" />
+ <Reference Include="Ice, Version=3.5b.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, 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 95e73ed5f32..930e38c2f4f 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.4.2@InstallDir)</IceHome>
+ <IceHome>$(Registry:HKEY_LOCAL_MACHINE\Software\ZeroC\Ice 3.5b@InstallDir)</IceHome>
<IceInclude>$(IceHome)\include</IceInclude>
</PropertyGroup>
<PropertyGroup Condition="!Exists('$(IceSourceHome)') And '$(Platform)' == 'Win32' And '$(MinimumVisualStudioVersion)' == 10.0">
diff --git a/vsaddin/src/AssemblyInfo.cs b/vsaddin/src/AssemblyInfo.cs index b97a84b9d98..0a1afb0fcea 100644 --- a/vsaddin/src/AssemblyInfo.cs +++ b/vsaddin/src/AssemblyInfo.cs @@ -21,7 +21,7 @@ using System.Resources; [assembly: AssemblyCopyright("Copyright (c) 2003-2012 ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.4.2.1")] +[assembly: AssemblyVersion("3.5.51")] [assembly: AssemblyDelaySign(false)] [assembly: ComVisible(false)] [assembly: NeutralResourcesLanguageAttribute("en-US")] |