Nuget - Add CefSharp.Core.Runtime reference when TargetFramework = Ne…

…tCore
cefsharp · Dec 9, 2020 · 5d4cd24 · 5d4cd24
1 parent ee05ef2
commit 5d4cd24
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/NuGet/CefSharp.Common.props b/NuGet/CefSharp.Common.props
@@ -4,9 +4,9 @@
     <CefSharpCommonBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
     <CefSharpCommonBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
     <CefSharpCommonBinariesAnyCPU Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
-	<CefSharpCommonManagedDlls Include="$(MSBuildThisFileDirectory)..\lib\net452\**\*.*" />
-	<CefSharpCommonTransform32 Include="$(MSBuildThisFileDirectory)app.config.x86.transform"/>
-	<CefSharpCommonTransform64 Include="$(MSBuildThisFileDirectory)app.config.x64.transform"/>
+    <CefSharpCommonManagedDlls Include="$(MSBuildThisFileDirectory)..\lib\net452\**\*.*" />
+    <CefSharpCommonTransform32 Include="$(MSBuildThisFileDirectory)app.config.x86.transform"/>
+    <CefSharpCommonTransform64 Include="$(MSBuildThisFileDirectory)app.config.x64.transform"/>
 
     <CefSharpBrowserProcessCore32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.BrowserSubprocess.Core.dll" />
     <CefSharpBrowserProcessCore64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.BrowserSubprocess.Core.dll" />

diff --git a/NuGet/CefSharp.Common.targets b/NuGet/CefSharp.Common.targets
@@ -108,6 +108,27 @@
 	</Otherwise>
   </Choose>
 
+  <!-- For Net Core 3.x we include a Reference to CefSharp.Core.Runtime so it's included in the .deps.json file -->
+	<Choose>
+	  <When Condition="'$(PlatformTarget)' == 'x64' AND $(TargetFramework.StartsWith('netcoreapp3'))">
+		<ItemGroup>
+		  <Reference Include="CefSharp.Core.Runtime">
+			<HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.Core.Runtime.dll</HintPath>
+			<Private>True</Private>
+		  </Reference>
+		</ItemGroup>
+	  </When>
+	  <!-- x86, Win32 and AnyCPU -->
+	  <When Condition="('$(PlatformTarget)' == 'x86' OR '$(PlatformTarget)' == 'Win32') AND $(TargetFramework.StartsWith('netcoreapp3'))">
+		<ItemGroup>
+		  <Reference Include="CefSharp.Core.Runtime">
+			<HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.Core.Runtime.dll</HintPath>
+			<Private>True</Private>
+		  </Reference>
+		</ItemGroup>
+	  </When>
+	</Choose>
+
   <!--
   For AnyCPU we use a Transform to add entries to app.config if possible
   Otherwise throw error to alert user they need to perform additional action