Merge pull request #10 from amaitland/upgrade/1750

Upgrade to Cef 33 -pre2 on staging PR inbox zero in this repo!
cefsharp · Oct 5, 2014 · 43102e5 · 43102e5
2 parents 48649c4 + d9ee11a
commit 43102e5
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 18 deletions.
diff --git a/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj b/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj
@@ -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.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.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.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="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -133,17 +133,17 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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">
     <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\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.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.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.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\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'))" />
   </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. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/CefSharp.MinimalExample.Wpf/Views/MainView.xaml b/CefSharp.MinimalExample.Wpf/Views/MainView.xaml
@@ -12,7 +12,7 @@
             <RowDefinition />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <cefSharp:WebView Grid.Row="0"
+        <cefSharp:ChromiumWebBrowser Grid.Row="0"
                           Address="http://www.google.com"
                           WebBrowser="{Binding WebBrowser, Mode=OneWayToSource}"
                           Title="{Binding Title, Mode=TwoWay}" />

diff --git a/CefSharp.MinimalExample.Wpf/packages.config b/CefSharp.MinimalExample.Wpf/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.redist" version="3.1650.1562-pre3" targetFramework="net40" />
-  <package id="CefSharp.Common" version="31.0.0-pre1" targetFramework="net40" />
-  <package id="CefSharp.Wpf" version="31.0.0-pre1" targetFramework="net40" />
+  <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" />
 </packages>
diff --git a/CefSharp.MinimalExample.sln b/CefSharp.MinimalExample.sln
@@ -8,19 +8,19 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
-		Debug|zNotEnabled_x64 = Debug|zNotEnabled_x64
+		Debug|x64 = Debug|x64
 		Release|x86 = Release|x86
-		Release|zNotEnabled_x64 = Release|zNotEnabled_x64
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{BE4C3AD0-8DA2-4246-8C63-EEEB7DC197BE}.Debug|x86.ActiveCfg = Debug|x86
 		{BE4C3AD0-8DA2-4246-8C63-EEEB7DC197BE}.Debug|x86.Build.0 = Debug|x86
-		{BE4C3AD0-8DA2-4246-8C63-EEEB7DC197BE}.Debug|zNotEnabled_x64.ActiveCfg = Debug|x64
-		{BE4C3AD0-8DA2-4246-8C63-EEEB7DC197BE}.Debug|zNotEnabled_x64.Build.0 = Debug|x64
+		{BE4C3AD0-8DA2-4246-8C63-EEEB7DC197BE}.Debug|x64.ActiveCfg = Debug|x64
+		{BE4C3AD0-8DA2-4246-8C63-EEEB7DC197BE}.Debug|x64.Build.0 = Debug|x64
 		{BE4C3AD0-8DA2-4246-8C63-EEEB7DC197BE}.Release|x86.ActiveCfg = Release|x86
 		{BE4C3AD0-8DA2-4246-8C63-EEEB7DC197BE}.Release|x86.Build.0 = Release|x86
-		{BE4C3AD0-8DA2-4246-8C63-EEEB7DC197BE}.Release|zNotEnabled_x64.ActiveCfg = Release|x64
-		{BE4C3AD0-8DA2-4246-8C63-EEEB7DC197BE}.Release|zNotEnabled_x64.Build.0 = Release|x64
+		{BE4C3AD0-8DA2-4246-8C63-EEEB7DC197BE}.Release|x64.ActiveCfg = Release|x64
+		{BE4C3AD0-8DA2-4246-8C63-EEEB7DC197BE}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/NuGet.config b/NuGet.config
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <packageSources>
+        <add key="nuget.org" value="https://nuget.org/api/v2/" /> 
+        <add key="staging.nuget.org" value="https://staging.nuget.org/api/v2/" /> 
+    </packageSources>
+    <activePackageSource>
+        <add key="All" value="(Aggregate source)"  />
+    </activePackageSource>
+</configuration>