diff options
| author | Jose <jose@zeroc.com> | 2013-11-26 21:55:01 +0100 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2015-10-27 10:30:08 -0400 |
| commit | f30e6b359b4d45327bfeed94869dd5e66105f8ce (patch) | |
| tree | 708cf81339a6d7bdd7f1887c7693714d3fe26f7f | |
| parent | Changes to support RHEL5 (diff) | |
| download | ice-f30e6b359b4d45327bfeed94869dd5e66105f8ce.tar.bz2 ice-f30e6b359b4d45327bfeed94869dd5e66105f8ce.tar.xz ice-f30e6b359b4d45327bfeed94869dd5e66105f8ce.zip | |
Visual Studio 2013 support
40 files changed, 1560 insertions, 153 deletions
diff --git a/cpp/Makefile.mak b/cpp/Makefile.mak index cbeae3716b9..b42380a5d5e 100644 --- a/cpp/Makefile.mak +++ b/cpp/Makefile.mak @@ -31,9 +31,9 @@ SUBDIRS = src include test SDK_FULL_PATH = $(MAKEDIR)\$(SDK_BASE_PATH) SDK_FULL_PATH = $(SDK_FULL_PATH:\.\=\) !if "$(PROCESSOR_ARCHITECTURE)" == "AMD64" -SDK_KEY = HKLM\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKs\$(SDK_NAME)\$(SDK_VERSION) +SDK_KEY = HKLM\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v$(TARGET_PLATFORM_VERSION)\ExtensionSDKs\$(SDK_NAME)\$(SDK_VERSION) !else -SDK_KEY = HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKs\$(SDK_NAME)\$(SDK_VERSION) +SDK_KEY = HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v$(TARGET_PLATFORM_VERSION)\ExtensionSDKs\$(SDK_NAME)\$(SDK_VERSION) !endif INSTALL_SUBDIRS = $(prefix)\SDKs diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak index 3b8b0117e87..bc2e32c513d 100755 --- a/cpp/config/Make.rules.mak +++ b/cpp/config/Make.rules.mak @@ -27,7 +27,7 @@ prefix = C:\Ice-$(VERSION) # # Specify your C++ compiler, or leave unset for auto-detection. -# Supported values are: VC90, VC100, VC110 +# Supported values are: VC90, VC100, VC110, VC120 # # CPP_COMPILER = VCxxx @@ -81,6 +81,8 @@ CPP_COMPILER = VC110 CPP_COMPILER = VC100 !elseif ([cl 2>&1 | findstr "Version\ 17" > nul] == 0) CPP_COMPILER = VC110 +!elseif ([cl 2>&1 | findstr "Version\ 18" > nul] == 0) +CPP_COMPILER = VC120 !elseif ([cl 2>&1 | findstr "Version\ 15" > nul] == 0) CPP_COMPILER = VC90 !else @@ -88,8 +90,8 @@ CPP_COMPILER = VC90 !endif #!message CPP_COMPILER set to $(CPP_COMPILER) -!elseif "$(CPP_COMPILER)" != "VC90" && "$(CPP_COMPILER)" != "VC100" && "$(CPP_COMPILER)" != "VC110" -!error Invalid CPP_COMPILER setting: $(CPP_COMPILER). Must be one of: VC90, VC100 or VC110. +!elseif "$(CPP_COMPILER)" != "VC90" && "$(CPP_COMPILER)" != "VC100" && "$(CPP_COMPILER)" != "VC110" && "$(CPP_COMPILER)" != "VC120" +!error Invalid CPP_COMPILER setting: $(CPP_COMPILER). Must be one of: VC90, VC100, VC110 or VC120. !endif # @@ -137,14 +139,16 @@ SETARGV = setargv.obj # !include $(top_srcdir)/config/Make.rules.msvc -!if "$(WINRT)" == "yes" && "$(CPP_COMPILER)" != "VC110" +!if "$(WINRT)" == "yes" && "$(CPP_COMPILER)" != "VC110" && "$(CPP_COMPILER)" != "VC120" !error CPP_COMPILER: $(CPP_COMPILER) not supported to build Ice for WinRT !endif !if "$(CPP_COMPILER)" == "VC90" libsuff = \vc90$(x64suffix) !elseif "$(CPP_COMPILER)" == "VC110" -libsuff = \vc110$(x64suffix) +libsuff = \vc110$(x64suffix) +!elseif "$(CPP_COMPILER)" == "VC120" +libsuff = \vc120$(x64suffix) !else libsuff = $(x64suffix) !endif @@ -164,6 +168,8 @@ COMPSUFFIX = _vc90 COMPSUFFIX = _vc100 !elseif "$(CPP_COMPILER)" == "VC110" COMPSUFFIX = _vc110 +!elseif "$(CPP_COMPILER)" == "VC120" +COMPSUFFIX = _vc120 !endif !endif diff --git a/cpp/config/Make.rules.msvc b/cpp/config/Make.rules.msvc index afda1337699..26737d5dd1a 100755 --- a/cpp/config/Make.rules.msvc +++ b/cpp/config/Make.rules.msvc @@ -69,9 +69,16 @@ LDFLAGS = $(LDFLAGS) /nologo !if "$(WINRT)" == "yes" LDFLAGS = $(LDFLAGS) /NXCOMPAT /MANIFEST:NO /APPCONTAINER /NOLOGO +!if "$(CPP_COMPILER)" == "VC120" +!if "$(ARCH)" == "x86" +LDFLAGS = $(LDFLAGS) /LIBPATH:"$(VCINSTALLDIR)\lib\store" +!else +LDFLAGS = $(LDFLAGS) /LIBPATH:"$(VCINSTALLDIR)\lib\store\$(ARCH)" +!endif !else LDFLAGS = $(LDFLAGS) /FIXED:no !endif +!endif !if "$(OPTIMIZE)" == "yes" LDFLAGS = $(LDFLAGS) /OPT:REF @@ -113,11 +120,22 @@ SDK_VERSION = $(SHORT_VERSION) SDK_NAME = Ice SDK_REG_FILE = $(SDK_NAME).reg SDK_MANIFEST = SDKManifest.xml + +!if "$(CPP_COMPILER)" == "VC110" +TARGET_PLATFORM_VERSION = 8.0 +MIN_VS_VERSION = 11.0 +!elseif "$(CPP_COMPILER)" == "VC120" +TARGET_PLATFORM_VERSION = 8.1 +MIN_VS_VERSION = 12.0 +SDK_PREFIX = \8.1 +!endif + !if "$(ice_src_dist)" != "" -SDK_BASE_PATH = $(top_srcdir)\SDKs\$(SDK_NAME)\$(SDK_VERSION) +SDK_BASE_PATH = $(top_srcdir)\SDKs$(SDK_PREFIX)\$(SDK_NAME)\$(SDK_VERSION) !else -SDK_BASE_PATH = $(ice_dir)\SDKs\$(SDK_NAME)\$(SDK_VERSION) +SDK_BASE_PATH = $(ice_dir)\SDKs$(SDK_PREFIX)\$(SDK_NAME)\$(SDK_VERSION) !endif + SDK_INCLUDE_PATH = $(SDK_BASE_PATH)\DesignTime\CommonConfiguration\Neutral\include SDK_LIBRARY_PATH = $(SDK_BASE_PATH)\DesignTime\$(CONFIG)\$(ARCH) SDK_REFERENCES_PATH = $(SDK_BASE_PATH)\References\$(CONFIG)\$(ARCH) @@ -165,7 +183,8 @@ $(SDK_BASE_PATH)\$(SDK_MANIFEST): $(SDK_BASE_PATH) Identity = "$(SDK_NAME), Version=$(SDK_VERSION)" DisplayName = "$(SDK_NAME) SDK" ProductFamiliyName = "ZeroC SDKs" - MinVSVersion = "11.0" + MinVSVersion = "$(MIN_VS_VERSION)" + MaxPlatformVersion = "$(TARGET_PLATFORM_VERSION)" AppliesTo = "WindowsAppContainer + VisualC" SupportedArchitecture = "x86;x64;ARM" SupportsMultipleVersion = "Error" @@ -190,7 +209,7 @@ $(SDK_PROPS_PATH)\$(SDK_PROPS_FILE): $(SDK_PROPS_PATH) </BuildMacro> </ItemGroup> <PropertyGroup> - <IceWinRTHome>$$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\$(SDK_NAME)\$(SDK_VERSION)@)</IceWinRTHome> + <IceWinRTHome>$$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v$(TARGET_PLATFORM_VERSION)\ExtensionSDKS\$(SDK_NAME)\$(SDK_VERSION)@)</IceWinRTHome> <IncludePath>$$(IceWinRTHome)\Designtime\CommonConfiguration\Neutral\include;$$(IncludePath)</IncludePath> <LibraryPath>$$(IceWinRTHome)\Designtime\$$(ConfigurationPrefix)\$$(PlatformTarget);$$(LibraryPath)</LibraryPath> </PropertyGroup> diff --git a/cpp/demo/Glacier2/winrt/chat/ChatView.xaml.cpp b/cpp/demo/Glacier2/winrt/chat/ChatView.xaml.cpp index d34a52a4ee1..af3a83ac052 100644 --- a/cpp/demo/Glacier2/winrt/chat/ChatView.xaml.cpp +++ b/cpp/demo/Glacier2/winrt/chat/ChatView.xaml.cpp @@ -42,7 +42,11 @@ ChatView::appendMessage(String^ message) { messages->Text += message + L"\n"; messages->UpdateLayout(); +#if (_WIN32_WINNT > 0x0602) + Scroller->ChangeView(nullptr, Scroller->ScrollableHeight, nullptr); +#else Scroller->ScrollToVerticalOffset(Scroller->ScrollableHeight); +#endif } void chat::ChatView::inputKeyDown(Platform::Object^ sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs^ e) diff --git a/cpp/demo/Glacier2/winrt/chat/Package-8.1.appxmanifest b/cpp/demo/Glacier2/winrt/chat/Package-8.1.appxmanifest new file mode 100644 index 00000000000..7ad321278b9 --- /dev/null +++ b/cpp/demo/Glacier2/winrt/chat/Package-8.1.appxmanifest @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest"> + <Identity Name="46e81031-9c5b-4caa-92cb-57fbccb3dc93" Publisher="CN=ZeroC Glacier2 Chat App" Version="1.1.0.0" /> + <Properties> + <DisplayName>Glacier2 Chat Demo</DisplayName> + <PublisherDisplayName>ZeroC</PublisherDisplayName> + <Logo>Assets\StoreLogo.png</Logo> + </Properties> + <Prerequisites> + <OSMinVersion>6.3</OSMinVersion> + <OSMaxVersionTested>6.3</OSMaxVersionTested> + </Prerequisites> + <Resources> + <Resource Language="x-generate" /> + </Resources> + <Applications> + <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="chat.App"> + <m2:VisualElements DisplayName="Glacier2 Chat Demo" Description="chat" BackgroundColor="#464646" ForegroundText="light" Square150x150Logo="Assets\Logo.png" Square30x30Logo="Assets\SmallLogo.png"> + <m2:DefaultTile> + <m2:ShowNameOnTiles> + <m2:ShowOn Tile="square150x150Logo" /> + </m2:ShowNameOnTiles> + </m2:DefaultTile> + <m2:SplashScreen Image="Assets\SplashScreen.png" /> + </m2:VisualElements> + </Application> + </Applications> + <Capabilities> + <Capability Name="privateNetworkClientServer" /> + <Capability Name="internetClient" /> + </Capabilities> + <Extensions> + <Extension Category="windows.certificates"> + <Certificates> + <Certificate StoreName="Root" Content="cacert.pem" /> + <Certificate StoreName="CA" Content="cacert.pem" /> + <TrustFlags ExclusiveTrust="true" /> + </Certificates> + </Extension> + </Extensions> +</Package>
\ No newline at end of file diff --git a/cpp/demo/Glacier2/winrt/chat/chat-8.1.vcxproj b/cpp/demo/Glacier2/winrt/chat/chat-8.1.vcxproj new file mode 100644 index 00000000000..e840e6006a6 --- /dev/null +++ b/cpp/demo/Glacier2/winrt/chat/chat-8.1.vcxproj @@ -0,0 +1,245 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <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 Label="Globals"> + <ProjectGuid>{c56bdb5e-9829-49d6-b5eb-9089ad7e89cc}</ProjectGuid> + <RootNamespace>chat</RootNamespace> + <DefaultLanguage>en-US</DefaultLanguage> + <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion> + <AppContainerApplication>true</AppContainerApplication> + <ApplicationType>Windows Store</ApplicationType> + <ApplicationTypeRevision>8.1</ApplicationTypeRevision> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.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" /> + <Import Project="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.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="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.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="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.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="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.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="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.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="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props')" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <PackageCertificateKeyFile>chat_TemporaryKey.pfx</PackageCertificateKeyFile> + <PackageCertificateThumbprint>C4DC5FE3362475B84F0E0B3920CE11F5B4D73F19</PackageCertificateThumbprint> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="Chat.h" /> + <ClInclude Include="ChatView.xaml.h"> + <DependentUpon>ChatView.xaml</DependentUpon> + </ClInclude> + <ClInclude Include="LoginView.xaml.h"> + <DependentUpon>LoginView.xaml</DependentUpon> + </ClInclude> + <ClInclude Include="pch.h" /> + <ClInclude Include="App.xaml.h"> + <DependentUpon>App.xaml</DependentUpon> + </ClInclude> + <ClInclude Include="MainPage.xaml.h"> + <DependentUpon>MainPage.xaml</DependentUpon> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ApplicationDefinition Include="App.xaml"> + <SubType>Designer</SubType> + </ApplicationDefinition> + <Page Include="ChatView.xaml"> + <SubType>Designer</SubType> + </Page> + <Page Include="Common\StandardStyles.xaml"> + <SubType>Designer</SubType> + </Page> + <Page Include="LoginView.xaml"> + <SubType>Designer</SubType> + </Page> + <Page Include="MainPage.xaml"> + <SubType>Designer</SubType> + </Page> + </ItemGroup> + <ItemGroup> + <AppxManifest Include="Package-8.1.appxmanifest"> + <SubType>Designer</SubType> + </AppxManifest> + <None Include="..\..\..\..\..\certs\winrt\cacert.pem"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="Chat.ice" /> + <None Include="chat_TemporaryKey.pfx" /> + </ItemGroup> + <ItemGroup> + <Image Include="Assets\Logo.png" /> + <Image Include="Assets\SmallLogo.png" /> + <Image Include="Assets\StoreLogo.png" /> + <Image Include="Assets\SplashScreen.png" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="App.xaml.cpp"> + <DependentUpon>App.xaml</DependentUpon> + </ClCompile> + <ClCompile Include="Chat.cpp" /> + <ClCompile Include="ChatView.xaml.cpp"> + <DependentUpon>ChatView.xaml</DependentUpon> + </ClCompile> + <ClCompile Include="LoginView.xaml.cpp"> + <DependentUpon>LoginView.xaml</DependentUpon> + </ClCompile> + <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> + </ItemGroup> + <ItemGroup> + <Text Include="README.txt" /> + </ItemGroup> + <ItemGroup> + <SDKReference Include="Ice, Version=3.5" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> + <ProjectExtensions> + <VisualStudio> + <UserProperties ZerocIce_ProjectVersion="1" ZerocIce_Enabled="True" /> + </VisualStudio> + </ProjectExtensions> +</Project>
\ No newline at end of file diff --git a/cpp/demo/Glacier2/winrt/chat/chat-8.1.vcxproj.filters b/cpp/demo/Glacier2/winrt/chat/chat-8.1.vcxproj.filters new file mode 100644 index 00000000000..ee0150bdd02 --- /dev/null +++ b/cpp/demo/Glacier2/winrt/chat/chat-8.1.vcxproj.filters @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Common"> + <UniqueIdentifier>c56bdb5e-9829-49d6-b5eb-9089ad7e89cc</UniqueIdentifier> + </Filter> + <Filter Include="Assets"> + <UniqueIdentifier>13723f9e-afb3-465e-9f73-02f19059882b</UniqueIdentifier> + </Filter> + <Page Include="Common\StandardStyles.xaml"> + <Filter>Common</Filter> + </Page> + <Image Include="Assets\Logo.png"> + <Filter>Assets</Filter> + </Image> + <Image Include="Assets\SmallLogo.png"> + <Filter>Assets</Filter> + </Image> + <Image Include="Assets\StoreLogo.png"> + <Filter>Assets</Filter> + </Image> + <Image Include="Assets\SplashScreen.png"> + <Filter>Assets</Filter> + </Image> + </ItemGroup> + <ItemGroup> + <ApplicationDefinition Include="App.xaml" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="App.xaml.cpp" /> + <ClCompile Include="MainPage.xaml.cpp" /> + <ClCompile Include="pch.cpp" /> + <ClCompile Include="ChatView.xaml.cpp" /> + <ClCompile Include="LoginView.xaml.cpp" /> + <ClCompile Include="Chat.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="pch.h" /> + <ClInclude Include="App.xaml.h" /> + <ClInclude Include="MainPage.xaml.h" /> + <ClInclude Include="ChatView.xaml.h" /> + <ClInclude Include="LoginView.xaml.h" /> + <ClInclude Include="Chat.h" /> + </ItemGroup> + <ItemGroup> + <None Include="Chat.ice" /> + <None Include="..\..\..\..\..\certs\winrt\cacert.pem" /> + <None Include="chat_TemporaryKey.pfx" /> + </ItemGroup> + <ItemGroup> + <Page Include="MainPage.xaml" /> + <Page Include="ChatView.xaml" /> + <Page Include="LoginView.xaml" /> + </ItemGroup> + <ItemGroup> + <Text Include="README.txt" /> + </ItemGroup> + <ItemGroup> + <AppxManifest Include="Package-8.1.appxmanifest" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/cpp/demo/Glacier2/winrt/chat/chat.vcxproj b/cpp/demo/Glacier2/winrt/chat/chat.vcxproj index 656d120772f..253d2153d9c 100644 --- a/cpp/demo/Glacier2/winrt/chat/chat.vcxproj +++ b/cpp/demo/Glacier2/winrt/chat/chat.vcxproj @@ -98,7 +98,7 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup> <PackageCertificateKeyFile>chat_TemporaryKey.pfx</PackageCertificateKeyFile> - <PackageCertificateThumbprint>6B95220F83E4986E53245E99A2945FFC71D08DFD</PackageCertificateThumbprint> + <PackageCertificateThumbprint>C4DC5FE3362475B84F0E0B3920CE11F5B4D73F19</PackageCertificateThumbprint> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <ClCompile> diff --git a/cpp/demo/Glacier2/winrt/chat/chat_TemporaryKey.pfx b/cpp/demo/Glacier2/winrt/chat/chat_TemporaryKey.pfx Binary files differindex 98315a02f85..6a5a0052030 100644 --- a/cpp/demo/Glacier2/winrt/chat/chat_TemporaryKey.pfx +++ b/cpp/demo/Glacier2/winrt/chat/chat_TemporaryKey.pfx diff --git a/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp b/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp index c2e500c5901..ea5994870ae 100644 --- a/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp +++ b/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp @@ -390,7 +390,7 @@ CHelloClientDlg::createProxy() { CString h; _host->GetWindowText(h); - string host = (LPCTSTR)h; + string host = IceUtil::wstringToString(wstring(h)); if(host.size() == 0) { _status->SetWindowText(CString(" No hostname")); diff --git a/cpp/demo/Ice/MFC/client/Ice.MFC.client.vcxproj b/cpp/demo/Ice/MFC/client/Ice.MFC.client.vcxproj index 987ac204ca1..fadfbe2fef5 100644 --- a/cpp/demo/Ice/MFC/client/Ice.MFC.client.vcxproj +++ b/cpp/demo/Ice/MFC/client/Ice.MFC.client.vcxproj @@ -28,22 +28,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseOfMfc>Dynamic</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> + <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseOfMfc>Dynamic</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> + <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseOfMfc>Dynamic</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> + <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseOfMfc>Dynamic</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> + <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -106,6 +106,7 @@ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> + <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> @@ -142,6 +143,7 @@ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> + <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> @@ -173,6 +175,7 @@ <AdditionalDependencies>Ice.lib;IceUtil.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <SubSystem>Windows</SubSystem> + <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> @@ -208,6 +211,7 @@ <AdditionalDependencies>Ice.lib;IceUtil.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <SubSystem>Windows</SubSystem> + <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> diff --git a/cpp/demo/Ice/MFC/client/Makefile.mak b/cpp/demo/Ice/MFC/client/Makefile.mak index 0c3a2977a24..66ccc6e1811 100755 --- a/cpp/demo/Ice/MFC/client/Makefile.mak +++ b/cpp/demo/Ice/MFC/client/Makefile.mak @@ -22,14 +22,14 @@ SRCS = $(OBJS:.obj=.cpp) !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. $(CPPFLAGS) -D_AFXDLL -DVC_EXTRALEAN +CPPFLAGS = -I. $(CPPFLAGS) -D_AFXDLL -DVC_EXTRALEAN -D_UNICODE !if "$(GENERATE_PDB)" == "yes" PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) !endif $(CLIENT): $(OBJS) $(COBJS) HelloClient.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) /subsystem:windows $(OBJS) $(COBJS) HelloClient.res \ + $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) /entry:wWinMainCRTStartup /subsystem:windows $(OBJS) $(COBJS) HelloClient.res \ $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/demo/Ice/MFC/server/Ice.MFC.server.vcxproj b/cpp/demo/Ice/MFC/server/Ice.MFC.server.vcxproj index ed1b8a96fc9..f0c3ba4bafc 100644 --- a/cpp/demo/Ice/MFC/server/Ice.MFC.server.vcxproj +++ b/cpp/demo/Ice/MFC/server/Ice.MFC.server.vcxproj @@ -28,22 +28,22 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseOfMfc>Dynamic</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> + <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseOfMfc>Dynamic</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> + <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseOfMfc>Dynamic</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> + <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseOfMfc>Dynamic</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> + <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -106,6 +106,7 @@ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> + <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> @@ -142,6 +143,7 @@ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> + <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> @@ -173,6 +175,7 @@ <AdditionalDependencies>ice.lib;iceutil.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <SubSystem>Windows</SubSystem> + <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> @@ -208,6 +211,7 @@ <AdditionalDependencies>ice.lib;iceutil.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <SubSystem>Windows</SubSystem> + <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> diff --git a/cpp/demo/Ice/MFC/server/Makefile.mak b/cpp/demo/Ice/MFC/server/Makefile.mak index 01765942675..19a521b0e63 100644 --- a/cpp/demo/Ice/MFC/server/Makefile.mak +++ b/cpp/demo/Ice/MFC/server/Makefile.mak @@ -24,14 +24,14 @@ SRCS = $(OBJS:.obj=.cpp) !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. $(CPPFLAGS) -D_AFXDLL -DVC_EXTRALEAN +CPPFLAGS = -I. $(CPPFLAGS) -D_AFXDLL -DVC_EXTRALEAN -D_UNICODE !if "$(GENERATE_PDB)" == "yes" PDBFLAGS = /pdb:$(SERVER:.exe=.pdb) !endif $(SERVER): $(OBJS) $(COBJS) HelloServer.res - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) /subsystem:windows $(OBJS) $(COBJS) HelloServer.res \ + $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) /entry:wWinMainCRTStartup /subsystem:windows $(OBJS) $(COBJS) HelloServer.res \ $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/demo/Ice/winrt/bidir/MainPage.xaml.cpp b/cpp/demo/Ice/winrt/bidir/MainPage.xaml.cpp index 7c56e1d4c00..fc2dacfbcf5 100644 --- a/cpp/demo/Ice/winrt/bidir/MainPage.xaml.cpp +++ b/cpp/demo/Ice/winrt/bidir/MainPage.xaml.cpp @@ -127,7 +127,11 @@ bidir::MainPage::print(const std::string& message) { output->Text += ref new String(IceUtil::stringToWstring(message).c_str()); output->UpdateLayout(); +#if (_WIN32_WINNT > 0x0602) + scroller->ChangeView(nullptr, scroller->ScrollableHeight, nullptr); +#else scroller->ScrollToVerticalOffset(scroller->ScrollableHeight); +#endif }, CallbackContext::Any)); } diff --git a/cpp/demo/Ice/winrt/bidir/Package-8.1.appxmanifest b/cpp/demo/Ice/winrt/bidir/Package-8.1.appxmanifest new file mode 100644 index 00000000000..4edc7d467ba --- /dev/null +++ b/cpp/demo/Ice/winrt/bidir/Package-8.1.appxmanifest @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest"> + <Identity Name="274700d0-21de-4e74-9f39-2e702de8c432" Publisher="CN=ZeroC BiDir App" Version="1.1.0.0" /> + <Properties> + <DisplayName>Ice Bidir Demo</DisplayName> + <PublisherDisplayName>ZeroC</PublisherDisplayName> + <Logo>Assets\StoreLogo.png</Logo> + </Properties> + <Prerequisites> + <OSMinVersion>6.3</OSMinVersion> + <OSMaxVersionTested>6.3</OSMaxVersionTested> + </Prerequisites> + <Resources> + <Resource Language="x-generate" /> + </Resources> + <Applications> + <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="bidir.App"> + <m2:VisualElements DisplayName="Ice Bidir Demo" Description="bidir" BackgroundColor="#464646" ForegroundText="light" Square150x150Logo="Assets\Logo.png" Square30x30Logo="Assets\SmallLogo.png"> + <m2:DefaultTile> + <m2:ShowNameOnTiles> + <m2:ShowOn Tile="square150x150Logo" /> + </m2:ShowNameOnTiles> + </m2:DefaultTile> + <m2:SplashScreen Image="Assets\SplashScreen.png" /> + </m2:VisualElements> + </Application> + </Applications> + <Capabilities> + <Capability Name="privateNetworkClientServer" /> + <Capability Name="internetClientServer" /> + <Capability Name="internetClient" /> + </Capabilities> +</Package>
\ No newline at end of file diff --git a/cpp/demo/Ice/winrt/bidir/bidir-8.1.vcxproj b/cpp/demo/Ice/winrt/bidir/bidir-8.1.vcxproj new file mode 100644 index 00000000000..54b11232252 --- /dev/null +++ b/cpp/demo/Ice/winrt/bidir/bidir-8.1.vcxproj @@ -0,0 +1,224 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <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 Label="Globals"> + <ProjectGuid>{4ef04ddd-1b81-4dc7-adf2-290e22008616}</ProjectGuid> + <RootNamespace>bidir</RootNamespace> + <DefaultLanguage>en-US</DefaultLanguage> + <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion> + <AppContainerApplication>true</AppContainerApplication> + <ApplicationType>Windows Store</ApplicationType> + <ApplicationTypeRevision>8.1</ApplicationTypeRevision> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.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" /> + <Import Project="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.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="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.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="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.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="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.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="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.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="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props')" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <PackageCertificateKeyFile>bidir_TemporaryKey.pfx</PackageCertificateKeyFile> + <PackageCertificateThumbprint>453273C2FDABA45C5F3C5D18F2A56D0640BAC69D</PackageCertificateThumbprint> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="Callback.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> + </ItemGroup> + <ItemGroup> + <ApplicationDefinition Include="App.xaml"> + <SubType>Designer</SubType> + </ApplicationDefinition> + <Page Include="Common\StandardStyles.xaml"> + <SubType>Designer</SubType> + </Page> + <Page Include="MainPage.xaml"> + <SubType>Designer</SubType> + </Page> + </ItemGroup> + <ItemGroup> + <AppxManifest Include="Package-8.1.appxmanifest"> + <SubType>Designer</SubType> + </AppxManifest> + <None Include="bidir_TemporaryKey.pfx" /> + <None Include="Callback.ice" /> + </ItemGroup> + <ItemGroup> + <Image Include="Assets\Logo.png" /> + <Image Include="Assets\SmallLogo.png" /> + <Image Include="Assets\StoreLogo.png" /> + <Image Include="Assets\SplashScreen.png" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="App.xaml.cpp"> + <DependentUpon>App.xaml</DependentUpon> + </ClCompile> + <ClCompile Include="Callback.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> + </ItemGroup> + <ItemGroup> + <Text Include="README.txt" /> + </ItemGroup> + <ItemGroup> + <SDKReference Include="Ice, Version=3.5" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> + <ProjectExtensions> + <VisualStudio> + <UserProperties ZerocIce_ProjectVersion="1" ZerocIce_Enabled="True" /> + </VisualStudio> + </ProjectExtensions> +</Project>
\ No newline at end of file diff --git a/cpp/demo/Ice/winrt/bidir/bidir-8.1.vcxproj.filters b/cpp/demo/Ice/winrt/bidir/bidir-8.1.vcxproj.filters new file mode 100644 index 00000000000..504f6bffb36 --- /dev/null +++ b/cpp/demo/Ice/winrt/bidir/bidir-8.1.vcxproj.filters @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Common"> + <UniqueIdentifier>4ef04ddd-1b81-4dc7-adf2-290e22008616</UniqueIdentifier> + </Filter> + <Filter Include="Assets"> + <UniqueIdentifier>51dcd63d-9ac1-4f7a-ae17-45da43b621d7</UniqueIdentifier> + </Filter> + <Page Include="Common\StandardStyles.xaml"> + <Filter>Common</Filter> + </Page> + <Image Include="Assets\Logo.png"> + <Filter>Assets</Filter> + </Image> + <Image Include="Assets\SmallLogo.png"> + <Filter>Assets</Filter> + </Image> + <Image Include="Assets\StoreLogo.png"> + <Filter>Assets</Filter> + </Image> + <Image Include="Assets\SplashScreen.png"> + <Filter>Assets</Filter> + </Image> + </ItemGroup> + <ItemGroup> + <ApplicationDefinition Include="App.xaml" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="App.xaml.cpp" /> + <ClCompile Include="MainPage.xaml.cpp" /> + <ClCompile Include="pch.cpp" /> + <ClCompile Include="Callback.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="pch.h" /> + <ClInclude Include="App.xaml.h" /> + <ClInclude Include="MainPage.xaml.h" /> + <ClInclude Include="Callback.h" /> + </ItemGroup> + <ItemGroup> + <None Include="bidir_TemporaryKey.pfx" /> + <None Include="Callback.ice" /> + </ItemGroup> + <ItemGroup> + <Page Include="MainPage.xaml" /> + </ItemGroup> + <ItemGroup> + <Text Include="README.txt" /> + </ItemGroup> + <ItemGroup> + <AppxManifest Include="Package-8.1.appxmanifest" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/cpp/demo/Ice/winrt/bidir/bidir.vcxproj b/cpp/demo/Ice/winrt/bidir/bidir.vcxproj index 59dfe0cfbaf..82263dc00ed 100644 --- a/cpp/demo/Ice/winrt/bidir/bidir.vcxproj +++ b/cpp/demo/Ice/winrt/bidir/bidir.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> @@ -98,7 +98,7 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup> <PackageCertificateKeyFile>bidir_TemporaryKey.pfx</PackageCertificateKeyFile> - <PackageCertificateThumbprint>2DF73CB191C29DD8294819F19EE453C1B4591D57</PackageCertificateThumbprint> + <PackageCertificateThumbprint>453273C2FDABA45C5F3C5D18F2A56D0640BAC69D</PackageCertificateThumbprint> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <ClCompile> diff --git a/cpp/demo/Ice/winrt/bidir/bidir_TemporaryKey.pfx b/cpp/demo/Ice/winrt/bidir/bidir_TemporaryKey.pfx Binary files differindex 178d16e5d1f..d21e8e8f317 100644 --- a/cpp/demo/Ice/winrt/bidir/bidir_TemporaryKey.pfx +++ b/cpp/demo/Ice/winrt/bidir/bidir_TemporaryKey.pfx diff --git a/cpp/demo/Ice/winrt/hello/Package-8.1.appxmanifest b/cpp/demo/Ice/winrt/hello/Package-8.1.appxmanifest new file mode 100644 index 00000000000..18092e29240 --- /dev/null +++ b/cpp/demo/Ice/winrt/hello/Package-8.1.appxmanifest @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest"> + <Identity Name="be9e42f6-f89b-4671-8754-e408ccec94f0" Publisher="CN=ZeroC Hello App" Version="1.1.0.0" /> + <Properties> + <DisplayName>Ice Hello Demo</DisplayName> + <PublisherDisplayName>ZeroC</PublisherDisplayName> + <Logo>Assets\StoreLogo.png</Logo> + </Properties> + <Prerequisites> + <OSMinVersion>6.3</OSMinVersion> + <OSMaxVersionTested>6.3</OSMaxVersionTested> + </Prerequisites> + <Resources> + <Resource Language="x-generate" /> + </Resources> + <Applications> + <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="hello.App"> + <m2:VisualElements DisplayName="Ice Hello Demo" Description="hello" BackgroundColor="#464646" ForegroundText="light" Square150x150Logo="Assets\Logo.png" Square30x30Logo="Assets\SmallLogo.png"> + <m2:DefaultTile> + <m2:ShowNameOnTiles> + <m2:ShowOn Tile="square150x150Logo" /> + </m2:ShowNameOnTiles> + </m2:DefaultTile> + <m2:SplashScreen Image="Assets\SplashScreen.png" /> + </m2:VisualElements> + </Application> + </Applications> + <Capabilities> + <Capability Name="privateNetworkClientServer" /> + <Capability Name="internetClientServer" /> + <Capability Name="internetClient" /> + </Capabilities> + <Extensions> + <Extension Category="windows.certificates"> + <Certificates> + <Certificate StoreName="Root" Content="cacert.pem" /> + <Certificate StoreName="CA" Content="cacert.pem" /> + <TrustFlags ExclusiveTrust="true" /> + </Certificates> + </Extension> + </Extensions> +</Package>
\ No newline at end of file diff --git a/cpp/demo/Ice/winrt/hello/hello-8.1.vcxproj b/cpp/demo/Ice/winrt/hello/hello-8.1.vcxproj new file mode 100644 index 00000000000..2259bdb15c6 --- /dev/null +++ b/cpp/demo/Ice/winrt/hello/hello-8.1.vcxproj @@ -0,0 +1,227 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <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 Label="Globals"> + <ProjectGuid>{dc1a22cc-0ad9-40cf-9159-952962f71520}</ProjectGuid> + <RootNamespace>hello</RootNamespace> + <DefaultLanguage>en-US</DefaultLanguage> + <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion> + <AppContainerApplication>true</AppContainerApplication> + <ApplicationType>Windows Store</ApplicationType> + <ApplicationTypeRevision>8.1</ApplicationTypeRevision> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.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" /> + <Import Project="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.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="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.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="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.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="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.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="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.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="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.5`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props')" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <PackageCertificateKeyFile>hello_TemporaryKey.pfx</PackageCertificateKeyFile> + <PackageCertificateThumbprint>0E11C0D04AF5C4ACA0EFE17C1BDA45AB686D2F3A</PackageCertificateThumbprint> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="Hello.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> + </ItemGroup> + <ItemGroup> + <ApplicationDefinition Include="App.xaml"> + <SubType>Designer</SubType> + </ApplicationDefinition> + <Page Include="Common\StandardStyles.xaml"> + <SubType>Designer</SubType> + </Page> + <Page Include="MainPage.xaml"> + <SubType>Designer</SubType> + </Page> + </ItemGroup> + <ItemGroup> + <AppxManifest Include="Package-8.1.appxmanifest"> + <SubType>Designer</SubType> + </AppxManifest> + <None Include="..\..\..\..\..\certs\winrt\cacert.pem"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="Hello.ice" /> + <None Include="hello_TemporaryKey.pfx" /> + </ItemGroup> + <ItemGroup> + <Image Include="Assets\Logo.png" /> + <Image Include="Assets\SmallLogo.png" /> + <Image Include="Assets\StoreLogo.png" /> + <Image Include="Assets\SplashScreen.png" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="App.xaml.cpp"> + <DependentUpon>App.xaml</DependentUpon> + </ClCompile> + <ClCompile Include="Hello.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> + </ItemGroup> + <ItemGroup> + <Text Include="README.txt" /> + </ItemGroup> + <ItemGroup> + <SDKReference Include="Ice, Version=3.5" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> + <ProjectExtensions> + <VisualStudio> + <UserProperties ZerocIce_ProjectVersion="1" ZerocIce_Enabled="True" /> + </VisualStudio> + </ProjectExtensions> +</Project>
\ No newline at end of file diff --git a/cpp/demo/Ice/winrt/hello/hello-8.1.vcxproj.filters b/cpp/demo/Ice/winrt/hello/hello-8.1.vcxproj.filters new file mode 100644 index 00000000000..6c42a0f7286 --- /dev/null +++ b/cpp/demo/Ice/winrt/hello/hello-8.1.vcxproj.filters @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Common"> + <UniqueIdentifier>dc1a22cc-0ad9-40cf-9159-952962f71520</UniqueIdentifier> + </Filter> + <Filter Include="Assets"> + <UniqueIdentifier>8f4fb9c1-d4ac-4879-aadd-7a0cd8c1ab92</UniqueIdentifier> + </Filter> + <Page Include="Common\StandardStyles.xaml"> + <Filter>Common</Filter> + </Page> + <Image Include="Assets\Logo.png"> + <Filter>Assets</Filter> + </Image> + <Image Include="Assets\SmallLogo.png"> + <Filter>Assets</Filter> + </Image> + <Image Include="Assets\StoreLogo.png"> + <Filter>Assets</Filter> + </Image> + <Image Include="Assets\SplashScreen.png"> + <Filter>Assets</Filter> + </Image> + </ItemGroup> + <ItemGroup> + <ApplicationDefinition Include="App.xaml" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="App.xaml.cpp" /> + <ClCompile Include="MainPage.xaml.cpp" /> + <ClCompile Include="pch.cpp" /> + <ClCompile Include="Hello.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="pch.h" /> + <ClInclude Include="App.xaml.h" /> + <ClInclude Include="MainPage.xaml.h" /> + <ClInclude Include="Hello.h" /> + </ItemGroup> + <ItemGroup> + <None Include="Hello.ice" /> + <None Include="..\..\..\..\..\certs\winrt\cacert.pem" /> + <None Include="hello_TemporaryKey.pfx" /> + </ItemGroup> + <ItemGroup> + <Page Include="MainPage.xaml" /> + </ItemGroup> + <ItemGroup> + <Text Include="README.txt" /> + </ItemGroup> + <ItemGroup> + <AppxManifest Include="Package-8.1.appxmanifest" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/cpp/demo/Ice/winrt/hello/hello.vcxproj b/cpp/demo/Ice/winrt/hello/hello.vcxproj index fd6df31f2c3..3c32d2c9cc1 100644 --- a/cpp/demo/Ice/winrt/hello/hello.vcxproj +++ b/cpp/demo/Ice/winrt/hello/hello.vcxproj @@ -98,7 +98,7 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup> <PackageCertificateKeyFile>hello_TemporaryKey.pfx</PackageCertificateKeyFile> - <PackageCertificateThumbprint>7307E1ECC4246EE77A7D9F5317876EB0CBB90DC8</PackageCertificateThumbprint> + <PackageCertificateThumbprint>0E11C0D04AF5C4ACA0EFE17C1BDA45AB686D2F3A</PackageCertificateThumbprint> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <ClCompile> diff --git a/cpp/demo/Ice/winrt/hello/hello_TemporaryKey.pfx b/cpp/demo/Ice/winrt/hello/hello_TemporaryKey.pfx Binary files differindex c4468675188..525b93c5bb6 100644 --- a/cpp/demo/Ice/winrt/hello/hello_TemporaryKey.pfx +++ b/cpp/demo/Ice/winrt/hello/hello_TemporaryKey.pfx diff --git a/cpp/demo/IcePatch2/MFC/IcePatch2.MFC.client.vcxproj b/cpp/demo/IcePatch2/MFC/IcePatch2.MFC.client.vcxproj index 191ef0be7d0..99a1a4bc060 100644 --- a/cpp/demo/IcePatch2/MFC/IcePatch2.MFC.client.vcxproj +++ b/cpp/demo/IcePatch2/MFC/IcePatch2.MFC.client.vcxproj @@ -89,7 +89,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.;.\generated;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_WINDOWS;_MBCS;_DEBUG;VC_EXTRALEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;VC_EXTRALEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -126,7 +126,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.;.\generated;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_WINDOWS;_MBCS;_DEBUG;VC_EXTRALEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;VC_EXTRALEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -160,7 +160,7 @@ <Optimization>MaxSpeed</Optimization> <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <AdditionalIncludeDirectories>.;.\generated;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_WINDOWS;_MBCS;NDEBUG;VC_EXTRALEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;VC_EXTRALEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -196,7 +196,7 @@ <Optimization>MaxSpeed</Optimization> <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <AdditionalIncludeDirectories>.;.\generated;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_WINDOWS;_MBCS;NDEBUG;VC_EXTRALEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;VC_EXTRALEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> diff --git a/cpp/demo/demo-winrt-8.1.sln b/cpp/demo/demo-winrt-8.1.sln new file mode 100644 index 00000000000..5d35210429d --- /dev/null +++ b/cpp/demo/demo-winrt-8.1.sln @@ -0,0 +1,87 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bidir", "Ice\winrt\bidir\bidir-8.1.vcxproj", "{4EF04DDD-1B81-4DC7-ADF2-290E22008616}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hello", "Ice\winrt\hello\hello-8.1.vcxproj", "{DC1A22CC-0AD9-40CF-9159-952962F71520}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ice", "Ice", "{2EA0DDEB-E230-4ABE-8257-3418A534FD0F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Glacier2", "Glacier2", "{B4B6E47C-00B7-439B-A3D7-04A80F4643B8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chat", "Glacier2\winrt\chat\chat-8.1.vcxproj", "{C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}" +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 + {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|ARM.ActiveCfg = Debug|ARM + {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|ARM.Build.0 = Debug|ARM + {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|ARM.Deploy.0 = Debug|ARM + {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|Win32.ActiveCfg = Debug|Win32 + {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|Win32.Build.0 = Debug|Win32 + {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|Win32.Deploy.0 = Debug|Win32 + {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|x64.ActiveCfg = Debug|x64 + {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|x64.Build.0 = Debug|x64 + {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|x64.Deploy.0 = Debug|x64 + {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|ARM.ActiveCfg = Release|ARM + {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|ARM.Build.0 = Release|ARM + {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|ARM.Deploy.0 = Release|ARM + {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|Win32.ActiveCfg = Release|Win32 + {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|Win32.Build.0 = Release|Win32 + {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|Win32.Deploy.0 = Release|Win32 + {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|x64.ActiveCfg = Release|x64 + {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|x64.Build.0 = Release|x64 + {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|x64.Deploy.0 = Release|x64 + {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|ARM.ActiveCfg = Debug|ARM + {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|ARM.Build.0 = Debug|ARM + {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|ARM.Deploy.0 = Debug|ARM + {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|Win32.ActiveCfg = Debug|Win32 + {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|Win32.Build.0 = Debug|Win32 + {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|Win32.Deploy.0 = Debug|Win32 + {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|x64.ActiveCfg = Debug|x64 + {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|x64.Build.0 = Debug|x64 + {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|x64.Deploy.0 = Debug|x64 + {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|ARM.ActiveCfg = Release|ARM + {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|ARM.Build.0 = Release|ARM + {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|ARM.Deploy.0 = Release|ARM + {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|Win32.ActiveCfg = Release|Win32 + {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|Win32.Build.0 = Release|Win32 + {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|Win32.Deploy.0 = Release|Win32 + {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|x64.ActiveCfg = Release|x64 + {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|x64.Build.0 = Release|x64 + {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|x64.Deploy.0 = Release|x64 + {DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|ARM.ActiveCfg = Debug|ARM + {DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|ARM.Build.0 = Debug|ARM + {DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|ARM.Deploy.0 = Debug|ARM + {DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|Win32.ActiveCfg = Debug|Win32 + {DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|Win32.Build.0 = Debug|Win32 + {DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|Win32.Deploy.0 = Debug|Win32 + {DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|x64.ActiveCfg = Debug|x64 + {DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|x64.Build.0 = Debug|x64 + {DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|x64.Deploy.0 = Debug|x64 + {DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|ARM.ActiveCfg = Release|ARM + {DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|ARM.Build.0 = Release|ARM + {DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|ARM.Deploy.0 = Release|ARM + {DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|Win32.ActiveCfg = Release|Win32 + {DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|Win32.Build.0 = Release|Win32 + {DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|Win32.Deploy.0 = Release|Win32 + {DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|x64.ActiveCfg = Release|x64 + {DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|x64.Build.0 = Release|x64 + {DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|x64.Deploy.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {4EF04DDD-1B81-4DC7-ADF2-290E22008616} = {2EA0DDEB-E230-4ABE-8257-3418A534FD0F} + {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC} = {B4B6E47C-00B7-439B-A3D7-04A80F4643B8} + {DC1A22CC-0AD9-40CF-9159-952962F71520} = {2EA0DDEB-E230-4ABE-8257-3418A534FD0F} + EndGlobalSection +EndGlobal diff --git a/cpp/src/Ice/winrt/StreamTransceiver.cpp b/cpp/src/Ice/winrt/StreamTransceiver.cpp index b9296fc48bc..3bc67733388 100644 --- a/cpp/src/Ice/winrt/StreamTransceiver.cpp +++ b/cpp/src/Ice/winrt/StreamTransceiver.cpp @@ -167,10 +167,19 @@ IceInternal::StreamTransceiver::startWrite(Buffer& buf) { try { +// +// SocketProtectionLevel::Ssl deprecated in Windows 8.1 +// +#if defined(_MSC_VER) && _MSC_VER >= 1800 +# pragma warning (disable : 4973) +#endif IAsyncAction^ action = safe_cast<StreamSocket^>(_fd)->ConnectAsync( _connectAddr.host, _connectAddr.port, _type == IceSSL::EndpointType ? SocketProtectionLevel::Ssl : SocketProtectionLevel::PlainSocket); +#if defined(_MSC_VER) && _MSC_VER >= 1800 +# pragma warning (default : 4973) +#endif if(!checkIfErrorOrCompleted(SocketOperationConnect, action)) { diff --git a/cpp/src/IceGrid/PlatformInfo.cpp b/cpp/src/IceGrid/PlatformInfo.cpp index d844a7f4a75..aa162923544 100644 --- a/cpp/src/IceGrid/PlatformInfo.cpp +++ b/cpp/src/IceGrid/PlatformInfo.cpp @@ -248,7 +248,17 @@ PlatformInfo::PlatformInfo(const string& prefix, } OSVERSIONINFO osInfo; osInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + +// +// GetVerionEx deprecated in Windows 8.1 +// +# if defined(_MSC_VER) && _MSC_VER >= 1800 +# pragma warning (disable : 4996) +# endif GetVersionEx(&osInfo); +# if defined(_MSC_VER) && _MSC_VER >= 1800 +# pragma warning (default : 4996) +# endif ostringstream os; os << osInfo.dwMajorVersion << "." << osInfo.dwMinorVersion; _release = os.str(); diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp index 75427f4a915..405a2db4127 100644 --- a/cpp/test/Ice/binding/AllTests.cpp +++ b/cpp/test/Ice/binding/AllTests.cpp @@ -849,7 +849,13 @@ allTests(const Ice::CommunicatorPtr& communicator) #if defined(_WIN32) && !defined(ICE_OS_WINRT) OSVERSIONINFO ver; ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); +# if defined(_MSC_VER) && _MSC_VER >= 1800 +# pragma warning (disable : 4996) +# endif GetVersionEx(&ver); +# if defined(_MSC_VER) && _MSC_VER >= 1800 +# pragma warning (default : 4996) +# endif const bool dualStack = ver.dwMajorVersion >= 6; // Windows XP IPv6 doesn't support dual-stack #else const bool dualStack = true; diff --git a/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp b/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp index a369e3dbda9..0250d115044 100644 --- a/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp +++ b/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp @@ -48,7 +48,11 @@ printToConsoleOutput(const std::string& message) { output->Text += msg; output->UpdateLayout(); +#if (_WIN32_WINNT > 0x0602) + scroller->ChangeView(nullptr, scroller->ScrollableHeight, nullptr); +#else scroller->ScrollToVerticalOffset(scroller->ScrollableHeight); +#endif }, CallbackContext::Any)); } diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index d4d3448b136..6ba67f95425 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -100,7 +100,7 @@ def getCppCompiler(): else: config = open(os.path.join(toplevel, "cpp", "config", "Make.rules.mak"), "r") compiler = re.search("CPP_COMPILER[\t\s]*= ([A-Z0-9]*)", config.read()).group(1) - if compiler != "VC90" and compiler != "VC100" and compiler != "VC110": + if compiler != "VC90" and compiler != "VC100" and compiler != "VC110" and compiler != "VC120": compiler = "" if compiler == "": @@ -115,6 +115,8 @@ def getCppCompiler(): compiler = "VC100" elif l.find("Version 17") != -1: compiler = "VC110" + elif l.find("Version 18") != -1: + compiler = "VC120" else: print("Cannot detect C++ compiler") sys.exit(1) @@ -138,6 +140,12 @@ def isVS2012(): compiler = getCppCompiler() return compiler == "VC110" +def isVS2013(): + if not isWin32(): + return False + compiler = getCppCompiler() + return compiler == "VC120" + # # The PHP interpreter is called "php5" on some platforms (e.g., SLES). # @@ -1431,8 +1439,11 @@ def getCppBinDir(lang = None): if iceHome: if lang == None: lang = getDefaultMapping() - if lang == "cpp" and isVS2012(): + if lang == "cpp": + if isVS2012(): binDir = os.path.join(binDir, "vc110") + elif isVS2013(): + binDir = os.path.join(binDir, "vc120") if x64: if isSolaris(): if isSparc(): diff --git a/vsaddin/addin-vs2013.sln b/vsaddin/addin-vs2013.sln new file mode 100644 index 00000000000..93f4ae9f8be --- /dev/null +++ b/vsaddin/addin-vs2013.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "addin-vs2013", "src\addin-vs2013.csproj", "{DB79C06D-CC17-4B29-B4BE-EAE5C8FED3E5}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {DB79C06D-CC17-4B29-B4BE-EAE5C8FED3E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DB79C06D-CC17-4B29-B4BE-EAE5C8FED3E5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DB79C06D-CC17-4B29-B4BE-EAE5C8FED3E5}.Debug|x86.ActiveCfg = Debug|x86 + {DB79C06D-CC17-4B29-B4BE-EAE5C8FED3E5}.Debug|x86.Build.0 = Debug|x86 + {DB79C06D-CC17-4B29-B4BE-EAE5C8FED3E5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DB79C06D-CC17-4B29-B4BE-EAE5C8FED3E5}.Release|Any CPU.Build.0 = Release|Any CPU + {DB79C06D-CC17-4B29-B4BE-EAE5C8FED3E5}.Release|x86.ActiveCfg = Release|x86 + {DB79C06D-CC17-4B29-B4BE-EAE5C8FED3E5}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/vsaddin/config/Ice-VS2013.AddIn b/vsaddin/config/Ice-VS2013.AddIn new file mode 100644 index 00000000000..9410001547a --- /dev/null +++ b/vsaddin/config/Ice-VS2013.AddIn @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<Extensibility xmlns="http://schemas.microsoft.com/AutomationExtensibility"> + <HostApplication> + <Name>Microsoft Visual Studio</Name> + <Version>12.0</Version> + </HostApplication> + <Addin> + <FriendlyName>Ice-@ver@ Visual Studio Add-in</FriendlyName> + <Description>Ice-@ver@ Visual Studio Add-in for Visual Studio 2013</Description> + <AboutBoxDetails>The Ice Visual Studio Add-in integrates Ice projects into the Visual Studio IDE. +The add-in supports C++, .NET, and Silverlight projects. +To know more about Ice visit ZeroC website at http://www.zeroc.com</AboutBoxDetails> + <AboutIconData>0000010006002020100000000000E8020000660000001010100000000000280100004E0300002020000001000800A8080000760400001010000001000800680500001E0D00002020000001002000A8100000861200001010000001002000680400002E2300002800000020000000400000000100040000000000000000000000000000000000000000000000000000000000000000000080000000808000800000008000800080800000C0C0C000808080000000FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF001111111111111111111111111111111111111111111111111111111000001111111111111111111111111110ABA01111111111111111111111111110BAB01111111111111111111111111110ABA01111111111110000000000F00000BAB00000111111118888888888F0ABABABABABA0111111118F77777777F0BABABABABAB0111111118F77777777F0ABABABABABA0111111118F77777777F00000BAB00000110001118F77777777FFFFF0ABA01111108880118F777777777777F0BAB01111887788008F777777777777F0ABA011118FF770778F777777777777F0000011118FFF78088F777777777777FFFFFF111118FF70118F7777777777777777801111118881118F7777777777777777801111111111118F7777777777777777801111111111118F7777777777777777801111111111118F7777777777777777801111111111118FFFFFFFFFFFFFFFFF801111111111118888888888888888888011111111111111111870111118701111111111111111111118F0111118F011111111111111111111108011111080111111111111111111110808011108080111111111111111111877788018777880111111111111111118FF778018FF7780111111111111111118FFF78018FFF7801111111111111111118FF701118FF7011111111111111111111777111117771111111111111111111111111111111111111111FFFFFFFFFFFFFE0FFFFFFE0FFFFFFE0FFFFFFE0FFF000000FF000000FF000000FF000000FF000000C700000F8300000F0000000F0000000F0000000F8300000FC700000FFF00000FFF00000FFF00000FFF00000FFF00000FFFF8F8FFFFF8F8FFFFF8F8FFFFF0707FFFE0203FFFE0203FFFE0203FFFF0707FFFF8F8FFFFFFFFFF2800000010000000200000000100040000000000000000000000000000000000000000000000000000000000000000000080000000808000800000008000800080800000C0C0C000808080000000FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF0011111111111111111111111111100011111111111110A011111111111000B00011110000F0ABABA011118F88F000B00011118F77FFF0A01170718F7777F000110F008F7777FFFF1170718F777777801111118FFFFFFF801111118888888880111111111101111111111111170711111111111110F01111111111111707111111FFFF1111FFE37777FFE3ABABFF80ABA0F0001111F0007777F0030000100300000003011110037777F003FFF0F0031111FF7F8011FE3F7777FE3F77F0FE3F1111280000002000000040000000010008000000000000000000000000000000000000000000000000000000000000008000008000000080800080000000800080008080000080808000C0DCC000F0CAA600AA3F2A00FF3F2A00005F2A00555F2A00AA5F2A00FF5F2A00007F2A00557F2A00AA7F2A00FF7F2A00009F2A00559F2A00AA9F2A00FF9F2A0000BF2A0055BF2A00AABF2A00FFBF2A0000DF2A0055DF2A00AADF2A00FFDF2A0000FF2A0055FF2A00AAFF2A00FFFF2A000000550055005500AA005500FF005500001F5500551F5500AA1F5500FF1F5500003F5500553F5500AA3F5500FF3F5500005F5500555F5500AA5F5500FF5F5500007F5500557F5500AA7F5500FF7F5500009F5500559F5500AA9F5500FF9F550000BF550055BF5500AABF5500FFBF550000DF550055DF5500AADF5500FFDF550000FF550055FF5500AAFF5500FFFF550000007F0055007F00AA007F00FF007F00001F7F00551F7F00AA1F7F00FF1F7F00003F7F00553F7F00AA3F7F00FF3F7F00005F7F00555F7F00AA5F7F00FF5F7F00007F7F00557F7F00AA7F7F00FF7F7F00009F7F00559F7F00AA9F7F00FF9F7F0000BF7F0055BF7F00AABF7F00FFBF7F0000DF7F0055DF7F00AADF7F00FFDF7F0000FF7F0055FF7F00AAFF7F00FFFF7F000000AA005500AA00AA00AA00FF00AA00001FAA00551FAA00AA1FAA00FF1FAA00003FAA00553FAA00AA3FAA00FF3FAA00005FAA00555FAA00AA5FAA00FF5FAA00007FAA00557FAA00AA7FAA00FF7FAA00009FAA00559FAA00AA9FAA00FF9FAA0000BFAA0055BFAA00AABFAA00FFBFAA0000DFAA0055DFAA00AADFAA00FFDFAA0000FFAA0055FFAA00AAFFAA00FFFFAA000000D4005500D400AA00D400FF00D400001FD400551FD400AA1FD400FF1FD400003FD400553FD400AA3FD400FF3FD400005FD400555FD400AA5FD400FF5FD400007FD400557FD400AA7FD400FF7FD400009FD400559FD400AA9FD400FF9FD40000BFD40055BFD400AABFD400FFBFD40000DFD40055DFD400AADFD400FFDFD40000FFD40055FFD400AAFFD400FFFFD4005500FF00AA00FF00001FFF00551FFF00AA1FFF00FF1FFF00003FFF00553FFF00AA3FFF00FF3FFF00005FFF00555FFF00AA5FFF00FF5FFF00007FFF00557FFF00AA7FFF00FF7FFF00009FFF00559FFF00AA9FFF00FF9FFF0000BFFF0055BFFF00AABFFF00FFBFFF0000DFFF0055DFFF00AADFFF00FFDFFF0055FFFF00AAFFFF00FFCCCC00FFCCFF00FFFF3300FFFF6600FFFF9900FFFFCC00007F0000557F0000AA7F0000FF7F0000009F0000559F0000AA9F0000FF9F000000BF000055BF0000AABF0000FFBF000000DF000055DF0000AADF0000FFDF000055FF0000AAFF000000002A0055002A00AA002A00FF002A00001F2A00551F2A00AA1F2A00FF1F2A00003F2A00553F2A00F0FBFF00A4A0A000808080000000FF0000FF000000FFFF00FF00000000000000FFFF0000FFFFFF00FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0C0CF50CF5FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0D3938350CFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD303939380DFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD11395D390CFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD35353535356139393110310D30FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD39666162616161613939393811FDFDFDFDFDFDFDFDFDFD3231073231323132083D858A61666261616161393935FDFDFDFDFDFDFDFDFD5E080909820982838608398A8A8A856165626161613D35FDFDFDFDFDFDFDFD82B3AF08080808080808AB39393939398A86613935353535FDFDFDFDFDFDFDFD86D1F6AFAFAFAFAF08AF0808D408D4398A6586390886FDFDFD5A073632FDFDFD86B3F6F6F6AFF6AFAFAFAF08AB0808398A8A8A39D432FDFD8286D4825A35FDFD82FFF6AFF6F6AFF6AF08D1AF08AFD43D8A8A8A610831FDFD5EFFAF088232363286FFFFF6F6AFF6AFF6AFAF08AF08085D61613D5DD4F5FDFD82F6F6AF085A825E82FFFFFFFFF6D1F6AFF6AFF6AFAFAF080808D408D431FDFD86D4FFFF095EFDFD09FFFFFFFFFFF6B3F6F6AFAFD108AFAFAF08AB09860DFDFDFD08825E86FDFDFD82FFFFFFFFFFFFF6F6AFF6F6AFF6AF08D1AF08088232FDFDFDFDFDFDFDFDFDFD86FFFFFFFFFFFFFFFFFFF6AFF6AFF6AFAF08AF088331FDFDFDFDFDFDFDFDFDFDFD86FFFFFFFFFFFFFFFFFFFFF6F6AFF6AFAFAF0807FDFDFDFDFDFDFDFDFDFDFDFDFD86828682825EF75E5E5E5A5E5A5A07360736FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD5E31FDFDFDFDFDFD5E31FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD8232FDFDFDFDFDFD8232FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD5A360732FDFDFDFD5A360732FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD8286D4823607FDFD8286D4823607FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD5EFFAF088232FDFD5EFFAF088232FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF7D1FFAF0807FDFDF7D1FFAF0807FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0808FFFF095EFDFD0808FFFF095EFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0982F786FDFDFDFD0982F786FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0FFFFFFE0FFFFFFE0FFFFFFE0FFFFFE000FFFFE000FFC00000FF800000FF000000FF000003870000030300000300000003000000030300000387000003FF000003FF800007FFC0000FFFFCFCFFFFFCFCFFFFF8787FFFF0303FFFF0303FFFF0303FFFF0303FFFF8787FFFFFFFFFFFFFFFFF280000001000000020000000010008000000000000000000000000000000000000000000000000000000000000008000008000000080800080000000800080008080000080808000C0DCC000F0CAA600AA3F2A00FF3F2A00005F2A00555F2A00AA5F2A00FF5F2A00007F2A00557F2A00AA7F2A00FF7F2A00009F2A00559F2A00AA9F2A00FF9F2A0000BF2A0055BF2A00AABF2A00FFBF2A0000DF2A0055DF2A00AADF2A00FFDF2A0000FF2A0055FF2A00AAFF2A00FFFF2A000000550055005500AA005500FF005500001F5500551F5500AA1F5500FF1F5500003F5500553F5500AA3F5500FF3F5500005F5500555F5500AA5F5500FF5F5500007F5500557F5500AA7F5500FF7F5500009F5500559F5500AA9F5500FF9F550000BF550055BF5500AABF5500FFBF550000DF550055DF5500AADF5500FFDF550000FF550055FF5500AAFF5500FFFF550000007F0055007F00AA007F00FF007F00001F7F00551F7F00AA1F7F00FF1F7F00003F7F00553F7F00AA3F7F00FF3F7F00005F7F00555F7F00AA5F7F00FF5F7F00007F7F00557F7F00AA7F7F00FF7F7F00009F7F00559F7F00AA9F7F00FF9F7F0000BF7F0055BF7F00AABF7F00FFBF7F0000DF7F0055DF7F00AADF7F00FFDF7F0000FF7F0055FF7F00AAFF7F00FFFF7F000000AA005500AA00AA00AA00FF00AA00001FAA00551FAA00AA1FAA00FF1FAA00003FAA00553FAA00AA3FAA00FF3FAA00005FAA00555FAA00AA5FAA00FF5FAA00007FAA00557FAA00AA7FAA00FF7FAA00009FAA00559FAA00AA9FAA00FF9FAA0000BFAA0055BFAA00AABFAA00FFBFAA0000DFAA0055DFAA00AADFAA00FFDFAA0000FFAA0055FFAA00AAFFAA00FFFFAA000000D4005500D400AA00D400FF00D400001FD400551FD400AA1FD400FF1FD400003FD400553FD400AA3FD400FF3FD400005FD400555FD400AA5FD400FF5FD400007FD400557FD400AA7FD400FF7FD400009FD400559FD400AA9FD400FF9FD40000BFD40055BFD400AABFD400FFBFD40000DFD40055DFD400AADFD400FFDFD40000FFD40055FFD400AAFFD400FFFFD4005500FF00AA00FF00001FFF00551FFF00AA1FFF00FF1FFF00003FFF00553FFF00AA3FFF00FF3FFF00005FFF00555FFF00AA5FFF00FF5FFF00007FFF00557FFF00AA7FFF00FF7FFF00009FFF00559FFF00AA9FFF00FF9FFF0000BFFF0055BFFF00AABFFF00FFBFFF0000DFFF0055DFFF00AADFFF00FFDFFF0055FFFF00AAFFFF00FFCCCC00FFCCFF00FFFF3300FFFF6600FFFF9900FFFFCC00007F0000557F0000AA7F0000FF7F0000009F0000559F0000AA9F0000FF9F000000BF000055BF0000AABF0000FFBF000000DF000055DF0000AADF0000FFDF000055FF0000AAFF000000002A0055002A00AA002A00FF002A00001F2A00551F2A00AA1F2A00FF1F2A00003F2A00553F2A00F0FBFF00A4A0A000808080000000FF0000FF000000FFFF00FF00000000000000FFFF0000FFFFFF00FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD353535FDFDFDFDFDFDFDFDFDFDFDFDFD356535FDFDFDFDFDFDFDFDFDFDFD39393985351111FDFDFDFDFDFDFDFDFD398A8A8A8A8935FDFDFDFDFDFD3131823D39398A393535FDFDFDFDFD32AF820808AB3DB239FDFDFDFDF5FDFD5AF6AFAFAF08393939FDFDFD5EFFF5F55EFFF6F6AFF6AF0886FDFDFDFD5EFDFD5EFFFFF6F6AFAFD4F5FDFDFDFDFDFDFDFDF75E5E5A5A0731FDFDFDFDFDFDFDFDFDFDFDFDF5FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF5FDFDFDFDFDFDFDFDFDFDFDFDFDFD5EFFF5FDFDFDFDFDFDFDFDFDFDFDFDFDFD5EFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFFFFFDFDFFC7FDFDFFC7FDFDFF01FDFDFF01FD39F8016261F0076139B00738110007FDFDB007FDFDF80F3231FF7F3132FF7F083DFE3F6166FF7F6161FFFF39352800000020000000400000000100200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002E5B35FC295231FF274F2FFF264D2EFF27502FFF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000306138FE329A4FFF2C9649FF259244FF2A5432FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000356A3DFC3FA259FF389D54FF319A4EFF2E5D36FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000397341FE4DAB66FF45A65FFF3DA158FF316439FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000045874CFF43854BFF42824AFF407E47FF3F7C46FF5BB471FF53AF6AFF4BAA64FF356B3DFF34683CFF33673BFF326439FF306038FF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000519F58FF85CF94FF7FCA8FFF77C689FF70C183FF69BD7DFF61B876FF59B370FF51AE6AFF49A963FF42A55CFF3B9F56FF387040FF00000000000000000000000000000000000000000000000000000000000000000000000089715F4689715FFF866E5BFF846B59FF816855FF7E6552FF7B624FFF79604CFF846E5CFFCAC1B9FF55A85DFF8FD59CFF8AD198FF84CD93FF7DCA8EFF76C688FF6EC082FF67BB7CFF5FB775FF58B26EFF50AD67FF48A861FF3E7A46FF000000000000000000000000000000000000000000000000000000000000000089715F46AE998AFFD2C0B6FFD0BDB3FFCEBBB1FFCCB9AEFFCBB6ABFFCAB4A9FFC7B2A6FFCCB8ADFFD4C4BCFF5AB061FF97DAA3FF93D8A0FF8ED49CFF88D097FF83CC92FF7BC98CFF75C487FF6DC081FF65BB7AFF5EB673FF56B16DFF43854AFF0000000000000000000000000000000000000000000000000000000000000000C3AFA2FFF3EFECFFE6DEDAFFE0D4CEFFDFD2CAFFDDCEC7FFDACCC3FFD8C9C1FFD6C6BDFFD8C8C1FFE1D6CFFF59AB60FF58AA5EFF56A75DFF55A65DFF57AA5EFF8DD39BFF87CF97FF81CC91FF4F9B57FF4B9352FF498D50FF478C4FFC46894DFC0000000000000000000000000000000000000000000000000000000000000000C4B0A3FFF7F3F1FFF5F0EEFFF2EDEBFFEFEAE7FFEEE6E3FFEBE3DFFFE8DFDBFFE6DCD6FFE4D8D2FFE1D4CEFFDED0CAFFDCCDC6FFD9C9C2FFD6C6BDFF57AB5EFF95D9A2FF91D69EFF8CD29AFF519E58FFDED2CBFFC4BAB2FF0000000000000000BEAFA531A69183C08D7664F8856C5AF8866B59C0826855310000000000000000C5B1A4FFF9F7F5FFF7F4F3FFF5F2EFFFF3EEECFFF0EBE8FFEFE8E4FFEDE4E1FFEAE1DDFFE7DDD8FFE4DAD4FFE2D7D0FFDFD3CCFFDCCEC8FFDACBC3FF5AAE62FF99DBA5FF99DAA4FF94D8A2FF54A45BFFDFD4CEFF846E5EFF0000000000000000BCADA2C0C7BAB0FFD7C7C1FFC3ADA1FF9D8373FF876D5AC00000000000000000C5B2A4FFFBFAF9FFF9F8F6FFF8F5F3FFF6F3F0FFF4EFEEFFF2ECEAFFF0EAE6FFEEE6E2FFEBE3DEFFE8DFDAFFE5DBD6FFE3D8D2FFE0D4CDFFDDD0C9FF5DB564FF99DBA5FF99DBA5FF99DBA5FF69B570FFDDD1CAFF69503BFF0000000000000000B19E90F8F9F7F6FFF0EAE8FFDCCEC6FFC2AEA1FF88705DF8866E5BFF846B59FFC6B2A5FFFDFDFDFFFCFAFAFFFBF9F8FFF9F6F5FFF7F3F2FFF5F0EEFFF2EEECFFF0EBE8FFEEE7E4FFECE4E0FFE9E1DCFFE6DDD7FFE4D9D4FFE2D6D0FF5DB263FF62BF69FF62BF69FF61BE68FF6AB671FFDED2CBFF6C523EFF0000000000000000B8A699F8F9F8F7FFFFFFFFFFF0EBE8FFD6C9C0FF937B6AF8C7B1A6FFB39A8AFFC6B3A5FFFFFFFFFFFFFDFEFFFDFBFBFFFBFAF9FFF9F8F6FFF7F5F3FFF5F2F0FFF3EFEDFFF1ECE9FFEFE9E5FFEDE6E2FFEBE3DEFFE8DFDAFFE6DBD5FFE2D8D2FFE0D4CDFFDDCFC9FFDFD1CBFFDED2CBFFDDCFC7FF6F5541FF0000000000000000CDC0B6C0DBD2CBFFFAF8F7FFF9F8F7FFCABDB4FFAB9789C00000000000000000C7B3A6FFFFFFFFFFFFFFFFFFFFFFFEFFFDFCFDFFFCFBFAFFFAF9F8FFF8F6F5FFF7F3F2FFF5F0EFFFF2EDEAFFF0EAE7FFEEE7E3FFEBE4DFFFE9E0DCFFE6DDD7FFE4D9D3FFE1D5CFFFDFD1CBFFD0BDB4FFC5B0A4FF725945FF0000000000000000DCD1CA31CFC1B7C0BBA99CF8B6A396F8C2B3A8C0C4B5AB310000000000000000C7B5A7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFEFDFFFCFCFBFFFBFAF8FFFAF7F6FFF7F5F2FFF6F2EFFFF3EFEDFFF2ECE9FFEFE9E5FFECE5E1FFEAE2DDFFE7DED9FFE5DBD5FFE2D7D1FFD3C2BAFFC8B3A8FF755C49FF00000000000000000000000000000000000000000000000000000000000000000000000000000000C8B5A8CAFFFFFFDAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFDFCFCFFFCFBFAFFFAF8F8FFF8F6F4FFF6F3F1FFF5F0EEFFF2EDEAFFF0EAE6FFEDE6E3FFEBE4DFFFE9E0DBFFE6DCD7FFDCCFC8FFCBB7ABFF795F4CFF0000000000000000000000000000000000000000000000000000000000000000000000000000000089715F31C5B1A4B2FFFFFFCDFFFFFFEAFFFFFFF4FFFFFFFFFFFFFFFFFFFFFFFFFEFDFDFFFDFCFBFFFBFAF9FFFAF6F5FFF7F4F3FFF5F2EFFFF3EEECFFF1EBE8FFEFE8E5FFECE5E1FFEAE1DDFFE4DAD5FF866E5CFF866E5C46000000000000000000000000000000000000000000000000000000000000000000000000000000000000000089715F31C5B1A4B2C3AFA2D3C0AD9EE8BDA99CFFBBA698FFB7A495FFB5A091FFB19C8DFFAE9989FFAB9585FFA79281FFA48E7DFFA08A7AFF9C8675FF988271FF957E6DFF917A68FF8A7260FF866E5C460000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B39A8AFF846B59FF000000000000000000000000000000000000000000000000B39A8AFF846B59FF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000C7B1A6FF866E5BFF000000000000000000000000000000000000000000000000C7B1A6FF866E5BFF0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000BEAFA531A69183C08D7664F8856C5AF8866B59C0826855310000000000000000BEAFA531A69183C08D7664F8856C5AF8866B59C082685531000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000BCADA2C0C7BAB0FFD7C7C1FFC3ADA1FF9D8373FF876D5AC00000000000000000BCADA2C0C7BAB0FFD7C7C1FFC3ADA1FF9D8373FF876D5AC0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B19E90F8F9F7F6FFF0EAE8FFDCCEC6FFC2AEA1FF88705DF80000000000000000B19E90F8F9F7F6FFF0EAE8FFDCCEC6FFC2AEA1FF88705DF8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B8A699F8F9F8F7FFFFFFFFFFF0EBE8FFD6C9C0FF937B6AF80000000000000000B8A699F8F9F8F7FFFFFFFFFFF0EBE8FFD6C9C0FF937B6AF8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000CDC0B6C0DBD2CBFFFAF8F7FFF9F8F7FFCABDB4FFAB9789C00000000000000000CDC0B6C0DBD2CBFFFAF8F7FFF9F8F7FFCABDB4FFAB9789C0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000DCD1CA31CFC1B7C0BBA99CF8B6A396F8C2B3A8C0C4B5AB310000000000000000DCD1CA31CFC1B7C0BBA99CF8B6A396F8C2B3A8C0C4B5AB3100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0FFFFFFE0FFFFFFE0FFFFFFE0FFFFFE000FFFFE000FF800000FF000000FF000000FF000003030000030300000300000003000000030300000303000003FF000003FF000003FF800007FFFCFCFFFFFCFCFFFFF0303FFFF0303FFFF0303FFFF0303FFFF0303FFFF0303FFFFFFFFFFFFFFFFF2800000010000000200000000100200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFF4643854BFF407D47FF3B7643FFFFFFFF46000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000488E50FF7BC88DFF3F7D47FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000055A65CFF519E58FF4D9554FF8AD29AFF43854BFF407E47FF3C7643FF00000000000000000000000000000000000000000000000000000000000000000000000059AE60FFA4E3B2FF9FE0ADFF9ADCA8FF94D9A3FF8ED59FFF407E47FF000000000000000000000000000000000000000000000000755B46FF6E5541FFC0B5ACFF5CB463FF59AE60FF55A65CFFAAE7B7FF4C9653FF478D4FFF44854BFF00000000000000000000000000000000FFFFFF31856D5AFFEDE6E3FFBFA79AFFD5C6BDFFD7C8C0FFD3C5BCFF59AE60FFB9F0C3FF509E58FF0000000000000000000000006348333B634833FF6348333BFFFFFF6A97806FFFF6F2F1FFF2EDEAFFEDE6E3FFE8E0DCFFE4D9D3FF5DB464FF59AE60FF55A75CFF000000000000000000000000AE9A8BFFFFFFFFFF634833FF634833FFA99484FFFDFBFCFFF9F7F7FFF6F3F0FFF2EDEAFFEDE7E3FFEBE3E0FFD9CEC7FFC4BAB2FF0000000000000000000000006348333BAE9A8BFF6348333BFFFFFF79B29D8EFFFFFFFFFFFCFCFBFFFAF8F7FFF6F2F1FFF2EDEAFFE9E0DBFFDFD2CBFF694E3AFF000000000000000000000000000000000000000000000000FFFFFF4600000000B6A193FFAE9A8BFFA79181FF9F8979FF97806FFF876F5DFF785F4CFF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000634833FF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006348333F634833FF6348333F00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000AE9A8BFFFFFFFFFF634833FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006348333FAE9A8BFF6348333F00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFF0000FF830000FFC70000FF010000FF010000F8010000E0070000000700000007000000070000E80F0000FF7F0000FE3F0000FE3F0000FE3F0000FFFF0000</AboutIconData> + <Assembly>@installdir@\vsaddin\IceVisualStudioAddin-VS2013.dll</Assembly> + <FullClassName>Ice.VisualStudio.Connect</FullClassName> + <LoadBehavior>5</LoadBehavior> + <CommandPreload>1</CommandPreload> + <CommandLineSafe>1</CommandLineSafe> + </Addin> +</Extensibility> diff --git a/vsaddin/config/Make.rules.mak b/vsaddin/config/Make.rules.mak index ccc23175073..07c59f57687 100644 --- a/vsaddin/config/Make.rules.mak +++ b/vsaddin/config/Make.rules.mak @@ -28,8 +28,8 @@ DEBUG = yes OPTIMIZE = yes # -# Define VS to VS2012, VS2010 or VS2008 to build with that Visual Studio Version. -# +# Define VS to VS2013, VS2012, VS2010 or VS2008 to build with that Visual Studio +# Version. # #VS = VS2008 @@ -79,7 +79,10 @@ SILVERLIGH_ASSEMBLIES_KEY = $(REGISTRY_PREFIX)\Microsoft SDKs\Silverlight\v5.0\A # Visual Studio version # -!if "$(VS)" == "" && "$(VSSDK110INSTALL)" != "" +!if "$(VS)" == "" && "$(VSSDK120INSTALL)" != "" +VS = VS2013 +!message VS2013 will be used! +!elseif "$(VS)" == "" && "$(VSSDK110INSTALL)" != "" VS = VS2012 !message VS2012 will be used! !elseif "$(VS)" == "" && "$(VSSDK100INSTALL)" != "" @@ -90,7 +93,10 @@ VS = VS2008 !message VS was not set VS2008 will be used! !endif -!if "$(VS)" == "VS2012" +!if "$(VS)" == "VS2013" +VSSDK_HOME = $(VSSDK120INSTALL) +ADDIN_PREFIX = $(ALLUSERSPROFILE)\Microsoft\VisualStudio\12.0\Addins +!elseif "$(VS)" == "VS2012" VSSDK_HOME = $(VSSDK110INSTALL) ADDIN_PREFIX = $(ALLUSERSPROFILE)\Microsoft\VisualStudio\11.0\Addins !elseif "$(VS)" == "VS2010" @@ -102,14 +108,14 @@ ADDIN_PREFIX = $(ALLUSERSPROFILE)\Microsoft\VisualStudio\9.0\Addins !endif !if "$(VSSDK_HOME)" == "" -!message The Visual Studio SDK does not appear to be installed: VSSDK110INSTALL, VSSDK100INSTALL and VSSDK90INSTALL are all unset. +!message The Visual Studio SDK does not appear to be installed: VSSDK120INSTALL, VSSDK110INSTALL, VSSDK100INSTALL and VSSDK90INSTALL are all unset. !endif VSTARGET = $(VS) VS_HOME = $(VSINSTALLDIR) PKG_PREFIX = $(VSTARGET) -!if "$(VS)" == "VS2010" || "$(VS)" == "VS2012" +!if "$(VS)" == "VS2010" || "$(VS)" == "VS2012" || "$(VS)" == "VS2013" PROPERTY_SHEET = "Ice.props" !endif @@ -148,7 +154,7 @@ MCSFLAGS = $(MCSFLAGS) /reference:"$(VSINSTALLDIR)\Common7\IDE\PublicAssemblies\ MCSFLAGS = $(MCSFLAGS) /reference:"$(VS_HOME)\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProject.dll" MCSFLAGS = $(MCSFLAGS) /reference:"$(VS_HOME)\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProjectEngine.dll" -!elseif "$(VSTARGET)" == "VS2012" +!elseif "$(VSTARGET)" == "VS2012" || "$(VSTARGET)" == "VS2013" MCSFLAGS = $(MCSFLAGS) /reference:"$(PROGRAMFILES)\Common Files\microsoft shared\MSEnv\PublicAssemblies\EnvDTE.dll" MCSFLAGS = $(MCSFLAGS) /reference:"$(PROGRAMFILES)\Common Files\microsoft shared\MSEnv\PublicAssemblies\EnvDTE80.dll" @@ -180,7 +186,7 @@ MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\ MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.Shell.dll" MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.Shell.Interop.dll" MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.Shell.Interop.8.0.dll" -!elseif "$(VSTARGET)" == "VS2012" +!elseif "$(VSTARGET)" == "VS2012" || "$(VSTARGET)" == "VS2013" MCSFLAGS = $(MCSFLAGS) /reference:"Microsoft.Build.dll" MCSFLAGS = $(MCSFLAGS) /reference:"$(PROGRAMFILES)\Common Files\microsoft shared\MSEnv\PublicAssemblies\Extensibility.dll" MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.OLE.Interop.dll" diff --git a/vsaddin/config/ice.props b/vsaddin/config/ice.props index 0568e815ba9..7873e6c0aae 100644 --- a/vsaddin/config/ice.props +++ b/vsaddin/config/ice.props @@ -25,6 +25,16 @@ <IceLib>$(IceHome)\lib\vc110\$(Platform)</IceLib> <IceBin>$(IceHome)\bin\vc110\$(Platform)</IceBin> </PropertyGroup> + + <PropertyGroup Condition="!Exists('$(IceSourceHome)') And '$(Platform)' == 'Win32' And '$(PlatformToolset)' == 'v120'"> + <IceLib>$(IceHome)\lib\vc120</IceLib> + <IceBin>$(IceHome)\bin\vc120</IceBin> + </PropertyGroup> + + <PropertyGroup Condition="!Exists('$(IceSourceHome)') And '$(Platform)' != 'Win32' And '$(PlatformToolset)' == 'v120'"> + <IceLib>$(IceHome)\lib\vc120\$(Platform)</IceLib> + <IceBin>$(IceHome)\bin\vc120\$(Platform)</IceBin> + </PropertyGroup> <PropertyGroup Condition="Exists('$(IceSourceHome)')"> <IceHome>$(IceSourceHome)</IceHome> diff --git a/vsaddin/src/Builder.cs b/vsaddin/src/Builder.cs index a1988ad36a3..a9f4de7965f 100644 --- a/vsaddin/src/Builder.cs +++ b/vsaddin/src/Builder.cs @@ -2891,74 +2891,42 @@ namespace Ice.VisualStudio { project = Util.getProjectByNameOrFile(_applicationObject.Solution, projectName); } + + List<Project> projects = new List<Project>(); + if(scope.Equals(vsBuildScope.vsBuildScopeProject)) + { + projects.Add(project); + } + else if(scope.Equals(vsBuildScope.vsBuildScopeSolution)) + { + projects = Util.buildOrder(_applicationObject.Solution); + } + else if(project != null && project.Kind.Equals(EnvDTE80.ProjectKinds.vsProjectKindSolutionFolder)) + { + projects = Util.solutionFolderProjects(project); + } if(action == vsBuildAction.vsBuildActionBuild || action == vsBuildAction.vsBuildActionRebuildAll) { - if(scope.Equals(vsBuildScope.vsBuildScopeProject) || - (project != null && project.Kind.Equals(EnvDTE80.ProjectKinds.vsProjectKindSolutionFolder))) + foreach(Project p in projects) { - List<Project> projects = new List<Project>(); - if(project.Kind.Equals(EnvDTE80.ProjectKinds.vsProjectKindSolutionFolder)) - { - projects = Util.solutionFolderProjects(project); - } - else + _buildProject = p; + if(p == null) { - projects.Add(project); + continue; } - foreach(Project p in projects) - { - _buildProject = p; - if(p == null) - { - continue; - } - - clearErrors(p); - if(action == vsBuildAction.vsBuildActionRebuildAll) - { - cleanProject(p, false); - } - buildProject(p, false, scope, true); - - if(hasErrors(p)) - { - bringErrorsToFront(); - Util.write(project, Util.msgLevel.msgError, - "------ Slice compilation contains errors. Build canceled. ------\n"); - if (_connectMode == ext_ConnectMode.ext_cm_CommandLine) - { - // Is this the best we can do? Is there a clean way to exit? - Environment.Exit(-1); - } - _applicationObject.ExecuteCommand("Build.Cancel", ""); - } - } - } - else - { - clearErrors(); - List<Project> projects = Util.buildOrder(_applicationObject.Solution); - foreach(Project p in projects) + clearErrors(p); + if(action == vsBuildAction.vsBuildActionRebuildAll) { - if(p != null) - { - if(!Util.isSliceBuilderEnabled(p)) - { - continue; - } - if(action == vsBuildAction.vsBuildActionRebuildAll) - { - cleanProject(p, false); - } - buildProject(p, false, scope, false); - } + cleanProject(p, false); } - if(hasErrors()) + buildProject(p, false, scope, true); + + if(hasErrors(p)) { bringErrorsToFront(); - Util.write(null, Util.msgLevel.msgError, + Util.write(project, Util.msgLevel.msgError, "------ Slice compilation contains errors. Build canceled. ------\n"); if(_connectMode == ext_ConnectMode.ext_cm_CommandLine) { @@ -2971,39 +2939,13 @@ namespace Ice.VisualStudio } else if(action == vsBuildAction.vsBuildActionClean) { - if(scope.Equals(vsBuildScope.vsBuildScopeProject) || - (project != null && project.Kind.Equals(EnvDTE80.ProjectKinds.vsProjectKindSolutionFolder))) + foreach(Project p in projects) { - List<Project> projects = new List<Project>(); - if (project.Kind.Equals(EnvDTE80.ProjectKinds.vsProjectKindSolutionFolder)) + if(p == null) { - projects = Util.solutionFolderProjects(project); - } - else - { - projects.Add(project); - } - foreach(Project p in projects) - { - _buildProject = p; - if (p == null) - { - continue; - } - cleanProject(p, false); - } - } - else - { - List<Project> projects = Util.buildOrder(_applicationObject.Solution); - foreach(Project p in projects) - { - if (p == null) - { - continue; - } - cleanProject(p, false); + continue; } + cleanProject(p, false); } } } diff --git a/vsaddin/src/Makefile.mak b/vsaddin/src/Makefile.mak index 8ab2c36af95..e107747fd03 100644 --- a/vsaddin/src/Makefile.mak +++ b/vsaddin/src/Makefile.mak @@ -75,7 +75,7 @@ install::$(TARGETS) @reg ADD "$(DOTNET_ASSEMBLIES_KEY)" /ve /d "$(prefix)\Assemblies" /f || \ echo "Could not add registry keyword $(DOTNET_ASSEMBLIES_KEY)" && exit 1 -!if "$(VS)" == "VS2010" || "$(VS)" == "VS2012" +!if "$(VS)" == "VS2010" || "$(VS)" == "VS2012" || "$(VS)" == "VS2013" install:: @if not exist $(ALLUSERSPROFILE)\ZeroC \ @echo "Creating $(ALLUSERSPROFILE)\ZeroC ..." && \ diff --git a/vsaddin/src/Util.cs b/vsaddin/src/Util.cs index a5e0c6fc2c3..7f63e0615c7 100644 --- a/vsaddin/src/Util.cs +++ b/vsaddin/src/Util.cs @@ -511,7 +511,7 @@ namespace Ice.VisualStudio propSheetFileName += ".vsprops"; #endif -#if VS2010 || VS2012 +#if VS2010 || VS2012 || VS2013 propSheetFileName += ".props"; #endif @@ -539,7 +539,7 @@ namespace Ice.VisualStudio } #endif -#if VS2010 || VS2012 +#if VS2010 || VS2012 || VS2013 newSheet = vcConfig.AddPropertySheet(propSheetFileName); #endif @@ -676,7 +676,7 @@ namespace Ice.VisualStudio configuration.InheritedPropertySheets = sheets.ToString(); } #endif -#if VS2010 || VS2012 +#if VS2010 || VS2012 || VS2013 VCPropertySheet sheet = null; IVCCollection sheets = (IVCCollection)configuration.PropertySheets; foreach(VCPropertySheet s in sheets) @@ -748,19 +748,27 @@ namespace Ice.VisualStudio } return false; } - -#if VS2012 + +#if VS2012 || VS2013 public static void addSdkReference(VCProject project, string component) { if(!Builder.commandLine) { string sdkId = component + ", Version=" + Util.MajorVersion + "." + Util.MinorVersion; VCReference reference = (VCReference)((VCReferences)project.VCReferences).Item(sdkId); + +# if VS2012 if (reference != null) { reference.Remove(); } project.AddSdkReference(sdkId); +# else + if(reference == null) + { + project.AddSdkReference(sdkId); + } +# endif } } @@ -950,7 +958,7 @@ namespace Ice.VisualStudio public static string cppBinDir(Project project, CPUType arch) { -#if VS2010 || VS2012 +#if VS2010 || VS2012 || VS2013 return isWinRTProject(project) ? "$(IceBin)\\winrt" : "$(IceBin)"; #else string cppBinDir = Path.Combine("$(IceHome)", "bin"); @@ -1007,7 +1015,7 @@ namespace Ice.VisualStudio path = "PATH=" + removeFromPath(assignmentValue(path).Trim(), Path.Combine(iceHome, dir)); } -#if VS2010 || VS2012 +#if VS2010 || VS2012 || VS2013 path = "PATH=" + removeFromPath(assignmentValue(path).Trim(), "$(IceBin)\\winrt"); path = "PATH=" + removeFromPath(assignmentValue(path).Trim(), "$(IceBin)"); #endif @@ -1058,7 +1066,7 @@ namespace Ice.VisualStudio } } -#if VS2010 || VS2012 +#if VS2010 || VS2012 || VS2013 if(libs.Remove(quote("$(IceLib)")) || libs.Remove("$(IceLib)") || libs.Remove(quote("$(IceLib)\\winrt")) || @@ -1133,20 +1141,23 @@ namespace Ice.VisualStudio public static bool isSliceBuilderEnabled(Project project) { - try + if(project != null) { - if(isCppProject(project) || - isCSharpProject(project) || - isVBProject(project) || - isSilverlightProject(project) || - isCSharpSmartDeviceProject(project) || - isVBSmartDeviceProject(project)) + try + { + if(isCppProject(project) || + isCSharpProject(project) || + isVBProject(project) || + isSilverlightProject(project) || + isCSharpSmartDeviceProject(project) || + isVBSmartDeviceProject(project)) + { + return Util.getProjectPropertyAsBool(project, Util.PropertyIce); + } + } + catch(System.NotImplementedException) { - return Util.getProjectPropertyAsBool(project, Util.PropertyIce); } - } - catch(System.NotImplementedException) - { } return false; } @@ -1770,7 +1781,7 @@ namespace Ice.VisualStudio // Reference from the project file; this value doesn't change as does CopyLocal. // -#if VS2010 || VS2012 +#if VS2010 || VS2012 || VS2013 // // This method requires .NET 4. Microsoft.Build.BuildEngine is deprecated // in .NET 4, so this method uses the new API Microsoft.Build.Evaluation. @@ -2043,7 +2054,7 @@ namespace Ice.VisualStudio // Remove ice.props, old property sheet used by VS 2010 // from all project configurations. // -#if VS2010 || VS2012 +#if VS2010 || VS2012 || VS2013 VCPropertySheet sheet = null; IVCCollection sheets = (IVCCollection)conf.PropertySheets; foreach(VCPropertySheet s in sheets) @@ -2324,7 +2335,7 @@ namespace Ice.VisualStudio { Util.addIcePropertySheet(project); } -#if VS2012 +#if VS2012 || VS2013 if(winrt) { VCProject vcProject = (VCProject)project.Object; @@ -2477,7 +2488,7 @@ namespace Ice.VisualStudio } } } -#if VS2012 +#if VS2012 || VS2013 else { Util.removeSdkReference((VCProject)project.Object, "Ice"); diff --git a/vsaddin/src/addin-vs2013.csproj b/vsaddin/src/addin-vs2013.csproj new file mode 100644 index 00000000000..9dc357241c1 --- /dev/null +++ b/vsaddin/src/addin-vs2013.csproj @@ -0,0 +1,242 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>9.0.30729</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{DB79C06D-CC17-4B29-B4BE-EAE5C8FED3E5}</ProjectGuid> + <OutputType>Library</OutputType> + <StartupObject> + </StartupObject> + <NoStandardLibraries>false</NoStandardLibraries> + <AssemblyName>IceVisualStudioAddin-VS2013</AssemblyName> + <RootNamespace>Ice.VisualStudio</RootNamespace> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <SignAssembly>false</SignAssembly> + <AssemblyOriginatorKeyFile> + </AssemblyOriginatorKeyFile> + <FileUpgradeFlags> + </FileUpgradeFlags> + <OldToolsVersion>3.5</OldToolsVersion> + <UpgradeBackupLocation /> + <PublishUrl>publish\</PublishUrl> + <Install>true</Install> + <InstallFrom>Disk</InstallFrom> + <UpdateEnabled>false</UpdateEnabled> + <UpdateMode>Foreground</UpdateMode> + <UpdateInterval>7</UpdateInterval> + <UpdateIntervalUnits>Days</UpdateIntervalUnits> + <UpdatePeriodically>false</UpdatePeriodically> + <UpdateRequired>false</UpdateRequired> + <MapFileExtensions>true</MapFileExtensions> + <ApplicationRevision>0</ApplicationRevision> + <ApplicationVersion>1.0.0.%2a</ApplicationVersion> + <IsWebBootstrapper>false</IsWebBootstrapper> + <UseApplicationTrust>false</UseApplicationTrust> + <BootstrapperEnabled>true</BootstrapperEnabled> + <TargetFrameworkProfile /> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <Optimize>false</Optimize> + <OutputPath>..\bin\</OutputPath> + <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging> + <DefineConstants>TRACE;DEBUG;VS2013</DefineConstants> + <WarningLevel>4</WarningLevel> + <IncrementalBuild>false</IncrementalBuild> + <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> + <TreatWarningsAsErrors>true</TreatWarningsAsErrors> + <Prefer32Bit>false</Prefer32Bit> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugSymbols>false</DebugSymbols> + <Optimize>true</Optimize> + <OutputPath>..\bin\</OutputPath> + <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging> + <DefineConstants>TRACE;VS2013</DefineConstants> + <WarningLevel>4</WarningLevel> + <IncrementalBuild>false</IncrementalBuild> + <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> + <TreatWarningsAsErrors>true</TreatWarningsAsErrors> + <Prefer32Bit>false</Prefer32Bit> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\x86\Debug\</OutputPath> + <DefineConstants>TRACE;DEBUG;VS2013</DefineConstants> + <PlatformTarget>x86</PlatformTarget> + <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> + <Prefer32Bit>false</Prefer32Bit> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> + <OutputPath>bin\x86\Release\</OutputPath> + <DefineConstants>TRACE;VS2013</DefineConstants> + <Optimize>true</Optimize> + <PlatformTarget>x86</PlatformTarget> + <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> + <Prefer32Bit>false</Prefer32Bit> + </PropertyGroup> + <PropertyGroup> + <ApplicationIcon> + </ApplicationIcon> + </PropertyGroup> + <ItemGroup> + <Reference Include="Extensibility, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <Reference Include="Microsoft.Build" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <Reference Include="Microsoft.VisualStudio.Shell.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\..\..\..\..\Program Files\Microsoft Visual Studio 11.0\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Shell.11.0.dll</HintPath> + </Reference> + <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <Reference Include="Microsoft.VisualStudio.VCProject, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <SpecificVersion>False</SpecificVersion> + <EmbedInteropTypes>False</EmbedInteropTypes> + <HintPath>..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProject.dll</HintPath> + </Reference> + <Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <SpecificVersion>False</SpecificVersion> + <EmbedInteropTypes>True</EmbedInteropTypes> + <HintPath>..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath> + </Reference> + <Reference Include="System" /> + <Reference Include="System.Data" /> + <Reference Include="System.Drawing" /> + <Reference Include="System.Windows.Forms" /> + <Reference Include="System.Xml" /> + <Reference Include="System.Xml.Linq"> + <RequiredTargetFramework>3.5</RequiredTargetFramework> + </Reference> + <Reference Include="VSLangProj, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + </ItemGroup> + <ItemGroup> + <Compile Include="AssemblyInfo.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="Builder.cs" /> + <Compile Include="Connect.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ExtraCompilerOptionsView.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="ExtraCompilerOptionsView.Designer.cs"> + <DependentUpon>ExtraCompilerOptionsView.cs</DependentUpon> + </Compile> + <Compile Include="IceDialog.cs" /> + <Compile Include="IceVBConfigurationDialog.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="IceVBConfigurationDialog.Designer.cs"> + <DependentUpon>IceVBConfigurationDialog.cs</DependentUpon> + </Compile> + <Compile Include="FileTracker.cs" /> + <Compile Include="IceCppConfigurationDialog.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="IceCppConfigurationDialog.designer.cs"> + <DependentUpon>IceCppConfigurationDialog.cs</DependentUpon> + </Compile> + <Compile Include="IceCsharpConfigurationDialog.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="IceCsharpConfigurationDialog.Designer.cs"> + <DependentUpon>IceCsharpConfigurationDialog.cs</DependentUpon> + </Compile> + <Compile Include="IncludePathView.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="IncludePathView.Designer.cs"> + <DependentUpon>IncludePathView.cs</DependentUpon> + </Compile> + <Compile Include="Options.cs" /> + <Compile Include="OutputDirView.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="OutputDirView.Designer.cs"> + <DependentUpon>OutputDirView.cs</DependentUpon> + </Compile> + <Compile Include="Util.cs" /> + </ItemGroup> + <ItemGroup> + <COMReference Include="EnvDTE"> + <Guid>{80CC9F66-E7D8-4DDD-85B6-D9E6CD0E93E2}</Guid> + <VersionMajor>8</VersionMajor> + <VersionMinor>0</VersionMinor> + <Lcid>0</Lcid> + <WrapperTool>primary</WrapperTool> + <Isolated>False</Isolated> + </COMReference> + <COMReference Include="EnvDTE80"> + <Guid>{1A31287A-4D7D-413E-8E32-3B374931BD89}</Guid> + <VersionMajor>8</VersionMajor> + <VersionMinor>0</VersionMinor> + <Lcid>0</Lcid> + <WrapperTool>primary</WrapperTool> + <Isolated>False</Isolated> + </COMReference> + <COMReference Include="Microsoft.VisualStudio.CommandBars"> + <Guid>{1CBA492E-7263-47BB-87FE-639000619B15}</Guid> + <VersionMajor>8</VersionMajor> + <VersionMinor>0</VersionMinor> + <Lcid>0</Lcid> + <WrapperTool>primary</WrapperTool> + <Isolated>False</Isolated> + </COMReference> + <COMReference Include="stdole"> + <Guid>{00020430-0000-0000-C000-000000000046}</Guid> + <VersionMajor>2</VersionMajor> + <VersionMinor>0</VersionMinor> + <Lcid>0</Lcid> + <WrapperTool>primary</WrapperTool> + <Isolated>False</Isolated> + </COMReference> + </ItemGroup> + <ItemGroup> + <EmbeddedResource Include="ExtraCompilerOptionsView.resx"> + <DependentUpon>ExtraCompilerOptionsView.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="IceVBConfigurationDialog.resx"> + <DependentUpon>IceVBConfigurationDialog.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="IceCppConfigurationDialog.resx"> + <DependentUpon>IceCppConfigurationDialog.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="IceCsharpConfigurationDialog.resx"> + <DependentUpon>IceCsharpConfigurationDialog.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="IncludePathView.resx"> + <DependentUpon>IncludePathView.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="OutputDirView.resx"> + <DependentUpon>OutputDirView.cs</DependentUpon> + </EmbeddedResource> + </ItemGroup> + <ItemGroup> + <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName> + <Install>false</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5 SP1</ProductName> + <Install>true</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1"> + <Visible>False</Visible> + <ProductName>Windows Installer 3.1</ProductName> + <Install>true</Install> + </BootstrapperPackage> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> + <PropertyGroup> + <PreBuildEvent> + </PreBuildEvent> + <PostBuildEvent> + </PostBuildEvent> + </PropertyGroup> +</Project>
\ No newline at end of file |