diff options
| author | Jose <jose@zeroc.com> | 2015-08-05 09:08:50 -0700 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-08-05 09:08:50 -0700 |
| commit | 08c7310b1549b7080d1e5c52ae4e5ceb71b871e8 (patch) | |
| tree | de4b085a165a9845ca27c2fd7a511608ee727dbc /cpp/test | |
| parent | Fixed ICE-6687 - IceSSL tests failures on El Capitan (diff) | |
| download | ice-08c7310b1549b7080d1e5c52ae4e5ceb71b871e8.tar.bz2 ice-08c7310b1549b7080d1e5c52ae4e5ceb71b871e8.tar.xz ice-08c7310b1549b7080d1e5c52ae4e5ceb71b871e8.zip | |
Add support to build Ice UAP SDK
Diffstat (limited to 'cpp/test')
| -rw-r--r-- | cpp/test/.gitignore (renamed from cpp/test/WinRT/.gitignore) | 0 | ||||
| -rw-r--r-- | cpp/test/TestSuite/.gitignore (renamed from cpp/test/WinRT/TestSuite/.gitignore) | 0 | ||||
| -rw-r--r-- | cpp/test/TestSuite/10.0/App.xaml (renamed from cpp/test/WinRT/TestSuite/App.xaml) | 7 | ||||
| -rw-r--r-- | cpp/test/TestSuite/10.0/App.xaml.cpp (renamed from cpp/test/WinRT/TestSuite/App.xaml.cpp) | 0 | ||||
| -rw-r--r-- | cpp/test/TestSuite/10.0/App.xaml.h (renamed from cpp/test/WinRT/TestSuite/App.xaml.h) | 0 | ||||
| -rw-r--r-- | cpp/test/TestSuite/10.0/Assets/LockScreenLogo.scale-200.png | bin | 0 -> 1430 bytes | |||
| -rw-r--r-- | cpp/test/TestSuite/10.0/Assets/SplashScreen.scale-200.png | bin | 0 -> 7700 bytes | |||
| -rw-r--r-- | cpp/test/TestSuite/10.0/Assets/Square150x150Logo.scale-200.png | bin | 0 -> 2937 bytes | |||
| -rw-r--r-- | cpp/test/TestSuite/10.0/Assets/Square44x44Logo.scale-200.png | bin | 0 -> 1647 bytes | |||
| -rw-r--r-- | cpp/test/TestSuite/10.0/Assets/Square44x44Logo.targetsize-24_altform-unplated.png | bin | 0 -> 1255 bytes | |||
| -rw-r--r-- | cpp/test/TestSuite/10.0/Assets/StoreLogo.png | bin | 0 -> 1451 bytes | |||
| -rw-r--r-- | cpp/test/TestSuite/10.0/Assets/Wide310x150Logo.scale-200.png | bin | 0 -> 3204 bytes | |||
| -rw-r--r-- | cpp/test/TestSuite/10.0/Package.appxmanifest | 38 | ||||
| -rw-r--r-- | cpp/test/TestSuite/10.0/TestSuite.vcxproj | 379 | ||||
| -rw-r--r-- | cpp/test/TestSuite/10.0/TestSuite.vcxproj.filters | 246 | ||||
| -rw-r--r-- | cpp/test/TestSuite/10.0/TestSuite_TemporaryKey.pfx | bin | 0 -> 2448 bytes | |||
| -rw-r--r-- | cpp/test/TestSuite/8.0/App.xaml | 40 | ||||
| -rw-r--r-- | cpp/test/TestSuite/8.0/App.xaml.cpp | 87 | ||||
| -rw-r--r-- | cpp/test/TestSuite/8.0/App.xaml.h | 28 | ||||
| -rw-r--r-- | cpp/test/TestSuite/8.0/Assets/Logo.png (renamed from cpp/test/WinRT/TestSuite/Assets/Logo.png) | bin | 801 -> 801 bytes | |||
| -rw-r--r-- | cpp/test/TestSuite/8.0/Assets/SmallLogo.png (renamed from cpp/test/WinRT/TestSuite/Assets/SmallLogo.png) | bin | 3680 -> 3680 bytes | |||
| -rw-r--r-- | cpp/test/TestSuite/8.0/Assets/SplashScreen.png (renamed from cpp/test/WinRT/TestSuite/Assets/SplashScreen.png) | bin | 6050 -> 6050 bytes | |||
| -rw-r--r-- | cpp/test/TestSuite/8.0/Assets/StoreLogo.png (renamed from cpp/test/WinRT/TestSuite/Assets/StoreLogo.png) | bin | 429 -> 429 bytes | |||
| -rw-r--r-- | cpp/test/TestSuite/8.0/Package.appxmanifest (renamed from cpp/test/WinRT/TestSuite/Package.appxmanifest) | 0 | ||||
| -rw-r--r-- | cpp/test/TestSuite/8.0/TestSuite.vcxproj (renamed from cpp/test/WinRT/TestSuite/TestSuite.vcxproj) | 40 | ||||
| -rw-r--r-- | cpp/test/TestSuite/8.0/TestSuite.vcxproj.filters (renamed from cpp/test/WinRT/TestSuite/TestSuite.vcxproj.filters) | 33 | ||||
| -rw-r--r-- | cpp/test/TestSuite/8.0/TestSuite_TemporaryKey.pfx | bin | 0 -> 2448 bytes | |||
| -rw-r--r-- | cpp/test/TestSuite/Controller.ice (renamed from cpp/test/WinRT/TestSuite/Controller.ice) | 0 | ||||
| -rw-r--r-- | cpp/test/TestSuite/MainPage.xaml (renamed from cpp/test/WinRT/TestSuite/MainPage.xaml) | 0 | ||||
| -rw-r--r-- | cpp/test/TestSuite/MainPage.xaml.cpp (renamed from cpp/test/WinRT/TestSuite/MainPage.xaml.cpp) | 2 | ||||
| -rw-r--r-- | cpp/test/TestSuite/MainPage.xaml.h (renamed from cpp/test/WinRT/TestSuite/MainPage.xaml.h) | 0 | ||||
| -rw-r--r-- | cpp/test/TestSuite/StandardStyles.xaml (renamed from cpp/test/WinRT/TestSuite/Common/StandardStyles.xaml) | 0 | ||||
| -rw-r--r-- | cpp/test/TestSuite/pch.cpp (renamed from cpp/test/WinRT/TestSuite/pch.cpp) | 0 | ||||
| -rw-r--r-- | cpp/test/TestSuite/pch.h (renamed from cpp/test/WinRT/TestSuite/pch.h) | 0 | ||||
| -rw-r--r-- | cpp/test/WinRT/TestSuite.sln | 40 | ||||
| -rw-r--r-- | cpp/test/WinRT/TestSuite/TestSuite_TemporaryKey.pfx | bin | 2504 -> 0 bytes |
36 files changed, 851 insertions, 89 deletions
diff --git a/cpp/test/WinRT/.gitignore b/cpp/test/.gitignore index cd450510b65..cd450510b65 100644 --- a/cpp/test/WinRT/.gitignore +++ b/cpp/test/.gitignore diff --git a/cpp/test/WinRT/TestSuite/.gitignore b/cpp/test/TestSuite/.gitignore index 4f40c2d1893..4f40c2d1893 100644 --- a/cpp/test/WinRT/TestSuite/.gitignore +++ b/cpp/test/TestSuite/.gitignore diff --git a/cpp/test/WinRT/TestSuite/App.xaml b/cpp/test/TestSuite/10.0/App.xaml index 4e4e56030a7..205e3b163b4 100644 --- a/cpp/test/WinRT/TestSuite/App.xaml +++ b/cpp/test/TestSuite/10.0/App.xaml @@ -7,12 +7,7 @@ <Application.Resources> <ResourceDictionary> <ResourceDictionary.MergedDictionaries> - - <!-- - Styles that define common aspects of the platform look and feel - Required by Visual Studio project and item templates - --> - <ResourceDictionary Source="Common/StandardStyles.xaml"/> + <ResourceDictionary Source="../StandardStyles.xaml"/> </ResourceDictionary.MergedDictionaries> <Style x:Key="TitleStyle" TargetType="TextBlock"> <Setter Property="Foreground" Value="White" /> diff --git a/cpp/test/WinRT/TestSuite/App.xaml.cpp b/cpp/test/TestSuite/10.0/App.xaml.cpp index b1cd025bf6d..b1cd025bf6d 100644 --- a/cpp/test/WinRT/TestSuite/App.xaml.cpp +++ b/cpp/test/TestSuite/10.0/App.xaml.cpp diff --git a/cpp/test/WinRT/TestSuite/App.xaml.h b/cpp/test/TestSuite/10.0/App.xaml.h index 3526e1c11b8..3526e1c11b8 100644 --- a/cpp/test/WinRT/TestSuite/App.xaml.h +++ b/cpp/test/TestSuite/10.0/App.xaml.h diff --git a/cpp/test/TestSuite/10.0/Assets/LockScreenLogo.scale-200.png b/cpp/test/TestSuite/10.0/Assets/LockScreenLogo.scale-200.png Binary files differnew file mode 100644 index 00000000000..735f57adb5d --- /dev/null +++ b/cpp/test/TestSuite/10.0/Assets/LockScreenLogo.scale-200.png diff --git a/cpp/test/TestSuite/10.0/Assets/SplashScreen.scale-200.png b/cpp/test/TestSuite/10.0/Assets/SplashScreen.scale-200.png Binary files differnew file mode 100644 index 00000000000..023e7f1feda --- /dev/null +++ b/cpp/test/TestSuite/10.0/Assets/SplashScreen.scale-200.png diff --git a/cpp/test/TestSuite/10.0/Assets/Square150x150Logo.scale-200.png b/cpp/test/TestSuite/10.0/Assets/Square150x150Logo.scale-200.png Binary files differnew file mode 100644 index 00000000000..af49fec1a54 --- /dev/null +++ b/cpp/test/TestSuite/10.0/Assets/Square150x150Logo.scale-200.png diff --git a/cpp/test/TestSuite/10.0/Assets/Square44x44Logo.scale-200.png b/cpp/test/TestSuite/10.0/Assets/Square44x44Logo.scale-200.png Binary files differnew file mode 100644 index 00000000000..ce342a2ec8a --- /dev/null +++ b/cpp/test/TestSuite/10.0/Assets/Square44x44Logo.scale-200.png diff --git a/cpp/test/TestSuite/10.0/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/cpp/test/TestSuite/10.0/Assets/Square44x44Logo.targetsize-24_altform-unplated.png Binary files differnew file mode 100644 index 00000000000..f6c02ce97e0 --- /dev/null +++ b/cpp/test/TestSuite/10.0/Assets/Square44x44Logo.targetsize-24_altform-unplated.png diff --git a/cpp/test/TestSuite/10.0/Assets/StoreLogo.png b/cpp/test/TestSuite/10.0/Assets/StoreLogo.png Binary files differnew file mode 100644 index 00000000000..7385b56c0e4 --- /dev/null +++ b/cpp/test/TestSuite/10.0/Assets/StoreLogo.png diff --git a/cpp/test/TestSuite/10.0/Assets/Wide310x150Logo.scale-200.png b/cpp/test/TestSuite/10.0/Assets/Wide310x150Logo.scale-200.png Binary files differnew file mode 100644 index 00000000000..288995b397f --- /dev/null +++ b/cpp/test/TestSuite/10.0/Assets/Wide310x150Logo.scale-200.png diff --git a/cpp/test/TestSuite/10.0/Package.appxmanifest b/cpp/test/TestSuite/10.0/Package.appxmanifest new file mode 100644 index 00000000000..f506eefe084 --- /dev/null +++ b/cpp/test/TestSuite/10.0/Package.appxmanifest @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp"> + <Identity Name="f4c6cdff-3ef9-43fb-8094-d50c547e70f6" Publisher="CN=jose" Version="1.0.0.0" /> + <mp:PhoneIdentity PhoneProductId="f4c6cdff-3ef9-43fb-8094-d50c547e70f6" PhonePublisherId="00000000-0000-0000-0000-000000000000" /> + <Properties> + <DisplayName>TestSuite</DisplayName> + <PublisherDisplayName>jose</PublisherDisplayName> + <Logo>Assets\StoreLogo.png</Logo> + </Properties> + <Dependencies> + <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" /> + </Dependencies> + <Resources> + <Resource Language="x-generate" /> + </Resources> + <Applications> + <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="TestSuite.App"> + <uap:VisualElements DisplayName="TestSuite" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="TestSuite" BackgroundColor="transparent"> + <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"> + </uap:DefaultTile> + <uap:SplashScreen Image="Assets\SplashScreen.png" /> + </uap:VisualElements> + </Application> + </Applications> + <Capabilities> + <Capability Name="internetClient" /> + <Capability Name="internetClientServer" /> + </Capabilities> + <Extensions> + <Extension Category="windows.certificates"> + <Certificates> + <Certificate StoreName="Root" Content="cacert.der" /> + <Certificate StoreName="CA" Content="cacert.der" /> + <TrustFlags ExclusiveTrust="true" /> + </Certificates> + </Extension> + </Extensions> +</Package>
\ No newline at end of file diff --git a/cpp/test/TestSuite/10.0/TestSuite.vcxproj b/cpp/test/TestSuite/10.0/TestSuite.vcxproj new file mode 100644 index 00000000000..1087bd0aaa3 --- /dev/null +++ b/cpp/test/TestSuite/10.0/TestSuite.vcxproj @@ -0,0 +1,379 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Label="Globals"> + <ProjectGuid>{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}</ProjectGuid> + <RootNamespace>TestSuite</RootNamespace> + <DefaultLanguage>en-US</DefaultLanguage> + <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion> + <AppContainerApplication>true</AppContainerApplication> + <ApplicationType>Windows Store</ApplicationType> + <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion> + <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> + <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|ARM"> + <Configuration>Debug</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|ARM"> + <Configuration>Release</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v140</PlatformToolset> + <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v140</PlatformToolset> + <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v140</PlatformToolset> + <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </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" /> + </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" /> + </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" /> + </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" /> + </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" /> + </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" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <PackageCertificateKeyFile>TestSuite_TemporaryKey.pfx</PackageCertificateKeyFile> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <DisableSpecificWarnings>4453;28204</DisableSpecificWarnings> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <AdditionalIncludeDirectories>.;..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <DisableSpecificWarnings>4453;28204</DisableSpecificWarnings> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <AdditionalIncludeDirectories>.;..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <DisableSpecificWarnings>4453;28204</DisableSpecificWarnings> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <AdditionalIncludeDirectories>.;..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <DisableSpecificWarnings>4453;28204</DisableSpecificWarnings> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <AdditionalIncludeDirectories>.;..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <DisableSpecificWarnings>4453;28204</DisableSpecificWarnings> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <AdditionalIncludeDirectories>.;..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <DisableSpecificWarnings>4453;28204</DisableSpecificWarnings> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <AdditionalIncludeDirectories>.;..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="App.xaml.h"> + <DependentUpon>App.xaml</DependentUpon> + </ClInclude> + <ClInclude Include="..\pch.h" /> + <ClInclude Include="generated\Controller.h" /> + <ClInclude Include="..\MainPage.xaml.h"> + <DependentUpon>..\MainPage.xaml</DependentUpon> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ApplicationDefinition Include="App.xaml"> + <SubType>Designer</SubType> + </ApplicationDefinition> + <Page Include="..\MainPage.xaml"> + <SubType>Designer</SubType> + </Page> + <Page Include="..\StandardStyles.xaml" /> + </ItemGroup> + <ItemGroup> + <AppxManifest Include="Package.appxmanifest"> + <SubType>Designer</SubType> + </AppxManifest> + </ItemGroup> + <ItemGroup> + <Image Include="Assets\LockScreenLogo.scale-200.png" /> + <Image Include="Assets\SplashScreen.scale-200.png" /> + <Image Include="Assets\Square150x150Logo.scale-200.png" /> + <Image Include="Assets\Square44x44Logo.scale-200.png" /> + <Image Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" /> + <Image Include="Assets\StoreLogo.png" /> + <Image Include="Assets\Wide310x150Logo.scale-200.png" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="App.xaml.cpp"> + <DependentUpon>App.xaml</DependentUpon> + </ClCompile> + <ClCompile Include="..\pch.cpp" /> + <ClCompile Include="generated\Controller.cpp" /> + <ClCompile Include="..\MainPage.xaml.cpp"> + <DependentUpon>..\MainPage.xaml</DependentUpon> + </ClCompile> + </ItemGroup> + <ItemGroup> + <IceBuilder Include="..\Controller.ice" /> + </ItemGroup> + <ItemGroup> + <None Include="..\..\Ice\acm\Ice_acm_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\acm\Ice_acm_server.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\adapterDeactivation\Ice_adapterDeactivation_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\adapterDeactivation\Ice_adapterDeactivation_collocated.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\adapterDeactivation\Ice_adapterDeactivation_server.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\admin\Ice_admin_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\admin\Ice_admin_server.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\ami\Ice_ami_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\ami\Ice_ami_server.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\binding\Ice_binding_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\binding\Ice_binding_server.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\dispatcher\Ice_dispatcher_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\dispatcher\Ice_dispatcher_server.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\enums\Ice_enums_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\enums\Ice_enums_server.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\exceptions\Ice_exceptions_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\exceptions\Ice_exceptions_collocated.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\exceptions\Ice_exceptions_server.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\exceptions\Ice_exceptions_serveramd.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\facets\Ice_facets_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\facets\Ice_facets_collocated.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\facets\Ice_facets_server.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\hash\Ice_hash_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\hold\Ice_hold_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\hold\Ice_hold_server.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\info/Ice_info_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\info\Ice_info_server.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\inheritance\Ice_inheritance_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\inheritance\Ice_inheritance_collocated.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\inheritance\Ice_inheritance_server.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\invoke\Ice_invoke_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\invoke\Ice_invoke_server.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\location\Ice_location_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\location\Ice_location_server.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\metrics\Ice_metrics_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\metrics\Ice_metrics_server.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\metrics\Ice_metrics_serveramd.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\objects\Ice_objects_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\objects\Ice_objects_collocated.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\objects\Ice_objects_server.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\operations\Ice_operations_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\operations\Ice_operations_collocated.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\operations\Ice_operations_server.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\operations\Ice_operations_serveramd.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\optional\Ice_optional_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\optional\Ice_optional_server.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\proxy\Ice_proxy_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\proxy\Ice_proxy_collocated.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\proxy\Ice_proxy_server.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\proxy\Ice_proxy_serveramd.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\retry\Ice_retry_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\retry\Ice_retry_server.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\stream\Ice_stream_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\timeout\Ice_timeout_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\timeout\Ice_timeout_server.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\udp\Ice_udp_client.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\Ice\udp\Ice_udp_server.dll"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\..\..\certs\cacert.der"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="TestSuite_TemporaryKey.pfx" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/cpp/test/TestSuite/10.0/TestSuite.vcxproj.filters b/cpp/test/TestSuite/10.0/TestSuite.vcxproj.filters new file mode 100644 index 00000000000..eca0be98104 --- /dev/null +++ b/cpp/test/TestSuite/10.0/TestSuite.vcxproj.filters @@ -0,0 +1,246 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Assets"> + <UniqueIdentifier>f061aee4-1cfc-46e9-bec1-56862ef6eb8d</UniqueIdentifier> + <Extensions>bmp;fbx;gif;jpg;jpeg;tga;tiff;tif;png</Extensions> + </Filter> + <Filter Include="Slice Files"> + <UniqueIdentifier>{29f5b957-676c-4569-b9f4-2a0a2a165847}</UniqueIdentifier> + <Extensions>ice</Extensions> + </Filter> + <Filter Include="Tests"> + <UniqueIdentifier>{bd12ace5-8391-4d0d-a278-55ce894025b2}</UniqueIdentifier> + </Filter> + <Filter Include="Styles"> + <UniqueIdentifier>65bbfccd-24aa-402e-8946-23421ba48638</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <ApplicationDefinition Include="App.xaml" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="generated\Controller.cpp" /> + <ClCompile Include="..\MainPage.xaml.cpp" /> + <ClCompile Include="..\pch.cpp" /> + <ClCompile Include="App.xaml.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="generated\Controller.h" /> + <ClInclude Include="..\MainPage.xaml.h" /> + <ClInclude Include="..\pch.h" /> + <ClInclude Include="App.xaml.h" /> + </ItemGroup> + <ItemGroup> + <Image Include="Assets\LockScreenLogo.scale-200.png"> + <Filter>Assets</Filter> + </Image> + <Image Include="Assets\SplashScreen.scale-200.png"> + <Filter>Assets</Filter> + </Image> + <Image Include="Assets\Square150x150Logo.scale-200.png"> + <Filter>Assets</Filter> + </Image> + <Image Include="Assets\Square44x44Logo.scale-200.png"> + <Filter>Assets</Filter> + </Image> + <Image Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png"> + <Filter>Assets</Filter> + </Image> + <Image Include="Assets\StoreLogo.png"> + <Filter>Assets</Filter> + </Image> + <Image Include="Assets\Wide310x150Logo.scale-200.png"> + <Filter>Assets</Filter> + </Image> + </ItemGroup> + <ItemGroup> + <AppxManifest Include="Package.appxmanifest" /> + </ItemGroup> + <ItemGroup> + <None Include="..\..\..\..\certs\cacert.der" /> + <None Include="..\..\Ice\udp\Ice_udp_server.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\acm\Ice_acm_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\acm\Ice_acm_server.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\adapterDeactivation\Ice_adapterDeactivation_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\adapterDeactivation\Ice_adapterDeactivation_collocated.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\adapterDeactivation\Ice_adapterDeactivation_server.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\admin\Ice_admin_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\admin\Ice_admin_server.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\ami\Ice_ami_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\ami\Ice_ami_server.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\binding\Ice_binding_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\binding\Ice_binding_server.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\dispatcher\Ice_dispatcher_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\dispatcher\Ice_dispatcher_server.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\enums\Ice_enums_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\enums\Ice_enums_server.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\exceptions\Ice_exceptions_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\exceptions\Ice_exceptions_collocated.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\exceptions\Ice_exceptions_server.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\exceptions\Ice_exceptions_serveramd.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\facets\Ice_facets_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\facets\Ice_facets_collocated.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\facets\Ice_facets_server.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\hash\Ice_hash_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\hold\Ice_hold_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\hold\Ice_hold_server.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\info/Ice_info_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\info\Ice_info_server.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\inheritance\Ice_inheritance_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\inheritance\Ice_inheritance_collocated.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\inheritance\Ice_inheritance_server.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\invoke\Ice_invoke_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\invoke\Ice_invoke_server.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\location\Ice_location_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\location\Ice_location_server.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\metrics\Ice_metrics_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\metrics\Ice_metrics_server.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\metrics\Ice_metrics_serveramd.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\objects\Ice_objects_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\objects\Ice_objects_collocated.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\objects\Ice_objects_server.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\operations\Ice_operations_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\operations\Ice_operations_collocated.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\operations\Ice_operations_server.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\operations\Ice_operations_serveramd.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\optional\Ice_optional_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\optional\Ice_optional_server.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\proxy\Ice_proxy_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\proxy\Ice_proxy_collocated.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\proxy\Ice_proxy_server.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\proxy\Ice_proxy_serveramd.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\retry\Ice_retry_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\retry\Ice_retry_server.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\stream\Ice_stream_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\timeout\Ice_timeout_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\timeout\Ice_timeout_server.dll"> + <Filter>Tests</Filter> + </None> + <None Include="..\..\Ice\udp\Ice_udp_client.dll"> + <Filter>Tests</Filter> + </None> + <None Include="TestSuite_TemporaryKey.pfx" /> + </ItemGroup> + <ItemGroup> + <Page Include="..\MainPage.xaml" /> + <Page Include="..\StandardStyles.xaml"> + <Filter>Styles</Filter> + </Page> + </ItemGroup> + <ItemGroup> + <IceBuilder Include="..\Controller.ice"> + <Filter>Slice Files</Filter> + </IceBuilder> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/cpp/test/TestSuite/10.0/TestSuite_TemporaryKey.pfx b/cpp/test/TestSuite/10.0/TestSuite_TemporaryKey.pfx Binary files differnew file mode 100644 index 00000000000..9064efd3d36 --- /dev/null +++ b/cpp/test/TestSuite/10.0/TestSuite_TemporaryKey.pfx diff --git a/cpp/test/TestSuite/8.0/App.xaml b/cpp/test/TestSuite/8.0/App.xaml new file mode 100644 index 00000000000..205e3b163b4 --- /dev/null +++ b/cpp/test/TestSuite/8.0/App.xaml @@ -0,0 +1,40 @@ +<Application + x:Class="TestSuite.App" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:local="using:TestSuite"> + + <Application.Resources> + <ResourceDictionary> + <ResourceDictionary.MergedDictionaries> + <ResourceDictionary Source="../StandardStyles.xaml"/> + </ResourceDictionary.MergedDictionaries> + <Style x:Key="TitleStyle" TargetType="TextBlock"> + <Setter Property="Foreground" Value="White" /> + <Setter Property="FontFamily" Value="Segoe UI Light" /> + <Setter Property="FontSize" Value="16" /> + </Style> + <Style x:Key="OutputStyle" TargetType="TextBlock"> + <Setter Property="Foreground" Value="Black" /> + <Setter Property="FontFamily" Value="Segoe UI Light" /> + <Setter Property="FontSize" Value="16" /> + </Style> + <Style x:Key="H1Style" TargetType="TextBlock"> + <Setter Property="Foreground" Value="White" /> + <Setter Property="FontFamily" Value="Segoe UI Light" /> + <Setter Property="FontSize" Value="36" /> + <Setter Property="Margin" Value="0,0,0,25" /> + </Style> + <Style x:Key="FooterStyle" TargetType="TextBlock"> + <Setter Property="Foreground" Value="White" /> + <Setter Property="FontFamily" Value="Segoe UI Light" /> + <Setter Property="FontSize" Value="12" /> + <Setter Property="Margin" Value="0,8,0,0" /> + </Style> + <Style x:Key="ButtonStyle" TargetType="Button"> + <Setter Property="Foreground" Value="White"/> + <Setter Property="Background" Value="Gray"/> + </Style> + </ResourceDictionary> + </Application.Resources> +</Application> diff --git a/cpp/test/TestSuite/8.0/App.xaml.cpp b/cpp/test/TestSuite/8.0/App.xaml.cpp new file mode 100644 index 00000000000..b1cd025bf6d --- /dev/null +++ b/cpp/test/TestSuite/8.0/App.xaml.cpp @@ -0,0 +1,87 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#include "pch.h" +#include "MainPage.xaml.h" + +using namespace TestSuite; + +using namespace Platform; +using namespace Windows::ApplicationModel; +using namespace Windows::ApplicationModel::Activation; +using namespace Windows::Foundation; +using namespace Windows::Foundation::Collections; +using namespace Windows::UI::Xaml; +using namespace Windows::UI::Xaml::Controls; +using namespace Windows::UI::Xaml::Controls::Primitives; +using namespace Windows::UI::Xaml::Data; +using namespace Windows::UI::Xaml::Input; +using namespace Windows::UI::Xaml::Interop; +using namespace Windows::UI::Xaml::Media; +using namespace Windows::UI::Xaml::Navigation; + +// The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=234227 + +/// <summary> +/// Initializes the singleton application object. This is the first line of authored code +/// executed, and as such is the logical equivalent of main() or WinMain(). +/// </summary> +App::App() +{ + InitializeComponent(); + Suspending += ref new SuspendingEventHandler(this, &App::OnSuspending); +} + +/// <summary> +/// Invoked when the application is launched normally by the end user. Other entry points +/// will be used when the application is launched to open a specific file, to display +/// search results, and so forth. +/// </summary> +/// <param name="pArgs">Details about the launch request and process.</param> +void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ pArgs) +{ + // Do not repeat app initialization when already running, just ensure that + // the window is active + if (pArgs->PreviousExecutionState == ApplicationExecutionState::Running) + { + Window::Current->Activate(); + return; + } + + if (pArgs->PreviousExecutionState == ApplicationExecutionState::Terminated) + { + //TODO: Load state from previously suspended application + } + + // Create a Frame to act navigation context and navigate to the first page + auto rootFrame = ref new Frame(); + if (!rootFrame->Navigate(TypeName(MainPage::typeid))) + { + throw ref new FailureException("Failed to create initial page"); + } + + // Place the frame in the current Window and ensure that it is active + Window::Current->Content = rootFrame; + Window::Current->Activate(); +} + +/// <summary> +/// Invoked when application execution is being suspended. Application state is saved +/// without knowing whether the application will be terminated or resumed with the contents +/// of memory still intact. +/// </summary> +/// <param name="sender">The source of the suspend request.</param> +/// <param name="e">Details about the suspend request.</param> +void App::OnSuspending(Object^ sender, SuspendingEventArgs^ e) +{ + (void) sender; // Unused parameter + (void) e; // Unused parameter + + //TODO: Save application state and stop any background activity +} diff --git a/cpp/test/TestSuite/8.0/App.xaml.h b/cpp/test/TestSuite/8.0/App.xaml.h new file mode 100644 index 00000000000..3526e1c11b8 --- /dev/null +++ b/cpp/test/TestSuite/8.0/App.xaml.h @@ -0,0 +1,28 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#pragma once + +#include "App.g.h" + +namespace TestSuite +{ +/// <summary> +/// Provides application-specific behavior to supplement the default Application class. +/// </summary> +ref class App sealed +{ +public: + App(); + virtual void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ pArgs) override; + +private: + void OnSuspending(Platform::Object^ sender, Windows::ApplicationModel::SuspendingEventArgs^ e); +}; +} diff --git a/cpp/test/WinRT/TestSuite/Assets/Logo.png b/cpp/test/TestSuite/8.0/Assets/Logo.png Binary files differindex e26771cb33a..e26771cb33a 100644 --- a/cpp/test/WinRT/TestSuite/Assets/Logo.png +++ b/cpp/test/TestSuite/8.0/Assets/Logo.png diff --git a/cpp/test/WinRT/TestSuite/Assets/SmallLogo.png b/cpp/test/TestSuite/8.0/Assets/SmallLogo.png Binary files differindex fdf5be574c1..fdf5be574c1 100644 --- a/cpp/test/WinRT/TestSuite/Assets/SmallLogo.png +++ b/cpp/test/TestSuite/8.0/Assets/SmallLogo.png diff --git a/cpp/test/WinRT/TestSuite/Assets/SplashScreen.png b/cpp/test/TestSuite/8.0/Assets/SplashScreen.png Binary files differindex 209a04651ac..209a04651ac 100644 --- a/cpp/test/WinRT/TestSuite/Assets/SplashScreen.png +++ b/cpp/test/TestSuite/8.0/Assets/SplashScreen.png diff --git a/cpp/test/WinRT/TestSuite/Assets/StoreLogo.png b/cpp/test/TestSuite/8.0/Assets/StoreLogo.png Binary files differindex dcb672712c6..dcb672712c6 100644 --- a/cpp/test/WinRT/TestSuite/Assets/StoreLogo.png +++ b/cpp/test/TestSuite/8.0/Assets/StoreLogo.png diff --git a/cpp/test/WinRT/TestSuite/Package.appxmanifest b/cpp/test/TestSuite/8.0/Package.appxmanifest index 54e7c753e07..54e7c753e07 100644 --- a/cpp/test/WinRT/TestSuite/Package.appxmanifest +++ b/cpp/test/TestSuite/8.0/Package.appxmanifest diff --git a/cpp/test/WinRT/TestSuite/TestSuite.vcxproj b/cpp/test/TestSuite/8.0/TestSuite.vcxproj index 49508d72e6f..b780ebb88d0 100644 --- a/cpp/test/WinRT/TestSuite/TestSuite.vcxproj +++ b/cpp/test/TestSuite/8.0/TestSuite.vcxproj @@ -100,7 +100,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <ClCompile> <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>.;..\..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeaderFile /> <PrecompiledHeaderOutputFile /> @@ -112,7 +112,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> <ClCompile> <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>.;..\..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeaderFile /> <PrecompiledHeaderOutputFile /> @@ -124,7 +124,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>.;..\..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeaderFile /> <PrecompiledHeaderOutputFile /> @@ -140,7 +140,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>.;..\..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeaderFile /> <PrecompiledHeaderOutputFile /> @@ -152,7 +152,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>.;..\..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeaderFile /> <PrecompiledHeaderOutputFile /> @@ -164,7 +164,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>.;..\..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeaderFile /> <PrecompiledHeaderOutputFile /> @@ -174,26 +174,23 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClInclude Include="..\..\include\TestCommon.h" /> + <ClInclude Include="..\pch.h" /> <ClInclude Include="generated\Controller.h" /> - <ClInclude Include="pch.h" /> <ClInclude Include="App.xaml.h"> <DependentUpon>App.xaml</DependentUpon> </ClInclude> - <ClInclude Include="MainPage.xaml.h"> - <DependentUpon>MainPage.xaml</DependentUpon> + <ClInclude Include="..\MainPage.xaml.h"> + <DependentUpon>..\MainPage.xaml</DependentUpon> </ClInclude> </ItemGroup> <ItemGroup> <ApplicationDefinition Include="App.xaml"> <SubType>Designer</SubType> </ApplicationDefinition> - <Page Include="Common\StandardStyles.xaml"> - <SubType>Designer</SubType> - </Page> - <Page Include="MainPage.xaml"> + <Page Include="..\MainPage.xaml"> <SubType>Designer</SubType> </Page> + <Page Include="..\StandardStyles.xaml" /> </ItemGroup> <ItemGroup> <AppxManifest Include="Package.appxmanifest"> @@ -385,24 +382,17 @@ <ClCompile Include="App.xaml.cpp"> <DependentUpon>App.xaml</DependentUpon> </ClCompile> + <ClCompile Include="..\pch.cpp" /> <ClCompile Include="generated\Controller.cpp" /> - <ClCompile Include="MainPage.xaml.cpp"> - <DependentUpon>MainPage.xaml</DependentUpon> - </ClCompile> - <ClCompile Include="pch.cpp"> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader> + <ClCompile Include="..\MainPage.xaml.cpp"> + <DependentUpon>..\MainPage.xaml</DependentUpon> </ClCompile> </ItemGroup> <ItemGroup> <SDKReference Include="Ice, Version=3.6" /> </ItemGroup> <ItemGroup> - <IceBuilder Include="Controller.ice" /> + <IceBuilder Include="..\Controller.ice" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> diff --git a/cpp/test/WinRT/TestSuite/TestSuite.vcxproj.filters b/cpp/test/TestSuite/8.0/TestSuite.vcxproj.filters index 37c7ec858a3..a4cdf3ee21a 100644 --- a/cpp/test/WinRT/TestSuite/TestSuite.vcxproj.filters +++ b/cpp/test/TestSuite/8.0/TestSuite.vcxproj.filters @@ -1,15 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <Filter Include="Common"> - <UniqueIdentifier>3ce71594-e3a4-4c38-9d0f-46e2a2076f6c</UniqueIdentifier> - </Filter> <Filter Include="Assets"> <UniqueIdentifier>aa39e686-931d-4eb4-a06f-1ce6c081fd4c</UniqueIdentifier> </Filter> - <Page Include="Common\StandardStyles.xaml"> - <Filter>Common</Filter> - </Page> <Image Include="Assets\Logo.png"> <Filter>Assets</Filter> </Image> @@ -29,22 +23,24 @@ <UniqueIdentifier>{a0f32232-9e67-427a-bab0-9659037ab6b9}</UniqueIdentifier> <Extensions>ice</Extensions> </Filter> + <Filter Include="Styles"> + <UniqueIdentifier>3ce71594-e3a4-4c38-9d0f-46e2a2076f6c</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ApplicationDefinition Include="App.xaml" /> </ItemGroup> <ItemGroup> - <ClCompile Include="App.xaml.cpp" /> - <ClCompile Include="MainPage.xaml.cpp" /> - <ClCompile Include="pch.cpp" /> <ClCompile Include="generated\Controller.cpp" /> + <ClCompile Include="..\MainPage.xaml.cpp" /> + <ClCompile Include="..\pch.cpp" /> + <ClCompile Include="App.xaml.cpp" /> </ItemGroup> <ItemGroup> - <ClInclude Include="pch.h" /> - <ClInclude Include="App.xaml.h" /> - <ClInclude Include="MainPage.xaml.h" /> - <ClInclude Include="..\..\include\TestCommon.h" /> <ClInclude Include="generated\Controller.h" /> + <ClInclude Include="..\MainPage.xaml.h" /> + <ClInclude Include="..\pch.h" /> + <ClInclude Include="App.xaml.h" /> </ItemGroup> <ItemGroup> <AppxManifest Include="Package.appxmanifest" /> @@ -173,7 +169,6 @@ <None Include="..\..\Ice\udp\Ice_udp_server.dll"> <Filter>Tests</Filter> </None> - <None Include="..\..\..\..\certs\cacert.der" /> <None Include="..\..\Ice\operations\Ice_operations_collocated.dll" /> <None Include="..\..\Ice\operations\Ice_operations_server.dll" /> <None Include="..\..\Ice\operations\Ice_operations_serveramd.dll" /> @@ -225,7 +220,6 @@ <None Include="..\..\Ice\admin\Ice_admin_server.dll"> <Filter>Tests</Filter> </None> - <None Include="TestSuite_TemporaryKey.pfx" /> <None Include="..\..\Ice\enums\Ice_enums_client.dll"> <Filter>Tests</Filter> </None> @@ -238,12 +232,17 @@ <None Include="..\..\Ice\acm\Ice_acm_server.dll"> <Filter>Tests</Filter> </None> + <None Include="..\..\..\..\certs\cacert.der" /> + <None Include="TestSuite_TemporaryKey.pfx" /> </ItemGroup> <ItemGroup> - <Page Include="MainPage.xaml" /> + <Page Include="..\MainPage.xaml" /> + <Page Include="..\StandardStyles.xaml"> + <Filter>Styles</Filter> + </Page> </ItemGroup> <ItemGroup> - <IceBuilder Include="Controller.ice"> + <IceBuilder Include="..\Controller.ice"> <Filter>Slice Files</Filter> </IceBuilder> </ItemGroup> diff --git a/cpp/test/TestSuite/8.0/TestSuite_TemporaryKey.pfx b/cpp/test/TestSuite/8.0/TestSuite_TemporaryKey.pfx Binary files differnew file mode 100644 index 00000000000..9064efd3d36 --- /dev/null +++ b/cpp/test/TestSuite/8.0/TestSuite_TemporaryKey.pfx diff --git a/cpp/test/WinRT/TestSuite/Controller.ice b/cpp/test/TestSuite/Controller.ice index 0508b4826da..0508b4826da 100644 --- a/cpp/test/WinRT/TestSuite/Controller.ice +++ b/cpp/test/TestSuite/Controller.ice diff --git a/cpp/test/WinRT/TestSuite/MainPage.xaml b/cpp/test/TestSuite/MainPage.xaml index f8eda9b24b4..f8eda9b24b4 100644 --- a/cpp/test/WinRT/TestSuite/MainPage.xaml +++ b/cpp/test/TestSuite/MainPage.xaml diff --git a/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp b/cpp/test/TestSuite/MainPage.xaml.cpp index 5596ac422bf..4a23435a41a 100644 --- a/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp +++ b/cpp/test/TestSuite/MainPage.xaml.cpp @@ -351,7 +351,7 @@ Runnable::run() { args.push_back("--Ice.ThreadPool.Server.Size=1"); args.push_back("--Ice.ThreadPool.Server.SizeMax=3"); - args.push_back("--Ice.ThreadPool.Server.SizeWarn=0"); + args.push_back("--Ice.ThreadPool.Server.SizeWarn=0"); } args.push_back("--Ice.Default.Host=" + _config.host); diff --git a/cpp/test/WinRT/TestSuite/MainPage.xaml.h b/cpp/test/TestSuite/MainPage.xaml.h index ccf32dfda38..ccf32dfda38 100644 --- a/cpp/test/WinRT/TestSuite/MainPage.xaml.h +++ b/cpp/test/TestSuite/MainPage.xaml.h diff --git a/cpp/test/WinRT/TestSuite/Common/StandardStyles.xaml b/cpp/test/TestSuite/StandardStyles.xaml index 81fb398ea20..81fb398ea20 100644 --- a/cpp/test/WinRT/TestSuite/Common/StandardStyles.xaml +++ b/cpp/test/TestSuite/StandardStyles.xaml diff --git a/cpp/test/WinRT/TestSuite/pch.cpp b/cpp/test/TestSuite/pch.cpp index 01484ff5aa4..01484ff5aa4 100644 --- a/cpp/test/WinRT/TestSuite/pch.cpp +++ b/cpp/test/TestSuite/pch.cpp diff --git a/cpp/test/WinRT/TestSuite/pch.h b/cpp/test/TestSuite/pch.h index fadf910de32..fadf910de32 100644 --- a/cpp/test/WinRT/TestSuite/pch.h +++ b/cpp/test/TestSuite/pch.h diff --git a/cpp/test/WinRT/TestSuite.sln b/cpp/test/WinRT/TestSuite.sln deleted file mode 100644 index 001c72c92dd..00000000000 --- a/cpp/test/WinRT/TestSuite.sln +++ /dev/null @@ -1,40 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "TestSuite\TestSuite.vcxproj", "{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|ARM = Release|ARM - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|ARM.ActiveCfg = Debug|ARM - {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|ARM.Build.0 = Debug|ARM - {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|ARM.Deploy.0 = Debug|ARM - {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|Win32.ActiveCfg = Debug|Win32 - {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|Win32.Build.0 = Debug|Win32 - {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|Win32.Deploy.0 = Debug|Win32 - {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|x64.ActiveCfg = Debug|x64 - {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|x64.Build.0 = Debug|x64 - {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|x64.Deploy.0 = Debug|x64 - {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|ARM.ActiveCfg = Release|ARM - {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|ARM.Build.0 = Release|ARM - {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|ARM.Deploy.0 = Release|ARM - {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|Win32.ActiveCfg = Release|Win32 - {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|Win32.Build.0 = Release|Win32 - {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|Win32.Deploy.0 = Release|Win32 - {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|x64.ActiveCfg = Release|x64 - {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|x64.Build.0 = Release|x64 - {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|x64.Deploy.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/cpp/test/WinRT/TestSuite/TestSuite_TemporaryKey.pfx b/cpp/test/WinRT/TestSuite/TestSuite_TemporaryKey.pfx Binary files differdeleted file mode 100644 index 5bc0fb21d1c..00000000000 --- a/cpp/test/WinRT/TestSuite/TestSuite_TemporaryKey.pfx +++ /dev/null |
