Improved locking performance on .NET 9.0+

.github/workflows/4_6_2_Core_Unit_Tests_Win.yaml

@@ -0,0 +1,113 @@
+name: build and test .NET 4.6.2 Windows
+
+on:
+  push:
+  pull_request:
+    branches: [ release, development ]
+    paths:
+    - '**.cs'
+    - '**.csproj'
+
+env:
+  DOTNET_VERSION: '9.0.x' # The .NET SDK version to use
+
+jobs:
+  build-and-test:
+    # if: ${{ ! always() }}
+    name: build-and-test-windows
+    runs-on: windows-latest
+    steps:
+    - name: Clone webprofusion/certify
+      uses: actions/checkout@master
+      with:
+        path: ./certify
+
+    - name: Clone webprofusion/anvil
+      uses: actions/checkout@master
+      with:
+        repository: webprofusion/anvil
+        ref: refs/heads/main
+        path: ./libs/anvil
+
+    - name: Clone webprofusion/certify-plugins (development branch push)
+      if: ${{ github.event_name == 'push' && (contains(github.ref_name, '_dev') || github.ref_name == 'development') }}
+      uses: actions/checkout@master
+      with:
+        repository: webprofusion/certify-plugins
+        ref: refs/heads/development    
+        path: ./certify-plugins
+
+    - name: Clone webprofusion/certify-plugins (release branch push)
+      if: ${{ github.event_name == 'push' && (contains(github.ref_name, '_rel') || github.ref_name == 'release') }}
+      uses: actions/checkout@master
+      with:
+        repository: webprofusion/certify-plugins
+        ref: refs/heads/release    
+        path: ./certify-plugins
+
+    - name: Clone webprofusion/certify-plugins (pull request)
+      if: ${{ github.event_name == 'pull_request' }}
+      uses: actions/checkout@master
+      with:
+        repository: webprofusion/certify-plugins
+        ref: ${{ github.base_ref }}    
+        path: ./certify-plugins
+
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@master
+      with:
+        dotnet-version: ${{ env.DOTNET_VERSION }}
+
+    - name: Setup Step CLI
+      run: |
+        Invoke-WebRequest -Method 'GET' -uri 'https://dl.smallstep.com/gh-release/cli/docs-cli-install/v0.24.4/step_windows_0.24.4_amd64.zip' -Outfile 'C:\temp\step_windows_0.24.4_amd64.zip'
+        tar -oxzf C:\temp\step_windows_0.24.4_amd64.zip -C "C:\Program Files"
+        echo "C:\Program Files\step_0.24.4\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+    - name: Pull step-ca Docker Image
+      run: docker pull webprofusion/step-ca-win
+
+    - name: Cache NuGet Dependencies    
+      uses: actions/cache@v3
+      with:
+        path: ~/.nuget/packages
+        # Look to see if there is a cache hit for the corresponding requirements file
+        key: ${{ runner.os }}-4.6.2-nuget-${{ hashFiles('./certify/src/Certify.Tests/Certify.Core.Tests.Unit/*.csproj') }}
+        restore-keys: |
+          ${{ runner.os }}-4.6.2-nuget
+
+    - name: Install Dependencies & Build Certify.Core.Tests.Unit
+      run: |
+        dotnet tool install --global dotnet-reportgenerator-globaltool --version 5.2.0
+        dotnet add package GitHubActionsTestLogger
+        dotnet build -c Debug -f net462 --property WarningLevel=0 /clp:ErrorsOnly
+      working-directory: ./certify/src/Certify.Tests/Certify.Core.Tests.Unit
+
+    - name: Run Certify.Core.Tests.Unit Tests
+      run: |
+        $env:GITHUB_WORKSPACE="$env:GITHUB_WORKSPACE\certify"
+        $env:GITHUB_STEP_SUMMARY=".\TestResults-${{ runner.os }}\test-summary.md"
+        dotnet test --no-build -f net462 -l "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true;annotations.messageFormat=@error\n@trace"
+      working-directory: ./certify/src/Certify.Tests/Certify.Core.Tests.Unit
+
+    - name: Generated Test Results Report
+      run: |
+        echo "# Test Results" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8
+        (Get-Content -Path .\TestResults-${{ runner.os }}\test-summary.md).Replace('<details>', '<details open>') | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
+      working-directory: ./certify/src/Certify.Tests/Certify.Core.Tests.Unit
+      if: ${{ always() }}
+
+    - name: Generated Test Coverage Report
+      run: |
+        reportgenerator -reports:./TestResults-${{ runner.os }}/*/*.cobertura.xml -targetdir:./TestResults-${{ runner.os }} -reporttypes:MarkdownSummaryGithub "-title:Test Coverage"
+        Get-Content -Path ./TestResults-${{ runner.os }}/SummaryGithub.md | Out-File -FilePath $env:GITHUB_STEP_SUMMARY
+      working-directory: ./certify/src/Certify.Tests/Certify.Core.Tests.Unit
+      if: ${{ always() }}
+
+    # - name: Upload dotnet test Artifacts
+    #   uses: actions/upload-artifact@master
+    #   with:
+    #     name: dotnet-results-${{ runner.os }}-${{ env.DOTNET_VERSION }}
+    #     path: ./certify/src/Certify.Tests/Certify.Core.Tests.Unit/TestResults-4_6_2-${{ runner.os }}
+    #   # Use always() to always run this step to publish test results when there are test failures
+    #   if: ${{ always() }}

.github/workflows/DotNetCore_Unit_Tests_Linux.yaml

@@ -0,0 +1,116 @@
+name: build and test .NET Core 9.0 Linux
+
+on:
+  push:
+  pull_request:
+    branches: [ release, development ]
+    paths:
+    - '**.cs'
+    - '**.csproj'
+
+env:
+  DOTNET_VERSION: '9.0.x' # The .NET SDK version to use
+
+jobs:
+  build-and-test:
+
+    name: build-and-test-linux
+    runs-on: ubuntu-latest
+    steps:
+    - name: Clone webprofusion/certify
+      uses: actions/checkout@master
+      with:
+        path: ./certify
+
+    - name: Clone webprofusion/anvil
+      uses: actions/checkout@master
+      with:
+        repository: webprofusion/anvil
+        ref: refs/heads/main
+        path: ./libs/anvil
+
+    - name: Clone webprofusion/certify-plugins (development branch push)
+      if: ${{ github.event_name == 'push' && (contains(github.ref_name, '_dev') || github.ref_name == 'development') }}
+      uses: actions/checkout@master
+      with:
+        repository: webprofusion/certify-plugins
+        ref: refs/heads/development    
+        path: ./certify-plugins
+
+    - name: Clone webprofusion/certify-plugins (release branch push)
+      if: ${{ github.event_name == 'push' && (contains(github.ref_name, '_rel') || github.ref_name == 'release') }}
+      uses: actions/checkout@master
+      with:
+        repository: webprofusion/certify-plugins
+        ref: refs/heads/release    
+        path: ./certify-plugins
+
+    - name: Clone webprofusion/certify-plugins (pull request)
+      if: ${{ github.event_name == 'pull_request' }}
+      uses: actions/checkout@master
+      with:
+        repository: webprofusion/certify-plugins
+        ref: ${{ github.base_ref }}    
+        path: ./certify-plugins
+
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@master
+      with:
+        dotnet-version: ${{ env.DOTNET_VERSION }}
+
+    - name: Setup Step CLI
+      run: |
+        wget https://dl.smallstep.com/gh-release/cli/docs-cli-install/v0.23.0/step-cli_0.23.0_amd64.deb
+        sudo dpkg -i step-cli_0.23.0_amd64.deb
+
+    - name: Pull step-ca Docker Image
+      run: docker pull smallstep/step-ca
+
+    - name: Cache NuGet Dependencies    
+      uses: actions/cache@v3
+      with:
+        path: ~/.nuget/packages
+        # Look to see if there is a cache hit for the corresponding requirements file
+        key: ${{ runner.os }}-${{ env.DOTNET_VERSION }}-nuget-${{ hashFiles('./certify/src/Certify.Tests/Certify.Core.Tests.Unit/*.csproj') }}
+        restore-keys: |
+          ${{ runner.os }}-${{ env.DOTNET_VERSION }}-nuget
+
+    - name: Install Dependencies & Build Certify.Core.Tests.Unit
+      run: |
+        dotnet tool install --global dotnet-reportgenerator-globaltool --version 5.3.8
+        dotnet add package GitHubActionsTestLogger
+        dotnet restore -f net9.0
+        pwd
+        ls
+        dotnet build -c Debug -f net9.0 --property WarningLevel=0 /clp:ErrorsOnly
+      working-directory: ./certify/src/Certify.Tests/Certify.Core.Tests.Unit
+
+    - name: Run Certify.Core.Tests.Unit Tests
+      run: |
+        export GITHUB_WORKSPACE="$GITHUB_WORKSPACE/certify"
+        export GITHUB_STEP_SUMMARY="./TestResults-${{ runner.os }}/test-summary.md"
+        dotnet test --no-build -f net9.0 -l "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true;annotations.messageFormat=@error\n@trace"
+      working-directory: ./certify/src/Certify.Tests/Certify.Core.Tests.Unit
+
+    - name: Generate Test Results Report
+      run: |
+        echo "# Test Results" > $GITHUB_STEP_SUMMARY
+        sed -i 's/<details>/<details open>/g' ./TestResults-${{ runner.os }}/test-summary.md
+        cat ./TestResults-${{ runner.os }}/test-summary.md >> $GITHUB_STEP_SUMMARY
+      working-directory: ./certify/src/Certify.Tests/Certify.Core.Tests.Unit
+      if: ${{ always() }}
+
+    - name: Generated Test Coverage Report
+      run: |
+        reportgenerator -reports:./TestResults-${{ runner.os }}/*/*.cobertura.xml -targetdir:./TestResults-${{ runner.os }} -reporttypes:MarkdownSummaryGithub "-title:Test Coverage"
+        cat ./TestResults-${{ runner.os }}/SummaryGithub.md > $GITHUB_STEP_SUMMARY
+      working-directory: ./certify/src/Certify.Tests/Certify.Core.Tests.Unit
+      if: ${{ always() }}
+
+    # - name: Upload dotnet test Artifacts
+    #   uses: actions/upload-artifact@master
+    #   with:
+    #     name: dotnet-results-${{ runner.os }}-${{ env.DOTNET_VERSION }}
+    #     path: ./certify/src/Certify.Tests/Certify.Core.Tests.Unit/TestResults-9_0-${{ runner.os }}
+    #   # Use always() to always run this step to publish test results when there are test failures
+    #   if: ${{ always() }}

