Skip to content

Commit 55bcee8

Browse files
amaitlandamaitland
authored
Upgrade to 89.0.170 (#132)
* Upgrade to 89.0.140-pre - Dependency Check is currently disabled * Upgrade to 89.0.170
1 parent 1d55d77 commit 55bcee8

14 files changed

+52
-73
lines changed

‎CefSharp.MinimalExample.OffScreen/CefSharp.MinimalExample.OffScreen.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\CefSharp.Common.88.2.90\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.88.2.90\build\CefSharp.Common.props')" />
4-
<Import Project="..\packages\cef.redist.x86.88.2.9\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.88.2.9\build\cef.redist.x86.props')" />
5-
<Import Project="..\packages\cef.redist.x64.88.2.9\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.88.2.9\build\cef.redist.x64.props')" />
3+
<Import Project="..\packages\CefSharp.Common.89.0.170\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.89.0.170\build\CefSharp.Common.props')" />
4+
<Import Project="..\packages\cef.redist.x86.89.0.17\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.89.0.17\build\cef.redist.x86.props')" />
5+
<Import Project="..\packages\cef.redist.x64.89.0.17\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.89.0.17\build\cef.redist.x64.props')" />
66
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
77
<PropertyGroup>
88
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -87,16 +87,16 @@
8787
<ApplicationManifest>app.manifest</ApplicationManifest>
8888
</PropertyGroup>
8989
<ItemGroup>
90-
<Reference Include="CefSharp, Version=88.2.90.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
91-
<HintPath>..\packages\CefSharp.Common.88.2.90\lib\net452\CefSharp.dll</HintPath>
90+
<Reference Include="CefSharp, Version=89.0.170.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
91+
<HintPath>..\packages\CefSharp.Common.89.0.170\lib\net452\CefSharp.dll</HintPath>
9292
<Private>True</Private>
9393
</Reference>
94-
<Reference Include="CefSharp.Core, Version=88.2.90.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
95-
<HintPath>..\packages\CefSharp.Common.88.2.90\lib\net452\CefSharp.Core.dll</HintPath>
94+
<Reference Include="CefSharp.Core, Version=89.0.170.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
95+
<HintPath>..\packages\CefSharp.Common.89.0.170\lib\net452\CefSharp.Core.dll</HintPath>
9696
<Private>True</Private>
9797
</Reference>
98-
<Reference Include="CefSharp.OffScreen, Version=88.2.90.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
99-
<HintPath>..\packages\CefSharp.OffScreen.88.2.90\lib\net452\CefSharp.OffScreen.dll</HintPath>
98+
<Reference Include="CefSharp.OffScreen, Version=89.0.170.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
99+
<HintPath>..\packages\CefSharp.OffScreen.89.0.170\lib\net452\CefSharp.OffScreen.dll</HintPath>
100100
<Private>True</Private>
101101
</Reference>
102102
<Reference Include="System" />
@@ -120,5 +120,5 @@
120120
<Target Name="CefSharpAfterBuildDebug" AfterTargets="AfterBuild">
121121
<CallTarget Targets="CefSharpAfterBuildDiagnostic" />
122122
</Target>
123-
<Import Project="..\packages\CefSharp.Common.88.2.90\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.88.2.90\build\CefSharp.Common.targets')" />
123+
<Import Project="..\packages\CefSharp.Common.89.0.170\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.89.0.170\build\CefSharp.Common.targets')" />
124124
</Project>

‎CefSharp.MinimalExample.OffScreen/CefSharp.MinimalExample.OffScreen.netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
</ItemGroup>
4848

4949
<ItemGroup>
50-
<PackageReference Include="CefSharp.OffScreen.NetCore" Version="88.2.90" />
50+
<PackageReference Include="CefSharp.OffScreen.NetCore" Version="89.0.170" />
5151
</ItemGroup>
5252

5353
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

‎CefSharp.MinimalExample.OffScreen/Program.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,8 @@ public static int Main(string[] args)
3434
CachePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "CefSharp\\Cache")
3535
};
3636

37-
var dependencyCheck = true;
38-
39-
#if NETCOREAPP || ANYCPU
40-
//For .Net Core/.Net 5 this should be fixed as part of https://github.com/cefsharp/CefSharp/issues/3388
41-
dependencyCheck = false;
42-
#endif
43-
4437
//Perform dependency check to make sure all relevant resources are in our output directory.
45-
Cef.Initialize(settings, performDependencyCheck: dependencyCheck, browserProcessHandler: null);
38+
Cef.Initialize(settings, performDependencyCheck: false, browserProcessHandler: null);
4639

