Skip to content

Commit f3f6169

Browse files
kpreisserkpreisser
authored
Merge 75acbf3 into d0988ce 
2 parents d0988ce + 75acbf3 commit f3f6169

21 files changed

+376
-57
lines changed

‎.vsconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"Microsoft.VisualStudio.Component.VC.CoreIde",
1818
"Microsoft.VisualStudio.Component.Windows10SDK",
1919
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
20+
"Microsoft.VisualStudio.Component.VC.Tools.ARM64",
2021
"Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites",
2122
"Microsoft.ComponentGroup.Blend",
2223
"Microsoft.VisualStudio.Workload.ManagedDesktop",

‎CefSharp.AfterBuild.targets‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,4 @@
1515
<Message Importance="high" Text="Copying $(SolutionDir)CefSharp.BrowserSubprocess\bin.netcore\$(Platform)\$(Configuration)\$(TargetFramework)\CefSharp.BrowserSubprocess.* to $(TargetDir)" />
1616
<Copy SourceFiles="@(SubProcessFiles)" DestinationFolder="$(TargetDir)" />
1717
</Target>
18-
19-
<Target Name="CefSharpCopyLibs86" BeforeTargets="AfterBuild" Condition="'$(Platform)' == 'x86'">
20-
<Message Importance="high" Text="Copying cef.redist x86 files to $(TargetDir)" />
21-
<Copy SourceFiles="@(CefRedist32)" DestinationFiles="@(CefRedist32->'$(TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
22-
</Target>
23-
24-
<Target Name="CefSharpCopyLibs64" BeforeTargets="AfterBuild" Condition="'$(Platform)' == 'x64'">
25-
<Message Importance="high" Text="Copying cef.redist x64 files to $(TargetDir)" />
26-
<Copy SourceFiles="@(CefRedist64)" DestinationFiles="@(CefRedist64->'$(TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
27-
</Target>
2818
</Project>

‎CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj‎

