Skip to content

Commit af5d036

Browse files
committed
Move setup-dotnet out of compile action
and bump dotnet version to 8.0 nominal, with tests on 7 and 9
1 parent f2e1cac commit af5d036

File tree

5 files changed

+21
-12
lines changed

5 files changed

+21
-12
lines changed

.github/actions/compile/action.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ inputs:
1010
default: Release
1111
description: The project configuration to build.
1212

13-
dotnet-version:
14-
default: 5.x
15-
description: Version of dotnet compiler to use. Defaults to 5.x.
16-
1713
ksp-zip-url:
1814
default: https://github.com/KSPModdingLibs/KSPLibs/raw/main/KSP-1.12.5.zip
1915
description: >
@@ -61,11 +57,6 @@ runs:
6157
shell: bash
6258
run: echo 'KSP_ROOT=${{ '/tmp/ksp' }}' >> "$GITHUB_ENV"
6359

64-
- name: Setup .NET
65-
uses: actions/setup-dotnet@v4
66-
with:
67-
dotnet-version: ${{ inputs.dotnet-version }}
68-
6960
- name: Download KSP Libs
7061
shell: bash
7162
run: |

.github/workflows/build.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ on:
2828
description: >
2929
Set to true if your project uses a packages.config file instead of packagereferences. This will cause the job
3030
to run on the Ubuntu-22.04 image instead of Ubuntu-24.04
31+
dotnet-version:
32+
type: string
33+
default: 8.x
34+
description: Version of dotnet compiler to use.
3135
use-ckan:
3236
type: boolean
3337
default: false
@@ -50,6 +54,11 @@ jobs:
5054
with:
5155
submodules: true
5256

57+
- name: Setup .NET
58+
uses: actions/setup-dotnet@v4
59+
with:
60+
dotnet-version: ${{ inputs.dotnet-version }}
61+
5362
# Install CKAN and set up an instance
5463
- uses: KSPModdingLibs/KSPBuildTools/.github/actions/[email protected]
5564
if: ${{ (inputs.use-ckan && inputs.use-msbuild) || inputs.dependency-identifiers }}

.github/workflows/internal-test-plugin-legacy.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ jobs:
1212
runs-on: ubuntu-22.04
1313
steps:
1414
- uses: actions/checkout@v4
15+
16+
- name: Setup .NET
17+
uses: actions/setup-dotnet@v4
18+
with:
19+
dotnet-version: '8.x'
1520

1621
- uses: ./.github/actions/setup-ckan
1722

.github/workflows/internal-test-plugin-nuget.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ jobs:
1717
build:
1818
strategy:
1919
matrix:
20-
dotnet-version: [ 5.x, 7.x, 9.x ]
20+
dotnet-version: [ 7.x, 8.x, 9.x ]
2121
runs-on: ubuntu-24.04
2222
steps:
2323
- uses: actions/checkout@v4
2424

2525
- name: Setup .NET
2626
uses: actions/setup-dotnet@v4
2727
with:
28-
dotnet-version: 8.0.x
28+
dotnet-version: ${{ matrix.dotnet-version }}
2929

3030
- name: Setup Nuget Package Sources
3131
run: |
@@ -44,7 +44,6 @@ jobs:
4444
ksp-zip-url: https://github.com/KSPModdingLibs/KSPLibs/raw/main/KSP-1.12.5.zip
4545
working-directory: ${{ env.TESTDIR }}
4646
solution-file-path: plugin-mod-nuget.csproj
47-
dotnet-version: ${{ matrix.dotnet-version }}
4847
env:
4948
KSPBuildToolsVersion: ${{ inputs.package-version }}
5049

.github/workflows/internal-test-plugin.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ jobs:
1212
runs-on: ubuntu-24.04
1313
steps:
1414
- uses: actions/checkout@v4
15+
16+
- name: Setup .NET
17+
uses: actions/setup-dotnet@v4
18+
with:
19+
dotnet-version: '8.x'
1520

1621
- uses: ./.github/actions/setup-ckan
1722

0 commit comments

Comments
 (0)