Merge pull request #16 from Lansweeper/chore/sync-with-original

Chore: sync with original

Author: landerverhacklansweeper

.appveyor.yml

@@ -1,3 +1,5 @@
+# Copyright 2020-2021 Chris Morgan <chmorgan@gmail.com>
+# SPDX-License-Identifier: MIT
 
 environment:
   # This key is encrypted using secdev's appveyor private key,
@@ -15,37 +17,26 @@ branches:
 
 image:
   - Visual Studio 2022
-  - Ubuntu1804
   - macos
 
 for:
--
-  matrix:
-    only:
-      - image: Visual Studio 2022
-  install:
-    - ps: .\scripts\install-windows.ps1
-    - ps: .\scripts\Install-npcap.ps1
-    - ps: .\scripts\install-winpkfilter.ps1
-  build_script:
-    - dotnet build -c Release
-  test_script:
-    - bash scripts/test.sh --filter "TestCategory!=RemotePcap&TestCategory!=WinDivert"
+  - matrix:
+      only:
+        - image: Visual Studio 2022
+    install:
+      - ps: .\scripts\install-windows.ps1
+      - ps: .\scripts\Install-npcap.ps1
+      - ps: .\scripts\install-winpkfilter.ps1
+    build_script:
+      - dotnet build -c Release
+    test_script:
+      - bash scripts/test.sh --filter "TestCategory!=RemotePcap&TestCategory!=WinDivert"
 
--
-  matrix:
-    only:
-      - image: Ubuntu1804
-  install:
-    - sudo -E bash scripts/install-libpcap.sh
-  test_script:
-    - sudo -E bash scripts/test.sh --filter "TestCategory!=Tunneling"
-
--
-  matrix:
-    only:
-      - image: macos
-  install:
-    - sudo -E bash scripts/install-libpcap.sh
-  test_script:
-    - sudo -E bash scripts/test.sh
+  - matrix:
+      only:
+        - image: macos
+    install:
+      - brew install --cask dotnet-sdk
+      - sudo -E bash scripts/install-libpcap.sh
+    test_script:
+      - sudo -E bash scripts/test.sh

.circleci/config.yml

@@ -17,7 +17,7 @@ executors:
       - image: circleci/node:12
 
 orbs:
-  win: circleci/windows@2.2.0
+  win: circleci/windows@5.0.0
   sonar-check: lansweeper/sonar@0.0.6
 
 commands:
@@ -85,7 +85,7 @@ jobs:
       - run:
           name: Set correct version in csproj file, build and pack it
           command: |
-            $env:package_version = "9.0.9"
+            $env:package_version = "10.0.0-alpha"
 
             $file = Get-Item << pipeline.parameters.csproj-file >>
             [xml]$cn = Get-Content $file

.gitattributes

@@ -1,3 +1,6 @@
+# Copyright 2018 Jan Pluskal
+# SPDX-License-Identifier: MIT
+
 # Auto detect text files and perform LF normalization
 * text=auto
 

.github/workflows/dotnet-core.yml

@@ -1,3 +1,6 @@
+# Copyright 2020 Chris Morgan <chmorgan@gmail.com>
+# SPDX-License-Identifier: MIT
+
 name: .NET Core
 
 on:
@@ -13,12 +16,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
-    - name: Install .net dependencies
-      run: dotnet restore
+        fetch-depth: 0
     - name: Install libpcap
       run: sudo -E bash scripts/install-libpcap.sh
     - name: Install tap
@@ -27,15 +26,17 @@ jobs:
       run: dotnet build SharpPcap/SharpPcap.csproj
     - name: Test
       run: sudo -E bash scripts/test.sh
+      # env:
+      #   CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
     - run: sudo chmod -R +r Test/TestResults
       if: always()
     - name: Publish Test Report
-      uses: mikepenz/action-junit-report@v4
+      uses: mikepenz/action-junit-report@v5
       if: always()
       with:
         report_paths: Test/TestResults/TestResults.xml
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: artifacts
@@ -53,3 +54,15 @@ jobs:
 
         # Flag to toggle pushing symbols along with nuget package to the server, disabled by default
         INCLUDE_SYMBOLS: true
+
+  # license-check:
+  #   # We use https://github.com/fsfe/reuse-tool to ensure EVERY file has correct license and copyright info
+  #   # Either in the file itself, or in .reuse\dep5 for binary files and files that don't support comments
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #   - uses: actions/checkout@v4
+  #   - uses: actions/setup-python@v5
+  #     with:
+  #       python-version: '3.10'
+  #   - run: pip install -r requirements.txt
+  #   - run: reuse lint

.gitignore

@@ -1,3 +1,6 @@
+# Copyright 2018 Jan Pluskal
+# SPDX-License-Identifier: MIT
+
 # Created by https://www.gitignore.io/api/visualstudio
 
 ### VisualStudio ###
@@ -299,5 +302,5 @@ __pycache__/
 
 # End of https://www.gitignore.io/api/visualstudio
 
-Scripts/htmldocs
-Scripts/monodoc_output
+Scripts/htmldocs
+Scripts/monodoc_output

.semaphore/semaphore.yml

@@ -1,3 +1,7 @@
+<!--
+Copyright 2020-2021 Ayoub Kaanich <kayoub5@live.com>
+SPDX-License-Identifier: MIT
+-->
 <Project>
  <PropertyGroup>
    <Deterministic>true</Deterministic>

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\SharpPcap\SharpPcap.csproj" />

Examples/CreatingCaptureFile/CreatingCaptureFile.csproj

@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 using System;
 using SharpPcap;
 using SharpPcap.LibPcap;

Examples/CreatingCaptureFile/Program.cs

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\SharpPcap\SharpPcap.csproj" />