Upgrade to 3.2526.1347

Upgrade 45.0.0 references to 47.0.0 Remove BrowserSettings.Java as it's an NPAPI plugin and support was removed in version 45
cefsharp · Oct 29, 2015 · 0ecd64d · 0ecd64d · shirotzu · Nov 17, 2015
1 parent f2f9704
commit 0ecd64d
Show file tree

Hide file tree

Showing 19 changed files with 35 additions and 45 deletions.
diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(SolutionDir)\packages\cef.sdk.3.2454.1344\build\cef.sdk.props" Condition="Exists('$(SolutionDir)\packages\cef.sdk.3.2454.1344\build\cef.sdk.props')" />
+  <Import Project="$(SolutionDir)\packages\cef.sdk.3.2526.1347\build\cef.sdk.props" Condition="Exists('$(SolutionDir)\packages\cef.sdk.3.2526.1347\build\cef.sdk.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -66,7 +66,7 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <NuGetPackageImportStamp>c3072048</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>0743bdeb</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>

diff --git a/CefSharp.BrowserSubprocess.Core/packages.config b/CefSharp.BrowserSubprocess.Core/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.sdk" version="3.2454.1344" targetFramework="Native" />
+  <package id="cef.sdk" version="3.2526.1347" targetFramework="Native" />
 </packages>
diff --git a/CefSharp.BrowserSubprocess/app.manifest b/CefSharp.BrowserSubprocess/app.manifest
@@ -8,7 +8,7 @@
     xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-  <assemblyIdentity version="45.0.0.0" name="CefSharp.BrowserSubprocess.app" />
+  <assemblyIdentity version="47.0.0.0" name="CefSharp.BrowserSubprocess.app" />
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">

diff --git a/CefSharp.Core/BrowserSettings.h b/CefSharp.Core/BrowserSettings.h
@@ -178,16 +178,6 @@ namespace CefSharp
             void set(CefState value) { _browserSettings->caret_browsing = (cef_state_t)value; }
         }
 
-        /// <summary>
-        /// Controls whether the Java plugin will be loaded. Also configurable using
-        /// the "disable-java" command-line switch.
-        /// </summary>
-        property CefState Java
-        {
-            CefState get() { return (CefState)_browserSettings->java; }
-            void set(CefState value) { _browserSettings->java = (cef_state_t)value; }
-        } 
-
         /// <summary>
         /// Controls whether any plugins will be loaded. Also configurable using the
         /// "disable-plugins" command-line switch.

diff --git a/CefSharp.Core/CefSharp.Core.vcxproj b/CefSharp.Core/CefSharp.Core.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(SolutionDir)\packages\cef.sdk.3.2454.1344\build\cef.sdk.props" Condition="Exists('$(SolutionDir)\packages\cef.sdk.3.2454.1344\build\cef.sdk.props')" />
+  <Import Project="$(SolutionDir)\packages\cef.sdk.3.2526.1347\build\cef.sdk.props" Condition="Exists('$(SolutionDir)\packages\cef.sdk.3.2526.1347\build\cef.sdk.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -66,7 +66,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>11.0.51106.1</_ProjectFileVersion>
-    <NuGetPackageImportStamp>530cad74</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>d31dc983</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>bin\$(Configuration)\</OutDir>

diff --git a/CefSharp.Core/packages.config b/CefSharp.Core/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.sdk" version="3.2454.1344" targetFramework="Native" />
+  <package id="cef.sdk" version="3.2526.1347" targetFramework="Native" />
 </packages>
diff --git a/CefSharp.Example/Resources/Home.html b/CefSharp.Example/Resources/Home.html
@@ -207,7 +207,7 @@ <h3>State-of-the-art HTML5 and Javascript support</h3>
                     </p>
                     <h3>Support for both x86 and x64</h3>
                     <p>
-                        Chromium 45 supports both x86 and x64, and so do we as of CefSharp 45.0.0 For the time being, it does not
+                        Chromium 47 supports both x86 and x64, and so do we as of CefSharp 47.0.0 For the time being, it does not
                         "auto-detect" the platform being used (since this is quite complex), so you have to choose either one for
                         your project. This practically means that you will have to compile &amp; package separate
                         binaries/installers of your app for x86 and x64 respectively if you want/need to support both of them.

