Dotnet/CefSharp.MinimalExample
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to 91.1.210 (#134)

Browse Source 
* 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
This commit is contained in:
Alex Maitland 2021-06-22 12:12:03 +10:00 committed by GitHub
parent d04f2840ca
commit c5a8b3275f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 50 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CefSharp.MinimalExample.OffScreen/CefSharp.MinimalExample.OffScreen.csproj
View File

@ -1,8 +1,8 @@
<?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.Common.90.6.70\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.90.6.70\build\CefSharp.Common.props')" />
<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')" />
<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')" />
<Import Project="..\packages\CefSharp.Common.91.1.210\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.91.1.210\build\CefSharp.Common.props')" />
<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')" />
<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')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -87,16 +87,16 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="CefSharp, Version=90.6.70.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.90.6.70\lib\net452\CefSharp.dll</HintPath>
<Reference Include="CefSharp, Version=91.1.210.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.91.1.210\lib\net452\CefSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="CefSharp.Core, Version=90.6.70.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.90.6.70\lib\net452\CefSharp.Core.dll</HintPath>
<Reference Include="CefSharp.Core, Version=91.1.210.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.91.1.210\lib\net452\CefSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="CefSharp.OffScreen, Version=90.6.70.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.OffScreen.90.6.70\lib\net452\CefSharp.OffScreen.dll</HintPath>
<Reference Include="CefSharp.OffScreen, Version=91.1.210.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.OffScreen.91.1.210\lib\net452\CefSharp.OffScreen.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@ -120,5 +120,5 @@
<Target Name="CefSharpAfterBuildDebug" AfterTargets="AfterBuild">
<CallTarget Targets="CefSharpAfterBuildDiagnostic" />
</Target>
<Import Project="..\packages\CefSharp.Common.90.6.70\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.90.6.70\build\CefSharp.Common.targets')" />
<Import Project="..\packages\CefSharp.Common.91.1.210\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.91.1.210\build\CefSharp.Common.targets')" />
</Project>

2
CefSharp.MinimalExample.OffScreen/CefSharp.MinimalExample.OffScreen.netcore.csproj
View File

@ -47,7 +47,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="CefSharp.OffScreen.NetCore" Version="90.6.70" />
<PackageReference Include="CefSharp.OffScreen.NetCore" Version="91.1.210" />
</ItemGroup>
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

23
CefSharp.MinimalExample.OffScreen/Program.cs
View File

@ -19,7 +19,7 @@ namespace CefSharp.MinimalExample.OffScreen
{
#if ANYCPU
//Only required for PlatformTarget of AnyCPU
AppDomain.CurrentDomain.AssemblyResolve += Resolver;
CefRuntime.SubscribeAnyCpuAssemblyResolver();
#endif
const string testUrl = "https://www.google.com/";
@ -102,26 +102,5 @@ namespace CefSharp.MinimalExample.OffScreen
});
}
}
// Will attempt to load missing assembly from either x86 or x64 subdir
//when PlatformTarget is AnyCPU
#if ANYCPU
private static System.Reflection.Assembly Resolver(object sender, ResolveEventArgs args)
{
if (args.Name.StartsWith("CefSharp.Core.Runtime"))
{
string assemblyName = args.Name.Split(new[] { ',' }, 2)[0] + ".dll";
string archSpecificPath = Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase,
Environment.Is64BitProcess ? "x64" : "x86",
assemblyName);
return File.Exists(archSpecificPath)
? System.Reflection.Assembly.LoadFile(archSpecificPath)
: null;
}
return null;
}
#endif
}
}

8
CefSharp.MinimalExample.OffScreen/packages.config
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="cef.redist.x64" version="90.6.7" targetFramework="net452" />
<package id="cef.redist.x86" version="90.6.7" targetFramework="net452" />
<package id="CefSharp.Common" version="90.6.70" targetFramework="net452" />
<package id="CefSharp.OffScreen" version="90.6.70" targetFramework="net452" />
<package id="cef.redist.x64" version="91.1.21" targetFramework="net452" />
<package id="cef.redist.x86" version="91.1.21" targetFramework="net452" />
<package id="CefSharp.Common" version="91.1.210" targetFramework="net452" />
<package id="CefSharp.OffScreen" version="91.1.210" targetFramework="net452" />
</packages>

