From 662724ffe1c09ce311a413da7b2dfe3051e673b0 Mon Sep 17 00:00:00 2001
From: amaitland <amaitland@users.noreply.github.com>
Date: Mon, 14 Oct 2019 20:03:54 +1000
Subject: [PATCH 1/7] Experimental - New native nuget packages

---
 NuGet/cef.redist.win.nuspec    | 32 ++++++++++++++++++++++++++++++++
 NuGet/cef.redist.win.x64.props | 15 +++++++++++++++
 NuGet/cef.redist.win.x86.props | 15 +++++++++++++++
 build.ps1                      |  4 ++++
 4 files changed, 66 insertions(+)
 create mode 100644 NuGet/cef.redist.win.nuspec
 create mode 100644 NuGet/cef.redist.win.x64.props
 create mode 100644 NuGet/cef.redist.win.x86.props

diff --git a/NuGet/cef.redist.win.nuspec b/NuGet/cef.redist.win.nuspec
new file mode 100644
index 0000000..a2af833
--- /dev/null
+++ b/NuGet/cef.redist.win.nuspec
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>cef.redist.win.$Platform$</id>
+    <version>$version$</version>
+    <authors>The Chromium Embedded Framework Authors</authors>
+    <owners>The CefSharp Authors</owners>
+    <projectUrl>https://github.com/cefsharp/cef-binary</projectUrl>
+    <iconUrl>https://raw.github.com/cefsharp/cef-binary/master/NuGet/cef128x128.gif</iconUrl>
+    <licenseUrl>https://raw.github.com/cefsharp/cef-binary/master/LICENSE.txt</licenseUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>CEF - the Chromium Embedded Framework.
+    NOTE: This package is maintained on behalf of the CEF authors by the CefSharp project at http://github.com/cefsharp/cef-binary</description>
+    <tags>chrome chromium native embedded browser CEF nativepackage</tags>
+    <copyright>Copyright © 2008-2019</copyright>
+  </metadata>
+  <files>
+    <file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\*.dll" target="runtimes\win-$Platform$\native" />
+    <file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\swiftshader\*.dll" target="runtimes\win-$Platform$\native\swiftshader" />
+    <!-- Since CEF 3.2357 the files natives_blob.bin and snapshot_blob.bin need to be distributed.
+         https://groups.google.com/a/chromium.org/forum/#!topic/chromium-packagers/75J9Y1vIc_E
+         http://www.magpcss.org/ceforum/viewtopic.php?f=6&t=12580
+     -->
+    <file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\*.bin" target="runtimes\win-$Platform$\native\" />
+    <file src="..\cef_binary_3.y.z_$CPlatform$\Resources\*.pak" target="runtimes\win-$Platform$\native\"/>
+    <file src="..\cef_binary_3.y.z_$CPlatform$\Resources\*.dat" target="runtimes\win-$Platform$\native\"/>
+    <file src="..\cef_binary_3.y.z_$CPlatform$\Resources\locales\*.pak" target="runtimes\win-$Platform$\native\locales"/>
+	<file src="..\cef_binary_3.y.z_$CPlatform$\Readme.txt" target="\"/>
+
+    <file src="cef.redist.win.$Platform$.props" target="build\" />
+  </files>
+</package>
diff --git a/NuGet/cef.redist.win.x64.props b/NuGet/cef.redist.win.x64.props
new file mode 100644
index 0000000..ad44dde
--- /dev/null
+++ b/NuGet/cef.redist.win.x64.props
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--
+    Files are no longer copied as part of this targets file.
+    For projects other than CefSharp define a target to copy the files.
+    Checkout the CefSharp.Common.targets file for an example
+    -->
+  
+  <!--
+	Using wildcard matching as per https://stackoverflow.com/a/17252671
+    -->  
+  <ItemGroup>
+    <CefRedist64 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\**\*.*" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/NuGet/cef.redist.win.x86.props b/NuGet/cef.redist.win.x86.props
new file mode 100644
index 0000000..6bdad49
--- /dev/null
+++ b/NuGet/cef.redist.win.x86.props
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--
+    Files are no longer copied as part of this targets file.
+    For projects other than CefSharp define a target to copy the files.
+    Checkout the CefSharp.Common.targets file for an example
+    -->
+  
+  <!--
+	Using wildcard matching as per https://stackoverflow.com/a/17252671
+    -->
+  <ItemGroup>
+    <CefRedist32 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\native\**\*.*" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/build.ps1 b/build.ps1
index 5097375..449516d 100644
--- a/build.ps1
+++ b/build.ps1
@@ -498,9 +498,11 @@ try
 
 		# Build 32bit packages
 		. $Nuget pack nuget\cef.redist.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;Platform=x86;CPlatform=windows32;' -OutputDirectory nuget
+		. $Nuget pack nuget\cef.redist.win.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;Platform=x86;CPlatform=windows32;' -OutputDirectory nuget
 
 		# Build 64bit packages
 		. $Nuget pack nuget\cef.redist.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;Platform=x64;CPlatform=windows64;' -OutputDirectory nuget
+		. $Nuget pack nuget\cef.redist.win.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;Platform=x64;CPlatform=windows64;' -OutputDirectory nuget
 
 		# Build sdk
 		$Filename = Resolve-Path ".\nuget\cef.sdk.props"
@@ -513,6 +515,8 @@ try
 		{
 			appveyor PushArtifact "nuget\cef.redist.x86.$CefPackageVersion.nupkg"
 			appveyor PushArtifact "nuget\cef.redist.x64.$CefPackageVersion.nupkg"
+			appveyor PushArtifact "nuget\cef.redist.win.x86.$CefPackageVersion.nupkg"
+			appveyor PushArtifact "nuget\cef.redist.win.x64.$CefPackageVersion.nupkg"
 			appveyor PushArtifact "nuget\cef.sdk.$CefPackageVersion.nupkg"
 		}
 	}

From ae4305c31e7310c3ac832781a1087a30afbfc474 Mon Sep 17 00:00:00 2001
From: amaitland <amaitland@users.noreply.github.com>
Date: Sun, 3 Nov 2019 09:07:57 +1000
Subject: [PATCH 2/7] Initial cef.redist.win.nuspec

---
 NuGet/cef.redist.win.nuspec | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/NuGet/cef.redist.win.nuspec b/NuGet/cef.redist.win.nuspec
index a2af833..08dbb9c 100644
--- a/NuGet/cef.redist.win.nuspec
+++ b/NuGet/cef.redist.win.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
-    <id>cef.redist.win.$Platform$</id>
+    <id>cef.redist.win-$Platform$</id>
     <version>$version$</version>
     <authors>The Chromium Embedded Framework Authors</authors>
     <owners>The CefSharp Authors</owners>
@@ -15,18 +15,14 @@
     <copyright>Copyright © 2008-2019</copyright>
   </metadata>
   <files>
-    <file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\*.dll" target="runtimes\win-$Platform$\native" />
     <file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\swiftshader\*.dll" target="runtimes\win-$Platform$\native\swiftshader" />
-    <!-- Since CEF 3.2357 the files natives_blob.bin and snapshot_blob.bin need to be distributed.
-         https://groups.google.com/a/chromium.org/forum/#!topic/chromium-packagers/75J9Y1vIc_E
-         http://www.magpcss.org/ceforum/viewtopic.php?f=6&t=12580
-     -->
+	<file src="..\cef_binary_3.y.z_$CPlatform$\Resources\locales\*.pak" target="runtimes\win-$Platform$\native\locales"/>
+	<file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\*.dll" target="runtimes\win-$Platform$\native" />
     <file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\*.bin" target="runtimes\win-$Platform$\native\" />
     <file src="..\cef_binary_3.y.z_$CPlatform$\Resources\*.pak" target="runtimes\win-$Platform$\native\"/>
     <file src="..\cef_binary_3.y.z_$CPlatform$\Resources\*.dat" target="runtimes\win-$Platform$\native\"/>
-    <file src="..\cef_binary_3.y.z_$CPlatform$\Resources\locales\*.pak" target="runtimes\win-$Platform$\native\locales"/>
 	<file src="..\cef_binary_3.y.z_$CPlatform$\Readme.txt" target="\"/>
 
