Upgrade to 94.4.20 (#139)

* Upgrade to 94.4.20
-  WinForms/Wpf/OffScreen - Update app.manifest
- Change version number to 1.0.0.0 (from 65.0.0.0) as it was never updated
- Update DPI awareness for WPF/OffScreen
This commit is contained in:
Alex Maitland 2021-09-30 10:17:04 +10:00 committed by GitHub
parent 0c0b588316
commit 8e160cfc5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 56 additions and 54 deletions

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\CefSharp.Common.93.1.140\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.93.1.140\build\CefSharp.Common.props')" /> <Import Project="..\packages\CefSharp.Common.94.4.20\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.94.4.20\build\CefSharp.Common.props')" />
<Import Project="..\packages\cef.redist.x86.93.1.14\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.93.1.14\build\cef.redist.x86.props')" /> <Import Project="..\packages\cef.redist.x86.94.4.2\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.94.4.2\build\cef.redist.x86.props')" />
<Import Project="..\packages\cef.redist.x64.93.1.14\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.93.1.14\build\cef.redist.x64.props')" /> <Import Project="..\packages\cef.redist.x64.94.4.2\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.94.4.2\build\cef.redist.x64.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -85,16 +85,16 @@
<ApplicationManifest>app.manifest</ApplicationManifest> <ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="CefSharp, Version=93.1.140.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138"> <Reference Include="CefSharp, Version=94.4.20.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.93.1.140\lib\net452\CefSharp.dll</HintPath> <HintPath>..\packages\CefSharp.Common.94.4.20\lib\net452\CefSharp.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="CefSharp.Core, Version=93.1.140.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138"> <Reference Include="CefSharp.Core, Version=94.4.20.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.93.1.140\lib\net452\CefSharp.Core.dll</HintPath> <HintPath>..\packages\CefSharp.Common.94.4.20\lib\net452\CefSharp.Core.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="CefSharp.OffScreen, Version=93.1.140.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138"> <Reference Include="CefSharp.OffScreen, Version=94.4.20.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.OffScreen.93.1.140\lib\net452\CefSharp.OffScreen.dll</HintPath> <HintPath>..\packages\CefSharp.OffScreen.94.4.20\lib\net452\CefSharp.OffScreen.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
@ -118,5 +118,5 @@
<Target Name="CefSharpAfterBuildDebug" AfterTargets="AfterBuild"> <Target Name="CefSharpAfterBuildDebug" AfterTargets="AfterBuild">
<CallTarget Targets="CefSharpAfterBuildDiagnostic" /> <CallTarget Targets="CefSharpAfterBuildDiagnostic" />
</Target> </Target>
<Import Project="..\packages\CefSharp.Common.93.1.140\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.93.1.140\build\CefSharp.Common.targets')" /> <Import Project="..\packages\CefSharp.Common.94.4.20\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.94.4.20\build\CefSharp.Common.targets')" />
</Project> </Project>

View File

@ -61,7 +61,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CefSharp.OffScreen.NetCore" Version="93.1.140" /> <PackageReference Include="CefSharp.OffScreen.NetCore" Version="94.4.20" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -7,7 +7,7 @@
xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<assemblyIdentity version="65.0.0.0" name="CefSharp.MinimalExample.Offscreen.app" /> <assemblyIdentity version="1.0.0.0" name="CefSharp.MinimalExample.Offscreen.app" />
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security> <security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3"> <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
@ -29,8 +29,9 @@
</trustInfo> </trustInfo>
<asmv3:application> <asmv3:application>
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings"> <asmv3:windowsSettings>
<dpiAware>true/PM</dpiAware> <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
</asmv3:windowsSettings> </asmv3:windowsSettings>
</asmv3:application> </asmv3:application>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="cef.redist.x64" version="93.1.14" targetFramework="net452" /> <package id="cef.redist.x64" version="94.4.2" targetFramework="net452" />
<package id="cef.redist.x86" version="93.1.14" targetFramework="net452" /> <package id="cef.redist.x86" version="94.4.2" targetFramework="net452" />
<package id="CefSharp.Common" version="93.1.140" targetFramework="net452" /> <package id="CefSharp.Common" version="94.4.20" targetFramework="net452" />
<package id="CefSharp.OffScreen" version="93.1.140" targetFramework="net452" /> <package id="CefSharp.OffScreen" version="94.4.20" targetFramework="net452" />
</packages> </packages>

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\CefSharp.Common.93.1.140\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.93.1.140\build\CefSharp.Common.props')" /> <Import Project="..\packages\CefSharp.Common.94.4.20\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.94.4.20\build\CefSharp.Common.props')" />
<Import Project="..\packages\cef.redist.x86.93.1.14\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.93.1.14\build\cef.redist.x86.props')" /> <Import Project="..\packages\cef.redist.x86.94.4.2\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.94.4.2\build\cef.redist.x86.props')" />
<Import Project="..\packages\cef.redist.x64.93.1.14\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.93.1.14\build\cef.redist.x64.props')" /> <Import Project="..\packages\cef.redist.x64.94.4.2\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.94.4.2\build\cef.redist.x64.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -72,16 +72,16 @@
<ApplicationManifest>app.manifest</ApplicationManifest> <ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="CefSharp, Version=93.1.140.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138"> <Reference Include="CefSharp, Version=94.4.20.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.93.1.140\lib\net452\CefSharp.dll</HintPath> <HintPath>..\packages\CefSharp.Common.94.4.20\lib\net452\CefSharp.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="CefSharp.Core, Version=93.1.140.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138"> <Reference Include="CefSharp.Core, Version=94.4.20.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.93.1.140\lib\net452\CefSharp.Core.dll</HintPath> <HintPath>..\packages\CefSharp.Common.94.4.20\lib\net452\CefSharp.Core.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="CefSharp.WinForms, Version=93.1.140.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138"> <Reference Include="CefSharp.WinForms, Version=94.4.20.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.WinForms.93.1.140\lib\net452\CefSharp.WinForms.dll</HintPath> <HintPath>..\packages\CefSharp.WinForms.94.4.20\lib\net452\CefSharp.WinForms.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
@ -144,5 +144,5 @@
<Target Name="CefSharpAfterBuildDebug" AfterTargets="AfterBuild"> <Target Name="CefSharpAfterBuildDebug" AfterTargets="AfterBuild">
<CallTarget Targets="CefSharpAfterBuildDiagnostic" /> <CallTarget Targets="CefSharpAfterBuildDiagnostic" />
</Target> </Target>
<Import Project="..\packages\CefSharp.Common.93.1.140\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.93.1.140\build\CefSharp.Common.targets')" /> <Import Project="..\packages\CefSharp.Common.94.4.20\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.94.4.20\build\CefSharp.Common.targets')" />
</Project> </Project>

