From 8d0fc1a4f8e405980c51a82b13ed128625887183 Mon Sep 17 00:00:00 2001
From: Alex Maitland <amaitland@users.noreply.github.com>
Date: Sun, 8 Nov 2020 15:30:20 +1000
Subject: [PATCH] Net Core - Copy files when no RuntimeIdentifier specified

- Include PackageReference in targets file, this technically probably valid though it works so we might test with it
- Copy files into the runtimes\{rid}\native\ folder
- Update PackageReference version number on build

Issue #3197
---
 .../CefSharp.Common.NETCore.targets           | 39 +++++++++++++++++++
 build.netcore.ps1                             | 16 ++++++++
 2 files changed, 55 insertions(+)

diff --git a/NuGet/PackageReference/CefSharp.Common.NETCore.targets b/NuGet/PackageReference/CefSharp.Common.NETCore.targets
index 3886d3de4b..167d6ab9fe 100644
--- a/NuGet/PackageReference/CefSharp.Common.NETCore.targets
+++ b/NuGet/PackageReference/CefSharp.Common.NETCore.targets
@@ -35,6 +35,8 @@
     </When>
     <Otherwise>
       <ItemGroup>
+		<PackageReference Include="chromiumembeddedframework.runtime.win-x64" Version="87.1.1" />
+		<PackageReference Include="chromiumembeddedframework.runtime.win-x86" Version="87.1.1" />
         <Content Include="@(CefRuntimeWin32Locales)">
 		  <Link>runtimes\win-x86\native\locales\%(RecursiveDir)%(FileName)%(Extension)</Link>
 		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -47,6 +49,25 @@
 		  <PublishState>Included</PublishState>
 		  <Visible>false</Visible>
 		</Content>
+		<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\lib\netcoreapp3.1\CefSharp.BrowserSubprocess.Core.dll">
+		  <Link>runtimes\win-x86\native\%(RecursiveDir)%(FileName)%(Extension)</Link>
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		  <PublishState>Included</PublishState>
+		  <Visible>false</Visible>
+		</Content>
+		<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\lib\netcoreapp3.1\CefSharp.dll">
+		  <Link>runtimes\win-x86\native\%(RecursiveDir)%(FileName)%(Extension)</Link>
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		  <PublishState>Included</PublishState>
+		  <Visible>false</Visible>
+		</Content>
+		<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\lib\netcoreapp3.1\Ijwhost.dll">
+		  <Link>runtimes\win-x64\native\%(RecursiveDir)%(FileName)%(Extension)</Link>
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		  <PublishState>Included</PublishState>
+		  <Visible>false</Visible>
+		</Content>
+		
 		<Content Include="@(CefRuntimeWin64Locales)">
 		  <Link>runtimes\win-x64\native\locales\%(RecursiveDir)%(FileName)%(Extension)</Link>
 		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -59,6 +80,24 @@
 		  <PublishState>Included</PublishState>
 		  <Visible>false</Visible>
 		</Content>
+		<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\lib\netcoreapp3.1\CefSharp.BrowserSubprocess.Core.dll">
+		  <Link>runtimes\win-x64\native\%(RecursiveDir)%(FileName)%(Extension)</Link>
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		  <PublishState>Included</PublishState>
+		  <Visible>false</Visible>
+		</Content>
+		<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\lib\netcoreapp3.1\CefSharp.dll">
+		  <Link>runtimes\win-x64\native\%(RecursiveDir)%(FileName)%(Extension)</Link>
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		  <PublishState>Included</PublishState>
+		  <Visible>false</Visible>
+		</Content>
+		<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\lib\netcoreapp3.1\Ijwhost.dll">
+		  <Link>runtimes\win-x64\native\%(RecursiveDir)%(FileName)%(Extension)</Link>
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		  <PublishState>Included</PublishState>
+		  <Visible>false</Visible>
+		</Content>
       </ItemGroup>
     </Otherwise>
   </Choose>
diff --git a/build.netcore.ps1 b/build.netcore.ps1
index d46a42b7d6..44603aabc3 100644
--- a/build.netcore.ps1
+++ b/build.netcore.ps1
@@ -290,6 +290,21 @@ function WriteVersionToAppveyor
     [System.IO.File]::WriteAllLines($Filename, $NewString, $Utf8NoBomEncoding)
 }
 
+function WriteVersionToNugetTargets
+{
+	$Filename = Join-Path $WorkingDir NuGet\PackageReference\CefSharp.Common.NETCore.targets
+	
+	Write-Diagnostic  "Write Version ($RedistVersion) to $Filename"
+	$Regex1  = '" Version=".*"';
+	$Replace = '" Version="' + $RedistVersion + '"';
+	
+	$RunTimeJsonData = Get-Content -Encoding UTF8 $Filename
+	$NewString = $RunTimeJsonData -replace $Regex1, $Replace
+	
+	$Utf8NoBomEncoding = New-Object System.Text.UTF8Encoding $False
+	[System.IO.File]::WriteAllLines($Filename, $NewString, $Utf8NoBomEncoding)
+}
+
 Write-Diagnostic "CEF Redist Version = $RedistVersion"
 
 DownloadNuget
@@ -297,6 +312,7 @@ DownloadNuget
 WriteAssemblyVersion
 WriteVersionToShfbproj
 WriteVersionToAppveyor
+WriteVersionToNugetTargets
 
 WriteVersionToManifest "CefSharp.BrowserSubprocess\app.manifest"
 WriteVersionToManifest "CefSharp.OffScreen.Example\app.manifest"