diff --git a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj
@@ -13,7 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
-    <NuGetPackageImportStamp>d65372b2</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>9cb9fa5b</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -90,6 +90,6 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\CefSharp.props" />
   <Import Project="$(SolutionDir)\CefSharp.Native.props" />
-  <Import Project="..\packages\cef.redist.x64.3.2454.1344\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2454.1344\build\cef.redist.x64.targets')" />
-  <Import Project="..\packages\cef.redist.x86.3.2454.1344\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2454.1344\build\cef.redist.x86.targets')" />
+  <Import Project="..\packages\cef.redist.x64.3.2526.1347\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2526.1347\build\cef.redist.x64.targets')" />
+  <Import Project="..\packages\cef.redist.x86.3.2526.1347\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2526.1347\build\cef.redist.x86.targets')" />
 </Project>
diff --git a/CefSharp.OffScreen.Example/packages.config b/CefSharp.OffScreen.Example/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.redist.x64" version="3.2454.1344" targetFramework="net45" />
-  <package id="cef.redist.x86" version="3.2454.1344" targetFramework="net45" />
+  <package id="cef.redist.x64" version="3.2526.1347" targetFramework="net45" />
+  <package id="cef.redist.x86" version="3.2526.1347" targetFramework="net45" />
 </packages>
diff --git a/CefSharp.Test/CefSharp.Test.csproj b/CefSharp.Test/CefSharp.Test.csproj
@@ -19,7 +19,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>721f2cb1</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>29bdd29e</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -138,6 +138,6 @@
   -->
   <Import Project="$(SolutionDir)\CefSharp.props" />
   <Import Project="$(SolutionDir)\CefSharp.Native.props" />
-  <Import Project="..\packages\cef.redist.x64.3.2454.1344\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2454.1344\build\cef.redist.x64.targets')" />
-  <Import Project="..\packages\cef.redist.x86.3.2454.1344\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2454.1344\build\cef.redist.x86.targets')" />
+  <Import Project="..\packages\cef.redist.x64.3.2526.1347\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2526.1347\build\cef.redist.x64.targets')" />
+  <Import Project="..\packages\cef.redist.x86.3.2526.1347\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2526.1347\build\cef.redist.x86.targets')" />
 </Project>
diff --git a/CefSharp.Test/packages.config b/CefSharp.Test/packages.config
@@ -2,8 +2,8 @@
 <packages>
   <package id="AutoFixture" version="3.18.7" targetFramework="net40" />
   <package id="AutoFixture.Xunit" version="3.18.7" targetFramework="net40" />
-  <package id="cef.redist.x64" version="3.2454.1344" targetFramework="net40" />
-  <package id="cef.redist.x86" version="3.2454.1344" targetFramework="net40" />
+  <package id="cef.redist.x64" version="3.2526.1347" targetFramework="net40" />
+  <package id="cef.redist.x86" version="3.2526.1347" targetFramework="net40" />
   <package id="xunit" version="1.9.2" targetFramework="net40" />
   <package id="xunit.extensions" version="1.9.2" targetFramework="net40" />
 </packages>
diff --git a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj
@@ -21,7 +21,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>c8a4335c</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>8167a32e</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <PlatformTarget>x64</PlatformTarget>
@@ -170,6 +170,6 @@
   <Import Project="$(SolutionDir)\CefSharp.Native.props" />
   <Import Project="..\packages\cef.redist.x64.3.2272.30\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2272.30\build\cef.redist.x64.targets')" />
   <Import Project="..\packages\cef.redist.x86.3.2272.30\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2272.30\build\cef.redist.x86.targets')" />
-  <Import Project="..\packages\cef.redist.x64.3.2454.1344\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2454.1344\build\cef.redist.x64.targets')" />
-  <Import Project="..\packages\cef.redist.x86.3.2454.1344\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2454.1344\build\cef.redist.x86.targets')" />
+  <Import Project="..\packages\cef.redist.x64.3.2526.1347\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2526.1347\build\cef.redist.x64.targets')" />
+  <Import Project="..\packages\cef.redist.x86.3.2526.1347\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2526.1347\build\cef.redist.x86.targets')" />
 </Project>
