Skip to content

Commit 8966f2e

Browse files
authored
Merge 081c4f7 into 43b9ff5
2 parents 43b9ff5 + 081c4f7 commit 8966f2e

1 file changed

Lines changed: 40 additions & 0 deletions

File tree

NuGet/CefSharp.Common.targets

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@
118118
<CefSharpTargetDir Condition="'$(CefSharpTargetDir)' != '' AND !HasTrailingSlash('$(CefSharpTargetDir)')">$(CefSharpTargetDir)\</CefSharpTargetDir>
119119
<CefSharpTargetDirAnyCpu32>$(CefSharpTargetDir)x86\</CefSharpTargetDirAnyCpu32>
120120
<CefSharpTargetDirAnyCpu64>$(CefSharpTargetDir)x64\</CefSharpTargetDirAnyCpu64>
121+
<CefSharpTargetDirAnyCpuArm64>$(CefSharpTargetDir)arm64\</CefSharpTargetDirAnyCpuArm64>
121122
<!--
122123
For Sdk Projects the PlatformTarget is unreliable (https://github.com/dotnet/sdk/issues/1560)
123124
When our targets file is imported $(PlatformTarget) will be x86 when the Platform is infact AnyCPU.
@@ -232,6 +233,12 @@
232233
<PublishState>Included</PublishState>
233234
<Visible>false</Visible>
234235
</None>
236+
<None Include="@(CefRedistArm64)">
237+
<Link>$(CefSharpTargetDirAnyCpuArm64)%(RecursiveDir)%(FileName)%(Extension)</Link>
238+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
239+
<PublishState>Included</PublishState>
240+
<Visible>false</Visible>
241+
</None>
235242
<None Include="@(CefSharpCommonBinaries32)">
236243
<Link>$(CefSharpTargetDirAnyCpu32)%(RecursiveDir)%(FileName)%(Extension)</Link>
237244
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -244,6 +251,12 @@
244251
<PublishState>Included</PublishState>
245252
<Visible>false</Visible>
246253
</None>
254+
<None Include="@(CefSharpCommonBinariesArm64)">
255+
<Link>$(CefSharpTargetDirAnyCpuArm64)%(RecursiveDir)%(FileName)%(Extension)</Link>
256+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
257+
<PublishState>Included</PublishState>
258+
<Visible>false</Visible>
259+
</None>
247260
<!--
248261
Include CefSharp.dll and CefSharp.Core.dll (we only need CefSharp.dll but it's easier to include both)
249262
in the arch specific folders as required by the BrowserSubProcess.
@@ -260,6 +273,12 @@
260273
<PublishState>Included</PublishState>
261274
<Visible>false</Visible>
262275
</None>
276+
<None Include="@(CefSharpCommonManagedDll)">
277+
<Link>$(CefSharpTargetDirAnyCpuArm64)%(RecursiveDir)%(FileName)%(Extension)</Link>
278+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
279+
<PublishState>Included</PublishState>
280+
<Visible>false</Visible>
281+
</None>
263282
</ItemGroup>
264283
</When>
265284
<!-- x86 and Win32-->
@@ -335,6 +354,13 @@
335354
<Visible>false</Visible>
336355
<IncludeInVsix>true</IncludeInVsix>
337356
</Content>
357+
<Content Include="@(CefRedistArm64)">
358+
<Link>$(CefSharpTargetDirAnyCpuArm64)%(RecursiveDir)%(FileName)%(Extension)</Link>
359+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
360+
<PublishState>Included</PublishState>
361+
<Visible>false</Visible>
362+
<IncludeInVsix>true</IncludeInVsix>
363+
</Content>
338364
<Content Include="@(CefSharpCommonBinaries32)">
339365
<Link>$(CefSharpTargetDirAnyCpu32)%(RecursiveDir)%(FileName)%(Extension)</Link>
340366
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -349,6 +375,13 @@
349375
<Visible>false</Visible>
350376
<IncludeInVsix>true</IncludeInVsix>
351377
</Content>
378+
<Content Include="@(CefSharpCommonBinariesArm64)">
379+
<Link>$(CefSharpTargetDirAnyCpuArm64)%(RecursiveDir)%(FileName)%(Extension)</Link>
380+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
381+
<PublishState>Included</PublishState>
382+
<Visible>false</Visible>
383+
<IncludeInVsix>true</IncludeInVsix>
384+
</Content>
352385
<!--
353386
Include CefSharp.dll and CefSharp.Core.dll (we only need CefSharp.dll but it's easier to include both)
354387
in the arch specific folders as required by the BrowserSubProcess.
@@ -367,6 +400,13 @@
367400
<Visible>false</Visible>
368401
<IncludeInVsix>true</IncludeInVsix>
369402
</Content>
403+
<Content Include="@(CefSharpCommonManagedDll)">
404+
<Link>$(CefSharpTargetDirAnyCpuArm64)%(RecursiveDir)%(FileName)%(Extension)</Link>
405+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
406+
<PublishState>Included</PublishState>
407+
<Visible>false</Visible>
408+
<IncludeInVsix>true</IncludeInVsix>
409+
</Content>
370410
</ItemGroup>
371411
</When>
372412
<!-- x86 and Win32-->

0 commit comments

Comments
 (0)