Skip to content

Commit a4a5dd1

Browse files
amaitlandamaitland
authored
Remove cef.redist packages (#110)
* Remove cef.redist packages * Change props names to match convention set in runtime package * Add Copy targets for Locales and fix naming Issue #93
1 parent a5c6a54 commit a4a5dd1

10 files changed

+101
-58
lines changed

‎NuGet/cef.redist.nuspec‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎NuGet/cef.sdk.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<CefSdkVer>cef.sdk.95.7.8</CefSdkVer>
4+
<CefSdkVer>cef.sdk.121.2.14</CefSdkVer>
55
</PropertyGroup>
66
</Project>

‎NuGet/chromiumembeddedframework.runtime.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
"runtimes": {
33
"win-x64": {
44
"chromiumembeddedframework.runtime": {
5-
"chromiumembeddedframework.runtime.win-x64": "95.7.8"
5+
"chromiumembeddedframework.runtime.win-x64": "121.2.14"
66
}
77
},
88
"win-x86": {
99
"chromiumembeddedframework.runtime": {
10-
"chromiumembeddedframework.runtime.win-x86": "95.7.8"
10+
"chromiumembeddedframework.runtime.win-x86": "121.2.14"
1111
}
1212
},
1313
"win-arm64": {
1414
"chromiumembeddedframework.runtime": {
15-
"chromiumembeddedframework.runtime.win-arm64": "95.7.8"
15+
"chromiumembeddedframework.runtime.win-arm64": "121.2.14"
1616
}
1717
},
1818
}

‎NuGet/chromiumembeddedframework.runtime.nuspec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<file src="..\cef_binary_3.y.z_windowsarm64\Resources\locales\*.pak" target="CEF\win-arm64\locales"/>
3131
<file src="..\cef\LICENSE.txt" target="LICENSE.txt" />
3232
<file src="chromiumembeddedframework.runtime.json" target="runtime.json" />
33+
<file src="chromiumembeddedframework.runtime.props" target="build\" />
3334
<file src="chromiumembeddedframework.runtime.props" target="buildTransitive\" />
3435
<file src="cef128x128.png" target="images\" />
3536
</files>

‎NuGet/chromiumembeddedframework.runtime.props‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,58 @@
88
<CefRuntimeWin64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-x64\locales\*.*" />
99
<CefRuntimeWinArm64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-arm64\locales\*.*" />
1010
</ItemGroup>
11+
12+
<Target Name="CefRedist32CopyLocales">
13+
<PropertyGroup>
14+
<_CefRedist32TargetDir>$(CefRedist32TargetDir)</_CefRedist32TargetDir>
15+
<_CefRedist32TargetDir Condition="'$(_CefRedist32TargetDir)' == ''">$(TargetDir)</_CefRedist32TargetDir>
16+
<_CefRedist32TargetDir>$(_CefRedist32TargetDir)\locales</_CefRedist32TargetDir>
17+
</PropertyGroup>
18+
<!--
19+
Cannot gurantee access to the main CefRuntimeWin32Locales ItemGroup here
20+
so we create a duplicate inside our target.
21+
https://github.com/dotnet/project-system/issues/4158
22+
-->
23+
<ItemGroup>
24+
<_CefRedist32Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-x86\locales\*.*" />
25+
</ItemGroup>
26+
<Message Importance="high" Text="Copying Chromium Embedded Framework Locales x86 files from $(MSBuildThisFileDirectory)..\CEF\win-x86\locales to $(CefRedist32TargetDir)\locales" />
27+
<Copy SourceFiles="@(_CefRedist32)" DestinationFiles="@(_CefRedist32Locales->'$(_CefRedist32TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
28+
</Target>
29+
30+
<Target Name="CefRedist64CopyLocales">
31+
<PropertyGroup>
32+
<_CefRedist64TargetDir>$(CefRedist64TargetDir)</_CefRedist64TargetDir>
33+
<_CefRedist64TargetDir Condition="'$(_CefRedist64TargetDir)' == ''">$(TargetDir)</_CefRedist64TargetDir>
34+
<_CefRedist64TargetDir>$(_CefRedist64TargetDir)\locales</_CefRedist64TargetDir>
35+
</PropertyGroup>
36+
<!--
37+
Cannot gurantee access to the main CefRuntimeWin64Locales ItemGroup here
38+
so we create a duplicate inside our target.
39+
https://github.com/dotnet/project-system/issues/4158
40+
-->
41+
<ItemGroup>
42+
<_CefRedist64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-x64\locales\*.*" />
43+
</ItemGroup>
44+
<Message Importance="high" Text="Copying Chromium Embedded Framework Locales x64 files from $(MSBuildThisFileDirectory)..\CEF\win-x64\locales to $(CefRedist64TargetDir)\locales" />
45+
<Copy SourceFiles="@(_CefRedist64)" DestinationFiles="@(_CefRedist64Locales->'$(_CefRedist64TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
46+
</Target>
47+
48+
<Target Name="CefRedistArm64CopyLocales">
49+
<PropertyGroup>
50+
<_CefRedistArm64TargetDir>$(CefRedistArm64TargetDir)</_CefRedistArm64TargetDir>
51+
<_CefRedistArm64TargetDir Condition="'$(_CefRedistArm64TargetDir)' == ''">$(TargetDir)</_CefRedistArm64TargetDir>
52+
<_CefRedistArm64TargetDir>$(_CefRedistArm64TargetDir)\locales</_CefRedistArm64TargetDir>
53+
</PropertyGroup>
54+
<!--
55+
Cannot gurantee access to the main CefRuntimeWinArm64Locales ItemGroup here
56+
so we create a duplicate inside our target.
57+
https://github.com/dotnet/project-system/issues/4158
58+
-->
59+
<ItemGroup>
60+
<_CefRedistArm64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-arm64\locales\*.*" />
61+
</ItemGroup>
62+
<Message Importance="high" Text="Copying Chromium Embedded Framework Locales arm64 files from $(MSBuildThisFileDirectory)..\CEF\win-arm64\locales\ to $(CefRedistArm64TargetDir)\locales" />
63+
<Copy SourceFiles="@(_CefRedistArm64)" DestinationFiles="@(_CefRedistArm64Locales->'$(_CefRedistArm64TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
64+
</Target>
1165
</Project>

‎NuGet/chromiumembeddedframework.runtime.win-arm64.props‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<!--
4+
Files are no longer copied as part of this targets file.
5+
For projects other than CefSharp define a target to copy the files.
6+
Checkout the CefSharp.Common.targets file for an example
7+
-->
8+
9+
<ItemGroup>
10+
<CefRuntimeWinArm64 Include="$(MSBuildThisFileDirectory)..\runtimes\win-arm64\native\*.*" />
11+
</ItemGroup>
12+
13+
<Target Name="CefRedistArm64CopyResources">
14+
<PropertyGroup>
15+
<CefRedistArm64TargetDir Condition="'$(CefRedistArm64TargetDir)' == ''">$(TargetDir)</CefRedistArm64TargetDir>
16+
</PropertyGroup>
17+
<!--
18+
Cannot gurantee access to the main CefRuntimeWinArm64 ItemGroup here
19+
so we create a duplicate inside our target.
20+
https://github.com/dotnet/project-system/issues/4158
21+
-->
22+
<ItemGroup>
23+
<_CefRuntimeWinArm64 Include="$(MSBuildThisFileDirectory)..\runtimes\win-arm64\native\*.*" />
24+
</ItemGroup>
25+
<Message Importance="high" Text="Copying Chromium Embedded Framework Runtime arm64 files from $(MSBuildThisFileDirectory)..\runtimes\win-arm64\native to $(CefRedistArm64TargetDir)" />
26+
<Copy SourceFiles="@(_CefRuntimeWinArm64)" DestinationFiles="@(_CefRuntimeWinArm64->'$(CefRedistArm64TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
27+
</Target>
28+
</Project>

‎NuGet/cef.redist.x64.props‎ renamed to ‎NuGet/chromiumembeddedframework.runtime.win-x64.props‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,23 @@
66
Checkout the CefSharp.Common.targets file for an example
77
-->
88

9-
<!--
10-
Using wildcard matching as per https://stackoverflow.com/a/17252671
11-
-->
129
<ItemGroup>
13-
<CefRedist64 Include="$(MSBuildThisFileDirectory)..\CEF\**\*.*" />
10+
<CefRuntimeWin64 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\*.*" />
1411
</ItemGroup>
1512

1613
<Target Name="CefRedist64CopyResources">
1714
<PropertyGroup>
1815
<CefRedist64TargetDir Condition="'$(CefRedist64TargetDir)' == ''">$(TargetDir)</CefRedist64TargetDir>
1916
</PropertyGroup>
2017
<!--
21-
Cannot gurantee access to the main CefRedist64 ItemGroup here
18+
Cannot gurantee access to the main CefRuntimeWin64 ItemGroup here
2219
so we create a duplicate inside our target.
2320
https://github.com/dotnet/project-system/issues/4158
2421
-->
2522
<ItemGroup>
26-
<_CefRedist64 Include="$(MSBuildThisFileDirectory)..\CEF\**\*.*" />
23+
<_CefRuntimeWin64 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\*.*" />
2724
</ItemGroup>
28-
<Message Importance="high" Text="Copying CEF Redist x64 files from $(MSBuildThisFileDirectory)..\CEF to $(CefRedist64TargetDir)" />
29-
<Copy SourceFiles="@(_CefRedist64)" DestinationFiles="@(_CefRedist64->'$(CefRedist64TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
25+
<Message Importance="high" Text="Copying Chromium Embedded Framework Runtime x64 files from $(MSBuildThisFileDirectory)..\runtimes\win-x64\native to $(CefRedist64TargetDir)" />
26+
<Copy SourceFiles="@(_CefRuntimeWin64)" DestinationFiles="@(_CefRuntimeWin64->'$(CefRedist64TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
3027
</Target>
3128
</Project>

‎NuGet/cef.redist.x86.props‎ renamed to ‎NuGet/chromiumembeddedframework.runtime.win-x86.props‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,23 @@
66
Checkout the CefSharp.Common.targets file for an example
77
-->
88

9-
<!--
10-
Using wildcard matching as per https://stackoverflow.com/a/17252671
11-
-->
129
<ItemGroup>
13-
<CefRedist32 Include="$(MSBuildThisFileDirectory)..\CEF\**\*.*" />
10+
<CefRuntimeWin32 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\native\*.*" />
1411
</ItemGroup>
1512

1613
<Target Name="CefRedist32CopyResources">
1714
<PropertyGroup>
1815
<CefRedist32TargetDir Condition="'$(CefRedist32TargetDir)' == ''">$(TargetDir)</CefRedist32TargetDir>
1916
</PropertyGroup>
2017
<!--
21-
Cannot gurantee access to the main CefRedist32 ItemGroup here
18+
Cannot gurantee access to the main CefRuntimeWin32 ItemGroup here
2219
so we create a duplicate inside our target.
2320
https://github.com/dotnet/project-system/issues/4158
2421
-->
2522
<ItemGroup>
26-
<_CefRedist32 Include="$(MSBuildThisFileDirectory)..\CEF\**\*.*" />
23+
<_CefRuntimeWin32 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\native\*.*" />
2724
</ItemGroup>
28-
<Message Importance="high" Text="Copying CEF Redist x86 files from $(MSBuildThisFileDirectory)..\CEF to $(CefRedist32TargetDir)" />
29-
<Copy SourceFiles="@(_CefRedist32)" DestinationFiles="@(_CefRedist32->'$(CefRedist32TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
25+
<Message Importance="high" Text="Copying Chromium Embedded Framework Runtime x86 files from $(MSBuildThisFileDirectory)..\runtimes\win-x86\native to $(CefRedist32TargetDir)" />
26+
<Copy SourceFiles="@(_CefRuntimeWin32)" DestinationFiles="@(_CefRuntimeWin32->'$(CefRedist32TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
3027
</Target>
3128
</Project>

‎NuGet/chromiumembeddedframework.runtime.win.nuspec‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,14 @@
2222
<copyright>Copyright © 2008-2021</copyright>
2323
</metadata>
2424
<files>
25-
<file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\*.dll" target="runtimes\win-$Platform$\native" />
25+
<file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\*.dll" target="runtimes\win-$Platform$\native\" />
2626
<file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\*.bin" target="runtimes\win-$Platform$\native\" />
2727
<file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\*.json" target="runtimes\win-$Platform$\native\" />
2828
<file src="..\cef_binary_3.y.z_$CPlatform$\Resources\*.pak" target="runtimes\win-$Platform$\native\"/>
2929
<file src="..\cef_binary_3.y.z_$CPlatform$\Resources\*.dat" target="runtimes\win-$Platform$\native\"/>
3030
<file src="..\cef_binary_3.y.z_$CPlatform$\Readme.txt" target="\"/>
31+
<file src="chromiumembeddedframework.runtime.win-$Platform$.props" target="build\" />
32+
<file src="chromiumembeddedframework.runtime.win-$Platform$.props" target="buildTransitive\" />
3133

3234
<file src="..\cef_binary_3.y.z_$CPlatform$\LICENSE.txt" target="LICENSE.txt" />
3335
<file src="cef128x128.png" target="images\" />

‎build.ps1‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ param(
1414
[string] $CefBinaryDir = "../cefsource/chromium/src/cef/binary_distrib/",
1515

1616
[Parameter(Position = 3)]
17-
$CefVersion = "95.7.8+g69b7dc3+chromium-95.0.4638.17",
17+
$CefVersion = "121.2.14+ga44b59f+chromium-121.0.6167.75",
1818

1919
[ValidateSet("tar.bz2","zip","7z")]
2020
[Parameter(Position = 4)]
@@ -444,11 +444,6 @@ function Nupkg
444444
$archLong = $platform.ArchLong
445445

446446
# Build packages
447-
if ($arch -ne "arm64")
448-
{
449-
. $Nuget pack nuget\cef.redist.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties "Configuration=Release;Platform=$arch;CPlatform=$archLong;" -OutputDirectory nuget
450-
}
451-
452447
. $Nuget pack nuget\chromiumembeddedframework.runtime.win.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties "Configuration=Release;Platform=$arch;CPlatform=$archLong;" -OutputDirectory nuget
453448
}
454449

0 commit comments

Comments
 (0)