Merge pull request #18 from dmako/devel

v 0.11

Author: dmako

.github/workflows/publish.yml

@@ -6,7 +6,7 @@ on:
       build_version_base:
         description: 'Build version number X.Y.Z'
         required: false
-        default: 0.10.0
+        default: 0.11.0
 
 jobs:
 
@@ -27,17 +27,17 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         fetch-depth: 0
 
     - name: Setup NuGet
       uses: NuGet/setup-nuget@v2
 
     - name: Install .NET
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
 
     # Create the NuGet packages in the folder from the environment variable NuGetDirectory
     - name: Build NuGet packages

.github/workflows/verify.yml

@@ -16,27 +16,27 @@ jobs:
   linux-build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 0
     - name: Setup .NET
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: '9.0.x'
+        dotnet-version: '10.0.x'
     - name: Set up JDK 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: 17
         distribution: 'zulu'
     - name: Cache SonarCloud packages
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ~/sonar/cache
         key: ${{ runner.os }}-sonar
         restore-keys: ${{ runner.os }}-sonar
     - name: Cache SonarCloud scanner
       id: cache-sonar-scanner
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ./.sonar/scanner
         key: ${{ runner.os }}-sonar-scanner
@@ -54,44 +54,39 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       shell: pwsh
-      run: ./.sonar/scanner/dotnet-sonarscanner begin /k:"dmako_CommonNetExtensions" /o:"dmako-github" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"  /d:sonar.cs.opencover.reportsPaths="coverage/**/coverage.opencover.xml"
+      run: ./.sonar/scanner/dotnet-sonarscanner begin /k:"dmako_CommonNetExtensions" /o:"dmako-github" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.scanner.scanAll=false /d:sonar.cs.vscoveragexml.reportsPaths="coverage/*.xml"
     - name: Build Tests
       run: dotnet build --configuration Release --no-restore CommonNet.Extensions.Tests/CommonNet.Extensions.Tests.csproj
     - name: Tests
-      run: dotnet test --no-restore --configuration Release --no-build --verbosity normal -p:CollectCoverage=true --collect:"XPlat Code Coverage;Format=cobertura,opencover" --results-directory ./coverage CommonNet.Extensions.Tests/CommonNet.Extensions.Tests.csproj
+      shell: pwsh
+      run: |
+        $currentDirectory = Get-Location
+        dotnet test --no-restore --configuration Release --no-build --verbosity normal --framework net8.0 --results-directory $currentDirectory/coverage --coverage-output=$currentDirectory/coverage/CommonNet.Extensions.Tests.net8.0.xml --coverage-output-format=xml --coverage --project CommonNet.Extensions.Tests/CommonNet.Extensions.Tests.csproj
+        dotnet test --no-restore --configuration Release --no-build --verbosity normal --framework net10.0 --results-directory $currentDirectory/coverage --coverage-output=$currentDirectory/coverage/CommonNet.Extensions.Tests.net10.0.xml --coverage-output-format=xml --coverage --project CommonNet.Extensions.Tests/CommonNet.Extensions.Tests.csproj
     - name: SonarCloud End
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       shell: pwsh
       run: ./.sonar/scanner/dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
-    - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v4
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        working-directory: coverage
-        flags: unittests
-        os: linux
   windows-build:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 0
     - name: Setup .NET
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: '9.0.x'
+        dotnet-version: '10.0.x'
     - name: Install dependencies
       run: dotnet restore CommonNet.Extensions.Tests/CommonNet.Extensions.Tests.csproj
     - name: Build Tests
       run: dotnet build --configuration Release --no-restore CommonNet.Extensions.Tests/CommonNet.Extensions.Tests.csproj
     - name: Tests
-      run: dotnet test --no-restore --configuration Release --no-build --verbosity normal -p:CollectCoverage=true --collect:"XPlat Code Coverage;Format=cobertura" --results-directory ./coverage CommonNet.Extensions.Tests/CommonNet.Extensions.Tests.csproj
-    - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v4
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        working-directory: coverage
-        flags: unittests
-        os: windows
+      shell: pwsh
+      run: |
+        $currentDirectory = Get-Location
+        dotnet test --no-restore --configuration Release --no-build --verbosity normal --framework net48 --results-directory $currentDirectory/coverage --coverage-output=$currentDirectory/coverage/CommonNet.Extensions.Tests.net48.xml --coverage-output-format=xml --coverage --project CommonNet.Extensions.Tests/CommonNet.Extensions.Tests.csproj
+        dotnet test --no-restore --configuration Release --no-build --verbosity normal --framework net8.0 --results-directory $currentDirectory/coverage --coverage-output=$currentDirectory/coverage/CommonNet.Extensions.Tests.net8.0.xml --coverage-output-format=xml --coverage --project CommonNet.Extensions.Tests/CommonNet.Extensions.Tests.csproj
+        dotnet test --no-restore --configuration Release --no-build --verbosity normal --framework net10.0 --results-directory $currentDirectory/coverage --coverage-output=$currentDirectory/coverage/CommonNet.Extensions.Tests.net10.0.xml --coverage-output-format=xml --coverage --project CommonNet.Extensions.Tests/CommonNet.Extensions.Tests.csproj

CommonNet.Extensions.Tests/Arbs.cs

@@ -0,0 +1,35 @@
+namespace CommonNet.Extensions.Tests;
+
+public class TextBlockFormatter : ArgumentDisplayFormatter
+{
+    public override bool CanHandle(object? value)
+    {
+        return value is string[];
+    }
+
+    public override string FormatValue(object? value)
+    {
+        if (value is string[] textArray)
+        {
+            return $"\"{string.Join(Environment.NewLine, textArray)}\"";
+        }
+        return "Invalid input type";
+    }
+}
+
+public class EnumerableFormatter : ArgumentDisplayFormatter
+{
+    public override bool CanHandle(object? value)
+    {
+        return value is System.Collections.IEnumerable;
+    }
+
+    public override string FormatValue(object? value)
+    {
+        if (value is System.Collections.IEnumerable enumerable)
+        {
+            return $"[{string.Join(",", enumerable.Cast<object>().Select(o => o?.ToString() ?? "null"))}]";
+        }
+        return "Invalid input type";
+    }
+}