Merge pull request #4107 from arturcic/feature/sunset-net7.0

arturcic · web-flow · commit f77726282fb0 · 2024-07-20T08:56:27.000+02:00
Sunset .net 7.0
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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<BuildContext>
diff --git 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<BuildContext>
@@ -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
@@ -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<BuildContext>
diff --git 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<BuildContext>
 {
diff --git 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
@@ -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<BuildContext>
 {
diff --git a/build/common/Utilities/Constants.cs b/build/common/Utilities/Constants.cs
@@ -6,15 +6,14 @@ 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;
 
     public const string DefaultBranch = "main";
     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
@@ -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<BuildContext>
diff --git 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<BuildContext>
diff --git 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
@@ -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
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
 
         <EndYear>$([System.DateTime]::Today.Year)</EndYear>
         <Authors>GitTools and Contributors</Authors>
diff --git a/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj b/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj
@@ -39,7 +39,6 @@
         <None Include="msbuild/buildMultiTargeting/*.*" Pack="true" PackagePath="buildMultiTargeting" />
 
         <None Include="$(ExePublishPath)/net6.0/publish/**/*;$(BinPath)/net6.0/GitVersion.MsBuild.*" Pack="true" PackagePath="tools/net6.0" />
-        <None Include="$(ExePublishPath)/net7.0/publish/**/*;$(BinPath)/net7.0/GitVersion.MsBuild.*" Pack="true" PackagePath="tools/net7.0" />
         <None Include="$(ExePublishPath)/net8.0/publish/**/*;$(BinPath)/net8.0/GitVersion.MsBuild.*" Pack="true" PackagePath="tools/net8.0" />
     </ItemGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ jobs:`
`28`	`28`	`- ubuntu.20.04`
`29`	`29`	`- ubuntu.22.04`
`30`	`30`	`- ubuntu.24.04`
`31`		`- targetFramework: [ '6.0', '7.0', '8.0' ]`
	`31`	`+ targetFramework: [ '6.0', '8.0' ]`
`32`	`32`
`33`	`33`	`steps:`
`34`	`34`	`-`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ jobs:`
`21`	`21`	`- ubuntu.20.04`
`22`	`22`	`- ubuntu.22.04`
`23`	`23`	`- ubuntu.24.04`
`24`		`- targetFramework: [ '6.0', '7.0', '8.0' ]`
	`24`	`+ targetFramework: [ '6.0', '8.0' ]`
`25`	`25`
`26`	`26`	`steps:`
`27`	`27`	`-`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;`
`5`	`5`	`[TaskName(nameof(ArtifactsPrepare))]`
`6`	`6`	`[TaskDescription("Pulls the docker images needed for testing the artifacts")]`
`7`	`7`	`[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]`
`8`		`-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70, Constants.Version80)]`
	`8`	`+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version80)]`
`9`	`9`	`[TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)]`
`10`	`10`	`public class ArtifactsPrepare : FrostingTask<BuildContext>`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace Build.Tasks;`
`8`	`8`
`9`	`9`	`[TaskName(nameof(UnitTest))]`
`10`	`10`	`[TaskDescription("Run the unit tests")]`
`11`		`-[TaskArgument(Arguments.DotnetTarget, Constants.Version60, Constants.Version70, Constants.Version80)]`
	`11`	`+[TaskArgument(Arguments.DotnetTarget, Constants.Version60, Constants.Version80)]`
`12`	`12`	`[IsDependentOn(typeof(Build))]`
`13`	`13`	`public class UnitTest : FrostingTask<BuildContext>`
`14`	`14`	`{`