Lines changed: 83 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
<Configuration>Debug</Configuration>
1111
<Platform>x64</Platform>
1212
</ProjectConfiguration>
13+
<ProjectConfiguration Include="Debug|arm64">
14+
<Configuration>Debug</Configuration>
15+
<Platform>arm64</Platform>
16+
</ProjectConfiguration>
1317
<ProjectConfiguration Include="Release|Win32">
1418
<Configuration>Release</Configuration>
1519
<Platform>Win32</Platform>
@@ -18,6 +22,10 @@
1822
<Configuration>Release</Configuration>
1923
<Platform>x64</Platform>
2024
</ProjectConfiguration>
25+
<ProjectConfiguration Include="Release|arm64">
26+
<Configuration>Release</Configuration>
27+
<Platform>arm64</Platform>
28+
</ProjectConfiguration>
2129
</ItemGroup>
2230
<PropertyGroup Label="Globals">
2331
<VCProjectVersion>16.0</VCProjectVersion>
@@ -41,6 +49,12 @@
4149
<CLRSupport>NetCore</CLRSupport>
4250
<CharacterSet>Unicode</CharacterSet>
4351
</PropertyGroup>
52+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'" Label="Configuration">
53+
<ConfigurationType>DynamicLibrary</ConfigurationType>
54+
<UseDebugLibraries>true</UseDebugLibraries>
55+
<CLRSupport>NetCore</CLRSupport>
56+
<CharacterSet>Unicode</CharacterSet>
57+
</PropertyGroup>
4458
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4559
<ConfigurationType>DynamicLibrary</ConfigurationType>
4660
<UseDebugLibraries>false</UseDebugLibraries>
@@ -53,6 +67,12 @@
5367
<CLRSupport>NetCore</CLRSupport>
5468
<CharacterSet>Unicode</CharacterSet>
5569
</PropertyGroup>
70+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'" Label="Configuration">
71+
<ConfigurationType>DynamicLibrary</ConfigurationType>
72+
<UseDebugLibraries>false</UseDebugLibraries>
73+
<CLRSupport>NetCore</CLRSupport>
74+
<CharacterSet>Unicode</CharacterSet>
75+
</PropertyGroup>
5676
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5777
<ImportGroup Label="ExtensionSettings">
5878
</ImportGroup>
@@ -62,12 +82,18 @@
6282
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
6383
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6484
</ImportGroup>
85+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'" Label="PropertySheets">
86+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
87+
</ImportGroup>
6588
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
6689
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6790
</ImportGroup>
6891
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
6992
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7093
</ImportGroup>
94+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'" Label="PropertySheets">
95+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
96+
</ImportGroup>
7197
<PropertyGroup Label="UserMacros" />
7298
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7399
<LinkIncremental>true</LinkIncremental>
@@ -85,6 +111,14 @@
85111
<IntDir>obj.netcore\$(Platform)\$(Configuration)\</IntDir>
86112
<SourcePath>$(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath)</SourcePath>
87113
</PropertyGroup>
114+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'">
115+
<LinkIncremental>true</LinkIncremental>
116+
<LinkKeyFile>..\CefSharp.snk</LinkKeyFile>
117+
<IgnoreImportLibrary>true</IgnoreImportLibrary>
118+
<OutDir>bin.netcore\$(Platform)\$(Configuration)\</OutDir>
119+
<IntDir>obj.netcore\$(Platform)\$(Configuration)\</IntDir>
120+
<SourcePath>$(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath)</SourcePath>
121+
</PropertyGroup>
88122
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
89123
<LinkIncremental>false</LinkIncremental>
90124
<LinkKeyFile>..\CefSharp.snk</LinkKeyFile>
@@ -99,12 +133,19 @@
99133
<IntDir>obj.netcore\$(Platform)\$(Configuration)\</IntDir>
100134
<SourcePath>$(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath)</SourcePath>
101135
</PropertyGroup>
136+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">
137+
<LinkIncremental>false</LinkIncremental>
138+
<LinkKeyFile>..\CefSharp.snk</LinkKeyFile>
139+
<OutDir>bin.netcore\$(Platform)\$(Configuration)\</OutDir>
140+
<IntDir>obj.netcore\$(Platform)\$(Configuration)\</IntDir>
141+
<SourcePath>$(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath)</SourcePath>
142+
</PropertyGroup>
102143
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
103144
<ClCompile>
104145
<WarningLevel>Level3</WarningLevel>
105146
<AdditionalIncludeDirectories>$(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)</AdditionalIncludeDirectories>
106147
<Optimization>Disabled</Optimization>
107-
<PreprocessorDefinitions>WIN32;_DEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
148+
<PreprocessorDefinitions>_DEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
108149
<PrecompiledHeader>Use</PrecompiledHeader>
109150
<BrowseInformation>true</BrowseInformation>
110151
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -124,7 +165,26 @@
124165
<WarningLevel>Level3</WarningLevel>
125166
<AdditionalIncludeDirectories>$(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)</AdditionalIncludeDirectories>
126167
<Optimization>Disabled</Optimization>
127-
<PreprocessorDefinitions>WIN32;_DEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
168+
<PreprocessorDefinitions>_DEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
169+
<PrecompiledHeader>Use</PrecompiledHeader>
170+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
171+
</ClCompile>
172+
<Link>
173+
<GenerateDebugInformation>true</GenerateDebugInformation>
174+
<AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib</AdditionalDependencies>
175+
<AdditionalLibraryDirectories>$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion);</AdditionalLibraryDirectories>
176+
<AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
177+
</Link>
178+
<Manifest>
179+
<AdditionalManifestFiles>Assembly.manifest</AdditionalManifestFiles>
180+
</Manifest>
181+
</ItemDefinitionGroup>
182+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'">
183+
<ClCompile>
184+
<WarningLevel>Level3</WarningLevel>
185+
<AdditionalIncludeDirectories>$(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)</AdditionalIncludeDirectories>
186+
<Optimization>Disabled</Optimization>
187+
<PreprocessorDefinitions>_DEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
128188
<PrecompiledHeader>Use</PrecompiledHeader>
129189
<MultiProcessorCompilation>true</MultiProcessorCompilation>
130190
</ClCompile>
@@ -142,7 +202,7 @@
142202
<ClCompile>
143203
<WarningLevel>Level3</WarningLevel>
144204
<AdditionalIncludeDirectories>$(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)</AdditionalIncludeDirectories>
145-
<PreprocessorDefinitions>WIN32;NDEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
205+
<PreprocessorDefinitions>NDEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
146206
<PrecompiledHeader>Use</PrecompiledHeader>
147207
<BrowseInformation>true</BrowseInformation>
148208
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -160,7 +220,24 @@
160220
<ClCompile>
161221
<WarningLevel>Level3</WarningLevel>
162222
<AdditionalIncludeDirectories>$(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)</AdditionalIncludeDirectories>
163-
<PreprocessorDefinitions>WIN32;NDEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
223+
<PreprocessorDefinitions>NDEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
224+
<PrecompiledHeader>Use</PrecompiledHeader>
225+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
226+
</ClCompile>
227+
<Link>
228+
<GenerateDebugInformation>true</GenerateDebugInformation>
229+
<AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib</AdditionalDependencies>
230+
<AdditionalLibraryDirectories>$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion)</AdditionalLibraryDirectories>
231+
</Link>
232+
<Manifest>
233+
<AdditionalManifestFiles>Assembly.manifest</AdditionalManifestFiles>
234+
</Manifest>
235+
</ItemDefinitionGroup>
236+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">
237+
<ClCompile>
238+
<WarningLevel>Level3</WarningLevel>
239+
<AdditionalIncludeDirectories>$(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)</AdditionalIncludeDirectories>
240+
<PreprocessorDefinitions>NDEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
164241
<PrecompiledHeader>Use</PrecompiledHeader>
165242
<MultiProcessorCompilation>true</MultiProcessorCompilation>
166243
</ClCompile>
@@ -223,8 +300,10 @@
223300
<ClCompile Include="Stdafx.cpp">
224301
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
225302
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
303+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'">Create</PrecompiledHeader>
226304
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
227305
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
306+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">Create</PrecompiledHeader>
228307
</ClCompile>
229308
<ClCompile Include="TypeUtils.cpp" />
230309
<ClCompile Include="Serialization\V8Serialization.cpp" />