4740
// Create the offscreen Chromium browser.
4841
browser = new ChromiumWebBrowser(testUrl);

‎CefSharp.MinimalExample.OffScreen/packages.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="cef.redist.x64" version="88.2.9" targetFramework="net452" />
4-
<package id="cef.redist.x86" version="88.2.9" targetFramework="net452" />
5-
<package id="CefSharp.Common" version="88.2.90" targetFramework="net452" />
6-
<package id="CefSharp.OffScreen" version="88.2.90" targetFramework="net452" />
3+
<package id="cef.redist.x64" version="89.0.17" targetFramework="net452" />
4+
<package id="cef.redist.x86" version="89.0.17" targetFramework="net452" />
5+
<package id="CefSharp.Common" version="89.0.170" targetFramework="net452" />
6+
<package id="CefSharp.OffScreen" version="89.0.170" targetFramework="net452" />
77
</packages>

‎CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\CefSharp.Common.88.2.90\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.88.2.90\build\CefSharp.Common.props')" />
4-
<Import Project="..\packages\cef.redist.x86.88.2.9\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.88.2.9\build\cef.redist.x86.props')" />
5-
<Import Project="..\packages\cef.redist.x64.88.2.9\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.88.2.9\build\cef.redist.x64.props')" />
3+
<Import Project="..\packages\CefSharp.Common.89.0.170\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.89.0.170\build\CefSharp.Common.props')" />
4+
<Import Project="..\packages\cef.redist.x86.89.0.17\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.89.0.17\build\cef.redist.x86.props')" />
5+
<Import Project="..\packages\cef.redist.x64.89.0.17\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.89.0.17\build\cef.redist.x64.props')" />
66
<PropertyGroup>
77
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
88
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -72,16 +72,16 @@
7272
<ApplicationManifest>app.manifest</ApplicationManifest>
7373
</PropertyGroup>
7474
<ItemGroup>
75-
<Reference Include="CefSharp, Version=88.2.90.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
76-
<HintPath>..\packages\CefSharp.Common.88.2.90\lib\net452\CefSharp.dll</HintPath>
75+
<Reference Include="CefSharp, Version=89.0.170.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
76+
<HintPath>..\packages\CefSharp.Common.89.0.170\lib\net452\CefSharp.dll</HintPath>
7777
<Private>True</Private>
7878
</Reference>
79-
<Reference Include="CefSharp.Core, Version=88.2.90.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
80-
<HintPath>..\packages\CefSharp.Common.88.2.90\lib\net452\CefSharp.Core.dll</HintPath>
79+
<Reference Include="CefSharp.Core, Version=89.0.170.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
80+
<HintPath>..\packages\CefSharp.Common.89.0.170\lib\net452\CefSharp.Core.dll</HintPath>
8181
<Private>True</Private>
8282
</Reference>
83-
<Reference Include="CefSharp.WinForms, Version=88.2.90.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
84-
<HintPath>..\packages\CefSharp.WinForms.88.2.90\lib\net452\CefSharp.WinForms.dll</HintPath>
83+
<Reference Include="CefSharp.WinForms, Version=89.0.170.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
84+
<HintPath>..\packages\CefSharp.WinForms.89.0.170\lib\net452\CefSharp.WinForms.dll</HintPath>
8585
<Private>True</Private>
8686
</Reference>
8787
<Reference Include="System" />
@@ -144,5 +144,5 @@
144144
<Target Name="CefSharpAfterBuildDebug" AfterTargets="AfterBuild">
145145
<CallTarget Targets="CefSharpAfterBuildDiagnostic" />
146146
</Target>
147-
<Import Project="..\packages\CefSharp.Common.88.2.90\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.88.2.90\build\CefSharp.Common.targets')" />
147+
<Import Project="..\packages\CefSharp.Common.89.0.170\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.89.0.170\build\CefSharp.Common.targets')" />
148148
</Project>

