From dfe1e0bc746ddfa42f0405e3713505e6144b190f Mon Sep 17 00:00:00 2001 From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com> Date: Fri, 14 Feb 2025 12:55:17 +0200 Subject: [PATCH 1/2] ci | release-packages: re-install net8 after net3.1 (ubuntu-latest only, windows-latest is ok) --- .github/actions/dotnet-test-build/action.yml | 9 +++++---- .github/workflows/ci.yml | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/actions/dotnet-test-build/action.yml b/.github/actions/dotnet-test-build/action.yml index a99b8155f..b079d4a82 100644 --- a/.github/actions/dotnet-test-build/action.yml +++ b/.github/actions/dotnet-test-build/action.yml @@ -5,10 +5,11 @@ runs: using: "composite" steps: - - uses: actions/setup-dotnet@v3 - with: - dotnet-quality: ga - dotnet-version: 9.0 + # # enable when a next .net preview sdk (not in an image) is needed + # - uses: actions/setup-dotnet@v4 + # with: + # dotnet-quality: ga + # dotnet-version: 10.0 - uses: actions/cache@v4 with: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba6852738..a83b44a93 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,7 +92,9 @@ jobs: - uses: actions/setup-dotnet@v4 with: dotnet-quality: ga - dotnet-version: 3.1 + dotnet-version: | + 3.1 + 8.0 - uses: actions/checkout@v4 From 10d995eced07e68d503c27ad95e00f8a85fab2ed Mon Sep 17 00:00:00 2001 From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com> Date: Fri, 14 Feb 2025 13:12:27 +0200 Subject: [PATCH 2/2] recover net9 (not in ubuntu-latest) for codeql-action/analyze --- .github/actions/dotnet-test-build/action.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/actions/dotnet-test-build/action.yml b/.github/actions/dotnet-test-build/action.yml index b079d4a82..3671d08b7 100644 --- a/.github/actions/dotnet-test-build/action.yml +++ b/.github/actions/dotnet-test-build/action.yml @@ -5,11 +5,10 @@ runs: using: "composite" steps: - # # enable when a next .net preview sdk (not in an image) is needed - # - uses: actions/setup-dotnet@v4 - # with: - # dotnet-quality: ga - # dotnet-version: 10.0 + - uses: actions/setup-dotnet@v4 + with: + dotnet-quality: ga + dotnet-version: 9.0 - uses: actions/cache@v4 with: