Rename chromiumembeddedframework.redist to chromiumembeddedframework.runtime

Author: amaitland

NuGet/cef.sdk.props

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <CefSdkVer>cef.sdk.77.1.11</CefSdkVer>
+    <CefSdkVer>cef.sdk.84.4.0</CefSdkVer>
   </PropertyGroup>
 </Project>

NuGet/chromiumembeddedframework.redist.win-x64.props

@@ -0,0 +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
+    -->  
+  <ItemGroup>
+    <CefRuntimeWin64 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\**\*.*" />
+    <CefRuntimeWin64Locales Include="$(MSBuildThisFileDirectory)..\contentFiles\any\any\runtimes\win-x64\native\locales\*.*" />
+    <CefRuntimeWin64SwiftShader Include="$(MSBuildThisFileDirectory)..\contentFiles\any\any\runtimes\win-x64\native\swiftshader\*.*" />
+  </ItemGroup>
+</Project>

NuGet/chromiumembeddedframework.redist.win-x86.props

@@ -0,0 +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
+    -->
+  <ItemGroup>
+    <CefRuntimeWin32 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\native\**\*.*" />
+    <CefRuntimeWin32Locales Include="$(MSBuildThisFileDirectory)..\contentFiles\any\any\runtimes\win-x86\native\locales\*.*" />
+    <CefRuntimeWin32SwiftShader Include="$(MSBuildThisFileDirectory)..\contentFiles\any\any\runtimes\win-x86\native\swiftshader\*.*" />
+  </ItemGroup>
+</Project>

NuGet/chromiumembeddedframework.runtime.win-x64.props

@@ -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>chromiumembeddedframework.redist.win-$Platform$</id>
+    <id>chromiumembeddedframework.runtime.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="chromiumembeddedframework.redist.win-$Platform$.props" target="build\" />
+    <file src="chromiumembeddedframework.runtime.win-$Platform$.props" target="build\" />
 
     <file src="..\LICENSE.txt" target="" />
     <file src="cef128x128.png" target="images\" />

NuGet/chromiumembeddedframework.runtime.win-x86.props

@@ -1,6 +1,6 @@
 image: Visual Studio 2017
 
-version: 75.0.0-CI{build}
+version: 84.4.0-CI{build}
 
 shallow_clone: true
 

NuGet/chromiumembeddedframework.redist.win.nuspec renamed to NuGet/chromiumembeddedframework.runtime.win.nuspec

@@ -14,7 +14,7 @@ param(
 	[string] $CefBinaryDir = "../cefsource/chromium/src/cef/binary_distrib/",
 
 	[Parameter(Position = 3)]
-	$CefVersion = "79.1.10+g7ec49fa+chromium-79.0.3945.117",
+	$CefVersion = "84.4.0+g304e015+chromium-84.0.4147.105",
 
 	[ValidateSet("tar.bz2","zip","7z")]
 	[Parameter(Position = 4)]
@@ -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\chromiumembeddedframework.redist.win.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;Platform=x86;CPlatform=windows32;' -OutputDirectory nuget
+		. $Nuget pack nuget\chromiumembeddedframework.runtime.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\chromiumembeddedframework.redist.win.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;Platform=x64;CPlatform=windows64;' -OutputDirectory nuget
+		. $Nuget pack nuget\chromiumembeddedframework.runtime.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\chromiumembeddedframework.redist.win-x86.$CefPackageVersion.nupkg"
-			appveyor PushArtifact "nuget\chromiumembeddedframework.redist.win-x64.$CefPackageVersion.nupkg"
+			appveyor PushArtifact "nuget\chromiumembeddedframework.runtime.win-x86.$CefPackageVersion.nupkg"
+			appveyor PushArtifact "nuget\chromiumembeddedframework.runtime.win-x64.$CefPackageVersion.nupkg"
 			appveyor PushArtifact "nuget\cef.sdk.$CefPackageVersion.nupkg"
 		}
 	}