Skip to content

Commit 8109871

Browse files
Christoph BauerChristoph Bauer
authored andcommitted
fix ci/cd
1 parent 4963af7 commit 8109871

3 files changed

Lines changed: 16 additions & 20 deletions

File tree

.github/workflows/CI.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,41 @@
11
name: CI
22
on: [push, pull_request]
3-
43
jobs:
54
ununtu:
65
runs-on: ubuntu-latest
76
env:
87
DOTNET_NOLOGO: true
98
steps:
10-
- uses: actions/checkout@v4.2.2
11-
- uses: actions/setup-dotnet@v4.1.0
9+
- uses: actions/checkout@v6
10+
- uses: actions/setup-dotnet@v5
1211
with:
13-
dotnet-version: 9.0.x
12+
dotnet-version: 10.0.x
1413
- run: dotnet restore src/NetMQ.sln
1514
- name: build
1615
run: dotnet build src/NetMQ.sln /p:Configuration=Release /verbosity:minimal
17-
- name: test net9.0
18-
run: dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f net9.0 src/NetMQ.Tests/NetMQ.Tests.csproj
16+
- name: test net10.0
17+
run: dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f net10.0 src/NetMQ.Tests/NetMQ.Tests.csproj
1918
windows:
2019
runs-on: windows-latest
2120
env:
2221
DOTNET_NOLOGO: true
2322
steps:
24-
- uses: actions/checkout@v4.2.2
25-
- uses: actions/setup-dotnet@v4.1.0
23+
- uses: actions/checkout@v6
24+
- uses: actions/setup-dotnet@v5
2625
with:
27-
dotnet-version: 9.0.x
26+
dotnet-version: 10.0.x
2827
- name: Install codecov
2928
run: |
3029
choco install opencover.portable
3130
choco install codecov
3231
- run: dotnet restore src/NetMQ.sln
3332
- name: build
3433
run: dotnet build src/NetMQ.sln /p:Configuration=Release /verbosity:minimal
35-
- name: test net9.0
36-
run: dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f net9.0 src\NetMQ.Tests\NetMQ.Tests.csproj
34+
- name: test net10.0
35+
run: dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f net10.0 src\NetMQ.Tests\NetMQ.Tests.csproj
3736
- name: test net472
3837
run: dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f net472 src\NetMQ.Tests\NetMQ.Tests.csproj
3938
- name: coverage
4039
run: |
41-
OpenCover.Console.exe -register:user -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:"test --no-build --configuration Release -f net6.0 --logger:trx;LogFileName=results.trx /p:DebugType=full src\NetMQ.Tests\NetMQ.Tests.csproj" -filter:"+[NetMQ*]* -[NetMQ.Tests*]*" -output:".\NetMQ_coverage.xml" -oldStyle
40+
OpenCover.Console.exe -register:user -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:"test --no-build --configuration Release -f net10.0 --logger:trx;LogFileName=results.trx /p:DebugType=full src\NetMQ.Tests\NetMQ.Tests.csproj" -filter:"+[NetMQ*]* -[NetMQ.Tests*]*" -output:".\NetMQ_coverage.xml" -oldStyle
4241
codecov -f "NetMQ_coverage.xml"

appveyor.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
version: 4.0.0.{build}
22
skip_tags: true
3-
image: Visual Studio 2019
3+
image: Visual Studio 2026
44
configuration: Release
5-
65
before_build:
76
- choco install opencover.portable
87
- choco install codecov
9-
108
build_script:
119
- dotnet restore src/NetMQ.sln
1210
- dotnet build src/NetMQ.sln /p:Configuration=Release /p:PackageVersion=%APPVEYOR_BUILD_VERSION%-pre /p:Version=%APPVEYOR_BUILD_VERSION% /p:ContinuousIntegrationBuild=true /verbosity:minimal
1311
- dotnet pack src/NetMQ/NetMQ.csproj -c Release --no-build /p:PackageVersion=%APPVEYOR_BUILD_VERSION%-pre /p:Version=%APPVEYOR_BUILD_VERSION%
14-
1512
test_script:
16-
- dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f netcoreapp2.1 src\NetMQ.Tests\NetMQ.Tests.csproj
17-
- dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f net47 src\NetMQ.Tests\NetMQ.Tests.csproj
18-
- OpenCover.Console.exe -register:user -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:"test --no-build --configuration Release -f netcoreapp2.1 --logger:trx;LogFileName=results.trx /p:DebugType=full src\NetMQ.Tests\NetMQ.Tests.csproj" -filter:"+[NetMQ*]* -[NetMQ.Tests*]*" -output:".\NetMQ_coverage.xml" -oldStyle
13+
- dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f net10.0 src\NetMQ.Tests\NetMQ.Tests.csproj
14+
- dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f net472 src\NetMQ.Tests\NetMQ.Tests.csproj
15+
- OpenCover.Console.exe -register:user -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:"test --no-build --configuration Release -f net10.0 --logger:trx;LogFileName=results.trx /p:DebugType=full src\NetMQ.Tests\NetMQ.Tests.csproj" -filter:"+[NetMQ*]* -[NetMQ.Tests*]*" -output:".\NetMQ_coverage.xml" -oldStyle
1916
- codecov -f "NetMQ_coverage.xml"
20-
2117
artifacts:
2218
- path: '**\*.nupkg'

src/NetMQ/NetMQ.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040

4141
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' != '.NETFramework' ">
4242
<PackageReference Include="System.ServiceModel.Primitives" Version="10.0.652802" />
43+
<PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.6" />
4344
</ItemGroup>
4445

4546
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">

0 commit comments

Comments
 (0)