Skip to content

Commit 79a9477

Browse files
committed
using parameters for target framework
1 parent ffd27a4 commit 79a9477

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

build.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ Task("Test")
154154
.IsDependentOn("Build")
155155
.Does<BuildParameters>((parameters) =>
156156
{
157-
var framework = "net461";
157+
var framework = parameters.FullFxVersion;
158158

159159
// run using dotnet test
160160
var projects = GetFiles("./src/**/*.Tests.csproj");

build/paths.cake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ public class BuildPaths
2727

2828
var artifactsDir = (DirectoryPath)(context.Directory("./artifacts") + context.Directory("v" + semVersion));
2929
var artifactsBinDir = artifactsDir.Combine("bin");
30-
var artifactsBinFullFxDir = artifactsBinDir.Combine("net461");
30+
var artifactsBinFullFxDir = artifactsBinDir.Combine(parameters.FullFxVersion);
3131
var artifactsBinFullFxILMergeDir = artifactsBinFullFxDir.Combine("il-merge");
3232
var artifactsBinFullFxPortableDir = artifactsBinFullFxDir.Combine("portable");
3333
var artifactsBinFullFxCmdlineDir = artifactsBinFullFxDir.Combine("cmdline");
34-
var artifactsBinCoreFxDir = artifactsBinDir.Combine("netcoreapp2.0");
34+
var artifactsBinCoreFxDir = artifactsBinDir.Combine(parameters.CoreFxVersion);
3535
var nugetRootDir = artifactsDir.Combine("nuget");
3636
var buildArtifactDir = artifactsDir.Combine("build-artifact");
3737
var testCoverageOutputDir = artifactsDir.Combine("code-coverage");

build/utils.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ string[] GetDockerTags(DockerImage dockerImage, BuildParameters parameters) {
201201
$"{name}:{parameters.Version.SemVersion}-{os}-{distro}-{targetframework}",
202202
};
203203

204-
if (distro == "debian" && targetframework == "netcoreapp2.1" || distro == "nano") {
204+
if (distro == "debian" && targetframework == parameters.CoreFxVersion || distro == "nano") {
205205
tags.AddRange(new[] {
206206
$"{name}:{parameters.Version.Version}-{os}",
207207
$"{name}:{parameters.Version.SemVersion}-{os}",

0 commit comments

Comments
 (0)