Skip to content

Commit

Permalink
Merge branch 'release/0.11.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
gep13 committed Apr 26, 2019
2 parents 4d65a20 + 9b99e00 commit bfffb64
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ branches:
#---------------------------------#
cache:
- Source\packages -> Source\**\packages.config
- tools -> setup.cake
- tools -> recipe.cake, tools/packages.config
2 changes: 1 addition & 1 deletion Source/Cake.Gitter.sln
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildScripts", "BuildScripts", "{92E2BE01-BDEE-44AB-8463-3A8203A8717E}"
ProjectSection(SolutionItems) = preProject
..\build.ps1 = ..\build.ps1
..\setup.cake = ..\setup.cake
..\recipe.cake = ..\recipe.cake
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AppVeyor", "AppVeyor", "{26E8879A-6313-4C47-B646-DCDC96653F07}"
Expand Down
4 changes: 2 additions & 2 deletions Source/Cake.Gitter/Cake.Gitter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Common" Version="0.28.0" PrivateAssets="All" />
<PackageReference Include="Cake.Core" Version="0.28.0" PrivateAssets="All" />
<PackageReference Include="Cake.Common" Version="0.33.0" PrivateAssets="All" />
<PackageReference Include="Cake.Core" Version="0.33.0" PrivateAssets="All" />
</ItemGroup>
</Project>
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>
2 changes: 1 addition & 1 deletion build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ http://cakebuild.net

[CmdletBinding()]
Param(
[string]$Script = "setup.cake",
[string]$Script = "recipe.cake",
[string]$Target = "Default",
[ValidateSet("Release", "Debug")]
[string]$Configuration = "Release",
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ else
fi

# Define default arguments.
SCRIPT="setup.cake"
SCRIPT="recipe.cake"
CAKE_ARGUMENTS=()

# Parse arguments.
Expand Down
5 changes: 3 additions & 2 deletions nuspec/nuget/Cake.Gitter.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
<owners>gep13, cake-contrib</owners>
<description>Cake Gitter AddIn.</description>
<summary>Cake AddIn that extends Cake with ability to send messages to Gitter.</summary>
<licenseUrl>https://github.com/cake-contrib/Cake.Gitter/blob/master/LICENSE</licenseUrl>
<license type="expression">MIT</license>
<repository type="git" url="https://github.com/cake-contrib/Cake.Gitter"/>
<projectUrl>https://github.com/cake-contrib/Cake.Gitter/</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<iconUrl>https://cdn.rawgit.com/cake-contrib/graphics/a5cf0f881c390650144b2243ae551d5b9f836196/png/cake-contrib-medium.png</iconUrl>
<iconUrl>https://cdn.jsdelivr.net/gh/cake-contrib/graphics/png/cake-contrib-medium.png</iconUrl>
<copyright>Copyright (c) Cake Contributions 2016 - Present</copyright>
<tags>Cake, Script, Build, Gitter</tags>
</metadata>
Expand Down
2 changes: 1 addition & 1 deletion setup.cake → 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
#load nuget:?package=Cake.Recipe&version=1.0.0

Environment.SetVariableNames();

Expand Down

0 comments on commit bfffb64

Please sign in to comment.