Skip to content

Remove cef.redist packages #110

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 3 commits into from
Feb 4, 2024
Merged

Remove cef.redist packages #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2204890
Remove cef.redist packages
amaitland Jan 28, 2024
9b2e136
Change props names to match convention set in runtime package
amaitland Feb 4, 2024
66c96fc
Add Copy targets for Locales and fix naming
amaitland Feb 4, 2024
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
31 changes: 0 additions & 31 deletions NuGet/cef.redist.nuspec
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion NuGet/cef.sdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.95.7.8</CefSdkVer>
<CefSdkVer>cef.sdk.121.2.14</CefSdkVer>
</PropertyGroup>
</Project>
6 changes: 3 additions & 3 deletions NuGet/chromiumembeddedframework.runtime.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"runtimes": {
"win-x64": {
"chromiumembeddedframework.runtime": {
"chromiumembeddedframework.runtime.win-x64": "95.7.8"
"chromiumembeddedframework.runtime.win-x64": "121.2.14"
}
},
"win-x86": {
"chromiumembeddedframework.runtime": {
"chromiumembeddedframework.runtime.win-x86": "95.7.8"
"chromiumembeddedframework.runtime.win-x86": "121.2.14"
}
},
"win-arm64": {
"chromiumembeddedframework.runtime": {
"chromiumembeddedframework.runtime.win-arm64": "95.7.8"
"chromiumembeddedframework.runtime.win-arm64": "121.2.14"
}
},
}
Expand Down
1 change: 1 addition & 0 deletions NuGet/chromiumembeddedframework.runtime.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<file src="..\cef_binary_3.y.z_windowsarm64\Resources\locales\*.pak" target="CEF\win-arm64\locales"/>
<file src="..\cef\LICENSE.txt" target="LICENSE.txt" />
<file src="chromiumembeddedframework.runtime.json" target="runtime.json" />
<file src="chromiumembeddedframework.runtime.props" target="build\" />
<file src="chromiumembeddedframework.runtime.props" target="buildTransitive\" />
<file src="cef128x128.png" target="images\" />
</files>
Expand Down
54 changes: 54 additions & 0 deletions NuGet/chromiumembeddedframework.runtime.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,58 @@
<CefRuntimeWin64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-x64\locales\*.*" />
<CefRuntimeWinArm64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-arm64\locales\*.*" />
</ItemGroup>

<Target Name="CefRedist32CopyLocales">
<PropertyGroup>
<_CefRedist32TargetDir>$(CefRedist32TargetDir)</_CefRedist32TargetDir>
<_CefRedist32TargetDir Condition="'$(_CefRedist32TargetDir)' == ''">$(TargetDir)</_CefRedist32TargetDir>
<_CefRedist32TargetDir>$(_CefRedist32TargetDir)\locales</_CefRedist32TargetDir>
</PropertyGroup>
<!--
Cannot gurantee access to the main CefRuntimeWin32Locales ItemGroup here
so we create a duplicate inside our target.
https://github.com/dotnet/project-system/issues/4158
-->
<ItemGroup>
<_CefRedist32Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-x86\locales\*.*" />
</ItemGroup>
<Message Importance="high" Text="Copying Chromium Embedded Framework Locales x86 files from $(MSBuildThisFileDirectory)..\CEF\win-x86\locales to $(CefRedist32TargetDir)\locales" />
<Copy SourceFiles="@(_CefRedist32)" DestinationFiles="@(_CefRedist32Locales->'$(_CefRedist32TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
</Target>