View File

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

View File

@ -68,7 +68,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CefSharp.WinForms.NetCore" Version="93.1.140" /> <PackageReference Include="CefSharp.WinForms.NetCore" Version="94.4.20" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -8,7 +8,7 @@
xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<assemblyIdentity version="65.0.0.0" name="CefSharp.MinimalExample.WinForms.app" /> <assemblyIdentity version="1.0.0.0" name="CefSharp.MinimalExample.WinForms.app" />
<dependency> <dependency>
<dependentAssembly> <dependentAssembly>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="cef.redist.x64" version="93.1.14" targetFramework="net452" /> <package id="cef.redist.x64" version="94.4.2" targetFramework="net452" />
<package id="cef.redist.x86" version="93.1.14" targetFramework="net452" /> <package id="cef.redist.x86" version="94.4.2" targetFramework="net452" />
<package id="CefSharp.Common" version="93.1.140" targetFramework="net452" /> <package id="CefSharp.Common" version="94.4.20" targetFramework="net452" />
<package id="CefSharp.WinForms" version="93.1.140" targetFramework="net452" /> <package id="CefSharp.WinForms" version="94.4.20" targetFramework="net452" />
</packages> </packages>

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\CefSharp.Common.93.1.140\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.93.1.140\build\CefSharp.Common.props')" /> <Import Project="..\packages\CefSharp.Common.94.4.20\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.94.4.20\build\CefSharp.Common.props')" />
<Import Project="..\packages\cef.redist.x86.93.1.14\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.93.1.14\build\cef.redist.x86.props')" /> <Import Project="..\packages\cef.redist.x86.94.4.2\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.94.4.2\build\cef.redist.x86.props')" />
<Import Project="..\packages\cef.redist.x64.93.1.14\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.93.1.14\build\cef.redist.x64.props')" /> <Import Project="..\packages\cef.redist.x64.94.4.2\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.94.4.2\build\cef.redist.x64.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -91,16 +91,16 @@
<ApplicationManifest>app.manifest</ApplicationManifest> <ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="CefSharp, Version=93.1.140.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138"> <Reference Include="CefSharp, Version=94.4.20.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.93.1.140\lib\net452\CefSharp.dll</HintPath> <HintPath>..\packages\CefSharp.Common.94.4.20\lib\net452\CefSharp.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="CefSharp.Core, Version=93.1.140.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138"> <Reference Include="CefSharp.Core, Version=94.4.20.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.93.1.140\lib\net452\CefSharp.Core.dll</HintPath> <HintPath>..\packages\CefSharp.Common.94.4.20\lib\net452\CefSharp.Core.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="CefSharp.Wpf, Version=93.1.140.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138"> <Reference Include="CefSharp.Wpf, Version=94.4.20.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Wpf.93.1.140\lib\net452\CefSharp.Wpf.dll</HintPath> <HintPath>..\packages\CefSharp.Wpf.94.4.20\lib\net452\CefSharp.Wpf.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@ -179,5 +179,5 @@
<Target Name="CefSharpAfterBuildDebug" AfterTargets="AfterBuild"> <Target Name="CefSharpAfterBuildDebug" AfterTargets="AfterBuild">
<CallTarget Targets="CefSharpAfterBuildDiagnostic" /> <CallTarget Targets="CefSharpAfterBuildDiagnostic" />
</Target> </Target>
<Import Project="..\packages\CefSharp.Common.93.1.140\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.93.1.140\build\CefSharp.Common.targets')" /> <Import Project="..\packages\CefSharp.Common.94.4.20\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.94.4.20\build\CefSharp.Common.targets')" />
</Project> </Project>

View File

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

View File

@ -7,7 +7,7 @@
xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<assemblyIdentity version="65.0.0.0" name="CefSharp.MinimalExample.Wpf.app" /> <assemblyIdentity version="1.0.0.0" name="CefSharp.MinimalExample.Wpf.app" />
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security> <security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3"> <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
@ -29,8 +29,9 @@
</trustInfo> </trustInfo>
<asmv3:application> <asmv3:application>
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings"> <asmv3:windowsSettings>
<dpiAware>true/PM</dpiAware> <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
</asmv3:windowsSettings> </asmv3:windowsSettings>
</asmv3:application> </asmv3:application>

View File

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

View File

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