20
CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.csproj
View File

@ -1,8 +1,8 @@
<?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.Common.90.6.70\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.90.6.70\build\CefSharp.Common.props')" />
<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')" />
<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')" />
<Import Project="..\packages\CefSharp.Common.91.1.210\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.91.1.210\build\CefSharp.Common.props')" />
<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')" />
<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')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -72,16 +72,16 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="CefSharp, Version=90.6.70.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.90.6.70\lib\net452\CefSharp.dll</HintPath>
<Reference Include="CefSharp, Version=91.1.210.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.91.1.210\lib\net452\CefSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="CefSharp.Core, Version=90.6.70.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.90.6.70\lib\net452\CefSharp.Core.dll</HintPath>
<Reference Include="CefSharp.Core, Version=91.1.210.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.91.1.210\lib\net452\CefSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="CefSharp.WinForms, Version=90.6.70.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.WinForms.90.6.70\lib\net452\CefSharp.WinForms.dll</HintPath>
<Reference Include="CefSharp.WinForms, Version=91.1.210.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.WinForms.91.1.210\lib\net452\CefSharp.WinForms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@ -144,5 +144,5 @@
<Target Name="CefSharpAfterBuildDebug" AfterTargets="AfterBuild">
<CallTarget Targets="CefSharpAfterBuildDiagnostic" />
</Target>
<Import Project="..\packages\CefSharp.Common.90.6.70\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.90.6.70\build\CefSharp.Common.targets')" />
<Import Project="..\packages\CefSharp.Common.91.1.210\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.91.1.210\build\CefSharp.Common.targets')" />
</Project>

2
CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.net472.csproj
View File

@ -41,7 +41,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="CefSharp.WinForms" Version="90.6.70" />
<PackageReference Include="CefSharp.WinForms" Version="91.1.210" />
</ItemGroup>
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />

2
CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.netcore.csproj
View File

@ -62,7 +62,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="CefSharp.WinForms.NetCore" Version="90.6.70" />
<PackageReference Include="CefSharp.WinForms.NetCore" Version="91.1.210" />
</ItemGroup>
<Target Name="CefSharpAfterBuildDiagnostic" AfterTargets="AfterBuild">

24
CefSharp.MinimalExample.WinForms/Program.cs
View File

@ -16,8 +16,7 @@ namespace CefSharp.MinimalExample.WinForms
{
#if ANYCPU
//Only required for PlatformTarget of AnyCPU
AppDomain.CurrentDomain.AssemblyResolve += Resolver;
CefRuntime.SubscribeAnyCpuAssemblyResolver();
#endif
//For Windows 7 and above, best to include relevant app.manifest entries as well
@ -49,26 +48,5 @@ namespace CefSharp.MinimalExample.WinForms
return 0;
}
// Will attempt to load missing assembly from either x86 or x64 subdir
//when PlatformTarget is AnyCPU
#if ANYCPU
private static System.Reflection.Assembly Resolver(object sender, ResolveEventArgs args)
{
if (args.Name.StartsWith("CefSharp.Core.Runtime"))
{
string assemblyName = args.Name.Split(new[] { ',' }, 2)[0] + ".dll";
string archSpecificPath = Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase,
Environment.Is64BitProcess ? "x64" : "x86",
assemblyName);
return File.Exists(archSpecificPath)
? System.Reflection.Assembly.LoadFile(archSpecificPath)
: null;
}
return null;
}
#endif
}
}

8
CefSharp.MinimalExample.WinForms/packages.config
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="cef.redist.x64" version="90.6.7" targetFramework="net452" />
<package id="cef.redist.x86" version="90.6.7" targetFramework="net452" />
<package id="CefSharp.Common" version="90.6.70" targetFramework="net452" />
<package id="CefSharp.WinForms" version="90.6.70" targetFramework="net452" />
<package id="cef.redist.x64" version="91.1.21" targetFramework="net452" />
<package id="cef.redist.x86" version="91.1.21" targetFramework="net452" />
<package id="CefSharp.Common" version="91.1.210" targetFramework="net452" />
<package id="CefSharp.WinForms" version="91.1.210" targetFramework="net452" />
</packages>

