From 1d9971849808c0d3748f18f86f11c53a3643753b Mon Sep 17 00:00:00 2001
From: Alex Maitland <amaitland@users.noreply.github.com>
Date: Thu, 16 Jun 2022 11:13:49 +1000
Subject: [PATCH] Net 5+ - Self Host the BrowserSubProcess for SelfContained
 builds

- Use the application exe instead of CefSharp.BrowserSubprocess.exe
- M103 will add a new CefSharpExcludeSubProcessExe which will
  exclude the exe from builds
---
 .../CefSharp.MinimalExample.WinForms.netcore.csproj      | 9 +++++++++
 .../CefSharp.MinimalExample.Wpf.netcore.csproj           | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.netcore.csproj b/CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.netcore.csproj
index 7f50e7d..2dc66f5 100644
--- a/CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.netcore.csproj
+++ b/CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.netcore.csproj
@@ -39,6 +39,15 @@
     <StartupObject>CefSharp.MinimalExample.WinForms.ProgramPublishSingleFile</StartupObject>
   </PropertyGroup>
 
+  <!--
+  For SelfContained we'll self host the BrowserSubprocess (use the applications own exe)
+  Instead of the provdied CefSharp.BrowserSubprocess.exe
+  -->
+  <PropertyGroup Condition="('$(TargetFramework)' == 'net5.0-windows' OR '$(TargetFramework)' == 'net6.0-windows') AND '$(SelfContained)' == 'true'">
+    <StartupObject>CefSharp.MinimalExample.WinForms.ProgramPublishSingleFile</StartupObject>
+    <CefSharpExcludeSubProcessExe>true</CefSharpExcludeSubProcessExe>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(PlatformTarget)' == 'x86'">
     <RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == ''">win-x86</RuntimeIdentifier>
     <SelfContained Condition="'$(SelfContained)' == ''">false</SelfContained>
diff --git a/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.netcore.csproj b/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.netcore.csproj
index 24517b5..c8279fe 100644
--- a/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.netcore.csproj
+++ b/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.netcore.csproj
@@ -49,6 +49,15 @@
     <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
     <StartupObject>CefSharp.MinimalExample.Wpf.ProgramPublishSingleFile</StartupObject>
   </PropertyGroup>
+
+  <!--
+  For SelfContained we'll self host the BrowserSubprocess (use the applications own exe)
+  Instead of the provdied CefSharp.BrowserSubprocess.exe
+  -->
+  <PropertyGroup Condition="('$(TargetFramework)' == 'net5.0-windows' OR '$(TargetFramework)' == 'net6.0-windows') AND '$(SelfContained)' == 'true'">
+    <StartupObject>CefSharp.MinimalExample.Wpf.ProgramPublishSingleFile</StartupObject>
+    <CefSharpExcludeSubProcessExe>true</CefSharpExcludeSubProcessExe>
+  </PropertyGroup>
   
   <ItemGroup>
     <Compile Remove="bin\**" />