-    <file src="cef.redist.win.$Platform$.props" target="build\" />
+    <file src="cef.redist.win-$Platform$.props" target="build\" />
   </files>
 </package>

From facc19cdfef8852bcfef73f5f9f8b11bf86194e5 Mon Sep 17 00:00:00 2001
From: Matthias Hoste <42743095+lifecoder-phoenix@users.noreply.github.com>
Date: Wed, 27 Nov 2019 20:17:20 +0100
Subject: [PATCH 3/7] Add minClientVersion 4.0.0, used by vs2017 (#84)

---
 NuGet/cef.redist.win.nuspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NuGet/cef.redist.win.nuspec b/NuGet/cef.redist.win.nuspec
index 08dbb9c..e8b99b5 100644
--- a/NuGet/cef.redist.win.nuspec
+++ b/NuGet/cef.redist.win.nuspec
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
+  <metadata minClientVersion="4.0.0">
     <id>cef.redist.win-$Platform$</id>
     <version>$version$</version>
     <authors>The Chromium Embedded Framework Authors</authors>

From 7f2b5a5d73bff2b4bf93326f3ad2a8594dfb4ebe Mon Sep 17 00:00:00 2001
From: amaitland <amaitland@users.noreply.github.com>
Date: Mon, 13 Jan 2020 21:26:35 +1000
Subject: [PATCH 4/7] Nupkg - Include ContentFiles for swiftshader and locales

- Upgrade nuget.exe to version 5.4 (was previously 2.8)
- Add new logo (converted existing gif to png), the logo is now included in the package
- Rename props files as they didn't match the new naming convention
- Add contentFiles metadata element
- Copy swiftshader/locales into the runtimes\win-x64\native folder so they're relative to libcef.dll

NOTE: Only minimal testing so far, loaded into a .Net Core 3 MinimalExample solution, files are copied as expected.
The swiftshader and locales folders aren't in the runtimeconfig.json

TODO:
- Try installing both x86 and x64 into same project.
- Test with just having a .Net 4.8 PackageReference project

References:
https://docs.microsoft.com/en-us/nuget/reference/nuspec#specifying-files-to-include-in-the-package
https://devblogs.microsoft.com/nuget/nuget-contentfiles-demystified/
https://stackoverflow.com/questions/56844233/additional-probing-paths-for-net-core-3-migration
---
 ...win.x64.props => cef.redist.win-x64.props} |   6 ---
 ...win.x86.props => cef.redist.win-x86.props} |   6 ---
 NuGet/cef.redist.win.nuspec                   |  42 +++++++++++++++---
 NuGet/cef128x128.png                          | Bin 0 -> 12397 bytes
 build.ps1                                     |   4 +-
 5 files changed, 37 insertions(+), 21 deletions(-)
 rename NuGet/{cef.redist.win.x64.props => cef.redist.win-x64.props} (62%)
 rename NuGet/{cef.redist.win.x86.props => cef.redist.win-x86.props} (61%)
 create mode 100644 NuGet/cef128x128.png

diff --git a/NuGet/cef.redist.win.x64.props b/NuGet/cef.redist.win-x64.props
similarity index 62%
rename from NuGet/cef.redist.win.x64.props
rename to NuGet/cef.redist.win-x64.props
index ad44dde..14d3326 100644
--- a/NuGet/cef.redist.win.x64.props
+++ b/NuGet/cef.redist.win-x64.props
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--
-    Files are no longer copied as part of this targets file.
-    For projects other than CefSharp define a target to copy the files.
-    Checkout the CefSharp.Common.targets file for an example
-    -->
-  
   <!--
 	Using wildcard matching as per https://stackoverflow.com/a/17252671
     -->  
diff --git a/NuGet/cef.redist.win.x86.props b/NuGet/cef.redist.win-x86.props
similarity index 61%
rename from NuGet/cef.redist.win.x86.props
rename to NuGet/cef.redist.win-x86.props
index 6bdad49..7429391 100644
--- a/NuGet/cef.redist.win.x86.props
+++ b/NuGet/cef.redist.win-x86.props
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--
-    Files are no longer copied as part of this targets file.
-    For projects other than CefSharp define a target to copy the files.
-    Checkout the CefSharp.Common.targets file for an example
-    -->
-  
   <!--
 	Using wildcard matching as per https://stackoverflow.com/a/17252671
     -->
