Dotnet/CefSharp.MinimalExample
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11 from cefsharp/33-no-pre

Browse Source 
CEF branch 1750 and CefSharp 33.0.0 both w/o -pre
This commit is contained in:
Alex Maitland 2014-10-07 10:42:09 +10:00
commit 7741a9f47c
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<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.Wpf.33.0.0-pre2\build\CefSharp.Wpf.props" Condition="Exists('..\packages\CefSharp.Wpf.33.0.0-pre2\build\CefSharp.Wpf.props')" />
<Import Project="..\packages\CefSharp.Common.33.0.0\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.33.0.0\build\CefSharp.Common.props')" />
<Import Project="..\packages\CefSharp.Wpf.33.0.0\build\CefSharp.Wpf.props" Condition="Exists('..\packages\CefSharp.Wpf.33.0.0\build\CefSharp.Wpf.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -137,13 +137,13 @@
<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>
</PropertyGroup>
<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.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.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\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'))" />
<Error Condition="!Exists('..\packages\CefSharp.Wpf.33.0.0\build\CefSharp.Wpf.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Wpf.33.0.0\build\CefSharp.Wpf.props'))" />
<Error Condition="!Exists('..\packages\CefSharp.Common.33.0.0\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.33.0.0\build\CefSharp.Common.props'))" />
<Error Condition="!Exists('..\packages\CefSharp.Common.33.0.0\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.33.0.0\build\CefSharp.Common.targets'))" />
<Error Condition="!Exists('..\packages\cef.redist.3.1750.1738\build\cef.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.3.1750.1738\build\cef.redist.targets'))" />
</Target>
<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')" />
<Import Project="..\packages\cef.redist.3.1750.1738\build\cef.redist.targets" Condition="Exists('..\packages\cef.redist.3.1750.1738\build\cef.redist.targets')" />
<Import Project="..\packages\CefSharp.Common.33.0.0\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.33.0.0\build\CefSharp.Common.targets')" />
<!-- 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.
<Target Name="BeforeBuild">

6
CefSharp.MinimalExample.Wpf/packages.config
View File

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