[pull] master from angularsen:master

.agents/criteria-for-adding-quantities-and-units.md

@@ -0,0 +1,44 @@
+# Criteria for adding quantities and units
+
+See also: [Docs/adding-a-new-unit.md](../Docs/adding-a-new-unit.md#great-but-before-you-start) for the full contributor guide.
+
+To avoid bloating the library, we want to ensure quantities and units are widely used and well defined.
+Avoid little used units that are obscure or too domain specific.
+Ask for justification and use cases if this is not clear.
+
+### A quantity is a good fit to add, if it
+
+- [x] Is well documented and unambiguous, e.g. has a wiki page and generally easy to find on Google
+- [x] Is widely used, preferably across domains
+- [x] Has multiple units to convert between (e.g. `Length` has kilometer, feet, nanometer etc.)
+- [x] Can convert to other quantities (e.g. `Length x Length = Area`)
+- [x] Can be represented by a `double` numeric value, integer values are not well supported and may suffer from precision errors
+- [x] Is not [dimensionless/unitless](https://en.wikipedia.org/wiki/Dimensionless_quantity) (consider using `Ratio`)
+
+Single-unit quantities are the exception. If a proposed quantity has only one unit, it needs stronger justification: the quantity must be widely used as a typed quantity representation on its own, not just as a unit abbreviation with no conversions.
+
+### A unit is a good fit to add to a quantity, if it
+
+- [x] Is well documented and unambiguous, e.g. has a wiki page or found in online unit converters
+- [x] Is widely used
+- [x] Can be converted to other units of the same quantity
+- [x] The conversion function is well established without ambiguous competing standards
+
+### Review test values for new units
+
+- [x] Test values use literal constants, not expressions that repeat the JSON conversion functions
+- [x] Test values preferably cite a verifiable source, such as an online converter, standard, or reference table
+- [x] Test values have at least 7 significant figures where possible, but no more precision than `double` can usefully represent
+- [x] The expected value independently sanity-checks the conversion function instead of mirroring its implementation
+
+### Review abbreviations for new units
+
+- [x] The primary abbreviation is the technically precise one when there is a clear distinction, such as `lbf`, `ozf`, or `gf` for force-derived compound units
+- [x] Common shorthand variants such as `lb`, `oz`, or `g` are only secondary abbreviations, and only when they are widely used and unambiguous for that quantity
+- [x] Shorthand aliases do not create ambiguity with another unit in the same quantity
+- [x] Common shorthand aliases that fit multiple quantities are mapped to each relevant quantity, e.g. `ft-lb` for torque and energy, or `oz·in` for torque and static unbalance
+- [x] Singular unit symbols such as `lb` and `oz` are preferred over pluralized forms such as `lbs` and `ozs`; pluralized forms should only be secondary aliases when they are strong domain conventions
+
+### Avoid X-per-Y units
+
+There are many variations of unit A over unit B, such as `LengthPerAngle` and we want to avoid adding these unless they are very common.

.config/dotnet-tools.json

@@ -2,11 +2,12 @@
   "version": 1,
   "isRoot": true,
   "tools": {
-    "jetbrains.dotcover.globaltool": {
-      "version": "2022.2.3",
+    "jetbrains.dotcover.commandlinetools": {
+      "version": "2025.1.8",
       "commands": [
-        "dotnet-dotcover"
-      ]
+        "dotCover"
+      ],
+      "rollForward": false
     },
     "timeitsharp": {
       "version": "0.0.8",
@@ -15,4 +16,4 @@
       ]
     }
   }
-}
+}

.devcontainer/unitsnet-modular/devcontainer.json

@@ -0,0 +1,22 @@
+{
+  "name": "UnitsNet.Modular samples",
+  "image": "mcr.microsoft.com/devcontainers/dotnet:10.0-noble",
+  "postCreateCommand": "dotnet build UnitsNet.Modular/Samples/UnitsNet.Modular.Samples.slnx -p:Platform=ProjectReferences",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-dotnettools.csdevkit"
+      ],
+      "settings": {
+        "dotnet.defaultSolution": "UnitsNet.Modular/Samples/UnitsNet.Modular.Samples.slnx",
+        "csharp.debug.console": "integratedTerminal",
+        "terminal.integrated.cwd": "${workspaceFolder}/UnitsNet.Modular/Samples"
+      }
+    },
+    "codespaces": {
+      "openFiles": [
+        "UnitsNet.Modular/Samples/README.md"
+      ]
+    }
+  }
+}

.editorconfig