‎CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.net472.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
For versions 87 and 88 specify CefSharpPlatformTargetOverride when using AnyCPU.
2828
For versions 89 and above use PlatformTarget (CefSharpPlatformTargetOverride will also still work)
2929
-->
30-
<!--<PlatformTarget>AnyCPU</PlatformTarget>-->
31-
<CefSharpPlatformTargetOverride>AnyCPU</CefSharpPlatformTargetOverride>
30+
<PlatformTarget>AnyCPU</PlatformTarget>
31+
<!--<CefSharpPlatformTargetOverride>AnyCPU</CefSharpPlatformTargetOverride>-->
3232
</PropertyGroup>
3333

3434
<ItemGroup>
@@ -41,7 +41,7 @@
4141
</ItemGroup>
4242

4343
<ItemGroup>
44-
<PackageReference Include="CefSharp.WinForms" Version="88.2.90" />
44+
<PackageReference Include="CefSharp.WinForms" Version="89.0.170" />
4545
</ItemGroup>
4646

4747
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />

‎CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
</ItemGroup>
6363

6464
<ItemGroup>
65-
<PackageReference Include="CefSharp.WinForms.NetCore" Version="88.2.90" />
65+
<PackageReference Include="CefSharp.WinForms.NetCore" Version="89.0.170" />
6666
</ItemGroup>
6767

6868
<Target Name="CefSharpAfterBuildDiagnostic" AfterTargets="AfterBuild">

‎CefSharp.MinimalExample.WinForms/Program.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,8 @@ public static int Main(string[] args)
4141
//For screen sharing add (see https://bitbucket.org/chromiumembedded/cef/issues/2582/allow-run-time-handling-of-media-access#comment-58677180)
4242
settings.CefCommandLineArgs.Add("enable-usermedia-screen-capturing");
4343

44-
var dependencyCheck = true;
45-
46-
#if NETCOREAPP || ANYCPU
47-
//For .Net Core/.Net 5 this should be fixed as part of https://github.com/cefsharp/CefSharp/issues/3388
48-
dependencyCheck = false;
49-
#endif
50-
5144
//Perform dependency check to make sure all relevant resources are in our output directory.
52-
Cef.Initialize(settings, performDependencyCheck: dependencyCheck, browserProcessHandler: null);
45+
Cef.Initialize(settings, performDependencyCheck: false, browserProcessHandler: null);
5346

5447
var browser = new BrowserForm();
5548
Application.Run(browser);

‎CefSharp.MinimalExample.WinForms/packages.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="cef.redist.x64" version="88.2.9" targetFramework="net452" />
4-
<package id="cef.redist.x86" version="88.2.9" targetFramework="net452" />
5-
<package id="CefSharp.Common" version="88.2.90" targetFramework="net452" />
6-
<package id="CefSharp.WinForms" version="88.2.90" targetFramework="net452" />
3+
<package id="cef.redist.x64" version="89.0.17" targetFramework="net452" />
4+
<package id="cef.redist.x86" version="89.0.17" targetFramework="net452" />
5+
<package id="CefSharp.Common" version="89.0.170" targetFramework="net452" />
6+
<package id="CefSharp.WinForms" version="89.0.170" targetFramework="net452" />
77
</packages>

‎CefSharp.MinimalExample.Wpf/App.xaml.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,13 @@ public App()
3131
//For screen sharing add (see https://bitbucket.org/chromiumembedded/cef/issues/2582/allow-run-time-handling-of-media-access#comment-58677180)
3232
settings.CefCommandLineArgs.Add("enable-usermedia-screen-capturing");
3333

34-
var dependencyCheck = true;
35-
36-
#if NETCOREAPP || ANYCPU
37-
//For .Net Core/.Net 5 this should be fixed as part of https://github.com/cefsharp/CefSharp/issues/3388
38-
dependencyCheck = false;
39-
#endif
40-
4134
//Example of checking if a call to Cef.Initialize has already been made, we require this for
4235
//our .Net 5.0 Single File Publish example, you don't typically need to perform this check
4336
//if you call Cef.Initialze within your WPF App constructor.
4437
if (!Cef.IsInitialized)
4538
{
4639
//Perform dependency check to make sure all relevant resources are in our output directory.
47-
Cef.Initialize(settings, performDependencyCheck: dependencyCheck, browserProcessHandler: null);
40+
Cef.Initialize(settings, performDependencyCheck: false, browserProcessHandler: null);
4841
}
4942
}
5043

0 commit comments

Comments
 (0)