diff --git a/NuGet/cef.redist.nuspec b/NuGet/cef.redist.nuspec deleted file mode 100644 index 680fdba..0000000 --- a/NuGet/cef.redist.nuspec +++ /dev/null @@ -1,31 +0,0 @@ - - - - cef.redist.$Platform$ - $version$ - The Chromium Embedded Framework Authors - The CefSharp Authors - https://github.com/cefsharp/cef-binary - https://raw.github.com/cefsharp/cef-binary/master/NuGet/cef128x128.gif - LICENSE.txt - false - CEF - the Chromium Embedded Framework. - NOTE: This package is maintained on behalf of the CEF authors by the CefSharp project at http://github.com/cefsharp/cef-binary - chrome chromium native embedded browser CEF nativepackage - Copyright © 2008-2021 - - - - - - - - - - - - - - - - diff --git a/NuGet/cef.sdk.props b/NuGet/cef.sdk.props index 795d807..ebe59a6 100644 --- a/NuGet/cef.sdk.props +++ b/NuGet/cef.sdk.props @@ -1,6 +1,6 @@ - cef.sdk.95.7.8 + cef.sdk.121.2.14 diff --git a/NuGet/chromiumembeddedframework.runtime.json b/NuGet/chromiumembeddedframework.runtime.json index 7a3c4b5..518fe36 100644 --- a/NuGet/chromiumembeddedframework.runtime.json +++ b/NuGet/chromiumembeddedframework.runtime.json @@ -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" } }, } diff --git a/NuGet/chromiumembeddedframework.runtime.nuspec b/NuGet/chromiumembeddedframework.runtime.nuspec index bc586c2..ef1fd41 100644 --- a/NuGet/chromiumembeddedframework.runtime.nuspec +++ b/NuGet/chromiumembeddedframework.runtime.nuspec @@ -30,6 +30,7 @@ + diff --git a/NuGet/chromiumembeddedframework.runtime.props b/NuGet/chromiumembeddedframework.runtime.props index e8a0eac..f303a74 100644 --- a/NuGet/chromiumembeddedframework.runtime.props +++ b/NuGet/chromiumembeddedframework.runtime.props @@ -8,4 +8,58 @@ + + + + <_CefRedist32TargetDir>$(CefRedist32TargetDir) + <_CefRedist32TargetDir Condition="'$(_CefRedist32TargetDir)' == ''">$(TargetDir) + <_CefRedist32TargetDir>$(_CefRedist32TargetDir)\locales + + + + <_CefRedist32Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-x86\locales\*.*" /> + + + + + + + + <_CefRedist64TargetDir>$(CefRedist64TargetDir) + <_CefRedist64TargetDir Condition="'$(_CefRedist64TargetDir)' == ''">$(TargetDir) + <_CefRedist64TargetDir>$(_CefRedist64TargetDir)\locales + + + + <_CefRedist64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-x64\locales\*.*" /> + + + + + + + + <_CefRedistArm64TargetDir>$(CefRedistArm64TargetDir) + <_CefRedistArm64TargetDir Condition="'$(_CefRedistArm64TargetDir)' == ''">$(TargetDir) + <_CefRedistArm64TargetDir>$(_CefRedistArm64TargetDir)\locales + + + + <_CefRedistArm64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-arm64\locales\*.*" /> + + + + \ No newline at end of file diff --git a/NuGet/chromiumembeddedframework.runtime.win-arm64.props b/NuGet/chromiumembeddedframework.runtime.win-arm64.props new file mode 100644 index 0000000..1cfb33e --- /dev/null +++ b/NuGet/chromiumembeddedframework.runtime.win-arm64.props @@ -0,0 +1,28 @@ + + + + + + + + + + + $(TargetDir) + + + + <_CefRuntimeWinArm64 Include="$(MSBuildThisFileDirectory)..\runtimes\win-arm64\native\*.*" /> + + + + + \ No newline at end of file diff --git a/NuGet/cef.redist.x64.props b/NuGet/chromiumembeddedframework.runtime.win-x64.props similarity index 54% rename from NuGet/cef.redist.x64.props rename to NuGet/chromiumembeddedframework.runtime.win-x64.props index 78bc32d..fc4fb38 100644 --- a/NuGet/cef.redist.x64.props +++ b/NuGet/chromiumembeddedframework.runtime.win-x64.props @@ -6,11 +6,8 @@ Checkout the CefSharp.Common.targets file for an example --> - - + @@ -18,14 +15,14 @@ $(TargetDir) - <_CefRedist64 Include="$(MSBuildThisFileDirectory)..\CEF\**\*.*" /> + <_CefRuntimeWin64 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\*.*" /> - - + + \ No newline at end of file diff --git a/NuGet/cef.redist.x86.props b/NuGet/chromiumembeddedframework.runtime.win-x86.props similarity index 54% rename from NuGet/cef.redist.x86.props rename to NuGet/chromiumembeddedframework.runtime.win-x86.props index 30766c5..04c5d44 100644 --- a/NuGet/cef.redist.x86.props +++ b/NuGet/chromiumembeddedframework.runtime.win-x86.props @@ -6,11 +6,8 @@ Checkout the CefSharp.Common.targets file for an example --> - - + @@ -18,14 +15,14 @@ $(TargetDir) - <_CefRedist32 Include="$(MSBuildThisFileDirectory)..\CEF\**\*.*" /> + <_CefRuntimeWin32 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\native\*.*" /> - - + + \ No newline at end of file diff --git a/NuGet/chromiumembeddedframework.runtime.win.nuspec b/NuGet/chromiumembeddedframework.runtime.win.nuspec index 95339c2..36bd1b5 100644 --- a/NuGet/chromiumembeddedframework.runtime.win.nuspec +++ b/NuGet/chromiumembeddedframework.runtime.win.nuspec @@ -22,12 +22,14 @@ Copyright © 2008-2021 - + + + diff --git a/build.ps1 b/build.ps1 index fbcf79b..48480ad 100644 --- a/build.ps1 +++ b/build.ps1 @@ -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)] @@ -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 }