@@ -8,13 +8,13 @@ root = true
 [*]
 indent_style = space
 trim_trailing_whitespace = true
+charset = utf-8
 # (Please don't specify an indent_size here; that has too many unintended consequences.)
 
 # Code files
 [*.{cs,csx,vb,vbx}]
 indent_size = 4
 insert_final_newline = true
-charset = utf-8-bom
 
 [*.{cmd,bat}]
 indent_size = 2
@@ -25,7 +25,6 @@ insert_final_newline = false
 indent_size = 2
 end_of_line = crlf
 insert_final_newline = true
-charset = utf-8-bom
 
 # Xml project files
 [*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]

.github/actions/run-benchmarks/action.yaml

@@ -1,13 +1,13 @@
 name: 'Run benchmark'
 inputs:
   framework:
-    description: 'The runtime version to use (e.g. net5.0)'
+    description: 'The target framework used to host the benchmarks (e.g. net10.0)'
     required: false
-    default: 'net5.0'
+    default: 'net10.0'
   runtimes:
-    description: 'The runtime version to use (e.g. netcoreapp31, net5.0)'
+    description: 'The runtime versions to benchmark (e.g. net10.0, net9.0, net48)'
     required: false
-    default: 'net5.0'
+    default: 'net10.0'
   output-folder:
     description: 'The output folder for the benchmark (a results folder is created inside)'
     required: false
@@ -40,4 +40,4 @@ runs:
         --exporters ${{ inputs.exporters }} 
         --filter '${{ inputs.filter }}' 
         ${{ inputs.categories }} ${{ inputs.execution-options }}
-      shell: bash
+      shell: bash

.github/workflows/ci.yml

@@ -7,103 +7,154 @@ on:
       - 'release/**'
       - 'maintenance/**'
     paths-ignore:
-      - '**/*.png'
       - '**/*.md'
+      - '**/*.png'
   workflow_dispatch:
+    inputs:
+      run_tests:
+        description: Run tests
+        required: true
+        default: true
+        type: boolean
+      collect_coverage:
+        description: Collect and upload coverage (requires tests)
+        required: true
+        default: true
+        type: boolean
+      pack_nugets:
+        description: Pack and upload NuGet artifacts
+        required: true
+        default: true
+        type: boolean
+      upload_artifacts:
+        description: Create and upload the full artifact archive
+        required: true
+        default: true
+        type: boolean
+      publish_nuget:
+        description: Publish to nuget.org (master only; forces packing)
+        required: true
+        default: false
+        type: boolean
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ci-${{ github.workflow }}-${{ github.ref }}
+  # Never interrupt a master run while it may be publishing an immutable package set.
+  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
 
 env:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
 
 jobs:
   build-and-test:
-    name: Build & Test
-    runs-on: windows-latest
+    name: CI Build & Test
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    permissions:
+      contents: read
+      id-token: write
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v7
       with:
         fetch-depth: 1
         lfs: true
 
-    - name: Setup .NET SDK
-      uses: actions/setup-dotnet@v4
+    - name: Setup .NET SDKs
+      uses: actions/setup-dotnet@v6
       with:
         dotnet-version: |
-          6.0.x
           8.0.x
+          9.0.x
+          10.0.x
 
-    - name: Setup .NET nanoFramework build components
-      uses: nanoframework/nanobuild@v1
-      with:
-        workload: 'nanoFramework'
-
-    - name: Build, Test and Pack
-      shell: pwsh
-      run: |
-        ./Build/build.ps1 -IncludeNanoFramework
-      working-directory: ${{ github.workspace }}
-
-    - name: Upload to codecov.io
+    - name: Build selected components
       shell: pwsh
       env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        RUN_TESTS: ${{ github.event_name != 'workflow_dispatch' || inputs.run_tests }}
+        COLLECT_COVERAGE: ${{ github.event_name != 'workflow_dispatch' || inputs.collect_coverage }}
+        PACK_NUGETS: ${{ github.event_name != 'workflow_dispatch' || inputs.pack_nugets || inputs.publish_nuget }}
+        CREATE_ARCHIVE: ${{ github.event_name != 'workflow_dispatch' || inputs.upload_artifacts }}
       run: |
