From fa2def9f82f32c8078c0a63a94e077c7efd85c8c Mon Sep 17 00:00:00 2001 From: Artur Stolear Date: Sat, 20 Jul 2024 08:17:45 +0200 Subject: [PATCH] Sunset .net 7.0 --- .github/workflows/_artifacts_linux.yml | 2 +- .github/workflows/_docker.yml | 2 +- .github/workflows/_docker_manifests.yml | 2 +- .github/workflows/_unit_tests.yml | 2 +- build/.run/UnitTest (7.0).run.xml | 23 ------------------- .../Tasks/ArtifactsDotnetToolTest.cs | 2 +- .../Tasks/ArtifactsMsBuildCoreTest.cs | 4 ++-- build/artifacts/Tasks/ArtifactsNativeTest.cs | 2 +- build/artifacts/Tasks/ArtifactsPrepare.cs | 2 +- build/artifacts/Tasks/ArtifactsTest.cs | 2 +- build/build/Tasks/Test/UnitTest.cs | 2 +- build/common/Utilities/Constants.cs | 3 +-- build/docker/Tasks/DockerBuild.cs | 2 +- build/docker/Tasks/DockerManifest.cs | 2 +- build/docker/Tasks/DockerPublish.cs | 2 +- build/docker/Tasks/DockerTest.cs | 2 +- src/Directory.Build.props | 2 +- .../GitVersion.MsBuild.csproj | 1 - 18 files changed, 17 insertions(+), 42 deletions(-) delete mode 100644 build/.run/UnitTest (7.0).run.xml diff --git a/.github/workflows/_artifacts_linux.yml b/.github/workflows/_artifacts_linux.yml index 3399b5eb9d..3bceaa02a6 100644 --- a/.github/workflows/_artifacts_linux.yml +++ b/.github/workflows/_artifacts_linux.yml @@ -28,7 +28,7 @@ jobs: - ubuntu.20.04 - ubuntu.22.04 - ubuntu.24.04 - targetFramework: [ '6.0', '7.0', '8.0' ] + targetFramework: [ '6.0', '8.0' ] steps: - diff --git a/.github/workflows/_docker.yml b/.github/workflows/_docker.yml index cff1275708..b9e2cb6d00 100644 --- a/.github/workflows/_docker.yml +++ b/.github/workflows/_docker.yml @@ -28,7 +28,7 @@ jobs: - ubuntu.20.04 - ubuntu.22.04 - ubuntu.24.04 - targetFramework: [ '6.0', '7.0', '8.0' ] + targetFramework: [ '6.0', '8.0' ] steps: - diff --git a/.github/workflows/_docker_manifests.yml b/.github/workflows/_docker_manifests.yml index 0452f5b12d..5c7dd10fd9 100644 --- a/.github/workflows/_docker_manifests.yml +++ b/.github/workflows/_docker_manifests.yml @@ -21,7 +21,7 @@ jobs: - ubuntu.20.04 - ubuntu.22.04 - ubuntu.24.04 - targetFramework: [ '6.0', '7.0', '8.0' ] + targetFramework: [ '6.0', '8.0' ] steps: - diff --git a/.github/workflows/_unit_tests.yml b/.github/workflows/_unit_tests.yml index 59aff4df34..dd8a130d49 100644 --- a/.github/workflows/_unit_tests.yml +++ b/.github/workflows/_unit_tests.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest, macos-13, macos-14] - targetFramework: [ '6.0', '7.0', '8.0' ] + targetFramework: [ '6.0', '8.0' ] runs-on: ${{ matrix.os }} steps: diff --git a/build/.run/UnitTest (7.0).run.xml b/build/.run/UnitTest (7.0).run.xml deleted file mode 100644 index c23ab78beb..0000000000 --- a/build/.run/UnitTest (7.0).run.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - \ No newline at end of file diff --git a/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs b/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs index c8b590dcda..2bf9641405 100644 --- a/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs +++ b/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs @@ -5,7 +5,7 @@ namespace Artifacts.Tasks; [TaskName(nameof(ArtifactsDotnetToolTest))] [TaskDescription("Tests the dotnet global tool in docker container")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] -[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70, Constants.Version80)] +[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version80)] [TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)] [IsDependentOn(typeof(ArtifactsPrepare))] public class ArtifactsDotnetToolTest : FrostingTask diff --git a/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs b/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs index 77e4617ad8..ce7d792164 100644 --- a/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs +++ b/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs @@ -5,7 +5,7 @@ namespace Artifacts.Tasks; [TaskName(nameof(ArtifactsMsBuildCoreTest))] [TaskDescription("Tests the msbuild package in docker container")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] -[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70, Constants.Version80)] +[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version80)] [TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)] [IsDependentOn(typeof(ArtifactsPrepare))] public class ArtifactsMsBuildCoreTest : FrostingTask @@ -32,7 +32,7 @@ public override void Run(BuildContext context) var targetFramework = framework switch { - Constants.Version60 or Constants.Version70 or Constants.Version80 => $"net{framework}", + Constants.Version60 or Constants.Version80 => $"net{framework}", _ => framework }; diff --git a/build/artifacts/Tasks/ArtifactsNativeTest.cs b/build/artifacts/Tasks/ArtifactsNativeTest.cs index b0dc47029c..464cd202b7 100644 --- a/build/artifacts/Tasks/ArtifactsNativeTest.cs +++ b/build/artifacts/Tasks/ArtifactsNativeTest.cs @@ -5,7 +5,7 @@ namespace Artifacts.Tasks; [TaskName(nameof(ArtifactsNativeTest))] [TaskDescription("Tests the native executables in docker container")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] -[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70, Constants.Version80)] +[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version80)] [TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)] [IsDependentOn(typeof(ArtifactsPrepare))] public class ArtifactsNativeTest : FrostingTask diff --git a/build/artifacts/Tasks/ArtifactsPrepare.cs b/build/artifacts/Tasks/ArtifactsPrepare.cs index 0e4b833566..700a1bdf64 100644 --- a/build/artifacts/Tasks/ArtifactsPrepare.cs +++ b/build/artifacts/Tasks/ArtifactsPrepare.cs @@ -5,7 +5,7 @@ namespace Artifacts.Tasks; [TaskName(nameof(ArtifactsPrepare))] [TaskDescription("Pulls the docker images needed for testing the artifacts")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] -[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70, Constants.Version80)] +[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version80)] [TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)] public class ArtifactsPrepare : FrostingTask { diff --git a/build/artifacts/Tasks/ArtifactsTest.cs b/build/artifacts/Tasks/ArtifactsTest.cs index 020260f6f7..3f781f68fa 100644 --- a/build/artifacts/Tasks/ArtifactsTest.cs +++ b/build/artifacts/Tasks/ArtifactsTest.cs @@ -5,7 +5,7 @@ namespace Artifacts.Tasks; [TaskName(nameof(ArtifactsTest))] [TaskDescription("Tests packages in docker container")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] -[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70, Constants.Version80)] +[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version80)] [TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)] [IsDependentOn(typeof(ArtifactsNativeTest))] [IsDependentOn(typeof(ArtifactsDotnetToolTest))] diff --git a/build/build/Tasks/Test/UnitTest.cs b/build/build/Tasks/Test/UnitTest.cs index b208dda4ff..7916c29e17 100644 --- a/build/build/Tasks/Test/UnitTest.cs +++ b/build/build/Tasks/Test/UnitTest.cs @@ -8,7 +8,7 @@ namespace Build.Tasks; [TaskName(nameof(UnitTest))] [TaskDescription("Run the unit tests")] -[TaskArgument(Arguments.DotnetTarget, Constants.Version60, Constants.Version70, Constants.Version80)] +[TaskArgument(Arguments.DotnetTarget, Constants.Version60, Constants.Version80)] [IsDependentOn(typeof(Build))] public class UnitTest : FrostingTask { diff --git a/build/common/Utilities/Constants.cs b/build/common/Utilities/Constants.cs index 39f7f3b228..ec2e56c887 100644 --- a/build/common/Utilities/Constants.cs +++ b/build/common/Utilities/Constants.cs @@ -6,7 +6,6 @@ public class Constants public const string Repository = "GitVersion"; public const string Version60 = "6.0"; - public const string Version70 = "7.0"; public const string Version80 = "8.0"; public const string VersionLatest = Version80; @@ -14,7 +13,7 @@ public class Constants public const string DefaultConfiguration = "Release"; public static readonly Architecture[] ArchToBuild = [Architecture.Amd64, Architecture.Arm64]; - public static readonly string[] Frameworks = [Version60, Version70, Version80]; + public static readonly string[] Frameworks = [Version60, Version80]; public const string DockerBaseImageName = "gittools/build-images"; public const string DockerImageName = "gittools/gitversion"; diff --git a/build/docker/Tasks/DockerBuild.cs b/build/docker/Tasks/DockerBuild.cs index 5cd7ac0c2c..cef78c2f3f 100644 --- a/build/docker/Tasks/DockerBuild.cs +++ b/build/docker/Tasks/DockerBuild.cs @@ -5,7 +5,7 @@ namespace Docker.Tasks; [TaskName(nameof(DockerBuild))] [TaskDescription("Build the docker images containing the GitVersion Tool")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] -[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70, Constants.Version80)] +[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version80)] [TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)] [TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)] public class DockerBuild : FrostingTask diff --git a/build/docker/Tasks/DockerManifest.cs b/build/docker/Tasks/DockerManifest.cs index 0a167a07d6..afa1f5fccf 100644 --- a/build/docker/Tasks/DockerManifest.cs +++ b/build/docker/Tasks/DockerManifest.cs @@ -5,7 +5,7 @@ namespace Docker.Tasks; [TaskName(nameof(DockerManifest))] [TaskDescription("Publish the docker manifest containing the images for amd64 and arm64")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] -[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70, Constants.Version80)] +[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version80)] [TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)] [IsDependentOn(typeof(DockerManifestInternal))] public class DockerManifest : FrostingTask diff --git a/build/docker/Tasks/DockerPublish.cs b/build/docker/Tasks/DockerPublish.cs index 16012720f9..51ceec0f9b 100644 --- a/build/docker/Tasks/DockerPublish.cs +++ b/build/docker/Tasks/DockerPublish.cs @@ -5,7 +5,7 @@ namespace Docker.Tasks; [TaskName(nameof(DockerPublish))] [TaskDescription("Publish the docker images containing the GitVersion Tool")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] -[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70, Constants.Version80)] +[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version80)] [TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)] [TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)] [IsDependentOn(typeof(DockerPublishInternal))] diff --git a/build/docker/Tasks/DockerTest.cs b/build/docker/Tasks/DockerTest.cs index 446ef7dd87..74d05631e9 100644 --- a/build/docker/Tasks/DockerTest.cs +++ b/build/docker/Tasks/DockerTest.cs @@ -5,7 +5,7 @@ namespace Docker.Tasks; [TaskName(nameof(DockerTest))] [TaskDescription("Test the docker images containing the GitVersion Tool")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] -[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70, Constants.Version80)] +[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version80)] [TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)] [TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)] [IsDependentOn(typeof(DockerBuild))] diff --git a/src/Directory.Build.props b/src/Directory.Build.props index ef2ef736ca..27dfc49416 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,6 +1,6 @@ - net6.0;net7.0;net8.0 + net6.0;net8.0 $([System.DateTime]::Today.Year) GitTools and Contributors diff --git a/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj b/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj index 15a1149d90..cd922f14c1 100644 --- a/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj +++ b/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj @@ -39,7 +39,6 @@ -