Skip to content

Commit c5a8b32

Browse files
amaitlandamaitland
authored
Upgrade to 91.1.210 (#134)
* Upgrade to 91.1.60-pre * AnyCPU - Use the new CefRuntime.SubscribeAnyCpuAssemblyResolver method Now CefSharp.dll is an AnyCPU dll the code for AnyCPU dll resolution can be added to the library. Exact same code, just included in CefSharp.dll * Upgrade to 91.1.160 * Upgrade to 91.1.210
1 parent d04f284 commit c5a8b32

14 files changed

+50
-112
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.90.6.70\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.90.6.70\build\CefSharp.Common.props')" />
4-
<Import Project="..\packages\cef.redist.x86.90.6.7\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.90.6.7\build\cef.redist.x86.props')" />
5-
<Import Project="..\packages\cef.redist.x64.90.6.7\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.90.6.7\build\cef.redist.x64.props')" />
3+
<Import Project="..\packages\CefSharp.Common.91.1.210\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.91.1.210\build\CefSharp.Common.props')" />
4+
<Import Project="..\packages\cef.redist.x86.91.1.21\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.91.1.21\build\cef.redist.x86.props')" />
5+
<Import Project="..\packages\cef.redist.x64.91.1.21\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.91.1.21\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=90.6.70.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
91-
<HintPath>..\packages\CefSharp.Common.90.6.70\lib\net452\CefSharp.dll</HintPath>
90+
<Reference Include="CefSharp, Version=91.1.210.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
91+
<HintPath>..\packages\CefSharp.Common.91.1.210\lib\net452\CefSharp.dll</HintPath>
9292
<Private>True</Private>
9393
</Reference>
94-
<Reference Include="CefSharp.Core, Version=90.6.70.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
95-
<HintPath>..\packages\CefSharp.Common.90.6.70\lib\net452\CefSharp.Core.dll</HintPath>
94+
<Reference Include="CefSharp.Core, Version=91.1.210.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
95+
<HintPath>..\packages\CefSharp.Common.91.1.210\lib\net452\CefSharp.Core.dll</HintPath>
9696
<Private>True</Private>
9797
</Reference>
98-
<Reference Include="CefSharp.OffScreen, Version=90.6.70.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
99-
<HintPath>..\packages\CefSharp.OffScreen.90.6.70\lib\net452\CefSharp.OffScreen.dll</HintPath>
98+
<Reference Include="CefSharp.OffScreen, Version=91.1.210.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
99+
<HintPath>..\packages\CefSharp.OffScreen.91.1.210\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.90.6.70\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.90.6.70\build\CefSharp.Common.targets')" />
123+
<Import Project="..\packages\CefSharp.Common.91.1.210\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.91.1.210\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="90.6.70" />
50+
<PackageReference Include="CefSharp.OffScreen.NetCore" Version="91.1.210" />
5151
</ItemGroup>
5252

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

‎CefSharp.MinimalExample.OffScreen/Program.cs

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public static int Main(string[] args)
1919
{
2020
#if ANYCPU
2121
//Only required for PlatformTarget of AnyCPU
22-
AppDomain.CurrentDomain.AssemblyResolve += Resolver;
22+
CefRuntime.SubscribeAnyCpuAssemblyResolver();
2323
#endif
2424

2525
const string testUrl = "https://www.google.com/";
@@ -102,26 +102,5 @@ private static void BrowserLoadingStateChanged(object sender, LoadingStateChange
102102
});
103103
}
104104
}
105-
106-
// Will attempt to load missing assembly from either x86 or x64 subdir
107-
//when PlatformTarget is AnyCPU
108-
#if ANYCPU
109-
private static System.Reflection.Assembly Resolver(object sender, ResolveEventArgs args)
110-
{
111-
if (args.Name.StartsWith("CefSharp.Core.Runtime"))
112-
{
113-
string assemblyName = args.Name.Split(new[] { ',' }, 2)[0] + ".dll";
114-
string archSpecificPath = Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase,
115-
Environment.Is64BitProcess ? "x64" : "x86",
116-
assemblyName);
117-
118-
return File.Exists(archSpecificPath)
119-
? System.Reflection.Assembly.LoadFile(archSpecificPath)
120-
: null;
121-
}
122-
123-
return null;
124-
}
125-
#endif
126105
}
127106
}

