Upgrade to 84.4.10

This commit is contained in:
amaitland 2020-08-26 15:57:36 +10:00 committed by Alex Maitland
parent 5b253e9de1
commit 2987ed1230
10 changed files with 34 additions and 34 deletions

View File

@ -1,9 +1,9 @@
<?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.OffScreen.84.3.10-pre\build\CefSharp.OffScreen.props" Condition="Exists('..\packages\CefSharp.OffScreen.84.3.10-pre\build\CefSharp.OffScreen.props')" /> <Import Project="..\packages\CefSharp.OffScreen.84.4.10\build\CefSharp.OffScreen.props" Condition="Exists('..\packages\CefSharp.OffScreen.84.4.10\build\CefSharp.OffScreen.props')" />
<Import Project="..\packages\CefSharp.Common.84.3.10-pre\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.84.3.10-pre\build\CefSharp.Common.props')" /> <Import Project="..\packages\CefSharp.Common.84.4.10\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.84.4.10\build\CefSharp.Common.props')" />
<Import Project="..\packages\cef.redist.x86.84.3.10\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.84.3.10\build\cef.redist.x86.props')" /> <Import Project="..\packages\cef.redist.x86.84.4.1\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.84.4.1\build\cef.redist.x86.props')" />
<Import Project="..\packages\cef.redist.x64.84.3.10\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.84.3.10\build\cef.redist.x64.props')" /> <Import Project="..\packages\cef.redist.x64.84.4.1\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.84.4.1\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>
@ -83,6 +83,6 @@
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\CefSharp.Common.84.3.10-pre\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.84.3.10-pre\build\CefSharp.Common.targets')" /> <Import Project="..\packages\CefSharp.Common.84.4.10\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.84.4.10\build\CefSharp.Common.targets')" />
<Import Project="..\packages\CefSharp.OffScreen.84.3.10-pre\build\CefSharp.OffScreen.targets" Condition="Exists('..\packages\CefSharp.OffScreen.84.3.10-pre\build\CefSharp.OffScreen.targets')" /> <Import Project="..\packages\CefSharp.OffScreen.84.4.10\build\CefSharp.OffScreen.targets" Condition="Exists('..\packages\CefSharp.OffScreen.84.4.10\build\CefSharp.OffScreen.targets')" />
</Project> </Project>

View File

@ -20,7 +20,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CefSharp.OffScreen" Version="84.3.10-pre" /> <PackageReference Include="CefSharp.OffScreen" Version="84.4.10" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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="84.3.10" targetFramework="net452" /> <package id="cef.redist.x64" version="84.4.1" targetFramework="net452" />
<package id="cef.redist.x86" version="84.3.10" targetFramework="net452" /> <package id="cef.redist.x86" version="84.4.1" targetFramework="net452" />
<package id="CefSharp.Common" version="84.3.10-pre" targetFramework="net452" /> <package id="CefSharp.Common" version="84.4.10" targetFramework="net452" />
<package id="CefSharp.OffScreen" version="84.3.10-pre" targetFramework="net452" /> <package id="CefSharp.OffScreen" version="84.4.10" targetFramework="net452" />
</packages> </packages>

View File

@ -1,9 +1,9 @@
<?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.WinForms.84.3.10-pre\build\CefSharp.WinForms.props" Condition="Exists('..\packages\CefSharp.WinForms.84.3.10-pre\build\CefSharp.WinForms.props')" /> <Import Project="..\packages\CefSharp.WinForms.84.4.10\build\CefSharp.WinForms.props" Condition="Exists('..\packages\CefSharp.WinForms.84.4.10\build\CefSharp.WinForms.props')" />
<Import Project="..\packages\CefSharp.Common.84.3.10-pre\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.84.3.10-pre\build\CefSharp.Common.props')" /> <Import Project="..\packages\CefSharp.Common.84.4.10\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.84.4.10\build\CefSharp.Common.props')" />
<Import Project="..\packages\cef.redist.x86.84.3.10\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.84.3.10\build\cef.redist.x86.props')" /> <Import Project="..\packages\cef.redist.x86.84.4.1\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.84.4.1\build\cef.redist.x86.props')" />
<Import Project="..\packages\cef.redist.x64.84.3.10\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.84.3.10\build\cef.redist.x64.props')" /> <Import Project="..\packages\cef.redist.x64.84.4.1\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.84.4.1\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>
@ -113,6 +113,6 @@
<None Include="Resources\chromium-256.png" /> <None Include="Resources\chromium-256.png" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\CefSharp.Common.84.3.10-pre\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.84.3.10-pre\build\CefSharp.Common.targets')" /> <Import Project="..\packages\CefSharp.Common.84.4.10\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.84.4.10\build\CefSharp.Common.targets')" />
<Import Project="..\packages\CefSharp.WinForms.84.3.10-pre\build\CefSharp.WinForms.targets" Condition="Exists('..\packages\CefSharp.WinForms.84.3.10-pre\build\CefSharp.WinForms.targets')" /> <Import Project="..\packages\CefSharp.WinForms.84.4.10\build\CefSharp.WinForms.targets" Condition="Exists('..\packages\CefSharp.WinForms.84.4.10\build\CefSharp.WinForms.targets')" />
</Project> </Project>

