Skip to content

Commit a578831

Browse files
Merge remote-tracking branch 'origin/feature/updating-restsharp' into feature/updating-restsharp
2 parents c27a151 + cbba6b8 commit a578831

File tree

2 files changed

+25
-9
lines changed

2 files changed

+25
-9
lines changed

.github/workflows/sonar.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
github.event.pull_request.head.repo.full_name == github.repository ||
2323
github.event_name != 'pull_request_target') }}
2424
run: echo "Unsecure PR, must be labelled with the 'safe' label, then run the workflow again" && exit 1
25-
- name: Setup .NET Core
26-
uses: actions/setup-dotnet@v1
25+
- name: Setup .NET 5
26+
uses: actions/setup-dotnet@v1.9.0
2727
with:
28-
dotnet-version: 2.1.700
28+
dotnet-version: 5.0.x
2929
- name: Setup java
3030
uses: actions/setup-java@v1
3131
with:

.github/workflows/test.yml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,34 @@ jobs:
3838
mono: none
3939
TEST_PROJECT: $NETCORE3_TEST_PROJECT
4040
steps:
41-
- uses: actions/checkout@v2
42-
- name: Setup .NET Core
43-
uses: actions/setup-dotnet@v1
41+
- name: Checkout code
42+
uses: actions/checkout@v2
43+
- name: Setup .NET 6
44+
uses: actions/[email protected]
45+
with:
46+
dotnet-version: 6.0.x
47+
- name: Build using .NET 6
48+
run: >
49+
export PATH="$PATH:$HOME/.dotnet/tools"
50+
51+
dotnet build ${{ env.NETCORE2_TEST_PROJECT }} -c Release
52+
53+
dotnet build ${{ env.NETCORE3_TEST_PROJECT }} -c Release
54+
- name: Setup .NET [Core] ${{ matrix.dotnet }}
55+
uses: actions/[email protected]
4456
with:
4557
dotnet-version: '${{ matrix.dotnet }}'
46-
- name: Test
58+
- name: List .NET SDKs
59+
run: >
60+
dotnet --list-sdks
61+
- name: Run tests using .NET [Core] ${{ matrix.dotnet }}
4762
run: >
4863
export PATH="$PATH:$HOME/.dotnet/tools"
49-
64+
5065
dotnet test ${{ matrix.TEST_PROJECT }} -c Release
5166
-l:"trx;LogFileName=tests.trx" -r:"bin/" /p:CollectCoverage=true
5267
/p:CoverletOutputFormat="opencover"
5368
/p:CoverletOutput="bin/coverage.xml"
54-
69+
- name: Local publish
70+
run: >
5571
dotnet publish ${{ matrix.TEST_PROJECT }} -c Release

0 commit comments

Comments
 (0)