‎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="90.6.7" targetFramework="net452" />
4-
<package id="cef.redist.x86" version="90.6.7" targetFramework="net452" />
5-
<package id="CefSharp.Common" version="90.6.70" targetFramework="net452" />
6-
<package id="CefSharp.OffScreen" version="90.6.70" targetFramework="net452" />
3+
<package id="cef.redist.x64" version="91.1.21" targetFramework="net452" />
4+
<package id="cef.redist.x86" version="91.1.21" targetFramework="net452" />
5+
<package id="CefSharp.Common" version="91.1.210" targetFramework="net452" />
6+
<package id="CefSharp.OffScreen" version="91.1.210" 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.90.6.70\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.90.6.70\build\CefSharp.Common.props')" />
4-
<Import Project="..\packages\cef.redist.x86.90.6.7\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.90.6.7\build\cef.redist.x86.props')" />
5-
<Import Project="..\packages\cef.redist.x64.90.6.7\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.90.6.7\build\cef.redist.x64.props')" />
3+
<Import Project="..\packages\CefSharp.Common.91.1.210\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.91.1.210\build\CefSharp.Common.props')" />
4+
<Import Project="..\packages\cef.redist.x86.91.1.21\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.91.1.21\build\cef.redist.x86.props')" />
5+
<Import Project="..\packages\cef.redist.x64.91.1.21\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.91.1.21\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=90.6.70.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
76-
<HintPath>..\packages\CefSharp.Common.90.6.70\lib\net452\CefSharp.dll</HintPath>
75+
<Reference Include="CefSharp, Version=91.1.210.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
76+
<HintPath>..\packages\CefSharp.Common.91.1.210\lib\net452\CefSharp.dll</HintPath>
7777
<Private>True</Private>
7878
</Reference>
79-
<Reference Include="CefSharp.Core, Version=90.6.70.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
80-
<HintPath>..\packages\CefSharp.Common.90.6.70\lib\net452\CefSharp.Core.dll</HintPath>
79+
<Reference Include="CefSharp.Core, Version=91.1.210.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
80+
<HintPath>..\packages\CefSharp.Common.91.1.210\lib\net452\CefSharp.Core.dll</HintPath>
8181
<Private>True</Private>
8282
</Reference>
83-
<Reference Include="CefSharp.WinForms, Version=90.6.70.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
84-
<HintPath>..\packages\CefSharp.WinForms.90.6.70\lib\net452\CefSharp.WinForms.dll</HintPath>
83+
<Reference Include="CefSharp.WinForms, Version=91.1.210.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
84+
<HintPath>..\packages\CefSharp.WinForms.91.1.210\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.90.6.70\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.90.6.70\build\CefSharp.Common.targets')" />
147+
<Import Project="..\packages\CefSharp.Common.91.1.210\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.91.1.210\build\CefSharp.Common.targets')" />
148148
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</ItemGroup>
4242

4343
<ItemGroup>
44-
<PackageReference Include="CefSharp.WinForms" Version="90.6.70" />
44+
<PackageReference Include="CefSharp.WinForms" Version="91.1.210" />
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="90.6.70" />
65+
<PackageReference Include="CefSharp.WinForms.NetCore" Version="91.1.210" />
6666
</ItemGroup>
6767

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

‎CefSharp.MinimalExample.WinForms/Program.cs

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ public static int Main(string[] args)
1616
{
1717

1818
#if ANYCPU
19-
//Only required for PlatformTarget of AnyCPU
20-
AppDomain.CurrentDomain.AssemblyResolve += Resolver;
19+
CefRuntime.SubscribeAnyCpuAssemblyResolver();
2120
#endif
2221

2322
//For Windows 7 and above, best to include relevant app.manifest entries as well
@@ -49,26 +48,5 @@ public static int Main(string[] args)
4948

5049
return 0;
5150
}
52-
53-
// Will attempt to load missing assembly from either x86 or x64 subdir
54-
//when PlatformTarget is AnyCPU
55-
#if ANYCPU
56-
private static System.Reflection.Assembly Resolver(object sender, ResolveEventArgs args)
57-
{
58-
if (args.Name.StartsWith("CefSharp.Core.Runtime"))
59-
{
60-
string assemblyName = args.Name.Split(new[] { ',' }, 2)[0] + ".dll";
61-
string archSpecificPath = Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase,
62-
Environment.Is64BitProcess ? "x64" : "x86",
63-
assemblyName);
64-
65-
return File.Exists(archSpecificPath)
66-
? System.Reflection.Assembly.LoadFile(archSpecificPath)
67-
: null;
68-
}
69-
70-
return null;
71-
}
72-
#endif
7351
}
7452
}

‎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="90.6.7" targetFramework="net452" />
4-
<package id="cef.redist.x86" version="90.6.7" targetFramework="net452" />
5-
<package id="CefSharp.Common" version="90.6.70" targetFramework="net452" />
6-
<package id="CefSharp.WinForms" version="90.6.70" targetFramework="net452" />
3+
<package id="cef.redist.x64" version="91.1.21" targetFramework="net452" />
4+
<package id="cef.redist.x86" version="91.1.21" targetFramework="net452" />
5+
<package id="CefSharp.Common" version="91.1.210" targetFramework="net452" />
6+
<package id="CefSharp.WinForms" version="91.1.210" targetFramework="net452" />
77
</packages>

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

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public App()
1111
{
1212
#if ANYCPU
1313
//Only required for PlatformTarget of AnyCPU
14-
AppDomain.CurrentDomain.AssemblyResolve += Resolver;
14+
CefRuntime.SubscribeAnyCpuAssemblyResolver();
1515
#endif
1616
var settings = new CefSettings()
1717
{
@@ -40,24 +40,5 @@ public App()
4040
Cef.Initialize(settings, performDependencyCheck: true, browserProcessHandler: null);
4141
}
4242
}
43-
44-
#if ANYCPU
45-
private static System.Reflection.Assembly Resolver(object sender, ResolveEventArgs args)
46-
{
47-
if (args.Name.StartsWith("CefSharp.Core.Runtime"))
48-
{
49-
string assemblyName = args.Name.Split(new[] { ',' }, 2)[0] + ".dll";
50-
string archSpecificPath = Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase,
51-
Environment.Is64BitProcess ? "x64" : "x86",
52-
assemblyName);
53-
54-
return File.Exists(archSpecificPath)
55-
? System.Reflection.Assembly.LoadFile(archSpecificPath)
56-
: null;
57-
}
58-
59-
return null;
60-
}
61-
#endif
6243
}
6344
}

0 commit comments

Comments
 (0)