Skip to content

Commit

Permalink
Split cef.redist.targets into x86 and x64
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@amaitland
amaitland committed Dec 24, 2017
1 parent 3ad3be2 commit 18b9d74
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 36 deletions.
1 change: 0 additions & 1 deletion NuGet/cef-binary-x64.txt
View file

This file was deleted.

1 change: 0 additions & 1 deletion NuGet/cef-binary-x86.txt
View file

This file was deleted.

3 changes: 1 addition & 2 deletions NuGet/cef.redist.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<file src="..\cef_binary_3.y.z_$CPlatform$\Resources\*.dat" target="CEF\"/>
<file src="..\cef_binary_3.y.z_$CPlatform$\Resources\locales\*.pak" target="CEF\locales"/>

<file src="cef.redist.targets" target="build\cef.redist.$Platform$$DotConfiguration$.targets" />
<file src="cef-binary-$Platform$.txt" target="CEF\" />
<file src="cef.redist.$Platform$.targets" target="build\" />
</files>
</package>
25 changes: 0 additions & 25 deletions NuGet/cef.redist.targets
View file

This file was deleted.

15 changes: 15 additions & 0 deletions NuGet/cef.redist.x64.targets
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?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
-->

<!--
Using wildcard matching as per https://stackoverflow.com/a/17252671
-->
<ItemGroup>
<CefRedist64 Include="$(MSBuildThisFileDirectory)..\CEF\**\*.*" />
</ItemGroup>
</Project>
15 changes: 15 additions & 0 deletions NuGet/cef.redist.x86.targets
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?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
-->

<!--
Using wildcard matching as per https://stackoverflow.com/a/17252671
-->
<ItemGroup>
<CefRedist32 Include="$(MSBuildThisFileDirectory)..\CEF\**\*.*" />
</ItemGroup>
</Project>
8 changes: 3 additions & 5 deletions appveyor.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@ artifacts:
- path: NuGet\*.nupkg
name: nupkgfiles

# Publish to myget.org feed
# Publish to appveyor nuget feed
deploy:
provider: NuGet
server: https://www.myget.org/F/cefsharp/api/v2/package
server: https://ci.appveyor.com/nuget/cefsharp-ci

This comment has been minimized.

Sign in to view

Copy link
@perlun

perlun Dec 25, 2017 •
edited
Loading

Member

Do you think it would be ok to fix #63 now so that it just "always pushes" a version to AppVeyor, for each PR? Or do you think it will be a bad idea, with loads of "extra" packages being built and published there?

(I know MyGet had support for keeping a "rolling number" of packages, so that old packages would automatically discarded. Maybe AppVeyor has something similar.)

This comment has been minimized.

Sign in to view

Copy link
@amaitland

amaitland Dec 25, 2017

Author Member

AppVeyor seems very limited in their Nuget support, which isn't surprising as it's not their primary focus. I'm not quite sure how to managed packages or even if it's possible. Currently the feed is password protected, and I haven't found a way to disable that, so this might be a short lived changed. I'll keep trying as It seems like a simple solution for now, we can always add the AppVeyor Feed as a package source for MyGet and have it mirror packages as required.

Do you think it would be ok to fix #63 now so that it just "always pushes" a version to AppVeyor, for each PR?

To get around the build numbering problems without a lot of work we can simply only publish packages for a tagged release. Every build produces a set of artifacts currently, so you can always manually download the nuget files that were produced. An example is https://ci.appveyor.com/project/cefsharp/cef-binary/build/63.0.0-CI41/artifacts
api_key:
secure: uftPtLACVpFbbbFBeFK6XD5fGkv33c+Xa3PWkyWgrod6FNl4AYGOtxScn+gsuuxD
skip_symbols: false
symbol_server: https://www.myget.org/F/cefsharp/api/v2/package
secure: vNESC6IT/8JSw4bcX9i68/mj0K1Jhq1apofM4pQtbuw=
artifact: nupkgfiles
4 changes: 2 additions & 2 deletions build.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,10 +377,10 @@ function Nupkg
}

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

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

# Build sdk
$Filename = Resolve-Path ".\nuget\cef.sdk.props"
Expand Down

0 comments on commit 18b9d74

Please sign in to comment.