diff --git a/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp b/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp index 0de6f4ad09..e1afe4a954 100644 --- a/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp +++ b/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp @@ -498,7 +498,7 @@ namespace CefSharp { for each (CefCustomScheme^ scheme in _schemes->AsReadOnly()) { - registrar->AddCustomScheme(StringUtils::ToNative(scheme->SchemeName), scheme->IsStandard, scheme->IsLocal, scheme->IsDisplayIsolated, scheme->IsSecure, scheme->IsCorsEnabled); + registrar->AddCustomScheme(StringUtils::ToNative(scheme->SchemeName), scheme->IsStandard, scheme->IsLocal, scheme->IsDisplayIsolated, scheme->IsSecure, scheme->IsCorsEnabled, false); } } } \ No newline at end of file diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj index a0a9fbc851..534f697702 100644 --- a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj +++ b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj @@ -1,6 +1,6 @@  - + Debug @@ -67,7 +67,7 @@ - 39d6b860 + 0c266be5 true diff --git a/CefSharp.BrowserSubprocess.Core/Resource.rc b/CefSharp.BrowserSubprocess.Core/Resource.rc index 8aa4d3c1e6..8901200110 100644 --- a/CefSharp.BrowserSubprocess.Core/Resource.rc +++ b/CefSharp.BrowserSubprocess.Core/Resource.rc @@ -1,6 +1,6 @@ 1 VERSIONINFO - FILEVERSION 57.0.0 - PRODUCTVERSION 57.0.0 + FILEVERSION 58.0.0 + PRODUCTVERSION 58.0.0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -16,10 +16,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "CefSharp.BrowserSubprocess.Core" - VALUE "FileVersion", "57.0.0" + VALUE "FileVersion", "58.0.0" VALUE "LegalCopyright", "Copyright © 2010-2017 The CefSharp Authors" VALUE "ProductName", "CefSharp" - VALUE "ProductVersion", "57.0.0" + VALUE "ProductVersion", "58.0.0" END END BLOCK "VarFileInfo" diff --git a/CefSharp.BrowserSubprocess.Core/packages.config b/CefSharp.BrowserSubprocess.Core/packages.config index f3693f17ba..541a37dd8f 100644 --- a/CefSharp.BrowserSubprocess.Core/packages.config +++ b/CefSharp.BrowserSubprocess.Core/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/CefSharp.BrowserSubprocess/app.manifest b/CefSharp.BrowserSubprocess/app.manifest index 7c91029ce6..3108c3ef14 100644 --- 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"> - + diff --git a/CefSharp.Core/CefSharp.Core.vcxproj b/CefSharp.Core/CefSharp.Core.vcxproj index aa0c66d614..5785fb80c0 100644 --- a/CefSharp.Core/CefSharp.Core.vcxproj +++ b/CefSharp.Core/CefSharp.Core.vcxproj @@ -1,6 +1,6 @@  - + Debug @@ -67,7 +67,7 @@ <_ProjectFileVersion>11.0.51106.1 - 0fe2b36c + 892d6872 bin\$(Platform)\$(Configuration)\ diff --git a/CefSharp.Core/Internals/CefSharpApp.h b/CefSharp.Core/Internals/CefSharpApp.h index 42e47dbda7..da96dc2b06 100644 --- a/CefSharp.Core/Internals/CefSharpApp.h +++ b/CefSharp.Core/Internals/CefSharpApp.h @@ -118,7 +118,7 @@ namespace CefSharp for each (CefCustomScheme^ scheme in _cefSettings->CefCustomSchemes) { // TOOD: Consider adding error handling here. But where do we report any errors that may have occurred? - registrar->AddCustomScheme(StringUtils::ToNative(scheme->SchemeName), scheme->IsStandard, scheme->IsLocal, scheme->IsDisplayIsolated, scheme->IsSecure, scheme->IsCorsEnabled); + registrar->AddCustomScheme(StringUtils::ToNative(scheme->SchemeName), scheme->IsStandard, scheme->IsLocal, scheme->IsDisplayIsolated, scheme->IsSecure, scheme->IsCorsEnabled, false); } }; diff --git a/CefSharp.Core/Resource.rc b/CefSharp.Core/Resource.rc index db0eeef502..fbc4854b84 100644 --- a/CefSharp.Core/Resource.rc +++ b/CefSharp.Core/Resource.rc @@ -1,6 +1,6 @@ 1 VERSIONINFO - FILEVERSION 57.0.0 - PRODUCTVERSION 57.0.0 + FILEVERSION 58.0.0 + PRODUCTVERSION 58.0.0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -16,10 +16,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "CefSharp.Core" - VALUE "FileVersion", "57.0.0" + VALUE "FileVersion", "58.0.0" VALUE "LegalCopyright", "Copyright © 2010-2017 The CefSharp Authors" VALUE "ProductName", "CefSharp" - VALUE "ProductVersion", "57.0.0" + VALUE "ProductVersion", "58.0.0" END END BLOCK "VarFileInfo" diff --git a/CefSharp.Core/packages.config b/CefSharp.Core/packages.config index f3693f17ba..541a37dd8f 100644 --- a/CefSharp.Core/packages.config +++ b/CefSharp.Core/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj index 96660487aa..6d9f98c4dc 100644 --- a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj +++ b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj @@ -13,7 +13,7 @@ 512 - 569bc3f8 + 8b6c24fc true @@ -95,6 +95,6 @@ - - + + \ No newline at end of file diff --git a/CefSharp.OffScreen.Example/app.manifest b/CefSharp.OffScreen.Example/app.manifest index 5c81e7581a..03d0721127 100644 --- a/CefSharp.OffScreen.Example/app.manifest +++ b/CefSharp.OffScreen.Example/app.manifest @@ -7,7 +7,7 @@ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - + diff --git a/CefSharp.OffScreen.Example/crash_reporter.cfg b/CefSharp.OffScreen.Example/crash_reporter.cfg index 16e7e7e035..08143ba58f 100644 --- a/CefSharp.OffScreen.Example/crash_reporter.cfg +++ b/CefSharp.OffScreen.Example/crash_reporter.cfg @@ -22,6 +22,6 @@ [Config] ProductName=CefSharp -ProductVersion=57.0.0 +ProductVersion=58.0.0 AppName=CefSharp ExternalHandler=CefSharp.BrowserSubprocess.exe \ No newline at end of file diff --git a/CefSharp.OffScreen.Example/packages.config b/CefSharp.OffScreen.Example/packages.config index dd8b1076f4..902e78d742 100644 --- a/CefSharp.OffScreen.Example/packages.config +++ b/CefSharp.OffScreen.Example/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj index 7696b194d8..5df5edb7c7 100644 --- a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj +++ b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj @@ -21,7 +21,7 @@ 3.5 Client - e7eeed5d + 5f632012 x64 @@ -185,6 +185,6 @@ - - + + \ No newline at end of file diff --git a/CefSharp.WinForms.Example/app.manifest b/CefSharp.WinForms.Example/app.manifest index 6980da6c66..3a92b90398 100644 --- 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"> - + diff --git a/CefSharp.WinForms.Example/crash_reporter.cfg b/CefSharp.WinForms.Example/crash_reporter.cfg index 16e7e7e035..08143ba58f 100644 --- a/CefSharp.WinForms.Example/crash_reporter.cfg +++ b/CefSharp.WinForms.Example/crash_reporter.cfg @@ -22,6 +22,6 @@ [Config] ProductName=CefSharp -ProductVersion=57.0.0 +ProductVersion=58.0.0 AppName=CefSharp ExternalHandler=CefSharp.BrowserSubprocess.exe \ No newline at end of file diff --git a/CefSharp.WinForms.Example/packages.config b/CefSharp.WinForms.Example/packages.config index dd8b1076f4..902e78d742 100644 --- a/CefSharp.WinForms.Example/packages.config +++ b/CefSharp.WinForms.Example/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj b/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj index 04b5cae724..5a95842470 100644 --- a/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj +++ b/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj @@ -21,7 +21,7 @@ 3.5 Client - d8af2ae2 + a03680f0 true @@ -186,6 +186,6 @@ - - + + \ No newline at end of file diff --git a/CefSharp.Wpf.Example/app.manifest b/CefSharp.Wpf.Example/app.manifest index 571ae0bfb3..035e5cf686 100644 --- 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"> - + diff --git a/CefSharp.Wpf.Example/crash_reporter.cfg b/CefSharp.Wpf.Example/crash_reporter.cfg index 16e7e7e035..08143ba58f 100644 --- a/CefSharp.Wpf.Example/crash_reporter.cfg +++ b/CefSharp.Wpf.Example/crash_reporter.cfg @@ -22,6 +22,6 @@ [Config] ProductName=CefSharp -ProductVersion=57.0.0 +ProductVersion=58.0.0 AppName=CefSharp ExternalHandler=CefSharp.BrowserSubprocess.exe \ No newline at end of file diff --git a/CefSharp.Wpf.Example/packages.config b/CefSharp.Wpf.Example/packages.config index c101aea75d..6b0debf223 100644 --- a/CefSharp.Wpf.Example/packages.config +++ b/CefSharp.Wpf.Example/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/CefSharp/Properties/AssemblyInfo.cs b/CefSharp/Properties/AssemblyInfo.cs index 0a0adbb99e..75bc8a239d 100644 --- 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 = "57.0.0"; - public const string AssemblyFileVersion = "57.0.0.0"; + public const string AssemblyVersion = "58.0.0"; + public const string AssemblyFileVersion = "58.0.0.0"; public const string AssemblyCopyright = "Copyright © 2010-2017 The CefSharp Authors"; public const string CefSharpCoreProject = "CefSharp.Core, PublicKey=" + PublicKey; public const string CefSharpBrowserSubprocessProject = "CefSharp.BrowserSubprocess, PublicKey=" + PublicKey; diff --git a/README.md b/README.md index 93f46d8f90..bceef726a2 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ If your new to `CefSharp` and are downloading the source to check it out, please | Branch | CEF Version | VC++ Version | .Net Version | Status | |--------|-------------|--------------|--------------|--------| -| [master](https://github.com/cefsharp/CefSharp/) | 2987 | 2013 | 4.5.2 | Development | +| [master](https://github.com/cefsharp/CefSharp/) | 3029 | 2013 | 4.5.2 | Development | | [cefsharp/57](https://github.com/cefsharp/CefSharp/tree/cefsharp/57) | 2987 | 2013 | 4.5.2 | **Release** | | [cefsharp/55](https://github.com/cefsharp/CefSharp/tree/cefsharp/55) | 2883 | 2013 | 4.5.2 | Unsupported | | [cefsharp/53](https://github.com/cefsharp/CefSharp/tree/cefsharp/53) | 2785 | 2013 | 4.5.2 | Unsupported | diff --git a/appveyor.yml b/appveyor.yml index 6eb1dbfa79..e60fa61bcd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ environment: VisualStudioVersion: 12.0 -version: 57.0.0-CI{build} +version: 58.0.0-CI{build} clone_depth: 10 diff --git a/build.ps1 b/build.ps1 index 8eae20da8a..e9762cf47c 100644 --- a/build.ps1 +++ b/build.ps1 @@ -3,9 +3,9 @@ param( [Parameter(Position = 0)] [string] $Target = "vs2013", [Parameter(Position = 1)] - [string] $Version = "57.0.0", + [string] $Version = "58.0.0", [Parameter(Position = 2)] - [string] $AssemblyVersion = "57.0.0" + [string] $AssemblyVersion = "58.0.0" ) $WorkingDir = split-path -parent $MyInvocation.MyCommand.Definition