Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: ITD-1716: update sharppcap package #9

Merged
merged 63 commits into from
Nov 24, 2023
Merged

feat: ITD-1716: update sharppcap package #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
d85b76c
Update dependency PacketDotNet to v1.4.5 (#390)
renovate[bot] May 14, 2022
905c972
Update dependency PacketDotNet to v1.4.6 (#392)
renovate[bot] May 28, 2022
25cf30b
Update dependency JunitXml.TestLogger to v3.0.114 (#391)
renovate[bot] May 28, 2022
7dc33e8
Update dependency Microsoft.NET.Test.Sdk to v17.2.0 (#389)
renovate[bot] May 28, 2022
8c531e9
Update Windows Packet Filter to 3.2.32.1 (#394)
kayoub5 May 29, 2022
f8341ec
Update dependency System.Memory to v4.5.5 (#393)
renovate[bot] May 29, 2022
7a8d924
Add test reports to CI (#395)
kayoub5 Jun 11, 2022
273fb12
Use Codecov uploader where possible (#388)
kayoub5 Jun 12, 2022
364f240
Upgrade to .NET 6
kayoub5 Jun 12, 2022
790246e
Remove Codecov from ARM
kayoub5 Jun 12, 2022
74e27eb
Add support for reading capture data from a file handle
heck-gd Jun 8, 2022
7b0577f
Fix core dump collection in GitHub actions
kayoub5 Jun 17, 2022
b5c2296
Fix Circle CI core dump collection
kayoub5 Jun 17, 2022
4d129e8
Prevent reading packet data if PcapHandle changed
kayoub5 Jun 17, 2022
a2820ed
Fix flaky transmit tests (#401)
kayoub5 Jun 18, 2022
e726b36
Thread safety test (Windows Only) (#407)
kayoub5 Jun 18, 2022
e99e34b
Update win orb to v5 (#412)
renovate[bot] Jul 29, 2022
27d92a1
Update dependency Microsoft.NET.Test.Sdk to v17.3.0 (#413)
renovate[bot] Aug 10, 2022
cad73d6
add check on invalid handle after pcap_create (#414)
sensokame Aug 11, 2022
267e536
Bump version to 6.2.3
kayoub5 Aug 12, 2022
7d105b4
Update dependency Microsoft.NET.Test.Sdk to v17.3.1
renovate[bot] Aug 30, 2022
f867372
Support for FileMode.Append in CaptureFileWriterDevice (#416)
ARHARUP Sep 15, 2022
d69569d
Update actions/setup-dotnet action to v3 (#420)
renovate[bot] Sep 30, 2022
83b04d8
Update dependency Microsoft.NET.Test.Sdk to v17.3.2 (#419)
renovate[bot] Sep 30, 2022
162576c
Make the capture thread thread safe (#422)
sensokame Oct 14, 2022
5f1e443
Test Linux Thread Safety (#423)
kayoub5 Oct 14, 2022
8ca67a9
Update azure macos image (#424)
kayoub5 Oct 15, 2022
0971f68
Bump version
kayoub5 Oct 17, 2022
125cdf0
Update dependency coverlet.msbuild to v3.2.0 (#428)
renovate[bot] Oct 29, 2022
0977a11
Update dependency PacketDotNet to v1.4.7 (#425)
renovate[bot] Oct 29, 2022
eddc0e0
Update dependency NUnit3TestAdapter to v4.3.0 (#427)
renovate[bot] Nov 1, 2022
07e07ee
For reading from a capture, use Capture() instead of StartCapture() (…
fiddyschmitt Nov 7, 2022
4c958ee
Update dependency NUnit3TestAdapter to v4.3.1 (#437)
renovate[bot] Nov 20, 2022
cb07689
Skip appveyor for branches (#453)
kayoub5 Apr 1, 2023
348a4ab
Ignore dbus in AppVeyor (#452)
kayoub5 Apr 1, 2023
3fc363a
Remove WinPcap CI (#454)
kayoub5 Apr 1, 2023
f0c9b4c
Update alirezanet/publish-nuget action to v3.0.5 (#459)
renovate[bot] May 1, 2023
bdee50e
Update dependency NUnit3TestAdapter to v4.4.2 (#451)
renovate[bot] May 12, 2023
d7c6589
Update alirezanet/publish-nuget action to v3.1.0 (#460)
renovate[bot] May 12, 2023
d35a0c4
Update dependency JunitXml.TestLogger to v3.0.124 (#450)
renovate[bot] May 12, 2023
908bbc5
Update dependency Microsoft.NET.Test.Sdk to v17.5.0 (#431)
renovate[bot] May 13, 2023
25cb75f
Update dependency Microsoft.NET.Test.Sdk to v17.6.0 (#461)
renovate[bot] May 16, 2023
b88a0be
Update dependency coverlet.msbuild to v6 (#462)
renovate[bot] May 21, 2023
a070e1b
Update dependency Microsoft.NET.Test.Sdk to v17.6.2 (#464)
renovate[bot] Jun 6, 2023
54b1643
Update dependency NUnit3TestAdapter to v4.5.0 (#463)
renovate[bot] Jun 6, 2023
f5f5dba
Update dependency JunitXml.TestLogger to v3.0.134 (#467)
renovate[bot] Jul 12, 2023
b736f1a
Update dependency Microsoft.NET.Test.Sdk to v17.6.3 (#466)
renovate[bot] Jul 12, 2023
136dfe8
Update dependency Microsoft.NET.Test.Sdk to v17.7.0
renovate[bot] Aug 4, 2023
cec7c3a
Adds TOC and fixes typos on README
Sterlinghv Aug 12, 2023
5f6edcf
Update dependency Microsoft.NET.Test.Sdk to v17.7.2
renovate[bot] Sep 3, 2023
309cde7
Update actions/checkout action to v4
renovate[bot] Sep 10, 2023
b6a0533
Update mikepenz/action-junit-report action to v4
renovate[bot] Oct 14, 2023
a6a3361
update tutorial after WinPcapDevice was removed
trivalik Nov 16, 2023
df4fc6f
Update dependency Microsoft.SourceLink.GitHub to v8
renovate[bot] Nov 15, 2023
576ebd7
Update dependency Microsoft.NET.Test.Sdk to v17.8.0
renovate[bot] Nov 8, 2023
0128405
Update dependency NUnit to v3.14.0
renovate[bot] Nov 16, 2023
f9b4da7
Merge remote-tracking branch 'dotpcap/master' into test
LSJoranVC Nov 24, 2023
969e834
feat: ITD-1716: fix build when updating sharppcap
LSJoranVC Nov 24, 2023
0745778
feat: ITD-1716: update package version
LSJoranVC Nov 24, 2023
2b31aed
try fix sonar
LSJoranVC Nov 24, 2023
fed4ed1
code smell
LSJoranVC Nov 24, 2023
c67a5d5
code smells
LSJoranVC Nov 24, 2023
3eb1cef
try fix build
LSJoranVC Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,20 @@ environment:
# Disable automatic AppVeyor build logic
build: off
skip_branch_with_pr: true
branches:
only:
- master

image:
- Visual Studio 2019
- Visual Studio 2022
- Ubuntu1804
- macos

for:
-
matrix:
only:
- image: Visual Studio 2019
- image: Visual Studio 2022
install:
- ps: .\scripts\install-windows.ps1
- ps: .\scripts\Install-npcap.ps1
Expand Down
12 changes: 10 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ parameters:
default: "Lansweeper_sharppcap"
nuget-output-file:
type: string
default: "SharpPcap/bin/Release/Lansweeper.SharpPcap.9.0.6.nupkg"
default: "SharpPcap/bin/Release/Lansweeper.SharpPcap.9.0.7.nupkg"

executors:
node:
Expand All @@ -20,6 +20,14 @@ orbs:
win: circleci/[email protected]
sonar-check: lansweeper/[email protected]

commands:
report:
steps:
- store_test_results:
path: Test/TestResults
- store_artifacts:
path: Test/TestResults

jobs:
build:
executor: win/default
Expand Down Expand Up @@ -77,7 +85,7 @@ jobs:
- run:
name: Set correct version in csproj file, build and pack it
command: |
$env:package_version = "9.0.6"
$env:package_version = "9.0.7"

$file = Get-Item << pipeline.parameters.csproj-file >>
[xml]$cn = Get-Content $file
Expand Down
12 changes: 0 additions & 12 deletions .config/dotnet-tools.json
View file
Open in desktop

This file was deleted.

22 changes: 18 additions & 4 deletions .github/workflows/dotnet-core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup .NET Core
uses: actions/setup-dotnet@v2
uses: actions/setup-dotnet@v3
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x
- name: Install .net dependencies
run: dotnet restore
- name: Install libpcap
Expand All @@ -27,9 +27,23 @@ jobs:
run: dotnet build SharpPcap/SharpPcap.csproj
- name: Test
run: sudo -E bash scripts/test.sh

- run: sudo chmod -R +r Test/TestResults
if: always()
- name: Publish Test Report
uses: mikepenz/action-junit-report@v4
if: always()
with:
report_paths: Test/TestResults/TestResults.xml
- uses: actions/upload-artifact@v3
if: failure()
with:
name: artifacts
path: Test/TestResults/

- name: publish on version change
id: publish_nuget
uses: alirezanet/publish-nuget@v3.0.4
uses: alirezanet/publish-nuget@v3.1.0
with:
# Filepath of the project to be packaged, relative to root of repository
PROJECT_FILE_PATH: SharpPcap/SharpPcap.csproj
Expand Down
4 changes: 2 additions & 2 deletions .semaphore/semaphore.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ blocks:
- checkout
- sudo -E bash scripts/install-libpcap.sh
- sudo -E bash scripts/install-tap.sh
- sudo -E bash scripts/install-dotnet.sh
- sudo -E bash scripts/install-dotnet.sh --install-dir /usr/local/bin
- sudo -E bash scripts/test.sh --filter "TestCategory!=Performance"
name: Test
agent:
Expand All @@ -39,6 +39,6 @@ blocks:
- commands:
- checkout
- sudo -E bash scripts/install-libpcap.sh
- brew install --cask dotnet-sdk
- sudo -E bash scripts/install-dotnet.sh --install-dir /usr/local/bin
- sudo -E bash scripts/test.sh --filter "TestCategory!=Performance"
name: Test
2 changes: 1 addition & 1 deletion Examples/CreatingCaptureFile/CreatingCaptureFile.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\SharpPcap\SharpPcap.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Examples/Example1.IfList/Example01.IfList.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\SharpPcap\SharpPcap.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Examples/Example10.SendQueue/Example10.SendQueue.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\SharpPcap\SharpPcap.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Examples/Example11.Statistics/Example11.Statistics.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\SharpPcap\SharpPcap.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Examples/Example12.PacketManipulation/Example12.PacketManipulation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\SharpPcap\SharpPcap.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Examples/Example2.ArpResolve/Example02.ArpResolve.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\SharpPcap\SharpPcap.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Examples/Example3.BasicCap/Example03.BasicCap.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\SharpPcap\SharpPcap.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Examples/Example4.BasicCapNoCallback/Example04.BasicCapNoCallback.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\SharpPcap\SharpPcap.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Examples/Example5.PcapFilter/Example05.PcapFilter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\SharpPcap\SharpPcap.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Examples/Example6.DumpTCP/Example06.DumpTCP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\SharpPcap\SharpPcap.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Examples/Example9.SendPacket/Example09.SendPacket.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\SharpPcap\SharpPcap.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Examples/MultipleFiltersOnDevice/MultipleFiltersOnDevice.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\SharpPcap\SharpPcap.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Examples/NpcapRemoteCapture/NpcapRemoteCapture.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\SharpPcap\SharpPcap.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Examples/QueuingPacketsForBackgroundProcessing/QueuingPacketsForBackgroundProcessing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\SharpPcap\SharpPcap.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Examples/ReadingCaptureFile/ReadingCaptureFile.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\SharpPcap\SharpPcap.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Examples/WakeOnLan/WakeOnLan.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\SharpPcap\SharpPcap.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Examples/WinpkFilterExample/WinpkFilterExample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\SharpPcap\SharpPcap.csproj" />
Expand Down
Loading
Loading