diff --git a/NuGet/cef.redist.win.nuspec b/NuGet/cef.redist.win.nuspec
index e8b99b5..79d9e3a 100644
--- a/NuGet/cef.redist.win.nuspec
+++ b/NuGet/cef.redist.win.nuspec
@@ -6,23 +6,51 @@
     <authors>The Chromium Embedded Framework Authors</authors>
     <owners>The CefSharp Authors</owners>
     <projectUrl>https://github.com/cefsharp/cef-binary</projectUrl>
-    <iconUrl>https://raw.github.com/cefsharp/cef-binary/master/NuGet/cef128x128.gif</iconUrl>
-    <licenseUrl>https://raw.github.com/cefsharp/cef-binary/master/LICENSE.txt</licenseUrl>
+    <icon>images\cef128x128.png</icon>
+    <license type="file">LICENSE.txt</license>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>CEF - the Chromium Embedded Framework.
+	<!--
+	TODO: Add repository link for CEF release branch and commit
+	https://docs.microsoft.com/en-us/nuget/reference/nuspec#repository
+	-->
+	<!--
+	<repository type="git" url="https://bitbucket.org/chromiumembedded/cef.git" branch="3945" commit="7ec49fabd56beae20e6b4c825c085231140c3b36" />
+	-->
+    <description>Chromium Embedded Framework (CEF) Release Distribution
     NOTE: This package is maintained on behalf of the CEF authors by the CefSharp project at http://github.com/cefsharp/cef-binary</description>
     <tags>chrome chromium native embedded browser CEF nativepackage</tags>
-    <copyright>Copyright © 2008-2019</copyright>
+    <copyright>Copyright © 2008-2020</copyright>
+	<contentFiles>
+		<!--
+		Architecture-specific files folder hierarchy lost (native subfolders) 
+		https://github.com/NuGet/Home/issues/7698#issuecomment-455368655
+		We have to copy swiftshader and locales via contentFiles
+		-->
+		<files include="any\any\runtimes\**" buildAction="Content" copyToOutput="true" />
+	</contentFiles>
   </metadata>
   <files>
-    <file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\swiftshader\*.dll" target="runtimes\win-$Platform$\native\swiftshader" />
-	<file src="..\cef_binary_3.y.z_$CPlatform$\Resources\locales\*.pak" target="runtimes\win-$Platform$\native\locales"/>
 	<file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\*.dll" target="runtimes\win-$Platform$\native" />
     <file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\*.bin" target="runtimes\win-$Platform$\native\" />
     <file src="..\cef_binary_3.y.z_$CPlatform$\Resources\*.pak" target="runtimes\win-$Platform$\native\"/>
     <file src="..\cef_binary_3.y.z_$CPlatform$\Resources\*.dat" target="runtimes\win-$Platform$\native\"/>
 	<file src="..\cef_binary_3.y.z_$CPlatform$\Readme.txt" target="\"/>
+	
+	<!--
+	PackageReference projects only support ContentFiles while packages.config only support content
+	So we have to copy the files twice (thankfully zip will negate any size concerns for the nupkg, extra space on disk though)
+	https://docs.microsoft.com/en-us/nuget/reference/nuspec#including-content-files
+	-->
+	<file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\swiftshader\*.dll" target="contentFiles\any\any\runtimes\win-x64\native\swiftshader" />
+	<file src="..\cef_binary_3.y.z_$CPlatform$\Resources\locales\*.pak" target="contentFiles\any\any\runtimes\win-x64\native\locales"/>
+	
+	<!-- Commented out for now, will need testing, focus on PackageReference format -->
+	<!-- <file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\swiftshader\*.dll" target="content\swiftshader" /> -->
+	<!-- <file src="..\cef_binary_3.y.z_$CPlatform$\Resources\locales\*.pak" target="content\locales"/> -->
 
