Skip to content

Commit 4f56cf3

Browse files
mmillerbemmillerbe
authored
Merge pull request #1 from zeromq/master
Update to latest master
2 parents 0d87057 + e86706f commit 4f56cf3

File tree

235 files changed

+13309
-4211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

235 files changed

+13309
-4211
lines changed

‎.github/stale.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Number of days of inactivity before an issue becomes stale
2+
daysUntilStale: 365
3+
# Number of days of inactivity before a stale issue is closed
4+
daysUntilClose: 56
5+
# Issues with these labels will never be considered stale
6+
exemptLabels:
7+
- "Help Request"
8+
- "Feature Request"
9+
- "Problem reproduced"
10+
- Critical
11+
# Label to use when marking an issue as stale
12+
staleLabel: stale
13+
# Comment to post when marking an issue as stale. Set to `false` to disable
14+
markComment: >
15+
This issue has been automatically marked as stale because it has not had
16+
activity for 365 days. It will be closed if no further activity occurs within
17+
56 days. Thank you for your contributions.
18+
# Comment to post when closing a stale issue. Set to `false` to disable
19+
closeComment: false

‎.github/workflows/CI.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: CI
2+
on: [push, pull_request]
3+
4+
jobs:
5+
ununtu:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- uses: actions/checkout@v2
9+
- run: dotnet restore src/NetMQ.sln
10+
- name: build
11+
run: dotnet build src/NetMQ.sln /p:Configuration=Release /verbosity:minimal
12+
- name: test netcoreapp3.1
13+
run: dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f netcoreapp3.1 src/NetMQ.Tests/NetMQ.Tests.csproj
14+
- name: test netcoreapp2.1
15+
run: dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f netcoreapp2.1 src/NetMQ.Tests/NetMQ.Tests.csproj
16+
windows:
17+
runs-on: windows-latest
18+
steps:
19+
- uses: actions/checkout@v2
20+
- name: Install codecov
21+
run: |
22+
choco install opencover.portable
23+
choco install codecov
24+
- run: dotnet restore src/NetMQ.sln
25+
- name: build
26+
run: dotnet build src/NetMQ.sln /p:Configuration=Release /verbosity:minimal
27+
- name: test netcoreapp2.1
28+
run: dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f netcoreapp2.1 src\NetMQ.Tests\NetMQ.Tests.csproj
29+
- name: test netcoreapp3.1
30+
run: dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f netcoreapp3.1 src\NetMQ.Tests\NetMQ.Tests.csproj
31+
- name: test net47
32+
run: dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f net47 src\NetMQ.Tests\NetMQ.Tests.csproj
33+
- name: coverage
34+
run: |
35+
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
36+
codecov -f "NetMQ_coverage.xml"
37+
38+
39+

‎.github/workflows/prerelease.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: prerelease
2+
on:
3+
release:
4+
types: [prereleased]
5+
6+
jobs:
7+
windows:
8+
runs-on: windows-latest
9+
steps:
10+
- uses: actions/checkout@v2
11+
- name: Get the version
12+
id: get_version
13+
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
14+
shell: bash
15+
- run: echo ${{ steps.get_version.outputs.VERSION }}
16+
- run: dotnet pack src/NetMQ/NetMQ.csproj -o . -c Release /p:PackageVersion="${{ steps.get_version.outputs.VERSION }}-pre" /p:Version=${{ steps.get_version.outputs.VERSION }} /p:ContinuousIntegrationBuild=true
17+
- run: dotnet nuget push *.nupkg -k $NUGET_API_KEY -s https://api.nuget.org/v3/index.json
18+
env:
19+
NUGET_API_KEY: ${{ secrets.NuGetAPIKey }}
20+
shell: bash
21+
22+

‎.github/workflows/release.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: release
2+
on:
3+
release:
4+
types: [published]
5+
6+
jobs:
7+
windows:
8+
runs-on: windows-latest
9+
if: "!github.event.release.prerelease"
10+
steps:
11+
- uses: actions/checkout@v2
12+
- name: Get the version
13+
id: get_version
14+
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
15+
shell: bash
16+
- run: echo ${{ steps.get_version.outputs.VERSION }}
17+
- run: dotnet pack src/NetMQ/NetMQ.csproj -o . -c Release /p:PackageVersion=${{ steps.get_version.outputs.VERSION }} /p:Version=${{ steps.get_version.outputs.VERSION }} /p:ContinuousIntegrationBuild=true
18+
- run: dotnet nuget push *.nupkg -k $NUGET_API_KEY -s https://api.nuget.org/v3/index.json
19+
env:
20+
NUGET_API_KEY: ${{ secrets.NuGetAPIKey }}
21+
shell: bash
22+
23+

‎.travis.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
language: csharp
22
mono: none
3-
dotnet: 2.1.3
3+
dotnet: 3.1
4+
5+
addons:
6+
apt:
7+
packages:
8+
- dotnet-sdk-2.2
9+
10+
411
script:
512
- dotnet restore src/NetMQ.sln
6-
- cd src/NetMQ.Tests; dotnet xunit -f netcoreapp2.0 -fxversion 2.0.4 -verbose -parallel none
13+
- dotnet build -v q -f netstandard2.0 src/NetMQ/NetMQ.csproj
14+
- dotnet test -v n --logger "Console;noprogress=true" -p:ParallelizeTestCollections=false -f netcoreapp2.1 --filter Category!=Beacon src/NetMQ.Tests/NetMQ.Tests.csproj -- RunConfiguration.ReporterSwitch=verbose
15+

