Upgrade to 1750 packages (-pre2)

This commit is contained in:
amaitland 2014-09-29 20:24:47 +10:00
parent 97fa445287
commit a234777811
3 changed files with 12 additions and 12 deletions

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\CefSharp.Wpf.31.0.0-pre1\build\CefSharp.Wpf.props" Condition="Exists('..\packages\CefSharp.Wpf.31.0.0-pre1\build\CefSharp.Wpf.props')" /> <Import Project="..\packages\CefSharp.Common.33.0.0-pre2\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.33.0.0-pre2\build\CefSharp.Common.props')" />
<Import Project="..\packages\CefSharp.Common.31.0.0-pre1\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.31.0.0-pre1\build\CefSharp.Common.props')" /> <Import Project="..\packages\CefSharp.Wpf.33.0.0-pre2\build\CefSharp.Wpf.props" Condition="Exists('..\packages\CefSharp.Wpf.33.0.0-pre2\build\CefSharp.Wpf.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -133,17 +133,17 @@
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Import Project="..\packages\cef.redist.3.1650.1562-pre3\build\cef.redist.targets" Condition="Exists('..\packages\cef.redist.3.1650.1562-pre3\build\cef.redist.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('..\packages\cef.redist.3.1650.1562-pre3\build\cef.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.3.1650.1562-pre3\build\cef.redist.targets'))" /> <Error Condition="!Exists('..\packages\CefSharp.Wpf.33.0.0-pre2\build\CefSharp.Wpf.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Wpf.33.0.0-pre2\build\CefSharp.Wpf.props'))" />
<Error Condition="!Exists('..\packages\CefSharp.Common.31.0.0-pre1\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.31.0.0-pre1\build\CefSharp.Common.props'))" /> <Error Condition="!Exists('..\packages\CefSharp.Common.33.0.0-pre2\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.33.0.0-pre2\build\CefSharp.Common.props'))" />
<Error Condition="!Exists('..\packages\CefSharp.Common.31.0.0-pre1\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.31.0.0-pre1\build\CefSharp.Common.targets'))" /> <Error Condition="!Exists('..\packages\CefSharp.Common.33.0.0-pre2\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.33.0.0-pre2\build\CefSharp.Common.targets'))" />
<Error Condition="!Exists('..\packages\CefSharp.Wpf.31.0.0-pre1\build\CefSharp.Wpf.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Wpf.31.0.0-pre1\build\CefSharp.Wpf.props'))" /> <Error Condition="!Exists('..\packages\cef.redist.3.1750.1738-pre2\build\cef.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.3.1750.1738-pre2\build\cef.redist.targets'))" />
</Target> </Target>
<Import Project="..\packages\CefSharp.Common.31.0.0-pre1\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.31.0.0-pre1\build\CefSharp.Common.targets')" /> <Import Project="..\packages\CefSharp.Common.33.0.0-pre2\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.33.0.0-pre2\build\CefSharp.Common.targets')" />
<Import Project="..\packages\cef.redist.3.1750.1738-pre2\build\cef.redist.targets" Condition="Exists('..\packages\cef.redist.3.1750.1738-pre2\build\cef.redist.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">

View File

@ -12,7 +12,7 @@
<RowDefinition /> <RowDefinition />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<cefSharp:WebView Grid.Row="0" <cefSharp:ChromiumWebBrowser Grid.Row="0"
Address="http://www.google.com" Address="http://www.google.com"
WebBrowser="{Binding WebBrowser, Mode=OneWayToSource}" WebBrowser="{Binding WebBrowser, Mode=OneWayToSource}"
Title="{Binding Title, Mode=TwoWay}" /> Title="{Binding Title, Mode=TwoWay}" />

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="cef.redist" version="3.1650.1562-pre3" targetFramework="net40" /> <package id="cef.redist" version="3.1750.1738-pre2" targetFramework="net40" />
<package id="CefSharp.Common" version="31.0.0-pre1" targetFramework="net40" /> <package id="CefSharp.Common" version="33.0.0-pre2" targetFramework="net40" />
<package id="CefSharp.Wpf" version="31.0.0-pre1" targetFramework="net40" /> <package id="CefSharp.Wpf" version="33.0.0-pre2" targetFramework="net40" />
</packages> </packages>