chromiumembeddedframework.runtime - move swiftshader/locales

Move the swiftshader and locales folders from the RID specific packages
and into the general runtime, combine the properties into a single props file.

the buildtransative props files were only accessible if the RID specific packages
were directly referenced.

Author: amaitland

NuGet/chromiumembeddedframework.runtime.json

@@ -2,12 +2,12 @@
   "runtimes": {
     "win-x64": {
       "chromiumembeddedframework.runtime": {
-        "chromiumembeddedframework.runtime.win-x64": "86.0.17"
+        "chromiumembeddedframework.runtime.win-x64": "86.0.20"
       }
     },
     "win-x86": {
       "chromiumembeddedframework.runtime": {
-        "chromiumembeddedframework.runtime.win-x86": "86.0.17"
+        "chromiumembeddedframework.runtime.win-x86": "86.0.20"
       }
     }
   }

NuGet/chromiumembeddedframework.runtime.nuspec

@@ -22,8 +22,16 @@
     <copyright>Copyright © 2008-2020</copyright>
   </metadata>
   <files>
+	<!-- 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 manually -->
+    <file src="..\cef_binary_3.y.z_windows32\Resources\locales\*.pak" target="CEF\win-x86\locales"/>
+    <file src="..\cef_binary_3.y.z_windows32\$Configuration$\swiftshader\*.dll" target="CEF\win-x86\swiftshader" />
+	<file src="..\cef_binary_3.y.z_windows64\Resources\locales\*.pak" target="CEF\win-x64\locales"/>
+    <file src="..\cef_binary_3.y.z_windows64\$Configuration$\swiftshader\*.dll" target="CEF\win-x64\swiftshader" />
     <file src="..\cef_binary_3.y.z_windows32\LICENSE.txt" target="LICENSE.txt" />
     <file src="chromiumembeddedframework.runtime.json" target="runtime.json" />
+	<file src="chromiumembeddedframework.runtime.props" target="buildTransitive\" />
     <file src="cef128x128.png" target="images\" />
   </files>
 </package>

NuGet/chromiumembeddedframework.runtime.win-x86.props renamed to NuGet/chromiumembeddedframework.runtime.props

@@ -2,10 +2,11 @@
 <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)..\CEF\locales\*.*" />
-    <CefRuntimeWin32SwiftShader Include="$(MSBuildThisFileDirectory)..\CEF\swiftshader\*.*" />
+    <CefRuntimeWin32Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-x86\locales\*.*" />
+    <CefRuntimeWin32SwiftShader Include="$(MSBuildThisFileDirectory)..\CEF\win-x86\swiftshader\*.*" />
+	<CefRuntimeWin64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-x64\locales\*.*" />
+    <CefRuntimeWin64SwiftShader Include="$(MSBuildThisFileDirectory)..\CEF\win-x64\swiftshader\*.*" />
   </ItemGroup>
 </Project>

NuGet/chromiumembeddedframework.runtime.win-x64.props

@@ -22,18 +22,11 @@
     <copyright>Copyright © 2008-2020</copyright>
   </metadata>
   <files>
-    <!-- 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 manually -->
-    <file src="..\cef_binary_3.y.z_$CPlatform$\Resources\locales\*.pak" target="CEF\locales"/>
-    <file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\swiftshader\*.dll" target="CEF\swiftshader" />
     <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="\"/>
-
-    <file src="chromiumembeddedframework.runtime.win-$Platform$.props" target="buildTransitive\" />
 
     <file src="..\cef_binary_3.y.z_windows32\LICENSE.txt" target="LICENSE.txt" />
     <file src="cef128x128.png" target="images\" />

NuGet/chromiumembeddedframework.runtime.win.nuspec

@@ -14,7 +14,7 @@ param(
 	[string] $CefBinaryDir = "../cefsource/chromium/src/cef/binary_distrib/",
 
 	[Parameter(Position = 3)]
-	$CefVersion = "86.0.17+g4a33048+chromium-86.0.4240.75",
+	$CefVersion = "86.0.20+gf2039ae+chromium-86.0.4240.111",
 
 	[ValidateSet("tar.bz2","zip","7z")]
 	[Parameter(Position = 4)]