diff options
Diffstat (limited to 'cpp/demo')
| -rw-r--r-- | cpp/demo/Glacier2/winrt/chat/chat.vcxproj | 14 | ||||
| -rwxr-xr-x | cpp/demo/Ice/MFC/client/HelloClient.rc | 8 | ||||
| -rw-r--r-- | cpp/demo/Ice/MFC/server/HelloServer.rc | 8 | ||||
| -rwxr-xr-x | cpp/demo/Ice/plugin/Ice.plugin.hello.vcproj | 16 | ||||
| -rwxr-xr-x | cpp/demo/Ice/plugin/Ice.plugin.logger.vcproj | 16 | ||||
| -rw-r--r-- | cpp/demo/Ice/winrt/bidir/bidir.vcxproj | 14 | ||||
| -rw-r--r-- | cpp/demo/Ice/winrt/hello/hello.vcxproj | 14 | ||||
| -rw-r--r-- | cpp/demo/IcePatch2/MFC/PatchClient.rc | 8 | ||||
| -rw-r--r-- | cpp/demo/IceStorm/clock/config.icebox | 2 | ||||
| -rw-r--r-- | cpp/demo/IceStorm/counter/config.icebox | 2 | ||||
| -rwxr-xr-x | cpp/demo/IceStorm/counter/expect.py | 2 | ||||
| -rw-r--r-- | cpp/demo/IceStorm/replicated/application.xml | 2 | ||||
| -rw-r--r-- | cpp/demo/IceStorm/replicated2/config.ib1 | 2 | ||||
| -rw-r--r-- | cpp/demo/IceStorm/replicated2/config.ib2 | 2 | ||||
| -rw-r--r-- | cpp/demo/IceStorm/replicated2/config.ib3 | 2 | ||||
| -rwxr-xr-x | cpp/demo/IceStorm/replicated2/expect.py | 6 |
16 files changed, 59 insertions, 59 deletions
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 = '' |