From 4ccb3c9dc03b0395e88b385af04ef8fb7436507b Mon Sep 17 00:00:00 2001 From: Adam Ralph Date: Thu, 19 Aug 2021 22:29:57 +0200 Subject: [PATCH] drop support for .NET Core 2.1 --- .github/workflows/ci.yml | 6 ------ MinVer.Lib/MinVer.Lib.csproj | 2 +- MinVer/MinVer.csproj | 2 +- MinVerTests.Infra/MinVerCli.cs | 2 +- MinVerTests.Infra/MinVerTests.Infra.csproj | 2 +- MinVerTests.Lib/MinVerTests.Lib.csproj | 6 +----- MinVerTests.Packages/MultipleProjects.cs | 2 +- README.md | 2 +- minver-cli/minver-cli.csproj | 2 +- 9 files changed, 8 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f78b7db9..c440f252 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,12 +24,6 @@ jobs: tests: framework: net5.0 sdk: "5.0.301" - - job: - os: ubuntu-20.04 - build: ./build.sh - tests: - framework: netcoreapp2.1 - sdk: "2.1.816" - job: os: ubuntu-20.04 build: ./build.sh diff --git a/MinVer.Lib/MinVer.Lib.csproj b/MinVer.Lib/MinVer.Lib.csproj index 1c0a4acb..59928ba0 100644 --- a/MinVer.Lib/MinVer.Lib.csproj +++ b/MinVer.Lib/MinVer.Lib.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + netcoreapp3.1 diff --git a/MinVer/MinVer.csproj b/MinVer/MinVer.csproj index c37bdb01..a7befd75 100644 --- a/MinVer/MinVer.csproj +++ b/MinVer/MinVer.csproj @@ -18,7 +18,7 @@ true major true - netcoreapp2.1 + netcoreapp3.1 diff --git a/MinVerTests.Infra/MinVerCli.cs b/MinVerTests.Infra/MinVerCli.cs index 0606bbed..b9b231e8 100644 --- a/MinVerTests.Infra/MinVerCli.cs +++ b/MinVerTests.Infra/MinVerCli.cs @@ -20,6 +20,6 @@ public static class MinVerCli } public static string GetPath(string configuration) => - Solution.GetFullPath($"minver-cli/bin/{configuration}/netcoreapp2.1/minver-cli.dll"); + Solution.GetFullPath($"minver-cli/bin/{configuration}/netcoreapp3.1/minver-cli.dll"); } } diff --git a/MinVerTests.Infra/MinVerTests.Infra.csproj b/MinVerTests.Infra/MinVerTests.Infra.csproj index 34644364..cb30dc6c 100644 --- a/MinVerTests.Infra/MinVerTests.Infra.csproj +++ b/MinVerTests.Infra/MinVerTests.Infra.csproj @@ -1,7 +1,7 @@ - netcoreapp2.1;net5.0 + netcoreapp3.1;net5.0 diff --git a/MinVerTests.Lib/MinVerTests.Lib.csproj b/MinVerTests.Lib/MinVerTests.Lib.csproj index 2fc59156..c0589c83 100644 --- a/MinVerTests.Lib/MinVerTests.Lib.csproj +++ b/MinVerTests.Lib/MinVerTests.Lib.csproj @@ -2,11 +2,7 @@ major - netcoreapp2.1;netcoreapp3.1;net5.0 - - - - true + netcoreapp3.1;net5.0 diff --git a/MinVerTests.Packages/MultipleProjects.cs b/MinVerTests.Packages/MultipleProjects.cs index 8e55d573..0976e1a9 100644 --- a/MinVerTests.Packages/MultipleProjects.cs +++ b/MinVerTests.Packages/MultipleProjects.cs @@ -15,7 +15,7 @@ public class MultipleProjects public MultipleProjects(ITestOutputHelper output) => this.output = output; - // for some reason, when using SDK 2.1 or 3.1, + // for some reason, when using SDK 3.1, // there is a 15 minute delay after the `dotnet build` command, // so we only run this test on SDK 5.0 and later [Net5PlusFact] diff --git a/README.md b/README.md index 68c46743..843dff9f 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Also available as a [command line tool](#can-i-use-minver-to-version-software-wh ## Prerequisites -- [.NET Core SDK 2.1 or later](https://www.microsoft.com/net/download) +- [.NET Core SDK 3.1 or later](https://www.microsoft.com/net/download) - [Git](https://git-scm.com/) ## Quick start diff --git a/minver-cli/minver-cli.csproj b/minver-cli/minver-cli.csproj index 4ad9293e..0aa29ebe 100644 --- a/minver-cli/minver-cli.csproj +++ b/minver-cli/minver-cli.csproj @@ -13,7 +13,7 @@ /~https://github.com/adamralph/minver/blob/main/CHANGELOG.md true major - netcoreapp2.1 + netcoreapp3.1 minver