Skip to content

Commit cb77594

Browse files
committed
change target frameworks to netcoreapp3.1 and net48
1 parent dce6ac2 commit cb77594

File tree

13 files changed

+12
-13
lines changed

13 files changed

+12
-13
lines changed

build.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/usr/bin/env bash
2-
DOTNET_VERSION=2.1.811,3.1.403
2+
DOTNET_VERSION=3.1.403

build/artifacts-test.cake

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

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

build/pack.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Task("Pack-Prepare")
44
{
55
PackPrepareNative(Context, parameters);
66

7-
var frameworks = new[] { parameters.CoreFxVersion21, parameters.FullFxVersion48 };
7+
var frameworks = new[] { parameters.CoreFxVersion31, parameters.FullFxVersion48 };
88

99
// MsBuild Task
1010
foreach(var framework in frameworks)

build/utils/docker.cake

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

152-
if (distro == "debian-9" && targetframework == parameters.CoreFxVersion21 || distro == "nanoserver-1809") {
152+
if (distro == "debian-9" && targetframework == parameters.CoreFxVersion31 || distro == "nanoserver-1809") {
153153
tags.AddRange(new[] {
154154
$"{name}:{parameters.Version.Version}-{os}",
155155
$"{name}:{parameters.Version.SemVersion}-{os}",

build/utils/parameters.cake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ public class BuildParameters
1010

1111
public const string MainRepoOwner = "gittools";
1212
public const string MainRepoName = "GitVersion";
13-
public string CoreFxVersion21 { get; private set; } = "netcoreapp2.1";
1413
public string CoreFxVersion31 { get; private set; } = "netcoreapp3.1";
1514
public string FullFxVersion48 { get; private set; } = "net48";
1615

src/Docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG DISTRO='debian-9'
2-
ARG DOTNET_VERSION='2.1'
2+
ARG DOTNET_VERSION='3.1'
33

44
FROM gittools/build-images:$DISTRO-sdk-$DOTNET_VERSION as installer
55
ARG contentFolder

src/GitVersionCore.Tests/GitVersionCore.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net48;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net48;netcoreapp3.1</TargetFrameworks>
55

66
<DebugType>full</DebugType>
77
<Optimize>false</Optimize>

src/GitVersionExe.Tests/GitVersionExe.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net48;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
3+
<TargetFrameworks>net48;netcoreapp3.1</TargetFrameworks>
44

55
<IsTestProject>true</IsTestProject>
66
</PropertyGroup>

src/GitVersionExe/GitVersionExe.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<OutputType>Exe</OutputType>
55
<RootNamespace>GitVersion</RootNamespace>
66
<AssemblyName>gitversion</AssemblyName>
7-
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
7+
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
88
<PlatformTarget>AnyCPU</PlatformTarget>
99
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1010
<DocumentationFile>bin\$(Configuration)\GitVersion.xml</DocumentationFile>

src/GitVersionTask.Tests/GitVersionTask.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net48;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
3+
<TargetFrameworks>net48;netcoreapp3.1</TargetFrameworks>
44

55
<IsTestProject>true</IsTestProject>
66
</PropertyGroup>

0 commit comments

Comments
 (0)