From 8e17a7f2bc5d270fd88f5e5f368a9d10124366aa Mon Sep 17 00:00:00 2001 From: Archomeda Date: Thu, 30 Dec 2021 21:07:23 +0100 Subject: [PATCH 1/4] Remove netcoreapp2.1 and add net6.0 for testing --- .github/workflows/ci.yml | 2 +- .github/workflows/command-test.yml | 2 +- .github/workflows/publish-version.yml | 3 ++- Gw2Sharp.Tests/Gw2Sharp.Tests.csproj | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 305b90136..1de2ef739 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,9 +20,9 @@ jobs: - ubuntu-latest - windows-latest dotnet: + - net6.0 - net5.0 - netcoreapp3.1 - - netcoreapp2.1 - net461 exclude: - os: ubuntu-latest diff --git a/.github/workflows/command-test.yml b/.github/workflows/command-test.yml index d43d6f2f8..f65a15c8b 100644 --- a/.github/workflows/command-test.yml +++ b/.github/workflows/command-test.yml @@ -29,9 +29,9 @@ jobs: - ubuntu-latest - windows-latest dotnet: + - net6.0 - net5.0 - netcoreapp3.1 - - netcoreapp2.1 - net461 exclude: - os: ubuntu-latest diff --git a/.github/workflows/publish-version.yml b/.github/workflows/publish-version.yml index d75b3c9ea..69036564a 100644 --- a/.github/workflows/publish-version.yml +++ b/.github/workflows/publish-version.yml @@ -16,8 +16,9 @@ jobs: - ubuntu-latest - windows-latest dotnet: + - net6.0 + - net5.0 - netcoreapp3.1 - - netcoreapp2.1 - net461 exclude: - os: ubuntu-latest diff --git a/Gw2Sharp.Tests/Gw2Sharp.Tests.csproj b/Gw2Sharp.Tests/Gw2Sharp.Tests.csproj index 0c4a11e11..2d541ede9 100644 --- a/Gw2Sharp.Tests/Gw2Sharp.Tests.csproj +++ b/Gw2Sharp.Tests/Gw2Sharp.Tests.csproj @@ -1,7 +1,7 @@ - net5.0;netcoreapp3.1;netcoreapp2.1;net461 + net5.0;netcoreapp3.1;net461 preview annotations false From 1b193981ae97dbc3d0664b1852db1f60be75cbe2 Mon Sep 17 00:00:00 2001 From: Archomeda Date: Thu, 30 Dec 2021 21:08:56 +0100 Subject: [PATCH 2/4] Add .NET 6 to test project --- Gw2Sharp.Tests/Gw2Sharp.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gw2Sharp.Tests/Gw2Sharp.Tests.csproj b/Gw2Sharp.Tests/Gw2Sharp.Tests.csproj index 2d541ede9..fe36bed9f 100644 --- a/Gw2Sharp.Tests/Gw2Sharp.Tests.csproj +++ b/Gw2Sharp.Tests/Gw2Sharp.Tests.csproj @@ -1,7 +1,7 @@ - net5.0;netcoreapp3.1;net461 + net6.0;net5.0;netcoreapp3.1;net461 preview annotations false From 43fd101dd76f928376c86bdc3fdc656e78de9e7c Mon Sep 17 00:00:00 2001 From: Archomeda Date: Thu, 30 Dec 2021 21:15:35 +0100 Subject: [PATCH 3/4] Target windows-2022 instead of windows-latest because latest is somehow not 2022... --- .github/workflows/ci.yml | 2 +- .github/workflows/command-test.yml | 4 ++-- .github/workflows/publish-version.yml | 4 ++-- .github/workflows/release.yml | 2 +- .github/workflows/sonarcloud.yml | 2 +- .github/workflows/update-docs.yml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1de2ef739..e03f6c072 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: matrix: os: - ubuntu-latest - - windows-latest + - windows-2022 dotnet: - net6.0 - net5.0 diff --git a/.github/workflows/command-test.yml b/.github/workflows/command-test.yml index f65a15c8b..2e1f05247 100644 --- a/.github/workflows/command-test.yml +++ b/.github/workflows/command-test.yml @@ -27,7 +27,7 @@ jobs: matrix: os: - ubuntu-latest - - windows-latest + - windows-2022 dotnet: - net6.0 - net5.0 @@ -45,7 +45,7 @@ jobs: sonarcloud: name: Analysis - runs-on: windows-latest + runs-on: windows-2022 needs: [pre] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/publish-version.yml b/.github/workflows/publish-version.yml index 69036564a..37d84b9b9 100644 --- a/.github/workflows/publish-version.yml +++ b/.github/workflows/publish-version.yml @@ -14,7 +14,7 @@ jobs: matrix: os: - ubuntu-latest - - windows-latest + - windows-2022 dotnet: - net6.0 - net5.0 @@ -30,7 +30,7 @@ jobs: release: name: Release - runs-on: windows-latest + runs-on: windows-2022 needs: [test] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b0c1dcf92..847ed9e3c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ on: jobs: nuget: name: NuGet - runs-on: windows-latest + runs-on: windows-2022 steps: - name: Download NuGet packages shell: powershell diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 97176309b..f17d701c6 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -8,7 +8,7 @@ on: jobs: sonarcloud: name: Analysis - runs-on: windows-latest + runs-on: windows-2022 if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Archomeda/Gw2Sharp' steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/update-docs.yml b/.github/workflows/update-docs.yml index 3efcfa053..9e201e7a6 100644 --- a/.github/workflows/update-docs.yml +++ b/.github/workflows/update-docs.yml @@ -10,7 +10,7 @@ on: jobs: build: name: Build - runs-on: windows-latest + runs-on: windows-2022 steps: - uses: actions/checkout@v2 - name: Download docfx From 69916081b039c8c1580451f25e30c02c1e3805eb Mon Sep 17 00:00:00 2001 From: Archomeda Date: Sun, 6 Feb 2022 15:39:12 +0100 Subject: [PATCH 4/4] Rerun actions