Skip to content

Commit

Permalink
GitHubSync update
Browse files Browse the repository at this point in the history
  • Loading branch information
GeertvanHorrik committed Apr 17, 2020
1 parent 476d227 commit cd86482
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
9 changes: 8 additions & 1 deletion deployment/cake/buildserver.cake
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,14 @@ public class BuildServerIntegration : IIntegration
{
CakeContext.Information("Variable '{0}' is specified via build.cakeoverrides", variableName);

return sb.ToString();
var sbValue = sb.ToString();
if (sbValue == "[ignore]" ||
sbValue == "[empty]")
{
return string.Empty;
}

return sbValue;
}
}

Expand Down
6 changes: 6 additions & 0 deletions deployment/cake/lib-generic.cake
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,9 @@ private static void ConfigureMsBuild(BuildContext buildContext, MSBuildSettings
msBuildSettings.ToolPath = toolPath;
}

// Continuous integration build
msBuildSettings.WithProperty("ContinuousIntegrationBuild", "true");

// No NuGet restore (should already be done)
msBuildSettings.WithProperty("ResolveNuGetPackages", "false");
msBuildSettings.Restore = false;
Expand Down Expand Up @@ -369,6 +372,9 @@ private static void ConfigureMsBuildForDotNetCore(BuildContext buildContext, Dot
msBuildSettings.ToolPath = toolPath;
}

// Continuous integration build
msBuildSettings.WithProperty("ContinuousIntegrationBuild", "true");

// No NuGet restore (should already be done)
msBuildSettings.WithProperty("ResolveNuGetPackages", "false");
//msBuildSettings.Restore = false;
Expand Down
Binary file added design/Package/Icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit cd86482

Please sign in to comment.