-    <file src="cef.redist.win-$Platform$.props" target="build\" />
+	<file src="cef.redist.win-$Platform$.props" target="build\" />
+	
+	<file src="..\LICENSE.txt" target="" />
+	<file src="cef128x128.png" target="images\" />
   </files>
 </package>
diff --git a/NuGet/cef128x128.png b/NuGet/cef128x128.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6456caeb9e177ad6dac83260f4827ac38623ff3
GIT binary patch
literal 12397
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
B$58+P

literal 0
HcmV?d00001

diff --git a/build.ps1 b/build.ps1
index 449516d..7676044 100644
--- a/build.ps1
+++ b/build.ps1
@@ -14,7 +14,7 @@ param(
 	[string] $CefBinaryDir = "../cefsource/chromium/src/cef/binary_distrib/",
 
 	[Parameter(Position = 3)]
-	$CefVersion = "77.1.11+g1687a63+chromium-77.0.3865.90",
+	$CefVersion = "79.1.10+g7ec49fa+chromium-79.0.3945.117",
 
 	[ValidateSet("tar.bz2","zip","7z")]
 	[Parameter(Position = 4)]
@@ -533,7 +533,7 @@ try
 			}
 			
 			$Client = New-Object System.Net.WebClient;
-			$Client.DownloadFile('http://nuget.org/nuget.exe', $Nuget);
+			$Client.DownloadFile('https://dist.nuget.org/win-x86-commandline/v5.4.0/nuget.exe', $Nuget);
 		}
 	}
 

From 5a4ef68901a7206eb3aa929520223efc1ea7a70b Mon Sep 17 00:00:00 2001
From: amaitland <amaitland@users.noreply.github.com>
Date: Tue, 14 Jan 2020 08:08:16 +1000
Subject: [PATCH 5/7] cef.redist.win-x64/x86.props - Add props for swiftshader
 and locales

Swiftshader and locales are in the contentFiles folder so we need to include individual props
(They could technically be compiled into a single prop, have separate for now)
---
 NuGet/cef.redist.win-x64.props | 2 ++
 NuGet/cef.redist.win-x86.props | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/NuGet/cef.redist.win-x64.props b/NuGet/cef.redist.win-x64.props
index 14d3326..5e852bd 100644
--- a/NuGet/cef.redist.win-x64.props
+++ b/NuGet/cef.redist.win-x64.props
@@ -5,5 +5,7 @@
     -->  
   <ItemGroup>
     <CefRedist64 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\**\*.*" />
+	<CefRedistLocales64 Include="$(MSBuildThisFileDirectory)..\contentFiles\any\any\runtimes\win-x64\native\locales\*.*" />
+	<CefRedistSwiftShader64 Include="$(MSBuildThisFileDirectory)..\contentFiles\any\any\runtimes\win-x64\native\swiftshader\*.*" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/NuGet/cef.redist.win-x86.props b/NuGet/cef.redist.win-x86.props
index 7429391..05d42c8 100644
--- a/NuGet/cef.redist.win-x86.props
+++ b/NuGet/cef.redist.win-x86.props
@@ -5,5 +5,7 @@
     -->
   <ItemGroup>
     <CefRedist32 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\native\**\*.*" />
+	<CefRedistLocales32 Include="$(MSBuildThisFileDirectory)..\contentFiles\any\any\runtimes\win-x86\native\locales\*.*" />
+	<CefRedistSwiftShader32 Include="$(MSBuildThisFileDirectory)..\contentFiles\any\any\runtimes\win-x86\native\swiftshader\*.*" />
   </ItemGroup>
 </Project>
\ No newline at end of file

From 330e8d0098d31631996072610992ba94a6ed0d65 Mon Sep 17 00:00:00 2001
From: amaitland <amaitland@users.noreply.github.com>
Date: Tue, 14 Jan 2020 08:12:02 +1000
Subject: [PATCH 6/7] Formatting - Tabs to spaces

---
 NuGet/cef.redist.win-x64.props |  6 ++--
 NuGet/cef.redist.win-x86.props |  6 ++--
 NuGet/cef.redist.win.nuspec    | 66 +++++++++++++++++-----------------
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/NuGet/cef.redist.win-x64.props b/NuGet/cef.redist.win-x64.props
index 5e852bd..c5320ec 100644
--- a/NuGet/cef.redist.win-x64.props
+++ b/NuGet/cef.redist.win-x64.props
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!--
-	Using wildcard matching as per https://stackoverflow.com/a/17252671
+    Using wildcard matching as per https://stackoverflow.com/a/17252671
     -->  
   <ItemGroup>
     <CefRedist64 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\**\*.*" />