-        Write-Host -Foreground Green "Downloading codecov binaries..."
-
-        Invoke-WebRequest -Uri https://uploader.codecov.io/verification.gpg -OutFile codecov.asc
-        gpg.exe --import codecov.asc
-
-        Invoke-WebRequest -Uri https://uploader.codecov.io/latest/windows/codecov.exe -Outfile codecov.exe
-        Invoke-WebRequest -Uri https://uploader.codecov.io/latest/windows/codecov.exe.SHA256SUM -Outfile codecov.exe.SHA256SUM
-        Invoke-WebRequest -Uri https://uploader.codecov.io/latest/windows/codecov.exe.SHA256SUM.sig -Outfile codecov.exe.SHA256SUM.sig
-
-        gpg.exe --verify codecov.exe.SHA256SUM.sig codecov.exe.SHA256SUM
-        If ($(Compare-Object -ReferenceObject  $(($(certUtil -hashfile codecov.exe SHA256)[1], "codecov.exe") -join "  ") -DifferenceObject $(Get-Content codecov.exe.SHA256SUM)).length -eq 0) { echo "SHASUM verified" } Else {exit 1}
-
-        Write-Host -Foreground Green "Uploading to codecov..."
-
-        .\codecov.exe --dir "Artifacts/Coverage" -t "$env:CODECOV_TOKEN" --build "${{ github.run_number }}"
-
-        Write-Host -Foreground Green "✅ Uploaded to codecov."
-
-    - name: Upload Artifacts
-      uses: actions/upload-artifact@v4
+        $buildArguments = @()
+        if ($env:RUN_TESTS -ne 'true') { $buildArguments += '-SkipTests' }
+        if ($env:COLLECT_COVERAGE -ne 'true') { $buildArguments += '-SkipCoverage' }
+        if ($env:PACK_NUGETS -ne 'true') { $buildArguments += '-SkipPack' }
+        if ($env:CREATE_ARCHIVE -ne 'true') { $buildArguments += '-SkipArchive' }
+        ./Build/build.ps1 @buildArguments
+
+    # Codecov intermittently fails while importing its verification key from Keybase.
+    # Keep coverage non-blocking until upstream adds reliable retry/error handling:
+    # https://github.com/codecov/codecov-action/issues/1876
+    # https://github.com/codecov/wrapper/pull/66
+    - name: Upload coverage to Codecov
+      if: github.event_name != 'workflow_dispatch' || (inputs.run_tests && inputs.collect_coverage)
+      continue-on-error: true
+      uses: codecov/codecov-action@v6
+      with:
+        directory: Artifacts/Coverage
+        fail_ci_if_error: true
+        plugins: noop
+        use_oidc: true
+
+    - name: Upload artifacts
+      if: github.event_name != 'workflow_dispatch' || inputs.upload_artifacts
+      uses: actions/upload-artifact@v7
       with:
         name: artifacts
         path: Artifacts/
         retention-days: 30
 
     - name: Upload NuGet packages
-      uses: actions/upload-artifact@v4
+      if: github.event_name != 'workflow_dispatch' || inputs.pack_nugets || inputs.publish_nuget
+      uses: actions/upload-artifact@v7
       with:
         name: nuget-packages
         path: |
           Artifacts/**/*.nupkg
           Artifacts/**/*.snupkg
+        if-no-files-found: error
         retention-days: 30
 
   publish-nuget:
-    name: Publish to NuGet
+    name: Publish NuGet packages
     needs: build-and-test
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master' && github.repository_owner == 'angularsen'
+    timeout-minutes: 10
+    if: >-
+      github.ref == 'refs/heads/master' &&
+      github.repository_owner == 'angularsen' &&
+      (github.event_name == 'push' || inputs.publish_nuget)
     environment: Publish
+    permissions:
+      contents: read
+      id-token: write
 
     steps:
     - name: Download NuGet packages
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v8
       with:
         name: nuget-packages
         path: nugets
 
     - name: Setup .NET SDK
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v6
+      with:
+        dotnet-version: 10.0.x
+
+    - name: Log in to NuGet with trusted publishing
+      uses: NuGet/login@v1
+      id: nuget-login
       with:
-        dotnet-version: 8.0.x
+        user: angularsen
 
     - name: Push to nuget.org
-      run: |
-        dotnet nuget push "**/*.nupkg" --skip-duplicate --api-key ${{ secrets.NUGET_ORG_APIKEY }} --source https://api.nuget.org/v3/index.json
-      working-directory: nugets
+      env:
+        NUGET_API_KEY: ${{ steps.nuget-login.outputs.NUGET_API_KEY }}
+      run: dotnet nuget push "**/*.nupkg" --skip-duplicate --api-key "$NUGET_API_KEY" --source https://api.nuget.org/v3/index.json
+      working-directory: nugets