From 34b17bd32f7ae7df83b1be73ca137c2630be7350 Mon Sep 17 00:00:00 2001
From: Alex Maitland <amaitland@users.noreply.github.com>
Date: Thu, 25 Feb 2021 20:29:37 +1000
Subject: [PATCH] Net Core - SelfContained/PublishSingleFile exclude
 CefSharp.BrowserSubprocess.runtimeconfig.json

For SelfContained and PublishSingleFile we remove the CefSharp.BrowserSubprocess.runtimeconfig.json file so
the BrowserSubprocess runs using the packages .net runtime

Issue #3407
---
 .../CefSharp.Common.NETCore.targets                 | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/NuGet/PackageReference/CefSharp.Common.NETCore.targets b/NuGet/PackageReference/CefSharp.Common.NETCore.targets
index 4bcd58b5ba..bfe5e06057 100644
--- a/NuGet/PackageReference/CefSharp.Common.NETCore.targets
+++ b/NuGet/PackageReference/CefSharp.Common.NETCore.targets
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--
+  For SelfContained and PublishSingleFile we remove the CefSharp.BrowserSubprocess.runtimeconfig.json file so
+  the BrowserSubprocess runs using the packages .net runtime
+  -->
+  <Target Name="CefSharpExcludeBrowserSubprocessRuntimeConfigAfterResolveAssemblyReferences" AfterTargets="ResolveAssemblyReferences" Condition="'$(RuntimeIdentifier)' != '' AND ('$(SelfContained)' == 'true' OR '$(PublishSingleFile)' == 'true')">
+    <PropertyGroup>
+		<_CefSharpBrowserSubProcessRuntimeConfig>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\runtimes\$(RuntimeIdentifier)\native\CefSharp.BrowserSubprocess.runtimeconfig.json'))</_CefSharpBrowserSubProcessRuntimeConfig>
+	</PropertyGroup>
+	<ItemGroup>
+	  <ReferenceCopyLocalPaths Remove="$(_CefSharpBrowserSubProcessRuntimeConfig)" />
+    </ItemGroup>
+  </Target>
+  
   <Choose>
     <When Condition="$(RuntimeIdentifier.StartsWith('win')) and $(RuntimeIdentifier.Contains('-x64'))">
       <ItemGroup>