-	<CefRedistLocales64 Include="$(MSBuildThisFileDirectory)..\contentFiles\any\any\runtimes\win-x64\native\locales\*.*" />
-	<CefRedistSwiftShader64 Include="$(MSBuildThisFileDirectory)..\contentFiles\any\any\runtimes\win-x64\native\swiftshader\*.*" />
+    <CefRedistLocales64 Include="$(MSBuildThisFileDirectory)..\contentFiles\any\any\runtimes\win-x64\native\locales\*.*" />
+    <CefRedistSwiftShader64 Include="$(MSBuildThisFileDirectory)..\contentFiles\any\any\runtimes\win-x64\native\swiftshader\*.*" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/NuGet/cef.redist.win-x86.props b/NuGet/cef.redist.win-x86.props
index 05d42c8..097eb75 100644
--- a/NuGet/cef.redist.win-x86.props
+++ b/NuGet/cef.redist.win-x86.props
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!--
-	Using wildcard matching as per https://stackoverflow.com/a/17252671
+    Using wildcard matching as per https://stackoverflow.com/a/17252671
     -->
   <ItemGroup>
     <CefRedist32 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\native\**\*.*" />
-	<CefRedistLocales32 Include="$(MSBuildThisFileDirectory)..\contentFiles\any\any\runtimes\win-x86\native\locales\*.*" />
-	<CefRedistSwiftShader32 Include="$(MSBuildThisFileDirectory)..\contentFiles\any\any\runtimes\win-x86\native\swiftshader\*.*" />
+    <CefRedistLocales32 Include="$(MSBuildThisFileDirectory)..\contentFiles\any\any\runtimes\win-x86\native\locales\*.*" />
+    <CefRedistSwiftShader32 Include="$(MSBuildThisFileDirectory)..\contentFiles\any\any\runtimes\win-x86\native\swiftshader\*.*" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/NuGet/cef.redist.win.nuspec b/NuGet/cef.redist.win.nuspec
index 79d9e3a..ded00dd 100644
--- a/NuGet/cef.redist.win.nuspec
+++ b/NuGet/cef.redist.win.nuspec
@@ -9,48 +9,48 @@
     <icon>images\cef128x128.png</icon>
     <license type="file">LICENSE.txt</license>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-	<!--
-	TODO: Add repository link for CEF release branch and commit
-	https://docs.microsoft.com/en-us/nuget/reference/nuspec#repository
-	-->
-	<!--
-	<repository type="git" url="https://bitbucket.org/chromiumembedded/cef.git" branch="3945" commit="7ec49fabd56beae20e6b4c825c085231140c3b36" />
-	-->
+    <!--
+    TODO: Add repository link for CEF release branch and commit
+    https://docs.microsoft.com/en-us/nuget/reference/nuspec#repository
+    -->
+    <!--
+    <repository type="git" url="https://bitbucket.org/chromiumembedded/cef.git" branch="3945" commit="7ec49fabd56beae20e6b4c825c085231140c3b36" />
+    -->
     <description>Chromium Embedded Framework (CEF) Release Distribution
     NOTE: This package is maintained on behalf of the CEF authors by the CefSharp project at http://github.com/cefsharp/cef-binary</description>
     <tags>chrome chromium native embedded browser CEF nativepackage</tags>
     <copyright>Copyright © 2008-2020</copyright>
-	<contentFiles>
-		<!--
-		Architecture-specific files folder hierarchy lost (native subfolders) 
-		https://github.com/NuGet/Home/issues/7698#issuecomment-455368655
-		We have to copy swiftshader and locales via contentFiles
-		-->
-		<files include="any\any\runtimes\**" buildAction="Content" copyToOutput="true" />
-	</contentFiles>
+    <contentFiles>
+        <!--
+        Architecture-specific files folder hierarchy lost (native subfolders) 
+        https://github.com/NuGet/Home/issues/7698#issuecomment-455368655
+        We have to copy swiftshader and locales via contentFiles
+        -->
+        <files include="any\any\runtimes\**" buildAction="Content" copyToOutput="true" />
+    </contentFiles>
   </metadata>
   <files>