<Target Name="CefRedist64CopyLocales">
<PropertyGroup>
<_CefRedist64TargetDir>$(CefRedist64TargetDir)</_CefRedist64TargetDir>
<_CefRedist64TargetDir Condition="'$(_CefRedist64TargetDir)' == ''">$(TargetDir)</_CefRedist64TargetDir>
<_CefRedist64TargetDir>$(_CefRedist64TargetDir)\locales</_CefRedist64TargetDir>
</PropertyGroup>
<!--
Cannot gurantee access to the main CefRuntimeWin64Locales ItemGroup here
so we create a duplicate inside our target.
https://github.com/dotnet/project-system/issues/4158
-->
<ItemGroup>
<_CefRedist64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-x64\locales\*.*" />
</ItemGroup>
<Message Importance="high" Text="Copying Chromium Embedded Framework Locales x64 files from $(MSBuildThisFileDirectory)..\CEF\win-x64\locales to $(CefRedist64TargetDir)\locales" />
<Copy SourceFiles="@(_CefRedist64)" DestinationFiles="@(_CefRedist64Locales->'$(_CefRedist64TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
</Target>

<Target Name="CefRedistArm64CopyLocales">
<PropertyGroup>
<_CefRedistArm64TargetDir>$(CefRedistArm64TargetDir)</_CefRedistArm64TargetDir>
<_CefRedistArm64TargetDir Condition="'$(_CefRedistArm64TargetDir)' == ''">$(TargetDir)</_CefRedistArm64TargetDir>
<_CefRedistArm64TargetDir>$(_CefRedistArm64TargetDir)\locales</_CefRedistArm64TargetDir>
</PropertyGroup>
<!--
Cannot gurantee access to the main CefRuntimeWinArm64Locales ItemGroup here
so we create a duplicate inside our target.
https://github.com/dotnet/project-system/issues/4158
-->
<ItemGroup>
<_CefRedistArm64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-arm64\locales\*.*" />
</ItemGroup>
<Message Importance="high" Text="Copying Chromium Embedded Framework Locales arm64 files from $(MSBuildThisFileDirectory)..\CEF\win-arm64\locales\ to $(CefRedistArm64TargetDir)\locales" />
<Copy SourceFiles="@(_CefRedistArm64)" DestinationFiles="@(_CefRedistArm64Locales->'$(_CefRedistArm64TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
</Target>
</Project>
28 changes: 28 additions & 0 deletions NuGet/chromiumembeddedframework.runtime.win-arm64.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--
Files are no longer copied as part of this targets file.
For projects other than CefSharp define a target to copy the files.
Checkout the CefSharp.Common.targets file for an example
-->

<ItemGroup>
<CefRuntimeWinArm64 Include="$(MSBuildThisFileDirectory)..\runtimes\win-arm64\native\*.*" />
</ItemGroup>

<Target Name="CefRedistArm64CopyResources">
<PropertyGroup>
<CefRedistArm64TargetDir Condition="'$(CefRedistArm64TargetDir)' == ''">$(TargetDir)</CefRedistArm64TargetDir>
</PropertyGroup>
<!--
Cannot gurantee access to the main CefRuntimeWinArm64 ItemGroup here
so we create a duplicate inside our target.
https://github.com/dotnet/project-system/issues/4158
-->
<ItemGroup>
<_CefRuntimeWinArm64 Include="$(MSBuildThisFileDirectory)..\runtimes\win-arm64\native\*.*" />
</ItemGroup>
<Message Importance="high" Text="Copying Chromium Embedded Framework Runtime arm64 files from $(MSBuildThisFileDirectory)..\runtimes\win-arm64\native to $(CefRedistArm64TargetDir)" />
<Copy SourceFiles="@(_CefRuntimeWinArm64)" DestinationFiles="@(_CefRuntimeWinArm64->'$(CefRedistArm64TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
</Target>
</Project>
13 changes: 5 additions & 8 deletions NuGet/cef.redist.x64.props → ...umembeddedframework.runtime.win-x64.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,23 @@
Checkout the CefSharp.Common.targets file for an example
-->

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

