Merge pull request GitTools#3243 from arturcic/feature/7.0

Add support for .net 7.0
asbjornu · Oct 22, 2022 · b9e5ff6 · b9e5ff6
2 parents a5ef03e + 5974053
commit b9e5ff6
Show file tree

Hide file tree

Showing 27 changed files with 92 additions and 79 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -55,10 +55,11 @@ jobs:
         path: run
         key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
     -
-      name: Install .NET SDK 6.0.x
-      uses: actions/setup-dotnet@v3
+      name: Setup .NET SDK
+      uses: actions/setup-dotnet@v3.0.2
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '7.0.x'
+        dotnet-quality: 'preview'
     -
       name: '[Prepare]'
       if: steps.cache-cake.outputs.cache-hit != 'true'
@@ -94,10 +95,11 @@ jobs:
         path: tools
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
     -
-      name: Install .NET SDK 6.0.x
-      uses: actions/setup-dotnet@v3
+      name: Setup .NET SDK
+      uses: actions/setup-dotnet@v3.0.2
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '7.0.x'
+        dotnet-quality: 'preview'
     -
       name: '[Build]'
       shell: pwsh
@@ -133,7 +135,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
-        targetFramework: [net6.0]
+        targetFramework: [net7.0, net6.0]
       fail-fast: false
 
     steps:
@@ -157,10 +159,11 @@ jobs:
         path: tools
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
     -
-      name: Install .NET SDK 6.0.x
-      uses: actions/setup-dotnet@v3
+      name: Setup .NET SDK
+      uses: actions/setup-dotnet@v3.0.2
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '7.0.x'
+        dotnet-quality: 'preview'
     -
       name: '[Unit Test]'
       shell: pwsh
@@ -209,10 +212,11 @@ jobs:
         name: nuget
         path: ${{ github.workspace }}/artifacts/packages/nuget
     -
-      name: Install .NET SDK 6.0.x
-      uses: actions/setup-dotnet@v3
+      name: Setup .NET SDK
+      uses: actions/setup-dotnet@v3.0.2
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '7.0.x'
+        dotnet-quality: 'preview'
     -
       name: '[Test Artifacts]'
       shell: pwsh
@@ -224,7 +228,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        targetFramework: [ '6.0' ]
+        targetFramework: [ '7.0', '6.0' ]
         distro: [ alpine.3.13, alpine.3.14, centos.7, centos.8, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ]
       fail-fast: false
 
@@ -269,10 +273,11 @@ jobs:
       with:
         install: true
     -
-      name: Install .NET SDK 6.0.x
-      uses: actions/setup-dotnet@v3
+      name: Setup .NET SDK
+      uses: actions/setup-dotnet@v3.0.2
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '7.0.x'
+        dotnet-quality: 'preview'
     -
       name: '[Test Artifacts (amd64)]'
       shell: pwsh
@@ -288,7 +293,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        targetFramework: [ '6.0' ]
+        targetFramework: [ '7.0', '6.0' ]
         distro: [ alpine.3.13, alpine.3.14, centos.7, centos.8, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ]
       fail-fast: false
 
@@ -327,10 +332,11 @@ jobs:
       with:
         install: true
     -
-      name: Install .NET SDK 6.0.x
-      uses: actions/setup-dotnet@v3
+      name: Setup .NET SDK
+      uses: actions/setup-dotnet@v3.0.2
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '7.0.x'
+        dotnet-quality: 'preview'
     -
       name: Login to DockerHub
       if: success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools'
@@ -417,10 +423,11 @@ jobs:
         name: nuget
         path: ${{ github.workspace }}/artifacts/packages/nuget
     -
-      name: Install .NET SDK 6.0.x
-      uses: actions/setup-dotnet@v3
+      name: Setup .NET SDK
+      uses: actions/setup-dotnet@v3.0.2
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '7.0.x'
+        dotnet-quality: 'preview'
     -
       name: '[Publish]'
       shell: pwsh
@@ -471,10 +478,11 @@ jobs:
         name: native-macOS
         path: ${{ github.workspace }}/artifacts/packages/native
     -
-      name: Install .NET SDK 6.0.x
-      uses: actions/setup-dotnet@v3
+      name: Setup .NET SDK
+      uses: actions/setup-dotnet@v3.0.2
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '7.0.x'
+        dotnet-quality: 'preview'
     -
       name: '[Release]'
       shell: pwsh

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -58,11 +58,11 @@ jobs:
         key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
 
     -
-      name: Install .NET SDKs
-      uses: actions/setup-dotnet@v3
+      name: Setup .NET SDK
+      uses: actions/setup-dotnet@v3.0.2
       with:
-        dotnet-version: |
-          6.0.x
+        dotnet-version: '7.0.x'
+        dotnet-quality: 'preview'
 
     -
       name: '[Prepare]'

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -69,10 +69,11 @@ jobs:
         key: node-${{ runner.os }}-${{ hashFiles('./package-lock.json') }}
         restore-keys: node-${{ runner.os }}
     -
-      name: Install .NET SDK 6.0.x
-      uses: actions/setup-dotnet@v3
+      name: Setup .NET SDK
+      uses: actions/setup-dotnet@v3.0.2
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '7.0.x'
+        dotnet-quality: 'preview'
     -
       name: '[Prepare]'
       if: steps.cache-cake.outputs.cache-hit != 'true'
@@ -103,10 +104,11 @@ jobs:
         path: tools
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
     -
-      name: Install .NET SDK 6.0.x
-      uses: actions/setup-dotnet@v3
+      name: Setup .NET SDK
+      uses: actions/setup-dotnet@v3.0.2
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '7.0.x'
+        dotnet-quality: 'preview'
     -
       name: '[Build Documentation]'
       shell: pwsh
@@ -160,10 +162,11 @@ jobs:
         path: tools
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
     -
-      name: Install .NET SDK 6.0.x
-      uses: actions/setup-dotnet@v3
+      name: Setup .NET SDK
+      uses: actions/setup-dotnet@v3.0.2
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '7.0.x'
+        dotnet-quality: 'preview'
     -
       name: '[Publish Documentation]'
       if: ${{ github.event_name == 'push' }}

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -30,9 +30,10 @@ jobs:
       - uses: actions/checkout@v3
       -
         name: Setup .NET SDK
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v3.0.2
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '7.0.x'
+          dotnet-quality: 'preview'
       -
         name: Run Format Build solution
         run: dotnet format ./build/ --verify-no-changes

diff --git a/build/Directory.Build.props b/build/Directory.Build.props
@@ -1,12 +1,12 @@
 <Project>
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
         <OutputPath>..\..\run\</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <Nullable>enable</Nullable>
-        <LangVersion>10</LangVersion>
+        <LangVersion>11</LangVersion>
         <NoWarn>NU1604</NoWarn>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>

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)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)]
 [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)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)]
 [IsDependentOn(typeof(ArtifactsPrepare))]
 public class ArtifactsMsBuildCoreTest : FrostingTask<BuildContext>
@@ -29,12 +29,11 @@ public override void Run(BuildContext context)
         {
             if (context.SkipImage(dockerImage)) continue;
 
-            string distro = dockerImage.Distro;
             string targetFramework = dockerImage.TargetFramework;
 
             targetFramework = targetFramework switch
             {
-                Constants.Version60 => $"net{targetFramework}",
+                Constants.Version60 or Constants.Version70 => $"net{targetFramework}",
                 _ => targetFramework
             };
 

diff --git a/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs b/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs
@@ -23,7 +23,7 @@ public override void Run(BuildContext context)
         var nugetSource = context.MakeAbsolute(Paths.Nuget).FullPath;
 
         context.Information("\nTesting msbuild task with dotnet build (for .net core)\n");
-        var frameworks = new[] { Constants.NetVersion60 };
+        var frameworks = new[] { Constants.NetVersion60, Constants.NetVersion70 };
         foreach (var framework in frameworks)
         {
             var dotnetMsBuildSettings = new DotNetMSBuildSettings();

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)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)]
 [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)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)]
 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)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)]
 [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.NetVersion60)]
+[TaskArgument(Arguments.DotnetTarget, Constants.NetVersion60, Constants.NetVersion70)]
 [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.NetVersion60 };
+        var frameworks = new[] { Constants.NetVersion60, Constants.NetVersion70 };
         if (!string.IsNullOrWhiteSpace(dotnetTarget))
         {
             if (!frameworks.Contains(dotnetTarget, StringComparer.OrdinalIgnoreCase))

diff --git a/build/common/Utilities/Constants.cs b/build/common/Utilities/Constants.cs
@@ -6,10 +6,12 @@ public class Constants
     public const string Repository = "GitVersion";
 
     public const string Version60 = "6.0";
+    public const string Version70 = "7.0";
 
-    public const string NetVersion60 = "net6.0";
+    public const string NetVersion60 = $"net{Version60}";
+    public const string NetVersion70 = $"net{Version70}";
 
-    public static readonly string[] VersionsToBuild = { Version60 };
+    public static readonly string[] VersionsToBuild = { Version60, Version70 };
     public static readonly Architecture[] ArchToBuild = { Architecture.Amd64, Architecture.Arm64 };
     public static readonly string[] DistrosToSkip = { Alpine313, Alpine314, Centos7 };
 
@@ -26,6 +28,7 @@ public class Constants
 
     public const string Alpine313 = "alpine.3.13";
     public const string Alpine314 = "alpine.3.14";
+    public const string Alpine315 = "alpine.3.15";
     public const string Centos7 = "centos.7";
     public const string Centos8 = "centos.8";
     public const string Debian10 = "debian.10";
@@ -39,6 +42,7 @@ public class Constants
     {
         Alpine313,
         Alpine314,
+        Alpine315,
         Centos7,
         Centos8,
         Debian10,

diff --git a/build/common/Utilities/DockerContextExtensions.cs b/build/common/Utilities/DockerContextExtensions.cs
@@ -13,7 +13,7 @@ public static bool SkipImage(this ICakeContext context, DockerImage dockerImage)
     {
         var (distro, targetFramework, architecture, _, _) = dockerImage;
 
-        if (architecture != Architecture.Arm64) return false;
+        if (architecture == Architecture.Amd64) return false;
         if (!Constants.DistrosToSkip.Contains(distro)) return false;
 
         context.Information($"Skipping Target: {targetFramework}, Distro: {distro}, Arch: {architecture}");
@@ -145,7 +145,8 @@ private static void DockerTestRun(this BuildContextBase context, string image, A
         var output = context.DockerRunImage(settings, image, command, args);
         context.Information("Output : " + output);
 
-        Assert.Contains(context.Version?.GitVersion.FullSemVer, output);
+        Assert.NotNull(context.Version?.GitVersion);
+        Assert.Contains(context.Version.GitVersion.FullSemVer!, output);
     }
     private static IEnumerable<string> GetDockerTags(this BuildContextBase context, DockerImage dockerImage, Architecture? arch = null)
     {

diff --git a/build/common/Utilities/Tools.cs b/build/common/Utilities/Tools.cs
@@ -6,6 +6,6 @@ public class Tools
 
     public static readonly Dictionary<string, string> Versions = new()
     {
-        { NugetCmd, "6.1.0" },
+        { NugetCmd, "6.3.1" },
     };
 }
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)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)]
 [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)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)]
 [IsDependentOn(typeof(DockerManifestInternal))]
 public class DockerManifest : FrostingTask<BuildContext>