From b4e69af9c05f82a3c4cbf2f744e13c65253336b0 Mon Sep 17 00:00:00 2001 From: kpreisser Date: Sat, 16 Jan 2021 13:59:08 +0100 Subject: [PATCH 1/3] Upgrade to 88.1.2+gac8e5f0+chromium-88.0.4324.27 / Chromium 88.0.4324.27 --- .../CefSharp.BrowserSubprocess.Core.netcore.vcxproj | 2 +- .../CefSharp.BrowserSubprocess.Core.vcxproj | 2 +- .../packages.CefSharp.BrowserSubprocess.Core.config | 2 +- .../packages.CefSharp.BrowserSubprocess.Core.netcore.config | 2 +- CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj | 2 +- CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj | 2 +- CefSharp.Core.Runtime/packages.CefSharp.Core.Runtime.config | 2 +- .../packages.CefSharp.Core.Runtime.netcore.config | 2 +- CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj | 4 ++-- .../CefSharp.OffScreen.Example.netcore.csproj | 4 ++-- CefSharp.OffScreen.Example/packages.config | 4 ++-- CefSharp.Test/CefSharp.Test.csproj | 4 ++-- CefSharp.Test/CefSharp.Test.netcore.csproj | 4 ++-- CefSharp.Test/packages.config | 4 ++-- CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj | 4 ++-- .../CefSharp.WinForms.Example.netcore.csproj | 4 ++-- CefSharp.WinForms.Example/packages.config | 4 ++-- CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj | 4 ++-- CefSharp.Wpf.Example/CefSharp.Wpf.Example.netcore.csproj | 4 ++-- CefSharp.Wpf.Example/packages.config | 4 ++-- appveyor.yml | 2 +- build.netcore.ps1 | 4 ++-- build.ps1 | 4 ++-- 23 files changed, 37 insertions(+), 37 deletions(-) diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj index e5e9083fa6..ba368a5325 100644 --- a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj +++ b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj @@ -1,6 +1,6 @@  - + Debug diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj index 496371d2d6..6a31f0d495 100644 --- a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj +++ b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj @@ -1,6 +1,6 @@  - + diff --git a/CefSharp.BrowserSubprocess.Core/packages.CefSharp.BrowserSubprocess.Core.config b/CefSharp.BrowserSubprocess.Core/packages.CefSharp.BrowserSubprocess.Core.config index 0294ce57bb..b63e253b53 100644 --- a/CefSharp.BrowserSubprocess.Core/packages.CefSharp.BrowserSubprocess.Core.config +++ b/CefSharp.BrowserSubprocess.Core/packages.CefSharp.BrowserSubprocess.Core.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/CefSharp.BrowserSubprocess.Core/packages.CefSharp.BrowserSubprocess.Core.netcore.config b/CefSharp.BrowserSubprocess.Core/packages.CefSharp.BrowserSubprocess.Core.netcore.config index 0783a54ca8..80404a197f 100644 --- a/CefSharp.BrowserSubprocess.Core/packages.CefSharp.BrowserSubprocess.Core.netcore.config +++ b/CefSharp.BrowserSubprocess.Core/packages.CefSharp.BrowserSubprocess.Core.netcore.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj index e1d1810e4d..f1eb3f939a 100644 --- a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj +++ b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj @@ -1,6 +1,6 @@  - + Debug diff --git a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj index d1f34c4c95..7e5a8f9fb8 100644 --- a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj +++ b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj @@ -1,6 +1,6 @@  - + diff --git a/CefSharp.Core.Runtime/packages.CefSharp.Core.Runtime.config b/CefSharp.Core.Runtime/packages.CefSharp.Core.Runtime.config index 0294ce57bb..b63e253b53 100644 --- a/CefSharp.Core.Runtime/packages.CefSharp.Core.Runtime.config +++ b/CefSharp.Core.Runtime/packages.CefSharp.Core.Runtime.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/CefSharp.Core.Runtime/packages.CefSharp.Core.Runtime.netcore.config b/CefSharp.Core.Runtime/packages.CefSharp.Core.Runtime.netcore.config index 0783a54ca8..80404a197f 100644 --- a/CefSharp.Core.Runtime/packages.CefSharp.Core.Runtime.netcore.config +++ b/CefSharp.Core.Runtime/packages.CefSharp.Core.Runtime.netcore.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj index efee17f8f6..1aaf1befa9 100644 --- a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj +++ b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj @@ -1,7 +1,7 @@  - - + + diff --git a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.netcore.csproj b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.netcore.csproj index 080a2c33e9..2099be162c 100644 --- a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.netcore.csproj +++ b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.netcore.csproj @@ -31,8 +31,8 @@ - - + + diff --git a/CefSharp.OffScreen.Example/packages.config b/CefSharp.OffScreen.Example/packages.config index d76f7f955a..1ec23867fc 100644 --- a/CefSharp.OffScreen.Example/packages.config +++ b/CefSharp.OffScreen.Example/packages.config @@ -1,6 +1,6 @@  - - + + \ No newline at end of file diff --git a/CefSharp.Test/CefSharp.Test.csproj b/CefSharp.Test/CefSharp.Test.csproj index 9352f053a4..455c43882c 100644 --- a/CefSharp.Test/CefSharp.Test.csproj +++ b/CefSharp.Test/CefSharp.Test.csproj @@ -1,7 +1,7 @@  - - + + diff --git a/CefSharp.Test/CefSharp.Test.netcore.csproj b/CefSharp.Test/CefSharp.Test.netcore.csproj index 8f3526f29c..066fed43f0 100644 --- a/CefSharp.Test/CefSharp.Test.netcore.csproj +++ b/CefSharp.Test/CefSharp.Test.netcore.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/CefSharp.Test/packages.config b/CefSharp.Test/packages.config index b1ef8df99f..10b7160728 100644 --- a/CefSharp.Test/packages.config +++ b/CefSharp.Test/packages.config @@ -2,8 +2,8 @@ - - + + diff --git a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj index 12bd30fcfe..d11f3a5925 100644 --- a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj +++ b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj @@ -1,7 +1,7 @@  - - + + Debug diff --git a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.netcore.csproj b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.netcore.csproj index cb10f7ace3..a3b7c58733 100644 --- a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.netcore.csproj +++ b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.netcore.csproj @@ -31,8 +31,8 @@ - - + + diff --git a/CefSharp.WinForms.Example/packages.config b/CefSharp.WinForms.Example/packages.config index d76f7f955a..1ec23867fc 100644 --- a/CefSharp.WinForms.Example/packages.config +++ b/CefSharp.WinForms.Example/packages.config @@ -1,6 +1,6 @@  - - + + \ No newline at end of file diff --git a/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj b/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj index a4ad183fd4..fc6390856c 100644 --- a/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj +++ b/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj @@ -1,7 +1,7 @@  - - + + Debug diff --git a/CefSharp.Wpf.Example/CefSharp.Wpf.Example.netcore.csproj b/CefSharp.Wpf.Example/CefSharp.Wpf.Example.netcore.csproj index a8dbed07ca..a14bc19ed7 100644 --- a/CefSharp.Wpf.Example/CefSharp.Wpf.Example.netcore.csproj +++ b/CefSharp.Wpf.Example/CefSharp.Wpf.Example.netcore.csproj @@ -32,8 +32,8 @@ - - + + diff --git a/CefSharp.Wpf.Example/packages.config b/CefSharp.Wpf.Example/packages.config index 14aee14441..4881224fa6 100644 --- a/CefSharp.Wpf.Example/packages.config +++ b/CefSharp.Wpf.Example/packages.config @@ -1,6 +1,6 @@  - - + + \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 8a64b51197..c07e1c15f6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 88.1.0-CI{build} +version: 88.1.2-CI{build} image: - Visual Studio 2015 diff --git a/build.netcore.ps1 b/build.netcore.ps1 index 21e5c31998..ad384e2ad9 100644 --- a/build.netcore.ps1 +++ b/build.netcore.ps1 @@ -3,9 +3,9 @@ [Parameter(Position = 0)] [string] $Target = "netcore31", [Parameter(Position = 1)] - [string] $Version = "88.1.0", + [string] $Version = "88.1.2", [Parameter(Position = 2)] - [string] $AssemblyVersion = "88.1.0" + [string] $AssemblyVersion = "88.1.2" ) $WorkingDir = split-path -parent $MyInvocation.MyCommand.Definition diff --git a/build.ps1 b/build.ps1 index 2db7756997..abfa160d13 100644 --- a/build.ps1 +++ b/build.ps1 @@ -3,9 +3,9 @@ [Parameter(Position = 0)] [string] $Target = "vs2015", [Parameter(Position = 1)] - [string] $Version = "88.1.0", + [string] $Version = "88.1.2", [Parameter(Position = 2)] - [string] $AssemblyVersion = "88.1.0" + [string] $AssemblyVersion = "88.1.2" ) $WorkingDir = split-path -parent $MyInvocation.MyCommand.Definition From 538f31e349a46994a8f3b73106a5259cbf23216e Mon Sep 17 00:00:00 2001 From: kpreisser Date: Sat, 16 Jan 2021 17:29:56 +0100 Subject: [PATCH 2/3] Add support for Windows ARM64 for the NETCore packages. Note: .NET 5.0 or higher is required to build a WinForms/WPF application for win-arm64. Fixes cefsharp/CefSharp#2944 --- ...arp.BrowserSubprocess.Core.netcore.vcxproj | 79 ++++++++++++++ .../CefSharp.BrowserSubprocess.netcore.csproj | 4 +- ...rp.Core.Runtime.RefAssembly.netcore.csproj | 7 +- .../CefSharp.Core.Runtime.netcore.vcxproj | 101 ++++++++++++++++++ CefSharp.Core/Initializer.cs | 3 +- .../CefSharp.OffScreen.Example.netcore.csproj | 7 +- CefSharp.Test/CefSharp.Test.netcore.csproj | 7 +- .../CefSharp.WinForms.Example.netcore.csproj | 7 +- .../CefSharp.Wpf.Example.netcore.csproj | 7 +- CefSharp3.netcore.sln | 58 ++++++++++ .../CefSharp.Common.NETCore.nuspec | 14 +++ .../CefSharp.Common.NETCore.targets | 56 +++++++++- build.netcore.ps1 | 3 +- 13 files changed, 336 insertions(+), 17 deletions(-) diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj index ba368a5325..5a8761b35b 100644 --- a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj +++ b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj @@ -10,6 +10,10 @@ Debug x64 + + Debug + arm64 + Release Win32 @@ -18,6 +22,10 @@ Release x64 + + Release + arm64 + 16.0 @@ -41,6 +49,12 @@ NetCore Unicode + + DynamicLibrary + true + NetCore + Unicode + DynamicLibrary false @@ -53,6 +67,12 @@ NetCore Unicode + + DynamicLibrary + false + NetCore + Unicode + @@ -62,12 +82,18 @@ + + + + + + true @@ -85,6 +111,14 @@ obj.netcore\$(Platform)\$(Configuration)\ $(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath) + + true + ..\CefSharp.snk + true + bin.netcore\$(Platform)\$(Configuration)\ + obj.netcore\$(Platform)\$(Configuration)\ + $(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath) + false ..\CefSharp.snk @@ -99,6 +133,13 @@ obj.netcore\$(Platform)\$(Configuration)\ $(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath) + + false + ..\CefSharp.snk + bin.netcore\$(Platform)\$(Configuration)\ + obj.netcore\$(Platform)\$(Configuration)\ + $(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath) + Level3 @@ -138,6 +179,25 @@ Assembly.manifest + + + Level3 + $(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir) + Disabled + WIN32;_DEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions) + Use + true + + + true + libcef.lib;libcef_dll_wrapper.lib + $(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion); + /ignore:4099 %(AdditionalOptions) + + + Assembly.manifest + + Level3 @@ -173,6 +233,23 @@ Assembly.manifest + + + Level3 + $(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir) + WIN32;NDEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions) + Use + true + + + true + libcef.lib;libcef_dll_wrapper.lib + $(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion) + + + Assembly.manifest + + @@ -223,8 +300,10 @@ Create Create + Create Create Create + Create diff --git a/CefSharp.BrowserSubprocess/CefSharp.BrowserSubprocess.netcore.csproj b/CefSharp.BrowserSubprocess/CefSharp.BrowserSubprocess.netcore.csproj index b66c10421c..858065d93d 100644 --- a/CefSharp.BrowserSubprocess/CefSharp.BrowserSubprocess.netcore.csproj +++ b/CefSharp.BrowserSubprocess/CefSharp.BrowserSubprocess.netcore.csproj @@ -21,7 +21,9 @@ MinimumRecommendedRules.ruleset app.manifest CefSharp.BrowserSubprocess.Program - x86;x64 + x86;x64;arm64 + + arm64 @@ -59,6 +59,11 @@ $(SolutionDir)CefSharp.Core.Runtime\bin.netcore\x64\$(Configuration)\CefSharp.Core.Runtime.dll + + + $(SolutionDir)CefSharp.Core.Runtime\bin.netcore\arm64\$(Configuration)\CefSharp.Core.Runtime.dll + + $(SolutionDir)CefSharp.Core.Runtime\bin.netcore\win32\$(Configuration)\CefSharp.Core.Runtime.dll diff --git a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj index f1eb3f939a..2c342caa5a 100644 --- a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj +++ b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj @@ -10,6 +10,10 @@ Debug x64 + + Debug + arm64 + Release Win32 @@ -18,6 +22,10 @@ Release x64 + + Release + arm64 + 16.0 @@ -41,6 +49,12 @@ NetCore true + + DynamicLibrary + Unicode + NetCore + true + DynamicLibrary Unicode @@ -51,6 +65,11 @@ Unicode NetCore + + DynamicLibrary + Unicode + NetCore + @@ -60,12 +79,18 @@ + + + + + + bin.netcore\$(Platform)\$(Configuration)\ @@ -91,6 +116,18 @@ obj.netcore\$(Platform)\$(Configuration)\ $(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath) + + false + false + ..\CefSharp.snk + AllRules.ruleset + + + CefSharp.Core.Runtime + bin.netcore\$(Platform)\$(Configuration)\ + obj.netcore\$(Platform)\$(Configuration)\ + $(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath) + bin.netcore\$(Platform)\$(Configuration)\ false @@ -113,6 +150,17 @@ obj.netcore\$(Platform)\$(Configuration)\ $(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath) + + false + AllRules.ruleset + + + CefSharp.Core.Runtime + ..\CefSharp.snk + bin.netcore\$(Platform)\$(Configuration)\ + obj.netcore\$(Platform)\$(Configuration)\ + $(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath) + Disabled @@ -177,6 +225,36 @@ Assembly.manifest + + + Disabled + $(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir) + _DEBUG;_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;USING_CEF_SHARED;_CRT_SECURE_NO_WARNINGS;EXPORT;NETCOREAPP;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Use + true + Level3 + ProgramDatabase + Stdafx.h + true + + + false + + + libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies) + $(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion) + false + true + true + false + false + $(LinkKeyFile) + + + Assembly.manifest + + $(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir) @@ -222,6 +300,27 @@ Assembly.manifest + + + $(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir) + _NDEBUG;_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;USING_CEF_SHARED;_CRT_SECURE_NO_WARNINGS;EXPORT;NETCOREAPP;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Level3 + ProgramDatabase + true + true + + + libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies) + $(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion) + true + $(LinkKeyFile) + + + Assembly.manifest + + @@ -248,8 +347,10 @@ Create Create + Create Create Create + Create diff --git a/CefSharp.Core/Initializer.cs b/CefSharp.Core/Initializer.cs index d210853328..9cf843e166 100644 --- a/CefSharp.Core/Initializer.cs +++ b/CefSharp.Core/Initializer.cs @@ -39,8 +39,7 @@ internal static void ModuleInitializer() } else { - //TODO: This will need changing if we support ARM64 - var arch = Environment.Is64BitProcess ? "x64" : "x86"; + var arch = RuntimeInformation.ProcessArchitecture.ToString().ToLowerInvariant(); var archFolder = $"runtimes\\win-{arch}\\native"; libCefPath = Path.Combine(currentFolder, archFolder, "libcef.dll"); if (File.Exists(libCefPath)) diff --git a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.netcore.csproj b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.netcore.csproj index 2099be162c..78bd4a983c 100644 --- a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.netcore.csproj +++ b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.netcore.csproj @@ -1,4 +1,4 @@ - + @@ -17,7 +17,9 @@ false app.manifest MinimumRecommendedRules.ruleset - x86;x64 + x86;x64;arm64 + + arm64 CefSharp.OffScreen.Example.Program @@ -17,7 +17,9 @@ true false MinimumRecommendedRules.ruleset - x86;x64 + x86;x64;arm64 + + arm64 @@ -29,6 +31,7 @@ + diff --git a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.netcore.csproj b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.netcore.csproj index a3b7c58733..f7fdea701b 100644 --- a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.netcore.csproj +++ b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.netcore.csproj @@ -1,4 +1,4 @@ - + @@ -18,7 +18,9 @@ false app.manifest MinimumRecommendedRules.ruleset - x86;x64 + x86;x64;arm64 + + arm64 @@ -18,7 +18,9 @@ false app.manifest MinimumRecommendedRules.ruleset - x86;x64 + x86;x64;arm64 + + arm64 CefSharp.Wpf.Example.Program + + @@ -46,6 +48,10 @@ + + + + @@ -55,6 +61,10 @@ + + + + @@ -63,5 +73,9 @@ + + + + \ No newline at end of file diff --git a/NuGet/PackageReference/CefSharp.Common.NETCore.targets b/NuGet/PackageReference/CefSharp.Common.NETCore.targets index 4bcd58b5ba..5e5a9f8bf6 100644 --- a/NuGet/PackageReference/CefSharp.Common.NETCore.targets +++ b/NuGet/PackageReference/CefSharp.Common.NETCore.targets @@ -37,10 +37,29 @@ - - - - + + + + locales\%(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + Included + false + true + + + swiftshader\%(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + Included + false + true + + + + + + + + runtimes\win-x86\native\locales\%(RecursiveDir)%(FileName)%(Extension) PreserveNewest @@ -98,6 +117,35 @@ false true + + + runtimes\win-arm64\native\locales\%(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + Included + false + true + + + runtimes\win-arm64\native\swiftshader\%(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + Included + false + true + + + runtimes\win-arm64\native\%(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + Included + false + true + + + runtimes\win-arm64\native\%(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + Included + false + true + diff --git a/build.netcore.ps1 b/build.netcore.ps1 index ad384e2ad9..3191b0de92 100644 --- a/build.netcore.ps1 +++ b/build.netcore.ps1 @@ -91,7 +91,7 @@ function Msvs [string] $Configuration, [Parameter(Position = 1, ValueFromPipeline = $true)] - [ValidateSet('x86', 'x64')] + [ValidateSet('x86', 'x64', 'arm64')] [string] $Platform ) @@ -178,6 +178,7 @@ function Compile # Compile Msvs 'Release' 'x64' Msvs 'Release' 'x86' + Msvs 'Release' 'arm64' } function Nupkg From 21a199b98b690a9e54e948585e75a637cfc1bca9 Mon Sep 17 00:00:00 2001 From: kpreisser Date: Sun, 17 Jan 2021 11:11:24 +0100 Subject: [PATCH 3/3] - Add a net5.0 target framework to CefSharp.BrowseSubprocess.netcore. - For win-arm64, use the net5.0 version instead of the netcoreapp3.1 version of CefSharp.BrowserSubprocess.exe since .NET 5.0 officially supports creating Windows ARM64 apps. --- .../CefSharp.BrowserSubprocess.netcore.csproj | 2 +- NuGet/PackageReference/CefSharp.Common.NETCore.nuspec | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CefSharp.BrowserSubprocess/CefSharp.BrowserSubprocess.netcore.csproj b/CefSharp.BrowserSubprocess/CefSharp.BrowserSubprocess.netcore.csproj index 858065d93d..793f5d1b61 100644 --- a/CefSharp.BrowserSubprocess/CefSharp.BrowserSubprocess.netcore.csproj +++ b/CefSharp.BrowserSubprocess/CefSharp.BrowserSubprocess.netcore.csproj @@ -12,7 +12,7 @@ WinExe - netcoreapp3.1 + netcoreapp3.1;net5.0 CefSharp.BrowserSubprocess CefSharp.BrowserSubprocess false diff --git a/NuGet/PackageReference/CefSharp.Common.NETCore.nuspec b/NuGet/PackageReference/CefSharp.Common.NETCore.nuspec index 34f0fc84cc..271d323512 100644 --- a/NuGet/PackageReference/CefSharp.Common.NETCore.nuspec +++ b/NuGet/PackageReference/CefSharp.Common.NETCore.nuspec @@ -74,8 +74,9 @@ - - - + + + + \ No newline at end of file