21
CefSharp.MinimalExample.Wpf/App.xaml.cs
View File

@ -11,7 +11,7 @@ namespace CefSharp.MinimalExample.Wpf
{
#if ANYCPU
//Only required for PlatformTarget of AnyCPU
AppDomain.CurrentDomain.AssemblyResolve += Resolver;
CefRuntime.SubscribeAnyCpuAssemblyResolver();
#endif
var settings = new CefSettings()
{
@ -40,24 +40,5 @@ namespace CefSharp.MinimalExample.Wpf
Cef.Initialize(settings, performDependencyCheck: true, browserProcessHandler: null);
}
}
#if ANYCPU
private static System.Reflection.Assembly Resolver(object sender, ResolveEventArgs args)
{
if (args.Name.StartsWith("CefSharp.Core.Runtime"))
{
string assemblyName = args.Name.Split(new[] { ',' }, 2)[0] + ".dll";
string archSpecificPath = Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase,
Environment.Is64BitProcess ? "x64" : "x86",
assemblyName);
return File.Exists(archSpecificPath)
? System.Reflection.Assembly.LoadFile(archSpecificPath)
: null;
}
return null;
}
#endif
}
}

20
CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj
View File

@ -1,8 +1,8 @@
<?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.Common.90.6.70\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.90.6.70\build\CefSharp.Common.props')" />
<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')" />
<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')" />
<Import Project="..\packages\CefSharp.Common.91.1.210\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.91.1.210\build\CefSharp.Common.props')" />
<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')" />
<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')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -93,16 +93,16 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="CefSharp, Version=90.6.70.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.90.6.70\lib\net452\CefSharp.dll</HintPath>
<Reference Include="CefSharp, Version=91.1.210.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.91.1.210\lib\net452\CefSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="CefSharp.Core, Version=90.6.70.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.90.6.70\lib\net452\CefSharp.Core.dll</HintPath>
<Reference Include="CefSharp.Core, Version=91.1.210.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.91.1.210\lib\net452\CefSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="CefSharp.Wpf, Version=90.6.70.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Wpf.90.6.70\lib\net452\CefSharp.Wpf.dll</HintPath>
<Reference Include="CefSharp.Wpf, Version=91.1.210.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Wpf.91.1.210\lib\net452\CefSharp.Wpf.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@ -181,5 +181,5 @@
<Target Name="CefSharpAfterBuildDebug" AfterTargets="AfterBuild">
<CallTarget Targets="CefSharpAfterBuildDiagnostic" />
</Target>
<Import Project="..\packages\CefSharp.Common.90.6.70\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.90.6.70\build\CefSharp.Common.targets')" />
<Import Project="..\packages\CefSharp.Common.91.1.210\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.91.1.210\build\CefSharp.Common.targets')" />
</Project>

2
CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.netcore.csproj
View File

@ -65,7 +65,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="CefSharp.Wpf.NetCore" Version="90.6.70" />
<PackageReference Include="CefSharp.Wpf.NetCore" Version="91.1.210" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.19" />
</ItemGroup>

8
CefSharp.MinimalExample.Wpf/packages.config
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="cef.redist.x64" version="90.6.7" targetFramework="net452" />
<package id="cef.redist.x86" version="90.6.7" targetFramework="net452" />
<package id="CefSharp.Common" version="90.6.70" targetFramework="net452" />
<package id="CefSharp.Wpf" version="90.6.70" targetFramework="net452" />
<package id="cef.redist.x64" version="91.1.21" targetFramework="net452" />
<package id="cef.redist.x86" version="91.1.21" targetFramework="net452" />
<package id="CefSharp.Common" version="91.1.210" targetFramework="net452" />
<package id="CefSharp.Wpf" version="91.1.210" targetFramework="net452" />
<package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.19" targetFramework="net452" />
</packages>

2
UpdateNugetPackages.bat
View File

@ -1,4 +1,4 @@
SET cefsharpversion=90.6.70
SET cefsharpversion=91.1.210
..\nuget restore CefSharp.MinimalExample.sln