Skip to content

Commit c906a4a

Browse files
committed
Rollback to windows-2019 but include .NET6 via action
1 parent 08c50f7 commit c906a4a

File tree

3 files changed

+35
-17
lines changed

3 files changed

+35
-17
lines changed

.github/workflows/wf-build-release-ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ on:
66
workflow_dispatch:
77
jobs:
88
build:
9-
runs-on: windows-2022
9+
runs-on: windows-2019
1010
env:
1111
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
1212
steps:
1313
- uses: actions/checkout@v1
1414
name: Checkout Code
15-
16-
- name: Setup MSBuild Ppth
15+
16+
- name: Setup MSBuild Path
1717
uses: microsoft/setup-msbuild@v1
1818

1919
- name: Setup NuGet
@@ -33,7 +33,7 @@ jobs:
3333

3434
test:
3535
needs: build
36-
runs-on: windows-2022
36+
runs-on: windows-2019
3737
steps:
3838
- name: Download artifacts
3939
uses: actions/[email protected]
@@ -90,7 +90,7 @@ jobs:
9090

9191
pack-push-ci:
9292
needs: test
93-
runs-on: windows-2022
93+
runs-on: windows-2019
9494
env:
9595
GH_PKG_SEC: ${{ secrets.GH_PKG_REPO }}
9696
steps:
@@ -124,7 +124,7 @@ jobs:
124124
clean:
125125
needs: [build, test, pack-push-ci]
126126
if: always()
127-
runs-on: windows-2022
127+
runs-on: windows-2019
128128
steps:
129129
- name: Delete artifacts
130130
uses: GeekyEggo/[email protected]

.github/workflows/wf-build-release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ on:
77
required: true
88
jobs:
99
build:
10-
runs-on: windows-2022
10+
runs-on: windows-2019
1111
env:
1212
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
1313
steps:
1414
- uses: actions/checkout@v1
1515
name: Checkout Code
1616

17-
- name: Setup MSBuild Ppth
17+
- name: Setup MSBuild Path
1818
uses: microsoft/setup-msbuild@v1
1919

2020
- name: Setup NuGet
@@ -34,7 +34,7 @@ jobs:
3434

3535
test:
3636
needs: build
37-
runs-on: windows-2022
37+
runs-on: windows-2019
3838
steps:
3939
- name: Download artifacts
4040
uses: actions/[email protected]
@@ -90,7 +90,7 @@ jobs:
9090

9191
pack-push-release:
9292
needs: test
93-
runs-on: windows-2022
93+
runs-on: windows-2019
9494
env:
9595
GH_PKG_SEC: ${{ secrets.GH_PKG_REPO }}
9696
steps:
@@ -120,7 +120,7 @@ jobs:
120120
clean:
121121
needs: [build, test, pack-push-release]
122122
if: always()
123-
runs-on: windows-2022
123+
runs-on: windows-2019
124124
steps:
125125
- name: Delete artifacts
126126
uses: GeekyEggo/[email protected]

.github/workflows/wf-build-test.yml

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,19 @@ on:
66
workflow_dispatch:
77
jobs:
88
build:
9-
runs-on: windows-2022
9+
runs-on: windows-2019
1010
env:
1111
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
1212
steps:
1313
- uses: actions/checkout@v1
1414
name: Checkout Code
15-
16-
- name: Setup MSBuild Ppth
15+
16+
- name: Install .NET 6
17+
uses: actions/setup-dotnet@v1
18+
with:
19+
dotnet-version: '3.1.x'
20+
21+
- name: Setup MSBuild Path
1722
uses: microsoft/setup-msbuild@v1
1823

1924
- name: Setup NuGet
@@ -33,34 +38,47 @@ jobs:
3338

3439
test:
3540
needs: build
36-
runs-on: windows-2022
41+
runs-on: windows-2019
3742
steps:
3843
- name: Download artifacts
3944
uses: actions/[email protected]
4045
with:
4146
name: Compiled project
42-
path: D:\a\qrcoder\qrcoder
47+
path: D:\a\qrcoder\qrcoder
48+
49+
- name: Install .NET 6
50+
uses: actions/setup-dotnet@v1
51+
with:
52+
dotnet-version: '3.1.x'
53+
4354
- name: Run test .NET 3.5
4455
run: dotnet test -c Release -f net35 --nologo --no-build # No coverage for NET3.5 because of bug in combination with Coverlet+Stron naming
56+
4557
- name: Run test .NET 4.52
4658
run: dotnet test -c Release -f net452 --nologo --no-build # No coverage for NET4.5 because of bug in combination with Coverlet+Stron naming
59+
4760
- name: Run test .NET Core 1.3
4861
run: dotnet test -c Release -f netcoreapp1.3 --nologo /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
62+
4963
- name: Run test .NET Core 2.0
5064
run: dotnet test -c Release -f netcoreapp2.0 --nologo /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
65+
5166
- name: Run test .NET 5.0
5267
run: dotnet test -c Release -f net5.0 --nologo --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
68+
5369
- name: Run test .NET 5.0 Windows
5470
run: dotnet test -c Release -f net5.0-windows --nologo --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
71+
5572
- name: Run test .NET 6.0
5673
run: dotnet test -c Release -f net6.0 --nologo --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
74+
5775
- name: Run test .NET 6.0 Windows
5876
run: dotnet test -c Release -f net6.0-windows --nologo --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
5977

6078
clean:
6179
needs: [build, test]
6280
if: always()
63-
runs-on: windows-2022
81+
runs-on: windows-2019
6482
steps:
6583
- name: Delete artifacts
6684
uses: GeekyEggo/[email protected]

0 commit comments

Comments
 (0)