Merge a56ca44 into ce70212

cefsharp · Sep 6, 2019 · bf5d00e · bf5d00e
2 parents ce70212 + a56ca44
commit bf5d00e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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>