Skip to content

Add chromiumembeddedframework.redist.win-x86/chromiumembeddedframework.redist.win-x64 packages #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 14, 2020
Merged

Add chromiumembeddedframework.redist.win-x86/chromiumembeddedframework.redist.win-x64 packages #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
662724f
Experimental - New native nuget packages
amaitland Oct 14, 2019
ae4305c
Initial cef.redist.win.nuspec
amaitland Nov 2, 2019
facc19c
Add minClientVersion 4.0.0, used by vs2017 (#84)
matthias-hoste Nov 27, 2019
7f2b5a5
Nupkg - Include ContentFiles for swiftshader and locales
amaitland Jan 13, 2020
5a4ef68
cef.redist.win-x64/x86.props - Add props for swiftshader and locales
amaitland Jan 13, 2020
330e8d0
Formatting - Tabs to spaces
amaitland Jan 13, 2020
30cffcf
Rename packages from cef.redist to chromiumembeddedframework.redist
amaitland Jan 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added NuGet/cef128x128.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions NuGet/chromiumembeddedframework.redist.win-x64.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
<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>
11 changes: 11 additions & 0 deletions NuGet/chromiumembeddedframework.redist.win-x86.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
<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>
56 changes: 56 additions & 0 deletions NuGet/chromiumembeddedframework.redist.win.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?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>
<version>$version$</version>
<authors>The Chromium Embedded Framework Authors</authors>
<owners>The CefSharp Authors</owners>
<projectUrl>https://github.com/cefsharp/cef-binary</projectUrl>
<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" />
-->
<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>
</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$\*.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="chromiumembeddedframework.redist.win-$Platform$.props" target="build\" />

<file src="..\LICENSE.txt" target="" />
<file src="cef128x128.png" target="images\" />
</files>
</package>
8 changes: 6 additions & 2 deletions build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down Expand Up @@ -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\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\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"
Expand All @@ -513,6 +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\cef.sdk.$CefPackageVersion.nupkg"
}
}
Expand All @@ -529,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);
}
}

Expand Down