Skip to content

Commit d52b320

Browse files
committed
Remove dotnet SDK version from CI (use global.json) (#6037)
(cherry picked from commit 061a5f2)
1 parent 8620afd commit d52b320

File tree

4 files changed

+6
-24
lines changed

4 files changed

+6
-24
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 11 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: '8.0.404'
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
@@ -65,10 +64,7 @@ jobs:
6564
${{ runner.os }}-nuget-
6665
6766
- name: Setup .NET Core SDK
68-
uses: actions/[email protected]
69-
with:
70-
dotnet-version: |
71-
${{ env.dotnet_sdk_version }}
67+
uses: actions/[email protected]
7268

7369
- name: Build
7470
run: dotnet build -c ${{ matrix.config }}
@@ -348,9 +344,7 @@ jobs:
348344
${{ runner.os }}-nuget-
349345
350346
- name: Setup .NET Core SDK
351-
uses: actions/[email protected]
352-
with:
353-
dotnet-version: ${{ env.dotnet_sdk_version }}
347+
uses: actions/[email protected]
354348

355349
- name: Pack
356350
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
@@ -382,9 +376,7 @@ jobs:
382376
uses: actions/checkout@v4
383377

384378
- name: Setup .NET Core SDK
385-
uses: actions/[email protected]
386-
with:
387-
dotnet-version: ${{ env.dotnet_sdk_version }}
379+
uses: actions/[email protected]
388380

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

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 4 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: '8.0.404'
3635
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
3736

3837
jobs:
@@ -66,9 +65,7 @@ jobs:
6665
# queries: ./path/to/local/query, your-org/your-repo/queries@main
6766

6867
- name: Setup .NET Core SDK
69-
uses: actions/[email protected]
70-
with:
71-
dotnet-version: ${{ env.dotnet_sdk_version }}
68+
uses: actions/[email protected]
7269

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

.github/workflows/native-aot.yml

Lines changed: 1 addition & 5 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: '8.0.404'
1918
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
2019
# Uncomment and edit the following to use nightly/preview builds
2120
# nuget_config: |
@@ -64,10 +63,7 @@ jobs:
6463
${{ runner.os }}-nuget-
6564
6665
- name: Setup .NET Core SDK
67-
uses: actions/[email protected]
68-
with:
69-
dotnet-version: |
70-
${{ env.dotnet_sdk_version }}
66+
uses: actions/[email protected]
7167

7268
# - name: Setup nuget config
7369
# run: echo "$nuget_config" > NuGet.config

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ on:
99
- '*'
1010

1111
env:
12-
dotnet_sdk_version: '8.0.404'
1312
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
1413

1514
jobs:
@@ -29,9 +28,7 @@ jobs:
2928
${{ runner.os }}-nuget-
3029
3130
- name: Setup .NET Core SDK
32-
uses: actions/[email protected]
33-
with:
34-
dotnet-version: ${{ env.dotnet_sdk_version }}
31+
uses: actions/[email protected]
3532

3633
- name: Build
3734
run: dotnet build Npgsql.sln --configuration Debug

0 commit comments

Comments
 (0)