Revert "(#2997) net4.8 removal"

This reverts commit f416196.

Author: arturcic

.github/workflows/ci.yml

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

build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs

@@ -43,5 +43,21 @@ 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)]
+[TaskArgument(Arguments.DotnetTarget, Constants.NetVersion60, Constants.CoreFxVersion31, Constants.FullFxVersion48)]
 [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.NetVersion60 };
+        var frameworks = new[] { Constants.CoreFxVersion31, Constants.FullFxVersion48, Constants.NetVersion60 };
         if (!string.IsNullOrWhiteSpace(dotnetTarget))
         {
             if (!frameworks.Contains(dotnetTarget, StringComparer.OrdinalIgnoreCase))
@@ -87,6 +87,11 @@ 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,6 +10,10 @@ 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

@@ -83,6 +83,10 @@
         <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 = PathHelper.Combine(ExecutableHelper.GetCurrentDirectory(), Guid.NewGuid().ToString("N"));
-        var executable = ExecutableHelper.GetDotNetExecutable();
+        var executable = ExecutableHelper.GetExecutable();
 
         var output = new StringBuilder();
         var args = ExecutableHelper.GetExecutableArgs($" /targetpath {workingDirectory} ");

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

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
+        <TargetFrameworks>net48;netcoreapp3.1;net6.0</TargetFrameworks>
 
         <IsTestProject>true</IsTestProject>
     </PropertyGroup>
@@ -21,6 +21,7 @@
     <ItemGroup>
         <Compile Include="..\GitVersion.Core.Tests\Helpers\DirectoryHelper.cs" Link="Helpers\DirectoryHelper.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Helpers\ExecutableHelper.cs" Link="Helpers\ExecutableHelper.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 = ExecutableHelper.GetDotNetExecutable();
+        var executable = ExecutableHelper.GetExecutable();
         var output = new StringBuilder();
 
         var environmentalVariables = new Dictionary<string, string?>

src/GitVersion.App/GitVersion.App.csproj

@@ -9,6 +9,10 @@
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
     </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>
@@ -21,6 +25,11 @@
         <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

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