Skip to content

Commit 7ef312f

Browse files
committed
Revert "Create new chromiumembeddedframework.runtime.resources package"
This reverts commit 0b04876.
1 parent 0b04876 commit 7ef312f

File tree

4 files changed

+16
-39
lines changed

4 files changed

+16
-39
lines changed

NuGet/chromiumembeddedframework.runtime.nuspec

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,19 @@
1919
<description>Chromium Embedded Framework (CEF) Release Distribution
2020
NOTE: This package is maintained on behalf of the CEF authors by the CefSharp project at http://github.com/cefsharp/cef-binary</description>
2121
<tags>chrome chromium native embedded browser CEF nativepackage</tags>
22-
<copyright>Copyright © 2008-2024</copyright>
22+
<copyright>Copyright © 2008-2021</copyright>
2323
</metadata>
2424
<files>
25+
<!-- Architecture-specific files folder hierarchy lost (native subfolders) -->
26+
<!-- https://github.com/NuGet/Home/issues/7698#issuecomment-455368655 -->
27+
<!-- We have to copy swiftshader and locales via manually -->
28+
<file src="..\cef_binary_3.y.z_windows32\Resources\locales\*.pak" target="CEF\win-x86\locales"/>
29+
<file src="..\cef_binary_3.y.z_windows64\Resources\locales\*.pak" target="CEF\win-x64\locales"/>
30+
<file src="..\cef_binary_3.y.z_windowsarm64\Resources\locales\*.pak" target="CEF\win-arm64\locales"/>
2531
<file src="..\cef\LICENSE.txt" target="LICENSE.txt" />
2632
<file src="chromiumembeddedframework.runtime.json" target="runtime.json" />
33+
<file src="chromiumembeddedframework.runtime.props" target="build\" />
34+
<file src="chromiumembeddedframework.runtime.props" target="buildTransitive\" />
2735
<file src="cef128x128.png" target="images\" />
2836
</files>
2937
</package>

NuGet/chromiumembeddedframework.runtime.resources.nuspec

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

build.ps1

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,13 @@ function Msvs
251251

252252
if($null -eq $VSInstallPath -or !(Test-Path $VSInstallPath))
253253
{
254-
Die "Visual Studio $VS_OFFICIAL_VER was not found"
254+
$VSInstallPath = & $global:VSwherePath -version $versionSearchStr -property installationPath -products 'Microsoft.VisualStudio.Product.BuildTools'
255+
Write-Diagnostic "BuildTools $($VS_OFFICIAL_VER)InstallPath: $VSInstallPath"
256+
257+
if($null -eq $VSInstallPath -or !(Test-Path $VSInstallPath))
258+
{
259+
Die "Visual Studio $VS_OFFICIAL_VER was not found"
260+
}
255261
}
256262

257263
$VisualStudioVersion = "$VS_VER.0"
@@ -443,7 +449,6 @@ function Nupkg
443449

444450
# Meta Package
445451
. $Nuget pack nuget\chromiumembeddedframework.runtime.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;' -OutputDirectory nuget
446-
. $Nuget pack nuget\chromiumembeddedframework.runtime.resources.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;' -OutputDirectory nuget
447452

448453
# Build sdk
449454
$Filename = Resolve-Path ".\nuget\cef.sdk.props"

0 commit comments

Comments
 (0)