‎CefSharp.BrowserSubprocess/CefSharp.BrowserSubprocess.netcore.csproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<PropertyGroup>
1414
<OutputType>WinExe</OutputType>
15-
<TargetFramework>netcoreapp3.1</TargetFramework>
15+
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
1616
<RootNamespace>CefSharp.BrowserSubprocess</RootNamespace>
1717
<AssemblyName>CefSharp.BrowserSubprocess</AssemblyName>
1818
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -21,7 +21,9 @@
2121
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
2222
<ApplicationManifest>app.manifest</ApplicationManifest>
2323
<StartupObject>CefSharp.BrowserSubprocess.Program</StartupObject>
24-
<Platforms>x86;x64</Platforms>
24+
<Platforms>x86;x64;arm64</Platforms>
25+
<!-- Explicitly set the PlatformTarget for arm64, see: https://github.com/dotnet/sdk/issues/15434 -->
26+
<PlatformTarget Condition="'$(Platform)' == 'arm64'">arm64</PlatformTarget>
2527
<!--
2628
Run on a newer version of .Net if the specified version (.Net Core 3.1) is not installed
2729
https://github.com/dotnet/docs/issues/12237

‎CefSharp.Core.Runtime.RefAssembly/CefSharp.Core.Runtime.RefAssembly.netcore.csproj‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
<!--
5252
Ugly hack to make sure we have an assembly to use as our source dll for GenAPI
53-
If the x64 version exists we'll use that, otherwise we'll use the win32
53+
If the x64 or arm64 version exists we'll use that, otherwise we'll use the win32
5454
Haven't found a nice way to determine the Platform (resolves as AnyCPU)
5555
-->
5656
<Choose>
@@ -59,6 +59,11 @@
5959
<IntermediateTargetPath>$(SolutionDir)CefSharp.Core.Runtime\bin.netcore\x64\$(Configuration)\CefSharp.Core.Runtime.dll</IntermediateTargetPath>
6060
</PropertyGroup>
6161
</When>
62+
<When Condition="Exists('$(SolutionDir)CefSharp.Core.Runtime\bin.netcore\arm64\$(Configuration)\CefSharp.Core.Runtime.dll')">
63+
<PropertyGroup>
64+
<IntermediateTargetPath>$(SolutionDir)CefSharp.Core.Runtime\bin.netcore\arm64\$(Configuration)\CefSharp.Core.Runtime.dll</IntermediateTargetPath>
65+
</PropertyGroup>
66+
</When>
6267
<Otherwise>
6368
<PropertyGroup>
6469
<IntermediateTargetPath>$(SolutionDir)CefSharp.Core.Runtime\bin.netcore\win32\$(Configuration)\CefSharp.Core.Runtime.dll</IntermediateTargetPath>

0 commit comments

Comments
 (0)