Feat/static linking

.circleci/config.yml

@@ -1,10 +1,27 @@
-# Copyright 2020-2021 Chris Morgan <[email protected]>
-# SPDX-License-Identifier: MIT
-
 version: 2.1
 
+parameters:
+  csproj-file:
+    type: string
+    default: "SharpPcap/SharpPcap.csproj"
+  sonar-project:
+    type: string
+    default: "Lansweeper_sharppcap"
+  nuget-output-file:
+    type: string
+    default: "SharpPcap/bin/Release/Lansweeper.SharpPcap.$PACKAGE_VERSION.nupkg"
+  nuget-output-file-static:
+    type: string
+    default: "SharpPcap/bin/Release/Lansweeper.SharpPcap.StaticLinking.$PACKAGE_VERSION.nupkg"
+
+executors:
+  node:
+    docker:
+      - image: circleci/node:12
+
 orbs:
   win: circleci/[email protected]
+  sonar-check: lansweeper/[email protected]
 
 commands:
   report:
@@ -15,64 +32,155 @@ commands:
         path: Test/TestResults
 
 jobs:
-  test-windows:
+  build:
+    executor: win/default
+    steps:
+      - checkout
+      - run:
+          name: Extract version from .csproj
+          command: |
+            $file = Get-Item << parameters.csproj-file >>
+            [xml]$cn = Get-Content $file
+            $version = $cn.Project.PropertyGroup.Version
+            echo "##vso[task.setvariable variable=PACKAGE_VERSION]$version"
+      - run:
+          name: Install SonarScanner for MSBuild .NET Core Global Tool
+          command: dotnet tool install --global dotnet-sonarscanner
+      - run:
+          name: Start SonarScanner
+          command: dotnet sonarscanner begin /k="<< parameters.sonar-project >>" /d:sonar.verbose=true /o:"lansweeper" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login=$Env:SONAR_TOKEN /d:sonar.language="cs"
+      - run: dotnet build << parameters.csproj-file >> --configuration Release
+      - run:
+          name: Upload SonarScanner results
+          command: dotnet sonarscanner end /d:sonar.login=$Env:SONAR_TOKEN
+      - persist_to_workspace:
+          root: .
+          paths:
+            - .
+
+  nuget-prepare:
     executor:
       name: win/default
     steps:
-      - checkout
-      - run: ./scripts/install-windows.ps1
-      - run: dotnet build -c Release
-      - run: bash scripts/test.sh --filter "TestCategory=WinDivert"
-      - report
+      - attach_workspace:
+          at: .
+      - run:
+          name: Create local nuget config file
+          command: |
+            $xml = "<?xml version='1.0' encoding='utf-8'?>
+            <configuration>
+              <packageSources>
+                <add key='github' value='https://nuget.pkg.github.com/Lansweeper/index.json' />
+              </packageSources>
+              <packageSourceCredentials>
+                <github>
+                  <add key='Username' value='$env:GITHUB_USER' />
+                  <add key='ClearTextPassword' value='$env:GITHUB_TOKEN' />
+                </github>
+              </packageSourceCredentials>
+            </configuration>"
+            Out-File -FilePath nuget.config -InputObject $xml -Encoding ASCII
+      - run: type nuget.config
+      - persist_to_workspace:
+          root: .
+          paths:
+            - .
 
-  test-ubuntu:
-    parameters:
-      libpcap:
-        description: How to install libpcap
-        type: string
-    machine:
-      image: ubuntu-2004:202201-02
+  nuget-publish:
+    executor:
+      name: win/default
     steps:
-      - checkout
-      - run: sudo -E bash scripts/install-tap.sh
-      # Download and compile latest libpcap
-      - when:
-          condition: { equal: [ libpcap-script, << parameters.libpcap >> ] }
-          steps:
-            - run: sudo -E bash scripts/install-libpcap.sh
-      # Install libpcap from apt-get
-      - when:
-          condition: {not: { equal: [ libpcap-script, << parameters.libpcap >> ] } }
-          steps:
-            - run: sudo apt-get install << parameters.libpcap >>
-      - run: sudo -E bash scripts/test.sh
-      - run: 
-          when: always
-          command: sudo chmod -R +r Test/TestResults
-      - report
+      - attach_workspace:
+          at: .
+      - run:
+          name: Set correct version in csproj file, build and pack it
+          command: |
+            $file = Get-Item << parameters.csproj-file >>
+            [xml]$cn = Get-Content $file
+            $cn.Project.PropertyGroup.Version="$env:PACKAGE_VERSION"
+            $cn.Save($file.FullName)
+            type ./<< parameters.csproj-file >>
+      - run:
+          name: Pack the default package
+          command: dotnet pack << parameters.csproj-file >> --configuration Release
+      - run:
+          name: Pack the StaticLinking package
+          command: dotnet pack << parameters.csproj-file >> --configuration StaticLinking --configuration Release
+      - run:
+          name: Publish the default package
+          command: |
+            dotnet nuget push << parameters.nuget-output-file >> --source "github" --api-key $env:GITHUB_TOKEN
+      - run:
+          name: Publish the StaticLinking package
+          command: |
+            dotnet nuget push << parameters.nuget-output-file-static >> --source "github" --api-key $env:GITHUB_TOKEN
 
-  test-arm:
-    machine:
-      image: ubuntu-2004:202101-01
-    resource_class: arm.medium
+  sonar:
+    executor: node
     steps:
-      - checkout
-      - run: sudo -E bash scripts/install-tap.sh
-      - run: sudo apt-get install libpcap0.8
-      - run: sudo -E bash scripts/test.sh
-      - run: 
-          when: always
-          command: sudo chmod -R +r Test/TestResults
-      - report
+      - attach_workspace:
+          at: .
+      - sonar-check/get_sonar_status:
+          report_file: "/home/circleci/project/.sonarqube/out/.sonar/report-task.txt"
 
 workflows:
   version: 2
-  build:
+
+  ci_on_pr:
+    jobs:
+      - build:
+          context:
+            - lec-github-packages-rw
+            - SonarCloud
+          filters:
+            branches:
+              ignore: master
+
+      - sonar:
+          context:
+            - SonarCloud
+          requires:
+            - build
+          filters:
+            branches:
+              ignore: master
+
+  ci_and_release_master:
+    jobs:
+      - build:
+          context:
+            - lec-github-packages-rw
+            - SonarCloud
+          filters:
+            branches:
+              only: master
+      - nuget-prepare:
+          requires:
+            - build
+          context:
+            - lec-github-packages-rw
+          filters:
+            branches:
+              only: master
+      - nuget-publish:
+          requires:
+            - nuget-prepare
+          context:
+            - lec-github-packages-rw
+          # filters:
+          #   branches:
+          #     only: master
+
+  run-daily-tests:
+    triggers:
+      - schedule:
+          cron: "0 0 * * *"
+          filters:
+            branches:
+              only: master
+
     jobs:
-      - test-windows
-      - test-arm
-      - test-ubuntu:
-          name: << matrix.libpcap >>
-          matrix:
-            parameters:
-              libpcap: [ "libpcap-script", "libpcap-dev", "libpcap0.8" ]
+      - build:
+          context:
+            - lec-github-packages-rw
+            - SonarCloud

.github/workflows/dotnet-core.yml

@@ -26,8 +26,8 @@ jobs:
       run: dotnet build SharpPcap/SharpPcap.csproj
     - name: Test
       run: sudo -E bash scripts/test.sh
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      # env:
+      #   CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
     - run: sudo chmod -R +r Test/TestResults
       if: always()
@@ -42,27 +42,27 @@ jobs:
         name: artifacts
         path: Test/TestResults/
 
