diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index f319224cf0..83c3421af3 100644 --- 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" ] } } -} \ No newline at end of file +} diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 048069c31a..d77cb454d4 100644 --- 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 index 2e8d25a1b7..e303b33333 100644 --- 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 index d7c39fdcf9..3eb5a4e2cf 100644 --- 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 index e6c84a6813..8741faedfd 100644 --- 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 index 73a4369e41..b1d5033cf1 100644 --- 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 index 79d58866f5..c7668a4dbc 100644 --- a/Octokit.AsyncPaginationExtension/Octokit.AsyncPaginationExtension.csproj +++ b/Octokit.AsyncPaginationExtension/Octokit.AsyncPaginationExtension.csproj @@ -6,7 +6,7 @@ GitHub 0.0.0-dev true - netstandard2.0;net461 + netstandard2.0;net462 Octokit.AsyncPaginationExtension Octokit.AsyncPaginationExtension embedded @@ -25,7 +25,7 @@ 2.0.0 - + diff --git a/Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj b/Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj index 9f3ce75d1c..ae4d2c9213 100644 --- a/Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj +++ b/Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj @@ -4,7 +4,7 @@ Convention-based tests for Octokit Octokit.Tests.Conventions GitHub - net6.0;netcoreapp3.1;net462 + net6.0;net462 $(NoWarn);CS4014;CS1998 Octokit.Tests.Conventions Octokit.Tests.Conventions diff --git a/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj b/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj index ee6cc3f65b..289a93ab49 100644 --- a/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj +++ b/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj @@ -4,7 +4,7 @@ Integration tests for Octokit Octokit.Tests.Integration GitHub - net6.0;netcoreapp3.1;net462 + net6.0;net462 false $(NoWarn);CS4014;CS1998 Octokit.Tests.Integration diff --git a/Octokit.Tests/Octokit.Tests.csproj b/Octokit.Tests/Octokit.Tests.csproj index 9a3af636d2..8056f00389 100644 --- a/Octokit.Tests/Octokit.Tests.csproj +++ b/Octokit.Tests/Octokit.Tests.csproj @@ -4,7 +4,7 @@ Tests for Octokit Octokit.Tests GitHub - net6.0;netcoreapp3.1;net462 + net6.0;net462 $(NoWarn);CS4014;CS1998 Octokit.Tests Octokit.Tests diff --git a/build/.vscode/launch.json b/build/.vscode/launch.json index 1c67c5f4c1..1926babdda 100644 --- 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 index ff64d50664..b6cc45d141 100644 --- a/build/Build.csproj +++ b/build/Build.csproj @@ -3,12 +3,12 @@ Exe false - netcoreapp3.1 + net6.0 $(MSBuildProjectDirectory)/.. - + diff --git a/build/Context.cs b/build/Context.cs index f9ede409e5..95ab580761 100644 --- 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;