Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

targetframework net5.0 #2452

Closed
wants to merge 6 commits into from
Closed

targetframework net5.0 #2452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8474eee
targetframework 5.0 for GitVersionExe
vip32 Nov 12, 2020
96291af
build with net50 too
vip32 Nov 12, 2020
f26a80b
NetVersion50 framework tests
vip32 Nov 13, 2020
1fe4e67
more parameters.NetVersion50
vip32 Nov 13, 2020
025031e
net50 targetframework for all test projects
vip32 Nov 13, 2020
3d9ff83
net5.0 docker images
Nov 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
strategy:
matrix:
os: [linux]
targetFramework: [3.1]
targetFramework: [3.1, 5.0]
distro: [alpine.3.10-x64, centos.7-x64, debian.9-x64, fedora.30-x64, ubuntu.16.04-x64, ubuntu.18.04-x64]
fail-fast: false

Expand Down Expand Up @@ -233,7 +233,7 @@ jobs:
strategy:
matrix:
os: [linux]
targetFramework: [3.1]
targetFramework: [3.1, 5.0]
distro: [alpine.3.10-x64, centos.7-x64, debian.9-x64, fedora.30-x64, ubuntu.16.04-x64, ubuntu.18.04-x64]
fail-fast: false

Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ stages:
name: Linux
vmImage: 'ubuntu-latest'
distros: [ 'alpine.3.10-x64', 'centos.7-x64', 'debian.9-x64', 'fedora.30-x64', 'ubuntu.16.04-x64', 'ubuntu.18.04-x64' ]
dotnetVersions: [ '3.1' ]
dotnetVersions: [ '3.1', '5.0' ]

- stage: Docker
displayName: 'Docker Build & Test'
Expand All @@ -72,7 +72,7 @@ stages:
name: Linux
vmImage: 'ubuntu-latest'
distros: [ 'alpine.3.10-x64', 'centos.7-x64', 'debian.9-x64', 'fedora.30-x64', 'ubuntu.16.04-x64', 'ubuntu.18.04-x64' ]
dotnetVersions: [ '3.1' ]
dotnetVersions: [ '3.1', '5.0' ]

- stage: Publish
displayName: 'Publish'
Expand Down
2 changes: 1 addition & 1 deletion build.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/usr/bin/env bash
DOTNET_VERSION=2.1.811,3.1.403
DOTNET_VERSION=2.1.811,3.1.403,5.0.100
2 changes: 1 addition & 1 deletion build/artifacts-test.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ Task("Artifacts-MsBuildFull-Test")
var nugetSource = MakeAbsolute(parameters.Paths.Directories.NugetRoot).FullPath;

Information("\nTesting msbuild task with dotnet build (for .net core)\n");
var frameworks = new[] { parameters.CoreFxVersion21, parameters.CoreFxVersion31 };
var frameworks = new[] { parameters.CoreFxVersion21, parameters.CoreFxVersion31, parameters.NetVersion50 };
foreach(var framework in frameworks)
{
var dotnetCoreMsBuildSettings = new DotNetCoreMSBuildSettings();
Expand Down
6 changes: 3 additions & 3 deletions build/test.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Task("UnitTest")
.IsDependentOn("Build")
.Does<BuildParameters>((parameters) =>
{
var frameworks = new[] { parameters.CoreFxVersion31, parameters.FullFxVersion48 };
var frameworks = new[] { parameters.CoreFxVersion31, parameters.FullFxVersion48, parameters.NetVersion50 };
var testResultsPath = parameters.Paths.Directories.TestResultsOutput;

foreach(var framework in frameworks)
Expand Down Expand Up @@ -39,15 +39,15 @@ Task("UnitTest")
Exclude = new List<string> { "[GitVersion*.Tests]*", "[GitVersionTask.MsBuild]*" }
};

if (string.Equals(framework, parameters.FullFxVersion48))
if (string.Equals(framework, parameters.FullFxVersion48))
{
if (IsRunningOnUnix()) {
settings.Filter = "TestCategory!=NoMono";
} else {
settings.Filter = "TestCategory!=NoNet48";
}
}

DotNetCoreTest(project.FullPath, settings, coverletSettings);
});
}
Expand Down
1 change: 1 addition & 0 deletions build/utils/parameters.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public class BuildParameters
public const string MainRepoName = "GitVersion";
public string CoreFxVersion21 { get; private set; } = "netcoreapp2.1";
public string CoreFxVersion31 { get; private set; } = "netcoreapp3.1";
public string NetVersion50 { get; private set; } = "net5.0";
public string FullFxVersion48 { get; private set; } = "net48";

public string DockerDistro { get; private set; }
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionCore.Tests/GitVersionCore.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net48;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net48;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>

<DebugType>full</DebugType>
<Optimize>false</Optimize>
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionExe.Tests/GitVersionExe.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net48;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net48;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>

<IsTestProject>true</IsTestProject>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionExe/GitVersionExe.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<OutputType>Exe</OutputType>
<RootNamespace>GitVersion</RootNamespace>
<AssemblyName>gitversion</AssemblyName>
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
<PlatformTarget>AnyCPU</PlatformTarget>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<DocumentationFile>bin\$(Configuration)\GitVersion.xml</DocumentationFile>
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net48;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net48;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>

<IsTestProject>true</IsTestProject>
</PropertyGroup>
Expand Down