Skip to content

Commit 5278f73

Browse files
committed
cef.redist 3.1650.1562-pre3 NuGet ... currently only with x86 .dll files
Former-commit-id: 2966877b847fd7e40912a80a4fd2d3c13bde2109
1 parent 8e1cbee commit 5278f73

File tree

3 files changed

+22
-19
lines changed

3 files changed

+22
-19
lines changed

NuGet/cef.redist.nuspec

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,26 @@
66
<authors>The Chromium Embedded Framework Authors</authors>
77
<owners>The CefSharp Authors</owners>
88
<projectUrl>https://github.com/cefsharp/cef-binary</projectUrl>
9-
<iconUrl>https://raw.github.com/jornh/cef-binary/fdc5894d5eb456ec3f389c37b2eeb6458e47a115/NuGet/cef32x32.gif</iconUrl>
9+
<iconUrl>https://raw.github.com/cefsharp/cef-binary/master/NuGet/cef128x128.gif</iconUrl>
10+
<licenseUrl>https://raw.github.com/cefsharp/cef-binary/master/cef_binary_3.y.z_windows32/LICENSE.txt</licenseUrl>
1011
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1112
<description>CEF - the Chromium Embedded Framework.
1213
NOTE: This package is maintained on behalf of the CEF authors by the CefSharp project at http://github.com/cefsharp/cef-binary</description>
1314
<tags>chrome chromium native embedded browser CEF nativepackage</tags>
14-
<copyright>Copyright © 2008-2013</copyright>
15+
<copyright>Copyright © 2008-2014</copyright>
1516
</metadata>
1617
<files>
1718
<!--
1819
CEF/Chromium files
1920
-->
20-
<file src="..\cef_binary_3.y.z_windows32\Release\icudt.dll" target="CEF\x86" />
21-
<file src="..\cef_binary_3.y.z_windows64\Release\icudt.dll" target="CEF\x64" />
22-
<file src="..\cef_binary_3.y.z_windows32\Release\libcef.dll" target="CEF\x86"/>
23-
<file src="..\cef_binary_3.y.z_windows64\Release\libcef.dll" target="CEF\x64"/>
24-
21+
<file src="..\cef_binary_3.y.z_windows32\Release\*.dll" target="CEF\x86" />
22+
<!-- <file src="..\cef_binary_3.y.z_windows64\Release\*.dll" target="CEF\x64" />
23+
-->
2524
<file src="..\cef_binary_3.y.z_windows32\Resources\cef.pak" target="CEF\"/>
2625
<file src="..\cef_binary_3.y.z_windows32\Resources\devtools_resources.pak" target="CEF\"/>
2726
<file src="..\cef_binary_3.y.z_windows32\Resources\locales\en-US.pak" target="CEF\locales"/>
2827

2928
<!-- <file src="Cef.props" target="build" /> -->
30-
<file src="Cef.targets" target="build" />
29+
<file src="cef.redist.targets" target="build" />
3130
</files>
3231
</package>

NuGet/cef.redist.targets

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Target Name="AfterBuild">
3+
<Target Name="CefRedistCopyDllPak" BeforeTargets="AfterBuild">
44
<ItemGroup>
55
<CefBinaries Include="$(MSBuildThisFileDirectory)..\CEF\$(Platform)\*.*" />
6-
<Locales Include="$(MSBuildThisFileDirectory)..\CEF\locales\*.*" />
7-
<CefSharpBinaries Include="$(MSBuildThisFileDirectory)..\CefSharp\$(Platform)\*.*" />
6+
<CefPakFiles Include="$(MSBuildThisFileDirectory)..\CEF\*.*" />
7+
<CefLocales Include="$(MSBuildThisFileDirectory)..\CEF\locales\*.*" />
88
</ItemGroup>
9-
<Message Importance="high" Text="Copying source files from $(MSBuildThisFileDirectory)..\CEF\$(Platform) to $(TargetDir)" />
9+
<Message Importance="high" Text="-- cef.redist.targets at $(MSBuildThisFileDirectory)" />
10+
11+
<Message Importance="high" Text="Copying CEF .dll files from $(MSBuildThisFileDirectory)..\CEF\$(Platform) to $(TargetDir)" />
1012
<Copy SourceFiles="@(CefBinaries)" DestinationFolder="$(TargetDir)" />
11-
<Message Importance="high" Text="Copying locales from $(MSBuildThisFileDirectory)..\CEF\locales to $(TargetDir)\locales" />
12-
<Copy SourceFiles="@(PakResources)" DestinationFolder="$(TargetDir)" />
13-
<Message Importance="high" Text="Copying .pak files from $(MSBuildThisFileDirectory)..\CEF to $(TargetDir)" />
14-
<Copy SourceFiles="@(Locales)" DestinationFolder="$(TargetDir)\locales" />
15-
<Message Importance="high" Text="Copying source files from $(MSBuildThisFileDirectory)..\CefSharp\$(Platform) to $(TargetDir)" />
16-
<Copy SourceFiles="@(CefSharpBinaries)" DestinationFolder="$(TargetDir)" />
13+
14+
<Message Importance="high" Text="Copying CEF .pak files from $(MSBuildThisFileDirectory)..\CEF to $(TargetDir)" />
15+
<Copy SourceFiles="@(CefPakFiles)" DestinationFolder="$(TargetDir)" />
16+
17+
<Message Importance="high" Text="Copying CEF locales from $(MSBuildThisFileDirectory)..\CEF\locales to $(TargetDir)\locales" />
18+
<Copy SourceFiles="@(CefLocales)" DestinationFolder="$(TargetDir)\locales" />
1719
</Target>
1820
</Project>

NuGet/pack.bat

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
set version=3.1650.1562-pre2
1+
set version=3.1650.1562-pre3
22
NuGet pack cef.redist.nuspec -NoPackageAnalysis -Version %version%
3+
NuGet pack cef.redist.x86.nuspec -NoPackageAnalysis -Version %version%
4+
NuGet pack cef.redist.x64.nuspec -NoPackageAnalysis -Version %version%
35
NuGet pack cef.sdk.nuspec -NoPackageAnalysis -Version %version%

0 commit comments

Comments
 (0)