<Target Name="CefRedist64CopyResources">
<PropertyGroup>
<CefRedist64TargetDir Condition="'$(CefRedist64TargetDir)' == ''">$(TargetDir)</CefRedist64TargetDir>
</PropertyGroup>
<!--
Cannot gurantee access to the main CefRedist64 ItemGroup here
Cannot gurantee access to the main CefRuntimeWin64 ItemGroup here
so we create a duplicate inside our target.
https://github.com/dotnet/project-system/issues/4158
-->
<ItemGroup>
<_CefRedist64 Include="$(MSBuildThisFileDirectory)..\CEF\**\*.*" />
<_CefRuntimeWin64 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\*.*" />
</ItemGroup>
<Message Importance="high" Text="Copying CEF Redist x64 files from $(MSBuildThisFileDirectory)..\CEF to $(CefRedist64TargetDir)" />
<Copy SourceFiles="@(_CefRedist64)" DestinationFiles="@(_CefRedist64->'$(CefRedist64TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
<Message Importance="high" Text="Copying Chromium Embedded Framework Runtime x64 files from $(MSBuildThisFileDirectory)..\runtimes\win-x64\native to $(CefRedist64TargetDir)" />
<Copy SourceFiles="@(_CefRuntimeWin64)" DestinationFiles="@(_CefRuntimeWin64->'$(CefRedist64TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
</Target>
</Project>
13 changes: 5 additions & 8 deletions NuGet/cef.redist.x86.props → ...umembeddedframework.runtime.win-x86.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,23 @@
Checkout the CefSharp.Common.targets file for an example
-->

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

<Target Name="CefRedist32CopyResources">
<PropertyGroup>
<CefRedist32TargetDir Condition="'$(CefRedist32TargetDir)' == ''">$(TargetDir)</CefRedist32TargetDir>
</PropertyGroup>
<!--
Cannot gurantee access to the main CefRedist32 ItemGroup here
Cannot gurantee access to the main CefRuntimeWin32 ItemGroup here
so we create a duplicate inside our target.
https://github.com/dotnet/project-system/issues/4158
-->
<ItemGroup>
<_CefRedist32 Include="$(MSBuildThisFileDirectory)..\CEF\**\*.*" />
<_CefRuntimeWin32 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\native\*.*" />
</ItemGroup>
<Message Importance="high" Text="Copying CEF Redist x86 files from $(MSBuildThisFileDirectory)..\CEF to $(CefRedist32TargetDir)" />
<Copy SourceFiles="@(_CefRedist32)" DestinationFiles="@(_CefRedist32->'$(CefRedist32TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
<Message Importance="high" Text="Copying Chromium Embedded Framework Runtime x86 files from $(MSBuildThisFileDirectory)..\runtimes\win-x86\native to $(CefRedist32TargetDir)" />
<Copy SourceFiles="@(_CefRuntimeWin32)" DestinationFiles="@(_CefRuntimeWin32->'$(CefRedist32TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
</Target>
</Project>
4 changes: 3 additions & 1 deletion NuGet/chromiumembeddedframework.runtime.win.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,14 @@
<copyright>Copyright © 2008-2021</copyright>
</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$\*.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$\$Configuration$\*.json" 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="build\" />
<file src="chromiumembeddedframework.runtime.win-$Platform$.props" target="buildTransitive\" />

<file src="..\cef_binary_3.y.z_$CPlatform$\LICENSE.txt" target="LICENSE.txt" />
<file src="cef128x128.png" target="images\" />
Expand Down
7 changes: 1 addition & 6 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 = "95.7.8+g69b7dc3+chromium-95.0.4638.17",
$CefVersion = "121.2.14+ga44b59f+chromium-121.0.6167.75",

[ValidateSet("tar.bz2","zip","7z")]
[Parameter(Position = 4)]
Expand Down Expand Up @@ -438,11 +438,6 @@ function Nupkg
$archLong = $platform.ArchLong

# Build packages
if ($arch -ne "arm64")
{
. $Nuget pack nuget\cef.redist.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties "Configuration=Release;Platform=$arch;CPlatform=$archLong;" -OutputDirectory nuget
}

. $Nuget pack nuget\chromiumembeddedframework.runtime.win.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties "Configuration=Release;Platform=$arch;CPlatform=$archLong;" -OutputDirectory nuget
}

Expand Down