-    - name: publish on version change
-      id: publish_nuget
-      uses: alirezanet/[email protected]
-      with:
-        # Filepath of the project to be packaged, relative to root of repository
-        PROJECT_FILE_PATH: SharpPcap/SharpPcap.csproj
+    # - name: publish on version change
+    #   id: publish_nuget
+    #   uses: alirezanet/[email protected]
+    #   with:
+    #     # Filepath of the project to be packaged, relative to root of repository
+    #     PROJECT_FILE_PATH: SharpPcap/SharpPcap.csproj
 
-        # API key to authenticate with NuGet server
-        NUGET_KEY: ${{secrets.NUGET_API_KEY}}
+    #     # API key to authenticate with NuGet server
+    #     NUGET_KEY: ${{secrets.NUGET_API_KEY}}
 
-        # Flag to toggle pushing symbols along with nuget package to the server, disabled by default
-        INCLUDE_SYMBOLS: true
+    #     # 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
+  # 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

Directory.Build.props

@@ -7,6 +7,5 @@ SPDX-License-Identifier: MIT
    <Deterministic>true</Deterministic>
    <DebugType>full</DebugType>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-   <LangVersion>8.0</LangVersion>
  </PropertyGroup>
 </Project>

Examples/Example3.BasicCap/Example03.BasicCap.csproj

@@ -2,6 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
+	  <PublishTrimmed>true</PublishTrimmed>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\SharpPcap\SharpPcap.csproj" />

Examples/Example3.BasicCap/Properties/PublishProfiles/lin-arm64-aot.pubxml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>.\publish\lin-arm64-aot\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <_TargetId>Folder</_TargetId>
+    <TargetFramework>net8.0</TargetFramework>
+    <RuntimeIdentifier>linux-arm64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+    <PublishAot>true</PublishAot>
+  </PropertyGroup>
+</Project>

Examples/Example3.BasicCap/Properties/PublishProfiles/lin-x64-aot.pubxml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+	<PropertyGroup>
+		<Configuration>Release</Configuration>
+		<Platform>Any CPU</Platform>
+		<PublishDir>.\publish\lin-x64-aot\</PublishDir>
+		<PublishProtocol>FileSystem</PublishProtocol>
+		<_TargetId>Folder</_TargetId>
+		<TargetFramework>net8.0</TargetFramework>
+		<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+		<SelfContained>true</SelfContained>
+		<PublishSingleFile>false</PublishSingleFile>
+		<PublishReadyToRun>false</PublishReadyToRun>
+		<PublishAot>true</PublishAot>
+	</PropertyGroup>
+</Project>

Examples/Example3.BasicCap/Properties/PublishProfiles/lin-x64.pubxml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+	<PropertyGroup>
+		<Configuration>Release</Configuration>
+		<Platform>Any CPU</Platform>
+		<PublishDir>.\publish\lin-x64\</PublishDir>
+		<PublishProtocol>FileSystem</PublishProtocol>
+		<_TargetId>Folder</_TargetId>
+		<TargetFramework>net8.0</TargetFramework>
+		<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+		<SelfContained>true</SelfContained>
+		<PublishSingleFile>true</PublishSingleFile>
+		<PublishReadyToRun>false</PublishReadyToRun>
+	</PropertyGroup>
+</Project>

Examples/Example3.BasicCap/Properties/PublishProfiles/win-x64-aot.pubxml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+	<PropertyGroup>
+		<Configuration>Release</Configuration>
+		<Platform>Any CPU</Platform>
+		<PublishDir>.\publish\win-x64-aot\</PublishDir>
+		<PublishProtocol>FileSystem</PublishProtocol>
+		<_TargetId>Folder</_TargetId>
+		<TargetFramework>net8.0</TargetFramework>
+		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
+		<SelfContained>true</SelfContained>
+		<PublishSingleFile>false</PublishSingleFile>
+		<PublishReadyToRun>false</PublishReadyToRun>
+		<PublishAot>true</PublishAot>
+	</PropertyGroup>
+</Project>