build(deps): Removes the dependency of .NET Core app 3.1 and bumps Ca…

…ke.Coverlet from 2.5.4 to 3.0.2 in /build (#2616)
octokit · Jan 5, 2023 · a8fc68c · a8fc68c
1 parent 04d2a87
commit a8fc68c
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 27 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -9,10 +9,10 @@
       ]
     },
     "dotnet-format": {
-      "version": "3.3.111304",
+      "version": "5.1.250801",
       "commands": [
         "dotnet-format"
       ]
     }
   }
-}
+}
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,11 +1,10 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.234.0/containers/dotnet/.devcontainer/base.Dockerfile
 
-# [Choice] .NET version: 6.0, 5.0, 3.1, 6.0-bullseye, 5.0-bullseye, 3.1-bullseye, 6.0-focal, 5.0-focal, 3.1-focal
+# [Choice] .NET version: 6.0, 5.0, 6.0-bullseye, 5.0-bullseye, 6.0-focal, 5.0-focal
 ARG VARIANT="6.0-bullseye"
 FROM mcr.microsoft.com/vscode/devcontainers/dotnet
 
-# "install" the dotnet 3.1 & 5.0 runtime for tests
-COPY --from=mcr.microsoft.com/dotnet/sdk:3.1 /usr/share/dotnet/shared /usr/share/dotnet/shared
+# "install" the dotnet 5.0 & 6.0 runtime for tests
 COPY --from=mcr.microsoft.com/dotnet/sdk:5.0 /usr/share/dotnet/shared /usr/share/dotnet/shared
 COPY --from=mcr.microsoft.com/dotnet/sdk:6.0 /usr/share/dotnet/shared /usr/share/dotnet/shared
 

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -5,7 +5,7 @@
   "build": {
     "dockerfile": "Dockerfile",
     "args": {
-      // Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0
+      // Update 'VARIANT' to pick a .NET Core version: 5.0, 6.0
       // Append -bullseye or -focal to pin to an OS version.
       "VARIANT": "latest"
     }

diff --git a/.github/workflows/netcore.yml b/.github/workflows/netcore.yml
@@ -27,10 +27,6 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 6.0.*
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 3.1.*
     - name: Build with dotnet
       run: ./build.sh --linksources=true --verbosity=verbose
       shell: bash
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -21,11 +21,6 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 6.0.*
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 3.1.*
-
     - name: Build with dotnet
       run: ./build.sh --linksources=true --verbosity=verbose
       shell: bash

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -16,7 +16,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build",
-      "program": "${workspaceFolder}/Octokit.Tests/bin/Debug/netcoreapp3.1/Octokit.Tests.dll",
+      "program": "${workspaceFolder}/Octokit.Tests/bin/Debug/net6.0/Octokit.Tests.dll",
       "args": [],
       "cwd": "${workspaceFolder}/Octokit.Tests",
       "console": "internalConsole",
@@ -27,7 +27,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build",
-      "program": "${workspaceFolder}/Octokit.Tests.Conventions/bin/Debug/netcoreapp3.1/Octokit.Tests.Conventions.dll",
+      "program": "${workspaceFolder}/Octokit.Tests.Conventions/bin/Debug/net6.0/Octokit.Tests.Conventions.dll",
       "args": [],
       "cwd": "${workspaceFolder}/Octokit.Tests.Conventions",
       "console": "internalConsole",
@@ -38,7 +38,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build",
-      "program": "${workspaceFolder}/Octokit.Tests.Integration/bin/Debug/netcoreapp3.1/Octokit.Tests.Integration.dll",
+      "program": "${workspaceFolder}/Octokit.Tests.Integration/bin/Debug/net6.0/Octokit.Tests.Integration.dll",
       "args": [],
       "cwd": "${workspaceFolder}/Octokit.Tests.Integration",
       "console": "internalConsole",

diff --git a/Octokit.AsyncPaginationExtension/Octokit.AsyncPaginationExtension.csproj b/Octokit.AsyncPaginationExtension/Octokit.AsyncPaginationExtension.csproj
@@ -6,7 +6,7 @@
     <Authors>GitHub</Authors>
     <Version>0.0.0-dev</Version>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
     <AssemblyName>Octokit.AsyncPaginationExtension</AssemblyName>
     <PackageId>Octokit.AsyncPaginationExtension</PackageId>
     <DebugType>embedded</DebugType>
@@ -25,7 +25,7 @@
     <NetStandardImplicitPackageVersion>2.0.0</NetStandardImplicitPackageVersion>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
   </ItemGroup>
 

diff --git a/Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj b/Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj
@@ -4,7 +4,7 @@
     <Description>Convention-based tests for Octokit</Description>
     <AssemblyTitle>Octokit.Tests.Conventions</AssemblyTitle>
     <Authors>GitHub</Authors>
-    <TargetFrameworks>net6.0;netcoreapp3.1;net462</TargetFrameworks>
+    <TargetFrameworks>net6.0;net462</TargetFrameworks>
     <NoWarn>$(NoWarn);CS4014;CS1998</NoWarn>
     <AssemblyName>Octokit.Tests.Conventions</AssemblyName>
     <PackageId>Octokit.Tests.Conventions</PackageId>

diff --git a/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj b/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj
@@ -4,7 +4,7 @@
     <Description>Integration tests for Octokit</Description>
     <AssemblyTitle>Octokit.Tests.Integration</AssemblyTitle>
     <Authors>GitHub</Authors>
-    <TargetFrameworks>net6.0;netcoreapp3.1;net462</TargetFrameworks>
+    <TargetFrameworks>net6.0;net462</TargetFrameworks>
     <SignAssembly>false</SignAssembly>
     <NoWarn>$(NoWarn);CS4014;CS1998</NoWarn>
     <AssemblyName>Octokit.Tests.Integration</AssemblyName>

diff --git a/Octokit.Tests/Octokit.Tests.csproj b/Octokit.Tests/Octokit.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>Tests for Octokit</Description>
     <AssemblyTitle>Octokit.Tests</AssemblyTitle>
     <Authors>GitHub</Authors>
-    <TargetFrameworks>net6.0;netcoreapp3.1;net462</TargetFrameworks>
+    <TargetFrameworks>net6.0;net462</TargetFrameworks>
     <NoWarn>$(NoWarn);CS4014;CS1998</NoWarn>
     <AssemblyName>Octokit.Tests</AssemblyName>
     <PackageId>Octokit.Tests</PackageId>

diff --git a/build/.vscode/launch.json b/build/.vscode/launch.json
@@ -10,7 +10,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/bin/Debug/netcoreapp3.1/Build.dll",
+            "program": "${workspaceFolder}/bin/Debug/net6.0/Build.dll",
             "args": [],
             "cwd": "${workspaceFolder}",
             // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window

diff --git a/build/Build.csproj b/build/Build.csproj
@@ -3,12 +3,12 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <SignAssembly>false</SignAssembly>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RunWorkingDirectory>$(MSBuildProjectDirectory)/..</RunWorkingDirectory>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Coverlet" Version="2.5.4" />
+    <PackageReference Include="Cake.Coverlet" Version="3.0.2" />
     <PackageReference Include="Cake.Frosting" Version="2.3.0" />
   </ItemGroup>
 

diff --git a/build/Context.cs b/build/Context.cs
@@ -38,7 +38,7 @@ public DotNetTestSettings GetTestSettings()
 
         if (!this.IsRunningOnWindows())
         {
-            var testFramework = "netcoreapp3.1";
+            var testFramework = "net6.0";
 
             this.Information($"Running tests against {testFramework} only as we're not on Windows.");
             settings.Framework = testFramework;