-	<file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\*.dll" target="runtimes\win-$Platform$\native" />
+    <file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\*.dll" target="runtimes\win-$Platform$\native" />
     <file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\*.bin" target="runtimes\win-$Platform$\native\" />
     <file src="..\cef_binary_3.y.z_$CPlatform$\Resources\*.pak" target="runtimes\win-$Platform$\native\"/>
     <file src="..\cef_binary_3.y.z_$CPlatform$\Resources\*.dat" target="runtimes\win-$Platform$\native\"/>
-	<file src="..\cef_binary_3.y.z_$CPlatform$\Readme.txt" target="\"/>
-	
-	<!--
-	PackageReference projects only support ContentFiles while packages.config only support content
-	So we have to copy the files twice (thankfully zip will negate any size concerns for the nupkg, extra space on disk though)
-	https://docs.microsoft.com/en-us/nuget/reference/nuspec#including-content-files
-	-->
-	<file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\swiftshader\*.dll" target="contentFiles\any\any\runtimes\win-x64\native\swiftshader" />
-	<file src="..\cef_binary_3.y.z_$CPlatform$\Resources\locales\*.pak" target="contentFiles\any\any\runtimes\win-x64\native\locales"/>
-	
-	<!-- Commented out for now, will need testing, focus on PackageReference format -->
-	<!-- <file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\swiftshader\*.dll" target="content\swiftshader" /> -->
-	<!-- <file src="..\cef_binary_3.y.z_$CPlatform$\Resources\locales\*.pak" target="content\locales"/> -->
+    <file src="..\cef_binary_3.y.z_$CPlatform$\Readme.txt" target="\"/>
+    
+    <!--
+    PackageReference projects only support ContentFiles while packages.config only support content
+    So we have to copy the files twice (thankfully zip will negate any size concerns for the nupkg, extra space on disk though)
+    https://docs.microsoft.com/en-us/nuget/reference/nuspec#including-content-files
+    -->
+    <file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\swiftshader\*.dll" target="contentFiles\any\any\runtimes\win-x64\native\swiftshader" />
+    <file src="..\cef_binary_3.y.z_$CPlatform$\Resources\locales\*.pak" target="contentFiles\any\any\runtimes\win-x64\native\locales"/>
+    
+    <!-- Commented out for now, will need testing, focus on PackageReference format -->
+    <!-- <file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\swiftshader\*.dll" target="content\swiftshader" /> -->
+    <!-- <file src="..\cef_binary_3.y.z_$CPlatform$\Resources\locales\*.pak" target="content\locales"/> -->
 
-	<file src="cef.redist.win-$Platform$.props" target="build\" />
-	
-	<file src="..\LICENSE.txt" target="" />
-	<file src="cef128x128.png" target="images\" />
+    <file src="cef.redist.win-$Platform$.props" target="build\" />
+    
+    <file src="..\LICENSE.txt" target="" />
+    <file src="cef128x128.png" target="images\" />
   </files>
 </package>

From 30cffcf96c196031a524d48d833f9a6a89e24948 Mon Sep 17 00:00:00 2001
From: amaitland <amaitland@users.noreply.github.com>
Date: Tue, 14 Jan 2020 10:48:24 +1000
Subject: [PATCH 7/7] Rename packages from cef.redist to
 chromiumembeddedframework.redist

Makes it clearer it's the chromium embedded framework, also makes it easier to distinguish between old and new when working on the code
---
 ...ops => chromiumembeddedframework.redist.win-x64.props} | 0
 ...ops => chromiumembeddedframework.redist.win-x86.props} | 0
 ...nuspec => chromiumembeddedframework.redist.win.nuspec} | 4 ++--
 build.ps1                                                 | 8 ++++----
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename NuGet/{cef.redist.win-x64.props => chromiumembeddedframework.redist.win-x64.props} (100%)
 rename NuGet/{cef.redist.win-x86.props => chromiumembeddedframework.redist.win-x86.props} (100%)
 rename NuGet/{cef.redist.win.nuspec => chromiumembeddedframework.redist.win.nuspec} (95%)

