Update Builds

Remove .net core 3.1
update from macos-10.15 to macos-latest
Upgraded Nuke
Upgrade to .Net 8
Convert to MacOS-latest instead of 10.15

Author: stevencl840

.github/workflows/ci.yml

@@ -25,7 +25,11 @@ jobs:
       - name: Build
         run: dotnet build LibGit2Sharp.sln --configuration Release
       - name: Upload packages
+<<<<<<< HEAD
         uses: actions/[email protected]
+=======
+        uses: actions/[email protected]
+>>>>>>> ced162ae (Update Builds)
         with:
           name: NuGet packages
           path: bin/Packages/
@@ -36,10 +40,17 @@ jobs:
     strategy:
       matrix:
         arch: [ amd64 ]
+<<<<<<< HEAD
         os: [ windows-2019, macos-11 ]
         tfm: [ net472, net6.0, net7.0 ]
         exclude:
           - os: macos-11
+=======
+        os: [windows-2019, macos-latest]
+        tfm: [ net472, net6.0 ]
+        exclude:
+          - os: macos-latest
+>>>>>>> ced162ae (Update Builds)
             tfm: net472
       fail-fast: false
     steps:
@@ -50,9 +61,13 @@ jobs:
       - name: Install .NET SDK
         uses: actions/[email protected]
         with:
+<<<<<<< HEAD
           dotnet-version: |
             7.0.x
             6.0.x
+=======
+          dotnet-version: 6.0.x
+>>>>>>> ced162ae (Update Builds)
       - name: Run ${{ matrix.tfm }} tests
         run: dotnet test LibGit2Sharp.sln --configuration Release --framework ${{ matrix.tfm }} --logger "GitHubActions" /p:ExtraDefine=LEAKS_IDENTIFYING
   test-linux:
@@ -62,8 +77,13 @@ jobs:
       matrix:
         arch: [ amd64 ]
         # arch: [ amd64, arm64 ]
+<<<<<<< HEAD
         distro: [ alpine.3.13, alpine.3.14, alpine.3.15, alpine.3.16, alpine.3.17, centos.7, centos.stream.8, debian.10, debian.11, fedora.36, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ]
         sdk:  [ '6.0', '7.0' ]
+=======
+        distro: [ alpine.3.12, alpine.3.13, alpine.3.14, centos.7, centos.8, debian.9, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04 ]
+        sdk:  [ '6.0' ]
+>>>>>>> ced162ae (Update Builds)
         exclude:
           - distro: alpine.3.13
             sdk: '7.0'
@@ -72,8 +92,11 @@ jobs:
         include:
           - sdk: '6.0'
             tfm: net6.0
+<<<<<<< HEAD
           - sdk: '7.0'
             tfm: net7.0
+=======
+>>>>>>> ced162ae (Update Builds)
       fail-fast: false
     steps:
       - name: Checkout
@@ -87,5 +110,9 @@ jobs:
         run: |
             git_command="git config --global --add safe.directory /app"
             test_command="dotnet test LibGit2Sharp.sln --configuration Release -p:TargetFrameworks=${{ matrix.tfm }} --logger "GitHubActions" -p:ExtraDefine=LEAKS_IDENTIFYING"
+<<<<<<< HEAD
             docker run -t --rm --platform linux/${{ matrix.arch }} -v "$PWD:/app" gittools/build-images:${{ matrix.distro }}-sdk-${{ matrix.sdk }} sh -c "$git_command && $test_command"
 
+=======
+            docker run -t --rm --platform linux/${{ matrix.arch }} -v "$PWD:/app" gittools/build-images:${{ matrix.distro }}-sdk-${{ matrix.sdk }} sh -c "$test_command"
+>>>>>>> ced162ae (Update Builds)

.nuke/build.schema.json

@@ -83,8 +83,7 @@
               "Compile",
               "Pack",
               "Restore",
-              "TestNet6",
-              "TestNetCoreApp31"
+              "TestNet6"
             ]
           }
         },
@@ -102,8 +101,7 @@
               "Compile",
               "Pack",
               "Restore",
-              "TestNet6",
-              "TestNetCoreApp31"
+              "TestNet6"
             ]
           }
         },

LibGit2Sharp.Tests/CloneFixture.cs

@@ -261,7 +261,7 @@ public void CanInspectCertificateOnClone(string url, string hostname, Type certT
                         Assert.True(valid);
                         var x509 = ((CertificateX509)cert).Certificate;
                         // we get a string with the different fields instead of a structure, so...
-                        Assert.Contains("CN=github.com,", x509.Subject);
+                        Assert.Contains("CN=github.com", x509.Subject);
                         checksHappy = true;
                         return false;
                     }

LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj

@@ -1,7 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+<<<<<<< HEAD
     <TargetFrameworks Condition="'$(TargetFrameworks)'==''">net472;net6.0;net7.0</TargetFrameworks>
