From a56ca442936f2f0fd34c1607144e85f16fa9b241 Mon Sep 17 00:00:00 2001
From: kpreisser <kpreisser@users.noreply.github.com>
Date: Fri, 6 Sep 2019 21:42:31 +0200
Subject: [PATCH] Adjust references in .props files for .NET Core projects:
 -Add a reference to CefSharp.BrowserSubprocess.Core when compiling for .NET
 Core (see #2891). -Adjust the references for .NET Core to not specify
 <Private>False<Private>, as otherwise they wouldn't be specified in the
 generated .deps.json file and so the CoreCLR wouldn't load them.

Contributes to #2796
---
 NuGet/CefSharp.Common.props    | 20 ++++++++++++++++----
 NuGet/CefSharp.OffScreen.props |  4 ++--
 NuGet/CefSharp.WinForms.props  |  4 ++--
 NuGet/CefSharp.Wpf.props       |  4 ++--
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/NuGet/CefSharp.Common.props b/NuGet/CefSharp.Common.props
index cfb962522c..65c3426b90 100644
--- a/NuGet/CefSharp.Common.props
+++ b/NuGet/CefSharp.Common.props
@@ -14,11 +14,17 @@
       <ItemGroup>
         <Reference Include="CefSharp">
           <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.dll</HintPath>
-          <Private>False</Private>
+          <Private Condition="!$(TargetFramework.StartsWith('netcoreapp'))">False</Private>
         </Reference>
         <Reference Include="CefSharp.Core">
           <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.Core.dll</HintPath>
-          <Private>False</Private>
+          <Private Condition="!$(TargetFramework.StartsWith('netcoreapp'))">False</Private>
+        </Reference>
+      </ItemGroup>      
+      <!-- Additional references for .NET Core -->
+      <ItemGroup Condition="$(TargetFramework.StartsWith('netcoreapp'))">
+        <Reference Include="CefSharp.BrowserSubprocess.Core">
+          <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.BrowserSubprocess.Core.dll</HintPath>
         </Reference>
       </ItemGroup>
     </When>
@@ -27,11 +33,17 @@
       <ItemGroup>
         <Reference Include="CefSharp">
           <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.dll</HintPath>
-          <Private>False</Private>
+          <Private Condition="!$(TargetFramework.StartsWith('netcoreapp'))">False</Private>
         </Reference>
         <Reference Include="CefSharp.Core">
           <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.Core.dll</HintPath>
-          <Private>False</Private>
+          <Private Condition="!$(TargetFramework.StartsWith('netcoreapp'))">False</Private>
+        </Reference>
+      </ItemGroup>      
+      <!-- Additional references for .NET Core -->
+      <ItemGroup Condition="$(TargetFramework.StartsWith('netcoreapp'))">
+        <Reference Include="CefSharp.BrowserSubprocess.Core">
+          <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.BrowserSubprocess.Core.dll</HintPath>
         </Reference>
       </ItemGroup>
     </Otherwise>
diff --git a/NuGet/CefSharp.OffScreen.props b/NuGet/CefSharp.OffScreen.props
index c532925b66..07a76a1450 100644
--- a/NuGet/CefSharp.OffScreen.props
+++ b/NuGet/CefSharp.OffScreen.props
@@ -12,7 +12,7 @@
       <ItemGroup>
         <Reference Include="CefSharp.OffScreen">
           <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.OffScreen.dll</HintPath>
-          <Private>False</Private>
+          <Private Condition="!$(TargetFramework.StartsWith('netcoreapp'))">False</Private>
         </Reference>
       </ItemGroup>
     </When>
@@ -21,7 +21,7 @@
       <ItemGroup>
         <Reference Include="CefSharp.OffScreen">
           <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.OffScreen.dll</HintPath>
-          <Private>False</Private>
+          <Private Condition="!$(TargetFramework.StartsWith('netcoreapp'))">False</Private>
         </Reference>
       </ItemGroup>
     </Otherwise>
diff --git a/NuGet/CefSharp.WinForms.props b/NuGet/CefSharp.WinForms.props
index 0451d0319f..b4135665bc 100644
--- a/NuGet/CefSharp.WinForms.props
+++ b/NuGet/CefSharp.WinForms.props
@@ -12,7 +12,7 @@
       <ItemGroup>
         <Reference Include="CefSharp.WinForms">
           <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.WinForms.dll</HintPath>
-          <Private>False</Private>
+          <Private Condition="!$(TargetFramework.StartsWith('netcoreapp'))">False</Private>
         </Reference>
       </ItemGroup>
     </When>
@@ -21,7 +21,7 @@
       <ItemGroup>
         <Reference Include="CefSharp.WinForms">
           <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.WinForms.dll</HintPath>
-          <Private>False</Private>
+          <Private Condition="!$(TargetFramework.StartsWith('netcoreapp'))">False</Private>
         </Reference>
       </ItemGroup>
     </Otherwise>
diff --git a/NuGet/CefSharp.Wpf.props b/NuGet/CefSharp.Wpf.props
index ea7c745140..b345e58dc5 100644
--- a/NuGet/CefSharp.Wpf.props
+++ b/NuGet/CefSharp.Wpf.props
@@ -12,7 +12,7 @@
       <ItemGroup>
         <Reference Include="CefSharp.Wpf">
           <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.Wpf.dll</HintPath>
-          <Private>False</Private>
+          <Private Condition="!$(TargetFramework.StartsWith('netcoreapp'))">False</Private>
         </Reference>
       </ItemGroup>
     </When>
@@ -21,7 +21,7 @@
       <ItemGroup>
         <Reference Include="CefSharp.Wpf">
           <HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.Wpf.dll</HintPath>
-          <Private>False</Private>
+          <Private Condition="!$(TargetFramework.StartsWith('netcoreapp'))">False</Private>
         </Reference>
       </ItemGroup>
     </Otherwise>