Skip to content

Commit 03e8c2c

Browse files
Fix dotnet SDK setup in ci.yml (#133)
1 parent 23c06b7 commit 03e8c2c

File tree

2 files changed

+23
-20
lines changed

2 files changed

+23
-20
lines changed

.azure/pipelines/ci.yml

+9-4
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,20 @@ steps:
4040
inputs:
4141
secureFile: 'VertiPaq-Analyzer.snk'
4242
- task: UseDotNet@2
43-
displayName: '.NET 6.0.x SDK setup'
43+
displayName: 'Install .NET SDK'
4444
inputs:
4545
packageType: sdk
46-
version: 6.0.x
46+
useGlobalJson: true
4747
- task: UseDotNet@2
48-
displayName: '.NET 3.1.x runtime setup'
48+
displayName: 'Install .NET 6.0 runtime'
4949
inputs:
5050
packageType: runtime
51-
version: 3.1.x
51+
version: '6.0.x'
52+
- task: UseDotNet@2
53+
displayName: 'Install .NET 3.1 runtime'
54+
inputs:
55+
packageType: runtime
56+
version: '3.1.x'
5257
- task: DotNetCoreCLI@2
5358
displayName: '.NET restore'
5459
inputs:

.github/workflows/ci.yml

+14-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
name: CI
1+
name: ci
2+
23
on:
34
push:
45
branches:
@@ -7,8 +8,7 @@ on:
78
branches:
89
- master
910
workflow_dispatch:
10-
env:
11-
CONFIGURATION: 'Release'
11+
1212
jobs:
1313
build-and-test:
1414
name: build-and-test--${{ matrix.os-version }}
@@ -18,19 +18,17 @@ jobs:
1818
os-version: [windows-latest] #, ubuntu-latest, macos-latest]
1919
steps:
2020
- uses: actions/checkout@v4
21-
- name: .NET setup
22-
uses: actions/setup-dotnet@v4
21+
- uses: actions/setup-dotnet@v4
2322
with:
24-
dotnet-version: |
23+
dotnet-version: |
2524
3.1.x
2625
6.0.x
27-
- name: .NET info
28-
run: dotnet --info
29-
- name: .NET restore
30-
run: dotnet restore ./VertiPaq-Analyzer.slnf
31-
- name: .NET build
32-
run: dotnet build ./VertiPaq-Analyzer.slnf --configuration ${{ env.CONFIGURATION }} --no-restore
33-
- name: .NET test
34-
run: dotnet test ./VertiPaq-Analyzer.slnf --configuration ${{ env.CONFIGURATION }} --no-build --verbosity normal
35-
- name: .NET pack
36-
run: dotnet pack ./VertiPaq-Analyzer.slnf --configuration ${{ env.CONFIGURATION }} --no-build --no-restore --verbosity normal
26+
global-json-file: global.json
27+
- name: restore
28+
run: dotnet restore VertiPaq-Analyzer.slnf
29+
- name: build
30+
run: dotnet build VertiPaq-Analyzer.slnf --configuration Release --no-restore
31+
- name: test
32+
run: dotnet test VertiPaq-Analyzer.slnf --configuration Release --no-build --verbosity normal
33+
- name: pack
34+
run: dotnet pack VertiPaq-Analyzer.slnf --configuration Release --no-build --no-restore --verbosity normal

0 commit comments

Comments
 (0)