Skip to content

Commit 18b9d74

Browse files
committed
Split cef.redist.targets into x86 and x64
Remove need for hack checks to determine if the target is a x86 or x64 build build.ps1 - Remove unused Nupkg variable Variable was empty and has been removed from nuspec file Switch to appveyor nuget feed
1 parent 3ad3be2 commit 18b9d74

File tree

8 files changed

+36
-36
lines changed

8 files changed

+36
-36
lines changed

NuGet/cef-binary-x64.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

NuGet/cef-binary-x86.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

NuGet/cef.redist.nuspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<file src="..\cef_binary_3.y.z_$CPlatform$\Resources\*.dat" target="CEF\"/>
2727
<file src="..\cef_binary_3.y.z_$CPlatform$\Resources\locales\*.pak" target="CEF\locales"/>
2828

29-
<file src="cef.redist.targets" target="build\cef.redist.$Platform$$DotConfiguration$.targets" />
30-
<file src="cef-binary-$Platform$.txt" target="CEF\" />
29+
<file src="cef.redist.$Platform$.targets" target="build\" />
3130
</files>
3231
</package>

NuGet/cef.redist.targets

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

NuGet/cef.redist.x64.targets

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
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+
<!--
10+
Using wildcard matching as per https://stackoverflow.com/a/17252671
11+
-->
12+
<ItemGroup>
13+
<CefRedist64 Include="$(MSBuildThisFileDirectory)..\CEF\**\*.*" />
14+
</ItemGroup>
15+
</Project>

NuGet/cef.redist.x86.targets

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
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+
<!--
10+
Using wildcard matching as per https://stackoverflow.com/a/17252671
11+
-->
12+
<ItemGroup>
13+
<CefRedist32 Include="$(MSBuildThisFileDirectory)..\CEF\**\*.*" />
14+
</ItemGroup>
15+
</Project>

appveyor.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@ artifacts:
1919
- path: NuGet\*.nupkg
2020
name: nupkgfiles
2121

22-
# Publish to myget.org feed
22+
# Publish to appveyor nuget feed
2323
deploy:
2424
provider: NuGet
25-
server: https://www.myget.org/F/cefsharp/api/v2/package
25+
server: https://ci.appveyor.com/nuget/cefsharp-ci
2626
api_key:
27-
secure: uftPtLACVpFbbbFBeFK6XD5fGkv33c+Xa3PWkyWgrod6FNl4AYGOtxScn+gsuuxD
28-
skip_symbols: false
29-
symbol_server: https://www.myget.org/F/cefsharp/api/v2/package
27+
secure: vNESC6IT/8JSw4bcX9i68/mj0K1Jhq1apofM4pQtbuw=
3028
artifact: nupkgfiles

build.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,10 +377,10 @@ function Nupkg
377377
}
378378

379379
# Build 32bit packages
380-
. $Nuget pack nuget\cef.redist.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;DotConfiguration=;Platform=x86;CPlatform=windows32;' -OutputDirectory nuget
380+
. $Nuget pack nuget\cef.redist.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;Platform=x86;CPlatform=windows32;' -OutputDirectory nuget
381381

382382
# Build 64bit packages
383-
. $Nuget pack nuget\cef.redist.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;DotConfiguration=;Platform=x64;CPlatform=windows64;' -OutputDirectory nuget
383+
. $Nuget pack nuget\cef.redist.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;Platform=x64;CPlatform=windows64;' -OutputDirectory nuget
384384

385385
# Build sdk
386386
$Filename = Resolve-Path ".\nuget\cef.sdk.props"

0 commit comments

Comments
 (0)