(#2997) net4.8 removal

.github/workflows/ci.yml

@@ -127,7 +127,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
-        targetFramework: [net48, net6.0, netcoreapp3.1]
+        targetFramework: [net6.0, netcoreapp3.1]
       fail-fast: false
 
     steps:

build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs

@@ -43,21 +43,5 @@ public override void Run(BuildContext context)
             var netcoreExe = Paths.Integration.Combine("core").Combine("build").Combine(framework).CombineWithFilePath("app.dll");
             context.ValidateOutput("dotnet", netcoreExe.FullPath, context.Version.GitVersion.FullSemVer);
         }
-
-        context.Information("\nTesting msbuild task with msbuild (for full framework)\n");
-
-        var msBuildSettings = new MSBuildSettings
-        {
-            Verbosity = Verbosity.Minimal,
-            Restore = true
-        };
-
-        msBuildSettings.WithProperty("GitVersionMsBuildVersion", version);
-        msBuildSettings.WithProperty("RestoreSource", nugetSource);
-
-        context.MSBuild("./tests/integration/full", msBuildSettings);
-
-        var fullExe = Paths.Integration.Combine("full").Combine("build").CombineWithFilePath("app.exe");
-        context.ValidateOutput(fullExe.FullPath, null, context.Version.GitVersion.FullSemVer);
     }
 }

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.NetVersion60, Constants.CoreFxVersion31, Constants.FullFxVersion48)]
+[TaskArgument(Arguments.DotnetTarget, Constants.NetVersion60, Constants.CoreFxVersion31)]
 [IsDependentOn(typeof(Build))]
 public class UnitTest : FrostingTask<BuildContext>
 {
@@ -17,7 +17,7 @@ public class UnitTest : FrostingTask<BuildContext>
     public override void Run(BuildContext context)
     {
         var dotnetTarget = context.Argument(Arguments.DotnetTarget, string.Empty);
-        var frameworks = new[] { Constants.CoreFxVersion31, Constants.FullFxVersion48, Constants.NetVersion60 };
+        var frameworks = new[] { Constants.CoreFxVersion31, Constants.NetVersion60 };
         if (!string.IsNullOrWhiteSpace(dotnetTarget))
         {
             if (!frameworks.Contains(dotnetTarget, StringComparer.OrdinalIgnoreCase))
@@ -87,11 +87,6 @@ private static void TestProjectForTarget(BuildContext context, FilePath project,
             Exclude = new List<string> { "[GitVersion*.Tests]*", "[GitTools.Testing]*" }
         };
 
-        if (string.Equals(framework, Constants.FullFxVersion48))
-        {
-            settings.Filter = context.IsRunningOnUnix() ? $"TestCategory!={Constants.NoMono}" : $"TestCategory!={Constants.NoNet48}";
-        }
-
         context.DotNetTest(project.FullPath, settings, coverletSettings);
     }
 }

build/common/Utilities/Constants.cs

@@ -10,10 +10,6 @@ public class Constants
 
     public const string NetVersion60 = "net6.0";
     public const string CoreFxVersion31 = "netcoreapp3.1";
-    public const string FullFxVersion48 = "net48";
-
-    public const string NoMono = "NoMono";
-    public const string NoNet48 = "NoNet48";
 
     public static readonly string[] VersionsToBuild = { Version60, Version31 };
     public static readonly Architecture[] ArchToBuild = { Architecture.Amd64, Architecture.Arm64 };

src/Directory.Build.props

@@ -81,10 +81,6 @@
         <None Include="../../build/nuspec/README.md" Pack="true" PackagePath="/"/>
     </ItemGroup>
 
-    <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
-        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" />
-    </ItemGroup>
-
     <!-- Workaround to enable .editorconfig based analyzer configuration until dotnet compilers support .editorconfig based configuration -->
     <PropertyGroup>
         <SkipDefaultEditorConfigAsAdditionalFile>true</SkipDefaultEditorConfigAsAdditionalFile>

src/GitVersion.App.Tests/ExecCmdLineArgumentTest.cs

@@ -73,7 +73,7 @@ public void WorkingDirectoryWithoutCommitsFailsWithInformativeMessage()
     public void WorkingDirectoryDoesNotExistFailsWithInformativeMessage()
     {
         var workingDirectory = Path.Combine(PathHelper.GetCurrentDirectory(), Guid.NewGuid().ToString("N"));
-        var executable = PathHelper.GetExecutable();
+        var executable = PathHelper.GetDotNetExecutable();
 
         var output = new StringBuilder();
         var args = PathHelper.GetExecutableArgs($" /targetpath {workingDirectory} ");

src/GitVersion.App.Tests/GitVersion.App.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net48;netcoreapp3.1;net6.0</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
 
         <IsTestProject>true</IsTestProject>
     </PropertyGroup>
@@ -21,7 +21,6 @@
     <ItemGroup>
         <Compile Include="..\GitVersion.Core.Tests\Helpers\DirectoryHelper.cs" Link="Helpers\DirectoryHelper.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Helpers\PathHelper.cs" Link="Helpers\PathHelper.cs" />
-        <Compile Include="..\GitVersion.Core.Tests\Helpers\RuntimeHelper.cs" Link="Helpers\RuntimeHelper.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Helpers\TestEffectiveConfiguration.cs" Link="Helpers\TestEffectiveConfiguration.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Helpers\TestEnvironment.cs" Link="Helpers\TestEnvironment.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Helpers\TestFileSystem.cs" Link="Helpers\TestFileSystem.cs" />

src/GitVersion.App.Tests/Helpers/GitVersionHelper.cs

@@ -36,7 +36,7 @@ private static ExecutionResults ExecuteIn(ArgumentBuilder arguments,
         params KeyValuePair<string, string>[] environments
     )
     {
-        var executable = PathHelper.GetExecutable();
+        var executable = PathHelper.GetDotNetExecutable();
         var output = new StringBuilder();
 
         var environmentalVariables = new Dictionary<string, string>

src/GitVersion.App/GitVersion.App.csproj

@@ -10,10 +10,6 @@
         <DocumentationFile>bin\$(Configuration)\GitVersion.xml</DocumentationFile>
     </PropertyGroup>
 
-    <PropertyGroup Condition=" '$(PackAsTool)' != 'true'">
-        <TargetFrameworks>net48;$(TargetFrameworks);</TargetFrameworks>
-    </PropertyGroup>
-
     <!-- workaround for https://github.com/dotnet/runtime/issues/49508 -->
     <PropertyGroup Condition=" '$(OsxArm64)' == 'true'">
         <TargetFrameworks>net6.0</TargetFrameworks>
@@ -26,11 +22,6 @@
         <PackageDescription>Derives SemVer information from a repository following GitFlow or GitHubFlow. This is the .NET Core Global Tool allowing usage of GitVersion from command line.</PackageDescription>
     </PropertyGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)'=='net48'">
-        <PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)" />
-        <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="$(PackageVersion_LibGit2Sharp_NativeBinaries)" />
-    </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="System.Text.Json" Version="$(PackageVersion_MicrosoftJson)" />
         <PackageReference Include="System.Text.Encodings.Web" Version="$(PackageVersion_MicrosoftJson)" />

src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.cs

@@ -226,8 +226,6 @@ public void NextVersionCanHavePatch()
 
     [Test]
     [MethodImpl(MethodImplOptions.NoInlining)]
-    [Category(NoMono)]
-    [Description(NoMonoDescription)]
     public void CanWriteOutEffectiveConfiguration()
     {
         var config = this.configProvider.Provide(this.repoPath);

src/GitVersion.Core.Tests/Configuration/Init/InitScenarios.cs

@@ -16,8 +16,6 @@ public class InitScenarios : TestBase
     public void Setup() => ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
 
     [Test]
-    [Category(NoMono)]
-    [Description(NoMonoDescription)]
     public void CanSetNextVersion()
     {
         var workingDirectory = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "c:\\proj" : "/proj";

src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs

@@ -72,8 +72,6 @@ public void GitPreparerShouldNotFailWhenTargetPathNotInitialized()
     }
 
     [Test]
-    [Category(NoMono)]
-    [Description(NoMonoDescription)]
     public void CacheKeyForWorktree()
     {
         using var fixture = new EmptyRepositoryFixture();
@@ -410,8 +408,6 @@ public void WorkingDirectoryWithoutCommits()
     }
 
     [Test]
-    [Category(NoMono)]
-    [Description(NoMonoDescription)]
     public void GetProjectRootDirectoryWorkingDirectoryWithWorktree()
     {
         using var fixture = new EmptyRepositoryFixture();
@@ -479,8 +475,6 @@ public void GetDotGitDirectoryNoWorktree()
     }
 
     [Test]
-    [Category(NoMono)]
-    [Description(NoMonoDescription)]
     public void GetDotGitDirectoryWorktree()
     {
         using var fixture = new EmptyRepositoryFixture();
@@ -511,8 +505,6 @@ public void GetDotGitDirectoryWorktree()
     }
 
     [Test]
-    [Category(NoMono)]
-    [Description(NoMonoDescription)]
     public void CalculateVersionFromWorktreeHead()
     {
         // Setup
@@ -542,8 +534,6 @@ public void CalculateVersionFromWorktreeHead()
     }
 
     [Test]
-    [Category(NoMono)]
-    [Description(NoMonoDescription)]
     public void CalculateVersionVariables_TwoBranchHasSameCommitHeadDetachedAndNotTagged_ThrowException()
     {
         // Setup
@@ -573,8 +563,6 @@ public void CalculateVersionVariables_TwoBranchHasSameCommitHeadDetachedAndNotTa
     }
 
     [Test]
-    [Category(NoMono)]
-    [Description(NoMonoDescription)]
     public void CalculateVersionVariables_TwoBranchHasSameCommitHeadDetachedAndTagged_ReturnSemver()
     {
         // Setup

src/GitVersion.Core.Tests/Extensions/StringFormatWithExtensionTests.cs

@@ -16,9 +16,8 @@ public class StringFormatWithExtensionTests
     public void FormatWithNoTokens()
     {
         var propertyObject = new { };
-        const string target = "Some String without tokens";
-        var expected = target;
-        var actual = target.FormatWith(propertyObject, this.environment);
+        const string expected = "Some String without tokens";
+        var actual = expected.FormatWith(propertyObject, this.environment);
         Assert.AreEqual(expected, actual);
     }
 

src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net48;netcoreapp3.1;net6.0</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
 
         <DebugType>full</DebugType>
         <Optimize>false</Optimize>

src/GitVersion.Core.Tests/Helpers/PathHelper.cs

@@ -4,14 +4,11 @@ public static class PathHelper
 {
     public static string GetCurrentDirectory() => Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
 
-    public static string GetExecutable() => RuntimeHelper.IsCoreClr() ? "dotnet" : Path.Combine(GetExeDirectory(), "gitversion.exe");
+    public static string GetDotNetExecutable() => "dotnet";
 
     public static string GetExecutableArgs(string args)
     {
-        if (RuntimeHelper.IsCoreClr())
-        {
-            args = $"{Path.Combine(GetExeDirectory(), "gitversion.dll")} {args}";
-        }
+        args = $"{Path.Combine(GetExeDirectory(), "gitversion.dll")} {args}";
         return args;
     }
 

src/GitVersion.Core.Tests/Helpers/TestBase.cs

@@ -8,9 +8,6 @@ namespace GitVersion.Core.Tests.Helpers;
 
 public class TestBase
 {
-    protected const string NoMonoDescription = "Won't run on Mono due to source information not being available for ShouldMatchApproved.";
-    protected const string NoMono = "NoMono";
-    protected const string NoNet48 = "NoNet48";
     public const string MainBranch = "main";
 
     protected static IServiceProvider ConfigureServices(Action<IServiceCollection> overrideServices = null)

src/GitVersion.Core.Tests/IntegrationTests/WorktreeScenarios.cs

@@ -8,10 +8,7 @@ namespace GitVersion.Core.Tests.IntegrationTests;
 [TestFixture]
 public class WorktreeScenarios : TestBase
 {
-
     [Test]
-    [Category(NoMono)]
-    [Description(NoMonoDescription)]
     public void UseWorktreeRepositoryForVersion()
     {
         using var fixture = new EmptyRepositoryFixture();

src/GitVersion.Core.Tests/VersionCalculation/JsonVersionBuilderTests.cs

@@ -13,8 +13,6 @@ public class JsonVersionBuilderTests : TestBase
     public void Setup() => ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
 
     [Test]
-    [Category(NoMono)]
-    [Description(NoMonoDescription)]
     public void Json()
     {
         var semanticVersion = new SemanticVersion

src/GitVersion.Core.Tests/VersionCalculation/VariableProviderTests.cs

@@ -48,8 +48,6 @@ public void ShouldLogWarningWhenUsingDefaultInformationalVersionInCustomFormat()
     }
 
     [Test]
-    [Category(NoMono)]
-    [Description(NoMonoDescription)]
     public void ProvidesVariablesInContinuousDeliveryModeForPreRelease()
     {
         var semVer = new SemanticVersion
@@ -75,8 +73,6 @@ public void ProvidesVariablesInContinuousDeliveryModeForPreRelease()
     }
 
     [Test]
-    [Category(NoMono)]
-    [Description(NoMonoDescription)]
     public void ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding()
     {
         var semVer = new SemanticVersion
@@ -102,8 +98,6 @@ public void ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding()
     }
 
     [Test]
-    [Category(NoMono)]
-    [Description(NoMonoDescription)]
     public void ProvidesVariablesInContinuousDeploymentModeForPreRelease()
     {
         var semVer = new SemanticVersion
@@ -128,8 +122,6 @@ public void ProvidesVariablesInContinuousDeploymentModeForPreRelease()
     }
 
     [Test]
-    [Category(NoMono)]
-    [Description(NoMonoDescription)]
     public void ProvidesVariablesInContinuousDeliveryModeForStable()
     {
         var semVer = new SemanticVersion
@@ -153,8 +145,6 @@ public void ProvidesVariablesInContinuousDeliveryModeForStable()
     }
 
     [Test]
-    [Category(NoMono)]
-    [Description(NoMonoDescription)]
     public void ProvidesVariablesInContinuousDeploymentModeForStable()
     {
         var semVer = new SemanticVersion
@@ -178,8 +168,6 @@ public void ProvidesVariablesInContinuousDeploymentModeForStable()
     }
 
     [Test]
-    [Category(NoMono)]
-    [Description(NoMonoDescription)]
     public void ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged()
     {
         var semVer = new SemanticVersion
@@ -251,8 +239,6 @@ public void ProvidesVariablesInContinuousDeploymentModeWithTagSetToUseBranchName
     }
 
     [Test]
-    [Category(NoMono)]
-    [Description(NoMonoDescription)]
     public void ProvidesVariablesInContinuousDeliveryModeForFeatureBranch()
     {
         var semVer = new SemanticVersion
@@ -278,8 +264,6 @@ public void ProvidesVariablesInContinuousDeliveryModeForFeatureBranch()
     }
 
     [Test]
-    [Category(NoMono)]
-    [Description(NoMonoDescription)]
     public void ProvidesVariablesInContinuousDeliveryModeForFeatureBranchWithCustomAssemblyInfoFormat()
     {
         var semVer = new SemanticVersion