.github/workflows/DotNetCore_Unit_Tests_Win.yaml

@@ -0,0 +1,114 @@
+name: build and test .NET Core 9.0 Windows
+
+on:
+  push:
+  pull_request:
+    branches: [ release, development ]
+    paths:
+    - '**.cs'
+    - '**.csproj'
+
+env:
+  DOTNET_VERSION: '9.0.x' # The .NET SDK version to use
+
+jobs:
+  build-and-test:
+
+    name: build-and-test-windows
+    runs-on: windows-latest
+    steps:
+    - name: Clone webprofusion/certify
+      uses: actions/checkout@master
+      with:
+        path: ./certify
+
+    - name: Clone webprofusion/anvil
+      uses: actions/checkout@master
+      with:
+        repository: webprofusion/anvil
+        ref: refs/heads/main
+        path: ./libs/anvil
+
+    - name: Clone webprofusion/certify-plugins (development branch push)
+      if: ${{ github.event_name == 'push' && (contains(github.ref_name, '_dev') || github.ref_name == 'development') }}
+      uses: actions/checkout@master
+      with:
+        repository: webprofusion/certify-plugins
+        ref: refs/heads/development    
+        path: ./certify-plugins
+
+    - name: Clone webprofusion/certify-plugins (release branch push)
+      if: ${{ github.event_name == 'push' && (contains(github.ref_name, '_rel') || github.ref_name == 'release') }}
+      uses: actions/checkout@master
+      with:
+        repository: webprofusion/certify-plugins
+        ref: refs/heads/release    
+        path: ./certify-plugins
+
+    - name: Clone webprofusion/certify-plugins (pull request)
+      if: ${{ github.event_name == 'pull_request' }}
+      uses: actions/checkout@master
+      with:
+        repository: webprofusion/certify-plugins
+        ref: ${{ github.base_ref }}    
+        path: ./certify-plugins
+
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@master
+      with:
+        dotnet-version: ${{ env.DOTNET_VERSION }}
+
+    - name: Setup Step CLI
+      run: |
+        Invoke-WebRequest -Method 'GET' -uri 'https://dl.smallstep.com/gh-release/cli/docs-cli-install/v0.24.4/step_windows_0.24.4_amd64.zip' -Outfile 'C:\temp\step_windows_0.24.4_amd64.zip'
+        tar -oxzf C:\temp\step_windows_0.24.4_amd64.zip -C "C:\Program Files"
+        echo "C:\Program Files\step_0.24.4\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+    - name: Pull step-ca Docker Image
+      run: docker pull webprofusion/step-ca-win
+
+    - name: Cache NuGet Dependencies    
+      uses: actions/cache@v3
+      with:
+        path: ~/.nuget/packages
+        # Look to see if there is a cache hit for the corresponding requirements file
+        key: ${{ runner.os }}-${{ env.DOTNET_VERSION }}-nuget-${{ hashFiles('./certify/src/Certify.Tests/Certify.Core.Tests.Unit/*.csproj') }}
+        restore-keys: |
+          ${{ runner.os }}-${{ env.DOTNET_VERSION }}-nuget
+
+    - name: Install Dependencies & Build Certify.Core.Tests.Unit
+      run: |
+        dotnet tool install --global dotnet-reportgenerator-globaltool --version 5.2.0
+        dotnet add package GitHubActionsTestLogger
+        dotnet restore -f net9.0
+        dotnet build Certify.Core.Tests.Unit.csproj -c Debug -f net9.0 --property WarningLevel=0 /clp:ErrorsOnly
+      working-directory: ./certify/src/Certify.Tests/Certify.Core.Tests.Unit
+
+    - name: Run Certify.Core.Tests.Unit Tests
+      run: |
+        $env:GITHUB_WORKSPACE="$env:GITHUB_WORKSPACE\certify"
+        $env:GITHUB_STEP_SUMMARY=".\TestResults-${{ runner.os }}\test-summary.md"
+        dotnet test --no-build -f net9.0 -l "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true;annotations.messageFormat=@error\n@trace"
+      working-directory: ./certify/src/Certify.Tests/Certify.Core.Tests.Unit
+
+    - name: Generate Test Results Report
+      run: |
+        echo "# Test Results" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8
+        (Get-Content -Path .\TestResults-${{ runner.os }}\test-summary.md).Replace('<details>', '<details open>') | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
+      working-directory: ./certify/src/Certify.Tests/Certify.Core.Tests.Unit
+      if: ${{ always() }}
+
+    - name: Generated Test Coverage Report
+      run: |
+        reportgenerator -reports:./TestResults-${{ runner.os }}/*/*.cobertura.xml -targetdir:./TestResults-${{ runner.os }} -reporttypes:MarkdownSummaryGithub "-title:Test Coverage"
+        Get-Content -Path ./TestResults-${{ runner.os }}/SummaryGithub.md | Out-File -FilePath $env:GITHUB_STEP_SUMMARY
+      working-directory: ./certify/src/Certify.Tests/Certify.Core.Tests.Unit
+      if: ${{ always() }}
+
+    # - name: Upload dotnet test Artifacts
+    #   uses: actions/upload-artifact@master
+    #   with:
+    #     name: dotnet-results-${{ runner.os }}-${{ env.DOTNET_VERSION }}
+    #     path: ./certify/src/Certify.Tests/Certify.Core.Tests.Unit/TestResults-9_0-${{ runner.os }}
+    #   # Use always() to always run this step to publish test results when there are test failures
+    #   if: ${{ always() }}

Directory.Build.props

@@ -1,14 +1,18 @@
 <Project>
   <PropertyGroup>
-    <Version>6.1.0</Version>
-    <AssemblyVersion>6.1.0</AssemblyVersion>
+    <Version>7.0.0</Version>
+    <AssemblyVersion>7.0.0</AssemblyVersion>
     <Authors>Webprofusion Pty Ltd</Authors>
     <Company>Webprofusion Pty Ltd</Company>
-    <Product>Certify Community Edition [via github]</Product>
+    <Product>Certify Certificate Manager - Community Edition [dev version via github]</Product>
     <PackageProjectUrl>https://certifytheweb.com</PackageProjectUrl>
     <RepositoryUrl>https://github.com/webprofusion/certify</RepositoryUrl>
     <Deterministic>false</Deterministic>
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup>
+	<Configuration Condition="'$(OS)|$(Configuration)' == 'UNIX|Debug'"></Configuration>
+	<DebugType>portable</DebugType>
   </PropertyGroup>
 </Project>

docs/testing.md

@@ -3,8 +3,15 @@ Testing Configuration
 
 - In Visual Studio (or other Test UI such as AxoCover), set execution environment to 64-bit to ensure tests load.
 - Units tests are for discreet function testing or limited component dependency tests.
+    - `CertifyManagerAccountTests` require an existing Prod and Staging ACME account for letsencrypt.org to exist. It also requires a `.env.test_accounts` file in the directory `C:\ProgramData\certify\Tests` with values for `RESTORE_KEY_PEM`, `RESTORE_ACCOUNT_URI`, and `RESTORE_ACCOUNT_EMAIL` for an existing letsencrypt.org ACME account
+      ```.env
+      RESTORE_KEY_PEM="-----BEGIN EC PRIVATE KEY-----\r\nMHcCAQEEINL5koIn4o+an+EwyDQEd4Ggnxra5j7Oro13M5klKmhaoAoGCCqGSM49\r\nAwEHoUQDQgAEPF7u1CLMe9FIBQo0MVmv7vlvqGOdSERG5nRLkNKTDUgBRxkXGqY+\r\nGbnnzXUb7j4g7VN7CuEy0SpCdFItD+63hQ==\r\n-----END EC PRIVATE KEY-----\r\n"
+      RESTORE_ACCOUNT_URI=https://acme-staging-v02.api.letsencrypt.org/acme/acct/123456789
+      [email protected]
 - Integration tests exercise multiple components and may interact with ACME services etc. Required elements include:
 	- IIS Installed on local machine
+        * A non-enabled site in IIS is needed for TestCertifyManagerGetPrimaryWebSitesIncludeStoppedSites() in CertifyManagerServerTypeTests.cs
+    - Must set IncludeExternalPlugins to true in C:\ProgramData\certify\appsettings.json and run copy-plugins.bat from certify-internal
     - The debug version of the app must be configured with a contact against staging Let's Encrypt servers
 	- Completing HTTP challenges requires that the machine can respond to port 80 requests from the internet (such as the Let's Encrypt staging server checks)
 	- DNS API Credentials test and DNS Challenges require the respective DNS credentials by configured as saved credentials in the UI (see config below)
@@ -26,8 +33,7 @@ Testing Configuration
         "Cloudflare_ZoneId": "5265262gdd562s4x6xd64zxczxcv",
         "Cloudflare_TestDomain": "anothertest.com"
     }
-```
-In addition, the test domain for some tests can be set using the CERTIFYSSLDOMAIN environment variable.
-
+- In addition, the test domain for some tests can be set using the CERTIFY_TESTDOMAIN environment variable.
+