Skip to content

Commit 061a5f2

Browse files
rojiroji
authored
Remove dotnet SDK version from CI (use global.json) (#6037)
1 parent 3146bcd commit 061a5f2

File tree

5 files changed

+1
-22
lines changed

5 files changed

+1
-22
lines changed

‎.github/workflows/build.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ concurrency:
1515
cancel-in-progress: true
1616

1717
env:
18-
dotnet_sdk_version: '9.0.100'
1918
postgis_version: 3
2019
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
2120
# Windows comes with PG pre-installed, and defines the PGPASSWORD environment variable. Remove it as it interferes
@@ -70,9 +69,6 @@ jobs:
7069
7170
- name: Setup .NET Core SDK
7271
uses: actions/setup-dotnet@v4.3.0
73-
with:
74-
dotnet-version: |
75-
${{ env.dotnet_sdk_version }}
7672

7773
- name: Build
7874
run: dotnet build -c ${{ matrix.config }}
@@ -355,8 +351,6 @@ jobs:
355351
356352
- name: Setup .NET Core SDK
357353
uses: actions/setup-dotnet@v4.3.0
358-
with:
359-
dotnet-version: ${{ env.dotnet_sdk_version }}
360354

361355
- name: Pack
362356
run: dotnet pack Npgsql.sln --configuration Release --property:PackageOutputPath="$PWD/nupkgs" --version-suffix "ci.$(date -u +%Y%m%dT%H%M%S)+sha.${GITHUB_SHA:0:9}" -p:ContinuousIntegrationBuild=true
@@ -389,8 +383,6 @@ jobs:
389383

390384
- name: Setup .NET Core SDK
391385
uses: actions/setup-dotnet@v4.3.0
392-
with:
393-
dotnet-version: ${{ env.dotnet_sdk_version }}
394386

395387
- name: Pack
396388
run: dotnet pack Npgsql.sln --configuration Release --property:PackageOutputPath="$PWD/nupkgs" -p:ContinuousIntegrationBuild=true

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ concurrency:
3232
cancel-in-progress: true
3333

3434
env:
35-
dotnet_sdk_version: '9.0.100'
3635
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
3736

3837
jobs:
@@ -67,8 +66,6 @@ jobs:
6766

6867
- name: Setup .NET Core SDK
6968
uses: actions/setup-dotnet@v4.3.0
70-
with:
71-
dotnet-version: ${{ env.dotnet_sdk_version }}
7269

7370
- name: Build
7471
run: dotnet build -c Release

‎.github/workflows/native-aot.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ concurrency:
1515
cancel-in-progress: true
1616

1717
env:
18-
dotnet_sdk_version: '9.0.100'
1918
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
2019
AOT_Compat: |
2120
param([string]$targetFramework)
@@ -109,9 +108,6 @@ jobs:
109108
110109
- name: Setup .NET Core SDK
111110
uses: actions/setup-dotnet@v4.3.0
112-
with:
113-
dotnet-version: |
114-
${{ env.dotnet_sdk_version }}
115111

116112
- name: Write script
117113
run: echo "$AOT_Compat" > test-aot-compatibility.ps1
@@ -146,9 +142,6 @@ jobs:
146142
147143
- name: Setup .NET Core SDK
148144
uses: actions/setup-dotnet@v4.3.0
149-
with:
150-
dotnet-version: |
151-
${{ env.dotnet_sdk_version }}
152145

153146
- name: Start PostgreSQL
154147
run: |

‎.github/workflows/rich-code-nav.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
workflow_dispatch:
55

66
env:
7-
dotnet_sdk_version: '9.0.100'
87
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
98

109
jobs:
@@ -25,8 +24,6 @@ jobs:
2524
2625
- name: Setup .NET Core SDK
2726
uses: actions/setup-dotnet@v4.3.0
28-
with:
29-
dotnet-version: ${{ env.dotnet_sdk_version }}
3027

3128
- name: Build
3229
run: dotnet build Npgsql.sln --configuration Debug

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.100",
3+
"version": "9.0.200",
44
"rollForward": "latestMajor",
55
"allowPrerelease": false
66
}

0 commit comments

Comments
 (0)