+=======
+    <TargetFrameworks Condition="'$(TargetFrameworks)'==''">net472;net6.0</TargetFrameworks>
+>>>>>>> ced162ae (Update Builds)
   </PropertyGroup>
 
   <ItemGroup>

LibGit2Sharp/LibGit2Sharp.csproj

@@ -1,7 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+<<<<<<< HEAD
     <TargetFrameworks>net472;net6.0</TargetFrameworks>
+=======
+    <TargetFrameworks>netstandard2.0;</TargetFrameworks>
+>>>>>>> ced162ae (Update Builds)
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>LibGit2Sharp brings all the might and speed of libgit2, a native Git implementation, to the managed world of .NET</Description>
     <Company>LibGit2Sharp contributors</Company>

build/Build.cs

@@ -1,6 +1,4 @@
 using Nuke.Common;
-using Nuke.Common.CI;
-using Nuke.Common.Execution;
 using Nuke.Common.IO;
 using Nuke.Common.ProjectModel;
 using Nuke.Common.Tools.DotNet;
@@ -9,16 +7,13 @@
 using static Nuke.Common.IO.FileSystemTasks;
 using static Nuke.Common.Tools.DotNet.DotNetTasks;
 
-[CheckBuildProjectConfigurations]
-[ShutdownDotNetAfterServerBuild]
 class Build : NukeBuild
 {
     /// Support plugins are available for:
     ///   - JetBrains ReSharper        https://nuke.build/resharper
     ///   - JetBrains Rider            https://nuke.build/rider
     ///   - Microsoft VisualStudio     https://nuke.build/visualstudio
     ///   - Microsoft VSCode           https://nuke.build/vscode
-
     public static int Main() => Execute<Build>(x => x.Pack);
 
     [Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
@@ -28,11 +23,13 @@ class Build : NukeBuild
 
     [Solution] readonly Solution Solution;
 
-    [Parameter("Branch name for OctoVersion to use to calculate the version number. Can be set via the environment variable OCTOVERSION_CurrentBranch.",
-     Name = "OCTOVERSION_CurrentBranch")]
+    [Parameter(
+        "Branch name for OctoVersion to use to calculate the version number. Can be set via the environment variable OCTOVERSION_CurrentBranch.",
+        Name = "OCTOVERSION_CurrentBranch")]
     readonly string BranchName;
 
-    [Parameter("Whether to auto-detect the branch name - this is okay for a local build, but should not be used under CI.")]
+    [Parameter(
+        "Whether to auto-detect the branch name - this is okay for a local build, but should not be used under CI.")]
     readonly bool AutoDetectBranch = IsLocalBuild;
 
     [OctoVersion(UpdateBuildNumber = true, BranchParameter = nameof(BranchName),
@@ -42,10 +39,7 @@ class Build : NukeBuild
     // For outline of original build process used by original source repository, check ./azure-pipelines/dotnet.yml
     Target Clean => _ => _
         .Before(Restore)
-        .Executes(() =>
-        {
-            DeleteDirectory(ArtifactsDirectory);
-        });
+        .Executes(() => { DeleteDirectory(ArtifactsDirectory); });
 
     Target Restore => _ => _
         .DependsOn(Clean)
@@ -67,35 +61,21 @@ class Build : NukeBuild
                 .EnableNoRestore());
         });
 
-    Target TestNetCoreApp31 => _ => _
-        .DependsOn(Compile)
-        .Executes(() =>
-        {
-            DotNetTest(s => s
-                .SetProjectFile(Solution)
-                .SetConfiguration(Configuration)
-                .SetFramework("netcoreapp3.1")  // Dont bother building for full framework
-                .SetNoBuild(true)
-                .SetFilter("TestCategory!=FailsInCloudTest & TestCategory!=FailsWhileInstrumented")
-                .EnableNoRestore());
-        });
-
     Target TestNet6 => _ => _
         .DependsOn(Compile)
         .Executes(() =>
         {
             DotNetTest(s => s
                 .SetProjectFile(Solution)
                 .SetConfiguration(Configuration)
-                .SetFramework("net6.0")  // Dont bother building for full framework
+                .SetFramework("net6.0") // Dont bother building for full framework
                 .SetNoBuild(true)
                 .SetFilter("TestCategory!=FailsInCloudTest & TestCategory!=FailsWhileInstrumented")
                 .EnableNoRestore());
         });
 
     Target Pack => _ => _
         .DependsOn(Compile)
-        .DependsOn(TestNetCoreApp31)
         .DependsOn(TestNet6)
         .Executes(() =>
         {

build/_build.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="6.0.3" />
+    <PackageReference Include="Nuke.Common" Version="6.3.0" />
     <PackageDownload Include="OctoVersion.Tool" Version="[0.2.1058]" />
   </ItemGroup>