Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump CefSharp.Common from 79.1.360 to 117.2.20 in /CEF/Lab.Startup/WinFormNet48 #87

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump CefSharp.Common from 79.1.360 to 117.2.20 in /CEF/Lab.Startup/WinFormNet48 #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion CEF/Lab.Startup/WinFormNet48/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="CefSharp" publicKeyToken="40c4b6fc221f4138" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-117.2.20.0" newVersion="117.2.20.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="CefSharp.Core" publicKeyToken="40c4b6fc221f4138" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-117.2.20.0" newVersion="117.2.20.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
16 changes: 16 additions & 0 deletions CEF/Lab.Startup/WinFormNet48/WinFormNet48.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="../packages/CefSharp.Common.117.2.20/build/CefSharp.Common.props" Condition="Exists('../packages/CefSharp.Common.117.2.20/build/CefSharp.Common.props')" />
<Import Project="../packages/cef.redist.x86.117.2.2/build/cef.redist.x86.props" Condition="Exists('../packages/cef.redist.x86.117.2.2/build/cef.redist.x86.props')" />
<Import Project="../packages/cef.redist.x64.117.2.2/build/cef.redist.x64.props" Condition="Exists('../packages/cef.redist.x64.117.2.2/build/cef.redist.x64.props')" />
<Import Project="..\packages\CefSharp.WinForms.79.1.360\build\CefSharp.WinForms.props" Condition="Exists('..\packages\CefSharp.WinForms.79.1.360\build\CefSharp.WinForms.props')" />
<Import Project="..\packages\CefSharp.Common.79.1.360\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.79.1.360\build\CefSharp.Common.props')" />
<Import Project="..\packages\cef.redist.x86.79.1.36\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.79.1.36\build\cef.redist.x86.props')" />
Expand Down Expand Up @@ -82,6 +85,14 @@
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="CefSharp, Version=117.2.20.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.117.2.20\lib\net462\CefSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="CefSharp.Core, Version=117.2.20.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
<HintPath>..\packages\CefSharp.Common.117.2.20\lib\net462\CefSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
Expand Down Expand Up @@ -272,6 +283,10 @@
<Error Condition="!Exists('..\packages\CefSharp.Common.79.1.360\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.79.1.360\build\CefSharp.Common.targets'))" />
<Error Condition="!Exists('..\packages\CefSharp.WinForms.79.1.360\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.WinForms.79.1.360\build\CefSharp.WinForms.props'))" />
<Error Condition="!Exists('..\packages\CefSharp.WinForms.79.1.360\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.WinForms.79.1.360\build\CefSharp.WinForms.targets'))" />
<Error Condition="!Exists('../packages/cef.redist.x64.117.2.2/build/cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '../packages/cef.redist.x64.117.2.2/build/cef.redist.x64.props'))" />
<Error Condition="!Exists('../packages/cef.redist.x86.117.2.2/build/cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', '../packages/cef.redist.x86.117.2.2/build/cef.redist.x86.props'))" />
<Error Condition="!Exists('../packages/CefSharp.Common.117.2.20/build/CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '../packages/CefSharp.Common.117.2.20/build/CefSharp.Common.props'))" />
<Error Condition="!Exists('../packages/CefSharp.Common.117.2.20/build/CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '../packages/CefSharp.Common.117.2.20/build/CefSharp.Common.targets'))" />
</Target>
<Import Project="..\packages\CefSharp.Common.79.1.360\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.79.1.360\build\CefSharp.Common.targets')" />
<Import Project="..\packages\CefSharp.WinForms.79.1.360\build\CefSharp.WinForms.targets" Condition="Exists('..\packages\CefSharp.WinForms.79.1.360\build\CefSharp.WinForms.targets')" />
Expand All @@ -283,4 +298,5 @@ xcopy /s /y $(ProjectDir)Views $(TargetDir)Views\

</PreBuildEvent>
</PropertyGroup>
<Import Project="../packages/CefSharp.Common.117.2.20/build/CefSharp.Common.targets" Condition="Exists('../packages/CefSharp.Common.117.2.20/build/CefSharp.Common.targets')" />
</Project>
6 changes: 3 additions & 3 deletions CEF/Lab.Startup/WinFormNet48/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="bootstrap" version="4.4.1" targetFramework="net48" />
<package id="cef.redist.x64" version="79.1.36" targetFramework="net48" />
<package id="cef.redist.x86" version="79.1.36" targetFramework="net48" />
<package id="CefSharp.Common" version="79.1.360" targetFramework="net48" />
<package id="cef.redist.x64" version="117.2.2" targetFramework="net48" />
<package id="cef.redist.x86" version="117.2.2" targetFramework="net48" />
<package id="CefSharp.Common" version="117.2.20" targetFramework="net48" />
<package id="CefSharp.WinForms" version="98.1.210" targetFramework="net48" />
<package id="jQuery" version="3.4.1" targetFramework="net48" />
<package id="popper.js" version="1.16.0" targetFramework="net48" />
Expand Down