Skip to content

Commit 6d703f1

Browse files
committed
adjust build scripts for net50
1 parent 35288ad commit 6d703f1

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

build/artifacts-test.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ Task("Artifacts-MsBuildFull-Test")
132132
var nugetSource = MakeAbsolute(parameters.Paths.Directories.NugetRoot).FullPath;
133133

134134
Information("\nTesting msbuild task with dotnet build (for .net core)\n");
135-
var frameworks = new[] { parameters.CoreFxVersion31 };
135+
var frameworks = new[] { parameters.CoreFxVersion31, parameters.NetVersion50 };
136136
foreach(var framework in frameworks)
137137
{
138138
var dotnetCoreMsBuildSettings = new DotNetCoreMSBuildSettings();

build/pack.cake

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ DirectoryPath PackPrepareNative(ICakeContext context, BuildParameters parameters
141141

142142
var settings = new DotNetCorePublishSettings
143143
{
144-
Framework = parameters.CoreFxVersion31,
144+
Framework = parameters.NetVersion50,
145145
Runtime = runtime,
146146
NoRestore = false,
147147
Configuration = parameters.Configuration,
@@ -151,9 +151,7 @@ DirectoryPath PackPrepareNative(ICakeContext context, BuildParameters parameters
151151

152152
settings.ArgumentCustomization =
153153
arg => arg
154-
.Append("/p:PublishSingleFile=true")
155-
.Append("/p:PublishTrimmed=true")
156-
.Append("/p:IncludeSymbolsInSingleFile=true");
154+
.Append("/p:PublishSingleFile=true");
157155

158156
context.DotNetCorePublish("./src/GitVersionExe/GitVersionExe.csproj", settings);
159157

build/test.cake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Task("UnitTest")
55
.IsDependentOn("Build")
66
.Does<BuildParameters>((parameters) =>
77
{
8-
var frameworks = new[] { parameters.CoreFxVersion31, parameters.FullFxVersion48 };
8+
var frameworks = new[] { parameters.CoreFxVersion31, parameters.FullFxVersion48, parameters.NetVersion50 };
99
var testResultsPath = parameters.Paths.Directories.TestResultsOutput;
1010

1111
foreach(var framework in frameworks)
@@ -39,15 +39,15 @@ Task("UnitTest")
3939
Exclude = new List<string> { "[GitVersion*.Tests]*" }
4040
};
4141

42-
if (string.Equals(framework, parameters.FullFxVersion48))
42+
if (string.Equals(framework, parameters.FullFxVersion48))
4343
{
4444
if (IsRunningOnUnix()) {
4545
settings.Filter = "TestCategory!=NoMono";
4646
} else {
4747
settings.Filter = "TestCategory!=NoNet48";
4848
}
4949
}
50-
50+
5151
DotNetCoreTest(project.FullPath, settings, coverletSettings);
5252
});
5353
}

build/utils/parameters.cake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ public class BuildParameters
1111
public const string MainRepoOwner = "gittools";
1212
public const string MainRepoName = "GitVersion";
1313
public string CoreFxVersion31 { get; private set; } = "netcoreapp3.1";
14+
public string NetVersion50 { get; private set; } = "net5.0";
1415
public string FullFxVersion48 { get; private set; } = "net48";
1516

1617
public string DockerDistro { get; private set; }

0 commit comments

Comments
 (0)