View File

@ -20,7 +20,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CefSharp.WinForms" Version="84.3.10-pre" /> <PackageReference Include="CefSharp.WinForms" Version="84.4.10" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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="84.3.10" targetFramework="net452" /> <package id="cef.redist.x64" version="84.4.1" targetFramework="net452" />
<package id="cef.redist.x86" version="84.3.10" targetFramework="net452" /> <package id="cef.redist.x86" version="84.4.1" targetFramework="net452" />
<package id="CefSharp.Common" version="84.3.10-pre" targetFramework="net452" /> <package id="CefSharp.Common" version="84.4.10" targetFramework="net452" />
<package id="CefSharp.WinForms" version="84.3.10-pre" targetFramework="net452" /> <package id="CefSharp.WinForms" version="84.4.10" targetFramework="net452" />
</packages> </packages>

View File

@ -1,9 +1,9 @@
<?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.Wpf.84.3.10-pre\build\CefSharp.Wpf.props" Condition="Exists('..\packages\CefSharp.Wpf.84.3.10-pre\build\CefSharp.Wpf.props')" /> <Import Project="..\packages\CefSharp.Wpf.84.4.10\build\CefSharp.Wpf.props" Condition="Exists('..\packages\CefSharp.Wpf.84.4.10\build\CefSharp.Wpf.props')" />
<Import Project="..\packages\CefSharp.Common.84.3.10-pre\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.84.3.10-pre\build\CefSharp.Common.props')" /> <Import Project="..\packages\CefSharp.Common.84.4.10\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.84.4.10\build\CefSharp.Common.props')" />
<Import Project="..\packages\cef.redist.x86.84.3.10\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.84.3.10\build\cef.redist.x86.props')" /> <Import Project="..\packages\cef.redist.x86.84.4.1\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.84.4.1\build\cef.redist.x86.props')" />
<Import Project="..\packages\cef.redist.x64.84.3.10\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.84.3.10\build\cef.redist.x64.props')" /> <Import Project="..\packages\cef.redist.x64.84.4.1\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.84.4.1\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>
@ -147,8 +147,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup /> <ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\CefSharp.Common.84.3.10-pre\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.84.3.10-pre\build\CefSharp.Common.targets')" /> <Import Project="..\packages\CefSharp.Common.84.4.10\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.84.4.10\build\CefSharp.Common.targets')" />
<Import Project="..\packages\CefSharp.Wpf.84.3.10-pre\build\CefSharp.Wpf.targets" Condition="Exists('..\packages\CefSharp.Wpf.84.3.10-pre\build\CefSharp.Wpf.targets')" /> <Import Project="..\packages\CefSharp.Wpf.84.4.10\build\CefSharp.Wpf.targets" Condition="Exists('..\packages\CefSharp.Wpf.84.4.10\build\CefSharp.Wpf.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">

View File

@ -23,7 +23,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" /> <PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" />
<PackageReference Include="CefSharp.Wpf" Version="84.3.10-pre" /> <PackageReference Include="CefSharp.Wpf" Version="84.4.10" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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="84.3.10" targetFramework="net452" /> <package id="cef.redist.x64" version="84.4.1" targetFramework="net452" />
<package id="cef.redist.x86" version="84.3.10" targetFramework="net452" /> <package id="cef.redist.x86" version="84.4.1" targetFramework="net452" />
<package id="CefSharp.Common" version="84.3.10-pre" targetFramework="net452" /> <package id="CefSharp.Common" version="84.4.10" targetFramework="net452" />
<package id="CefSharp.Wpf" version="84.3.10-pre" targetFramework="net452" /> <package id="CefSharp.Wpf" version="84.4.10" targetFramework="net452" />
<package id="System.Windows.Interactivity.WPF" version="2.0.20525" targetFramework="net452" /> <package id="System.Windows.Interactivity.WPF" version="2.0.20525" targetFramework="net452" />
</packages> </packages>

View File

@ -1,4 +1,4 @@
SET cefsharpversion=84.3.10-pre SET cefsharpversion=84.4.10
..\nuget update CefSharp.MinimalExample.OffScreen\CefSharp.MinimalExample.OffScreen.csproj -Id CefSharp.OffScreen -Version %cefsharpversion% ..\nuget update CefSharp.MinimalExample.OffScreen\CefSharp.MinimalExample.OffScreen.csproj -Id CefSharp.OffScreen -Version %cefsharpversion%
..\nuget update CefSharp.MinimalExample.WinForms\CefSharp.MinimalExample.WinForms.csproj -Id CefSharp.WinForms -Version %cefsharpversion% ..\nuget update CefSharp.MinimalExample.WinForms\CefSharp.MinimalExample.WinForms.csproj -Id CefSharp.WinForms -Version %cefsharpversion%