Skip to content

Commit 692c35a

Browse files
authored
Merge branch 'master' into bugfix/issue-1536-ignore-versions-in-branch-names
2 parents 0ba2eda + e2148e0 commit 692c35a

File tree

4 files changed

+2
-2
lines changed

4 files changed

+2
-2
lines changed

build.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ Task("Pack-Chocolatey")
356356

357357
var files = GetFiles(artifactPath + "/**/*.*")
358358
.Select(file => new ChocolateyNuSpecContent { Source = file.FullPath, Target = file.FullPath.Replace(artifactPath, "") });
359-
var txtFiles = GetFiles("./nuspec/*.txt")
359+
var txtFiles = (GetFiles("./nuspec/*.txt") + GetFiles("./nuspec/*.ps1"))
360360
.Select(file => new ChocolateyNuSpecContent { Source = file.FullPath, Target = file.GetFilename().ToString() });
361361

362362
ChocolateyPack(package.NuspecPath, new ChocolateyPackSettings {

build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Write-Host "Preparing to run build script..."
4848

4949
if ($PSEdition -eq "Desktop") { $IsWindows = $true }
5050

51-
$CakeVersion = "0.30.0"
51+
$CakeVersion = "0.31.0"
5252

5353
$DotNetChannel = "Current";
5454
$DotNetInstaller = if ($IsWindows) { "dotnet-install.ps1" } else { "dotnet-install.sh" }
Loading
4.62 KB
Loading

0 commit comments

Comments
 (0)