Upgrade to 88.2.90 (#131)
* Upgrade to v88.2.40-pre WPF - Add https scheme to default URL to workaround upstream issue https://bitbucket.org/chromiumembedded/cef/issues/3079/cant-load-urls-without-scheme * Net Core - Add AnyCPU Platform to projects/solution * Net Core - Add RuntimeIdentifier based on PlatformTarget - Set RuntimeIdentifier based on PlatformTarget (PlatformTarget isn't set of AnyCPU) - Set SelfContained to false so as not to provide a Framework Dependant build (don't include the whole .net framework) * WPF/WinForms - Change CefSharpBuildAction to Content For testing of ClickOnce publish * Net 5.0 - Update to include PublishSingleFile settings - .Net 5.0 Publish Settings for PublishSingleFile https://docs.microsoft.com/en-us/dotnet/core/deploying/single-file Defaults differ compared to .Net Core 3.1 - Set RollForward to Major so runs on newer runtime version - Add net5.0-windows TargetFramework * .Net 5.0 - Publish Single Exe Example - Use the main application exe as the BrowserSubprocess when self publishing a .Net 5.0 exe - Only the WPF and WinForms examples have been updated https://github.com/cefsharp/CefSharp/issues/3407 * Upgrade to 88.2.90
This commit is contained in:
Alex Maitland
GitHub
@@ -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.87.1.132\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.87.1.132\build\CefSharp.Common.props')" />
|
||||
<Import Project="..\packages\cef.redist.x86.87.1.13\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.87.1.13\build\cef.redist.x86.props')" />
|
||||
<Import Project="..\packages\cef.redist.x64.87.1.13\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.87.1.13\build\cef.redist.x64.props')" />
|
||||
<Import Project="..\packages\CefSharp.Common.88.2.90\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.88.2.90\build\CefSharp.Common.props')" />
|
||||
<Import Project="..\packages\cef.redist.x86.88.2.9\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.88.2.9\build\cef.redist.x86.props')" />
|
||||
<Import Project="..\packages\cef.redist.x64.88.2.9\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.88.2.9\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=87.1.132.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
|
||||
<HintPath>..\packages\CefSharp.Common.87.1.132\lib\net452\CefSharp.dll</HintPath>
|
||||
<Reference Include="CefSharp, Version=88.2.90.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
|
||||
<HintPath>..\packages\CefSharp.Common.88.2.90\lib\net452\CefSharp.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="CefSharp.Core, Version=87.1.132.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
|
||||
<HintPath>..\packages\CefSharp.Common.87.1.132\lib\net452\CefSharp.Core.dll</HintPath>
|
||||
<Reference Include="CefSharp.Core, Version=88.2.90.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
|
||||
<HintPath>..\packages\CefSharp.Common.88.2.90\lib\net452\CefSharp.Core.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="CefSharp.OffScreen, Version=87.1.132.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
|
||||
<HintPath>..\packages\CefSharp.OffScreen.87.1.132\lib\net452\CefSharp.OffScreen.dll</HintPath>
|
||||
<Reference Include="CefSharp.OffScreen, Version=88.2.90.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138">
|
||||
<HintPath>..\packages\CefSharp.OffScreen.88.2.90\lib\net452\CefSharp.OffScreen.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
@@ -117,8 +117,8 @@
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="..\packages\CefSharp.Common.87.1.132\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.87.1.132\build\CefSharp.Common.targets')" />
|
||||
<Target Name="CefSharpAfterBuildDebug" AfterTargets="AfterBuild">
|
||||
<CallTarget Targets="CefSharpAfterBuildDiagnostic"/>
|
||||
<CallTarget Targets="CefSharpAfterBuildDiagnostic" />
|
||||
</Target>
|
||||
<Import Project="..\packages\CefSharp.Common.88.2.90\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.88.2.90\build\CefSharp.Common.targets')" />
|
||||
</Project>
|
||||
@@ -7,15 +7,30 @@
|
||||
<BaseOutputPath>bin.netcore\</BaseOutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<TargetFrameworks>netcoreapp3.1;net5.0-windows</TargetFrameworks>
|
||||
<RootNamespace>CefSharp.MinimalExample.OffScreen</RootNamespace>
|
||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||
<Platforms>x86;x64</Platforms>
|
||||
<Platforms>x86;x64;AnyCPU</Platforms>
|
||||
<!--
|
||||
Run on a newer version of .Net if the specified version (.Net Core 3.1) is not installed
|
||||
https://github.com/dotnet/docs/issues/12237
|
||||
-->
|
||||
<RollForward>Major</RollForward>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(PlatformTarget)' == 'x86'">
|
||||
<RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == ''">win-x86</RuntimeIdentifier>
|
||||
<SelfContained Condition="'$(SelfContained)' == ''">false</SelfContained>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(PlatformTarget)' == 'x64'">
|
||||
<RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == ''">win-x64</RuntimeIdentifier>
|
||||
<SelfContained Condition="'$(SelfContained)' == ''">false</SelfContained>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@@ -26,10 +41,14 @@
|
||||
<None Remove="bin\**" />
|
||||
<None Remove="obj\**" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Remove="app.config" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CefSharp.OffScreen.NetCore" Version="87.1.132" />
|
||||
<PackageReference Include="CefSharp.OffScreen.NetCore" Version="88.2.90" />
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" />
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
|
||||
</Project>
|
||||
|
||||
@@ -36,8 +36,8 @@ namespace CefSharp.MinimalExample.OffScreen
|
||||
|
||||
var dependencyCheck = true;
|
||||
|
||||
#if NETCOREAPP
|
||||
//This should be fixed shortly.
|
||||
#if NETCOREAPP || ANYCPU
|
||||
//For .Net Core/.Net 5 this should be fixed as part of https://github.com/cefsharp/CefSharp/issues/3388
|
||||
dependencyCheck = false;
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="cef.redist.x64" version="87.1.13" targetFramework="net452" />
|
||||
<package id="cef.redist.x86" version="87.1.13" targetFramework="net452" />
|
||||
<package id="CefSharp.Common" version="87.1.132" targetFramework="net452" />
|
||||
<package id="CefSharp.OffScreen" version="87.1.132" targetFramework="net452" />
|
||||
<package id="cef.redist.x64" version="88.2.9" targetFramework="net452" />
|
||||
<package id="cef.redist.x86" version="88.2.9" targetFramework="net452" />
|
||||
<package id="CefSharp.Common" version="88.2.90" targetFramework="net452" />
|
||||
<package id="CefSharp.OffScreen" version="88.2.90" targetFramework="net452" />
|
||||
</packages>
|
||||
Reference in New Issue
Block a user