diff --git a/CefSharp.WinForms.Example/app.manifest b/CefSharp.WinForms.Example/app.manifest
@@ -8,7 +8,7 @@
     xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-  <assemblyIdentity version="45.0.0.0" name="CefSharp.WinForms.Example.app" />
+  <assemblyIdentity version="47.0.0.0" name="CefSharp.WinForms.Example.app" />
 
   <dependency>
     <dependentAssembly>

diff --git a/CefSharp.WinForms.Example/packages.config b/CefSharp.WinForms.Example/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.redist.x64" version="3.2454.1344" targetFramework="net45" />
-  <package id="cef.redist.x86" version="3.2454.1344" targetFramework="net45" />
+  <package id="cef.redist.x64" version="3.2526.1347" targetFramework="net45" />
+  <package id="cef.redist.x86" version="3.2526.1347" targetFramework="net45" />
 </packages>
diff --git a/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj b/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj
@@ -21,7 +21,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>f40f6e26</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>8e82bccc</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -195,6 +195,6 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\CefSharp.props" />
   <Import Project="$(SolutionDir)\CefSharp.Native.props" />
-  <Import Project="..\packages\cef.redist.x64.3.2454.1344\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2454.1344\build\cef.redist.x64.targets')" />
-  <Import Project="..\packages\cef.redist.x86.3.2454.1344\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2454.1344\build\cef.redist.x86.targets')" />
+  <Import Project="..\packages\cef.redist.x64.3.2526.1347\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2526.1347\build\cef.redist.x64.targets')" />
+  <Import Project="..\packages\cef.redist.x86.3.2526.1347\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2526.1347\build\cef.redist.x86.targets')" />
 </Project>
diff --git a/CefSharp.Wpf.Example/app.manifest b/CefSharp.Wpf.Example/app.manifest
@@ -7,7 +7,7 @@
   xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-  <assemblyIdentity version="45.0.0.0" name="CefSharp.Wpf.Example.app" />
+  <assemblyIdentity version="47.0.0.0" name="CefSharp.Wpf.Example.app" />
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">

diff --git a/CefSharp.Wpf.Example/packages.config b/CefSharp.Wpf.Example/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.redist.x64" version="3.2454.1344" targetFramework="net45" />
-  <package id="cef.redist.x86" version="3.2454.1344" targetFramework="net45" />
+  <package id="cef.redist.x64" version="3.2526.1347" targetFramework="net45" />
+  <package id="cef.redist.x86" version="3.2526.1347" targetFramework="net45" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="net45" />
   <package id="MvvmLightLibs" version="5.1.1.0" targetFramework="net45" />
 </packages>
diff --git a/CefSharp/Properties/AssemblyInfo.cs b/CefSharp/Properties/AssemblyInfo.cs
@@ -34,8 +34,8 @@ public static class AssemblyInfo
         public const bool ComVisible = false;
         public const string AssemblyCompany = "The CefSharp Authors";
         public const string AssemblyProduct = "CefSharp";
-        public const string AssemblyVersion = "45.0.0";
-        public const string AssemblyFileVersion = "45.0.0.0";
+        public const string AssemblyVersion = "47.0.0";
+        public const string AssemblyFileVersion = "47.0.0.0";
         public const string AssemblyCopyright = "Copyright © The CefSharp Authors 2010-2015";
         public const string CefSharpCoreProject = "CefSharp.Core, PublicKey=" + PublicKey;
         public const string CefSharpBrowserSubprocessProject = "CefSharp.BrowserSubprocess, PublicKey=" + PublicKey;

diff --git a/build.ps1 b/build.ps1
@@ -3,11 +3,11 @@ param(
     [Parameter(Position = 0)] 
     [string] $Target = "vs2013",
     [Parameter(Position = 1)]
-    [string] $Version = "45.0.0",
+    [string] $Version = "47.0.0",
     [Parameter(Position = 2)]
-    [string] $AssemblyVersion = "45.0.0",
+    [string] $AssemblyVersion = "47.0.0",
     [Parameter(Position = 3)]
-    [string] $RedistVersion = "3.2454.1344"
+    [string] $RedistVersion = "3.3.2526.1347"
 )
 
 $WorkingDir = split-path -parent $MyInvocation.MyCommand.Definition