diff --git a/NuGet/cef.redist.win-x64.props b/NuGet/chromiumembeddedframework.redist.win-x64.props
similarity index 100%
rename from NuGet/cef.redist.win-x64.props
rename to NuGet/chromiumembeddedframework.redist.win-x64.props
diff --git a/NuGet/cef.redist.win-x86.props b/NuGet/chromiumembeddedframework.redist.win-x86.props
similarity index 100%
rename from NuGet/cef.redist.win-x86.props
rename to NuGet/chromiumembeddedframework.redist.win-x86.props
diff --git a/NuGet/cef.redist.win.nuspec b/NuGet/chromiumembeddedframework.redist.win.nuspec
similarity index 95%
rename from NuGet/cef.redist.win.nuspec
rename to NuGet/chromiumembeddedframework.redist.win.nuspec
index ded00dd..269f347 100644
--- a/NuGet/cef.redist.win.nuspec
+++ b/NuGet/chromiumembeddedframework.redist.win.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata minClientVersion="4.0.0">
-    <id>cef.redist.win-$Platform$</id>
+    <id>chromiumembeddedframework.redist.win-$Platform$</id>
     <version>$version$</version>
     <authors>The Chromium Embedded Framework Authors</authors>
     <owners>The CefSharp Authors</owners>
@@ -48,7 +48,7 @@
     <!-- <file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\swiftshader\*.dll" target="content\swiftshader" /> -->
     <!-- <file src="..\cef_binary_3.y.z_$CPlatform$\Resources\locales\*.pak" target="content\locales"/> -->
 
-    <file src="cef.redist.win-$Platform$.props" target="build\" />
+    <file src="chromiumembeddedframework.redist.win-$Platform$.props" target="build\" />
     
     <file src="..\LICENSE.txt" target="" />
     <file src="cef128x128.png" target="images\" />
diff --git a/build.ps1 b/build.ps1
index 7676044..c514b71 100644
--- a/build.ps1
+++ b/build.ps1
@@ -498,11 +498,11 @@ try
 
 		# Build 32bit packages
 		. $Nuget pack nuget\cef.redist.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;Platform=x86;CPlatform=windows32;' -OutputDirectory nuget
-		. $Nuget pack nuget\cef.redist.win.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;Platform=x86;CPlatform=windows32;' -OutputDirectory nuget
+		. $Nuget pack nuget\chromiumembeddedframework.redist.win.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;Platform=x86;CPlatform=windows32;' -OutputDirectory nuget
 
 		# Build 64bit packages
 		. $Nuget pack nuget\cef.redist.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;Platform=x64;CPlatform=windows64;' -OutputDirectory nuget
-		. $Nuget pack nuget\cef.redist.win.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;Platform=x64;CPlatform=windows64;' -OutputDirectory nuget
+		. $Nuget pack nuget\chromiumembeddedframework.redist.win.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;Platform=x64;CPlatform=windows64;' -OutputDirectory nuget
 
 		# Build sdk
 		$Filename = Resolve-Path ".\nuget\cef.sdk.props"
@@ -515,8 +515,8 @@ try
 		{
 			appveyor PushArtifact "nuget\cef.redist.x86.$CefPackageVersion.nupkg"
 			appveyor PushArtifact "nuget\cef.redist.x64.$CefPackageVersion.nupkg"
-			appveyor PushArtifact "nuget\cef.redist.win.x86.$CefPackageVersion.nupkg"
-			appveyor PushArtifact "nuget\cef.redist.win.x64.$CefPackageVersion.nupkg"
+			appveyor PushArtifact "nuget\chromiumembeddedframework.redist.win-x86.$CefPackageVersion.nupkg"
+			appveyor PushArtifact "nuget\chromiumembeddedframework.redist.win-x64.$CefPackageVersion.nupkg"
 			appveyor PushArtifact "nuget\cef.sdk.$CefPackageVersion.nupkg"
 		}
 	}