Skip to content

Commit

Permalink
Merge branch 'release/0.7.0'
Browse files Browse the repository at this point in the history
* release/0.7.0:
  (GH-41) Use embedded license in NuGet package
  (GH-39) Add repository metadata to NuGet package
  (GH-37) Update Wyam to 2.2.5
  (build) Correctly invalidate cache on AppVeyor
  (build)  Build with Cake.Recipe 1.0.0
  • Loading branch information
gep13 committed Jul 29, 2019
2 parents 89302cf + 83caf22 commit cc8f3f2
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ branches:
# Build Cache #
#---------------------------------#
cache:
- tools -> setup.cake
- tools -> recipe.cake
3 changes: 2 additions & 1 deletion Cake.Wyam.Recipe/Cake.Wyam.Recipe.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@
<authors>gep13</authors>
<owners>cake-contrib, gep13</owners>
<description>Re-usable build script for Cake that can be used for numerous Wyam projects.</description>
<licenseUrl>https://github.com/cake-contrib/Cake.Wyam.Recipe/blob/develop/LICENSE</licenseUrl>
<license type="expression">MIT</license>
<projectUrl>http://cake-contrib.github.io/Cake.Wyam.Recipe/</projectUrl>
<iconUrl>https://cdn.rawgit.com/cake-contrib/graphics/a5cf0f881c390650144b2243ae551d5b9f836196/png/cake-contrib-medium.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<repository type="git" url="https://github.com/cake-contrib/Cake.Wyam.Recipe.git"/>
<tags>Build Cake Wyam Recipe</tags>
</metadata>
</package>
2 changes: 1 addition & 1 deletion Cake.Wyam.Recipe/Content/addins.cake
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#addin nuget:?package=Cake.Figlet&version=1.2.0
#addin nuget:?package=Cake.Git&version=0.19.0
#addin nuget:?package=Cake.Kudu&version=0.8.0
#addin nuget:?package=Cake.Wyam&version=2.1.0
#addin nuget:?package=Cake.Wyam&version=2.2.5
#addin nuget:?package=Cake.Http&version=0.5.0

Action<string, IDictionary<string, string>> RequireAddin = (code, envVars) => {
Expand Down
2 changes: 1 addition & 1 deletion Cake.Wyam.Recipe/Content/tools.cake
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
///////////////////////////////////////////////////////////////////////////////

private const string KuduSyncTool = "#tool nuget:?package=KuduSync.NET&version=1.4.0";
private const string WyamTool = "#tool nuget:?package=Wyam&version=2.1.0";
private const string WyamTool = "#tool nuget:?package=Wyam&version=2.2.5";

Action<string, Action> RequireTool = (tool, action) => {
var script = MakeAbsolute(File(string.Format("./{0}.cake", Guid.NewGuid())));
Expand Down
2 changes: 1 addition & 1 deletion recipe.cake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#load nuget:https://www.myget.org/F/cake-contrib/api/v2?package=Cake.Recipe&prerelease&version=0.3.0-unstable0403
#load nuget:?package=Cake.Recipe&version=1.0.0

Environment.SetVariableNames();

Expand Down
2 changes: 1 addition & 1 deletion tools/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Cake" version="0.30.0" />
<package id="Cake" version="0.32.1" />
</packages>

0 comments on commit cc8f3f2

Please sign in to comment.