‎AUTHORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ Contributors
2525
* Calin Pirtea — [@pcalin](https://github.com/pcalin)
2626
* Osiris Pedroso — [@opedroso](https://github.com/opedroso)
2727
* Mike Miller — [@mikepmiller](https://github.com/mikepmiller)
28+
* Miguel Labayen — [@milabtom](https://github.com/milabtom)

‎README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<img src="https://cdn.rawgit.com/zeromq/netmq/master/img/NetMQLogo.svg" width="350" />
22

3-
[![NetMQ AppVeyor Build](https://ci.appveyor.com/api/projects/status/as5fiw8a3suw53iu/branch/master?svg=true)](https://ci.appveyor.com/project/somdoron/netmq-2bhss) [![NetMQ NuGet version](https://img.shields.io/nuget/v/NetMQ.svg)](https://www.nuget.org/packages/NetMQ/) [![NetMQ NuGet prerelease version](https://img.shields.io/nuget/vpre/NetMQ.svg)](https://www.nuget.org/packages/NetMQ/)
3+
[![NetMQ AppVeyor Build](https://ci.appveyor.com/api/projects/status/as5fiw8a3suw53iu/branch/master?svg=true)](https://ci.appveyor.com/project/somdoron/netmq-2bhss) [![codecov](https://codecov.io/gh/zeromq/netmq/branch/master/graph/badge.svg)](https://codecov.io/gh/zeromq/netmq) [![NetMQ NuGet version](https://img.shields.io/nuget/v/NetMQ.svg)](https://www.nuget.org/packages/NetMQ/) [![NetMQ NuGet prerelease version](https://img.shields.io/nuget/vpre/NetMQ.svg)](https://www.nuget.org/packages/NetMQ/)
44

55
NetMQ is a 100% native C# port of the lightweight messaging library ZeroMQ.
66

@@ -66,8 +66,6 @@ using (var client = new RequestSocket(">tcp://localhost:5556")) // connect
6666

6767
## Contributing
6868

69-
[![Issue Stats](http://issuestats.com/github/zeromq/netmq/badge/pr?style=flat)](http://issuestats.com/github/zeromq/netmq) [![Issue Stats](http://issuestats.com/github/zeromq/netmq/badge/issue?style=flat)](http://issuestats.com/github/zeromq/netmq)
70-
7169
We need help, so if you have good knowledge of C# and ZeroMQ just grab one of the issues and add a pull request.
7270
We are using [C4.1 process](http://rfc.zeromq.org/spec:22), so make sure you read this before.
7371

@@ -107,10 +105,6 @@ There are open issues in the issues tab that still need to be taken care of, fee
107105

108106
## Build Server
109107

110-
[TeamCity at CodeBetter](http://teamcity.codebetter.com/project.html?projectId=project372&tab=projectOverview)
111-
112108
![Code Better](http://www.jetbrains.com/img/banners/Codebetter300x250.png)
113109

114110
[YouTrack by JetBrains - keyboard-centric bug tracker](http://www.jetbrains.com/youtrack)
115-
116-
[TeamCity by JetBrains - continuous integration server](http://www.jetbrains.com/teamcity)

‎appveyor.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
version: 4.0.0.{build}
22
skip_tags: true
3-
image: Visual Studio 2017
3+
image: Visual Studio 2019
44
configuration: Release
5+
6+
before_build:
7+
- choco install opencover.portable
8+
- choco install codecov
9+
510
build_script:
611
- dotnet restore src/NetMQ.sln
7-
- msbuild src/NetMQ.sln /p:Configuration=Release /p:PackageVersion=%APPVEYOR_BUILD_VERSION%-pre /p:Version=%APPVEYOR_BUILD_VERSION% /verbosity:minimal
12+
- dotnet build src/NetMQ.sln /p:Configuration=Release /p:PackageVersion=%APPVEYOR_BUILD_VERSION%-pre /p:Version=%APPVEYOR_BUILD_VERSION% /p:ContinuousIntegrationBuild=true /verbosity:minimal
813
- dotnet pack src/NetMQ/NetMQ.csproj -c Release --no-build /p:PackageVersion=%APPVEYOR_BUILD_VERSION%-pre /p:Version=%APPVEYOR_BUILD_VERSION%
14+
915
test_script:
10-
- cd src\NetMQ.Tests
11-
- dotnet xunit -configuration Release -verbose -nobuild -parallel none -f netcoreapp2.0 -fxversion 2.0.3
12-
- dotnet xunit -configuration Release -verbose -nobuild -parallel none -f netcoreapp1.0 -fxversion 1.0.5
13-
- dotnet xunit -configuration Release -verbose -nobuild -parallel none -f net452
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
19+
- codecov -f "NetMQ_coverage.xml"
1420

1521
artifacts:
1622
- path: '**\*.nupkg'

‎codecov.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
coverage:
2+
range: 65..95
3+
status:
4+
project:
5+
default:
6+
target: auto
7+
threshold: 0.5%
8+
base: auto
9+
10+
comment:
11+
require_changes: true
12+
layout: "diff, files"

0 commit comments

Comments
 (0)