Skip to content
Merged

fix #144

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/actions/documentation/docfx-build/action.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Generate docs with docfx'
name: 'Generate docs with docfx'
author: 'Pete Sramek'
description: 'Generate documentation using docfx'
inputs:
Expand All @@ -14,9 +14,9 @@ inputs:
required: true
# Optional
dotnet_sdk_version:
description: '.NET SDK version. Default: 9.x'
description: '.NET SDK version. Default: 10.x'
required: false
default: '9.x'
default: '10.x'

runs:
using: composite
Expand Down Expand Up @@ -44,4 +44,4 @@ runs:
uses: actions/upload-artifact@v4
with:
name: ${{ inputs.artifact-name }}
path: ${{ inputs.output-directory }}
path: ${{ inputs.output-directory }}
7 changes: 3 additions & 4 deletions .github/actions/documentation/docfx-metadata/action.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Generate metadata with docfx'
name: 'Generate metadata with docfx'
author: 'Pete Sramek'
description: 'Generate metadata using docfx'

Expand All @@ -18,9 +18,9 @@ inputs:
required: true
# Optional
dotnet_sdk_version:
description: '.NET SDK version. Default: 9.x'
description: '.NET SDK version. Default: 10.x'
required: false
default: '9.x'
default: '10.x'

runs:
using: composite
Expand Down Expand Up @@ -63,4 +63,3 @@ runs:
with:
name: ${{ inputs.artifact-name }}
path: ${{ inputs.output-directory }}

6 changes: 3 additions & 3 deletions .github/actions/git/push-changes/action.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Push Changes'
name: 'Push Changes'
author: 'Pete Sramek'
description: 'Push changes to a specified branch in the repository.'
inputs:
Expand All @@ -8,9 +8,9 @@ inputs:
required: true
# Optional
dotnet_sdk_version:
description: '.NET SDK version. Default: 9.x'
description: '.NET SDK version. Default: 10.x'
required: false
default: '9.x'
default: '10.x'
artifact-name:
description: 'Name of the artifact to download before pushing changes. Default: '''''
required: false
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/nuget/publish-package/action.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Publish packages to NuGet feed'
name: 'Publish packages to NuGet feed'
author: 'Pete Sramek'
description: 'Publishes packages in working directory to public NuGet feed'
inputs:
Expand All @@ -17,9 +17,9 @@ inputs:
required: true
# Optional
dotnet-sdk-version:
description: '.NET SDK version. Default: 9.x'
description: '.NET SDK version. Default: 10.x'
required: false
default: '9.x'
default: '10.x'
working-directory:
description: 'Working directory to search for file.'
required: false
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/source/compile/action.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Compile source code'
name: 'Compile source code'
author: 'Pete Sramek'
description: 'Compiles source code, uploads build artifacts.'
inputs:
Expand All @@ -20,9 +20,9 @@ inputs:
required: true
# Optional
dotnet_sdk_version:
description: '.NET SDK version. Default: ''9.x'''
description: '.NET SDK version. Default: ''10.x'''
required: false
default: '9.x'
default: '10.x'
build-configuration:
description: 'Build configuration. Default: ''Release'''
required: false
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/source/format/action.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Format source code'
name: 'Format source code'
author: 'Pete Sramek'
description: 'Formats source code using dotnet format tool. Pushes changes to the current branch.'
inputs:
Expand All @@ -8,9 +8,9 @@ inputs:
required: true
# Optional
dotnet_sdk_version:
description: '.NET SDK version. Default: ''9.x'''
description: '.NET SDK version. Default: ''10.x'''
required: false
default: '9.x'
default: '10.x'
format-whitespace:
description: 'Format whitespace. Default: ''true'''
required: false
Expand Down
8 changes: 4 additions & 4 deletions .github/actions/testing/code-coverage/action.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Test with .NET CLI'
name: 'Test with .NET CLI'
author: 'Pete Sramek'
description: 'Run tests, collects code coverage, logs test results, uploads test artifacts'
inputs:
Expand All @@ -8,9 +8,9 @@ inputs:
required: true
# Optional
dotnet_sdk_version:
description: '.NET SDK version. Default: 9.x'
description: '.NET SDK version. Default: 10.x'
required: false
default: '9.x'
default: '10.x'

outputs:
code-coverage-report-file:
Expand Down Expand Up @@ -70,4 +70,4 @@ runs:

- name: 'Generate code coverage report'
shell: bash
run: reportgenerator -reports:${{ env.CODE_COVERAGE_MERGED_FILE }} -targetdir:${{ env.CODE_COVERAGE_REPORT_FOLDER }} -reporttypes:"MarkdownSummary"
run: reportgenerator -reports:${{ env.CODE_COVERAGE_MERGED_FILE }} -targetdir:${{ env.CODE_COVERAGE_REPORT_FOLDER }} -reporttypes:"MarkdownSummary"
8 changes: 4 additions & 4 deletions .github/actions/testing/test-report/action.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Generate test report with Liquid Test Reports CLI'
name: 'Generate test report with Liquid Test Reports CLI'
author: 'Pete Sramek'
description: 'Run tests, collects code coverage, logs test results, uploads test artifacts'
inputs:
Expand All @@ -8,9 +8,9 @@ inputs:
required: true
# Optional
dotnet_sdk_version:
description: '.NET SDK version. Default: 9.x'
description: '.NET SDK version. Default: 10.x'
required: false
default: '9.x'
default: '10.x'
test-report-filename:
description: 'Filename of the test report. Default: test-report.md'
required: false
Expand Down Expand Up @@ -57,4 +57,4 @@ runs:

- name: Generate test report
shell: bash
run: liquid --inputs "Folder=${{ env.TEST_RESULT_FOLDER }};File=**/*.trx;Format=Trx" --output-file ${{ env.TEST_REPORT_FILE }}
run: liquid --inputs "Folder=${{ env.TEST_RESULT_FOLDER }};File=**/*.trx;Format=Trx" --output-file ${{ env.TEST_REPORT_FILE }}
19 changes: 12 additions & 7 deletions .github/actions/testing/test/action.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
name: 'Test with .NET CLI'
name: 'Test with .NET CLI'
author: 'Pete Sramek'
description: 'Run tests, collects code coverage, logs test results, uploads test artifacts'
inputs:
# Required

# Optional
dotnet_sdk_version:
description: '.NET SDK version. Default: 9.x'
description: '.NET SDK version. Default: 10.x'
required: false
default: '9.x'
default: '10.x'
build-configuration:
description: 'Build configuration. Default: Release'
required: false
default: 'Release'
use-testing-platform:
description: 'Use Microsoft Testing Platform, Default: true'
required: false
default: 'true'
project-path:
description: 'Search pattern for test projects.'
required: true
Comment on lines 20 to 22
Expand Down Expand Up @@ -50,7 +54,7 @@ runs:
using: composite
steps:
- name: 'Checkout ${{ github.head_ref || github.ref }}'
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: 'Setup .NET ${{ inputs.dotnet_sdk_version }}'
uses: actions/setup-dotnet@v4
Expand Down Expand Up @@ -82,10 +86,11 @@ runs:
- name: 'Test with .NET CLI'
shell: bash
run: dotnet test ${{ inputs.test-project-glob-pattern }} --configuration ${{ inputs.build-configuration }} -- ${{ env.CODE_COVERAGE_ARGS }} ${{ env.TRX_LOGGER_ARGS }} --results-directory ${{ inputs.test-results-directory }}

env:
DOTNET_TEST_USE_MICROSOFT_TESTING_PLATFORM: true
- name: 'Upload test results'
if: ${{ inputs.upload-test-artifacts == 'true' }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: '${{ inputs.test-artifacts-name }}'
path: '${{ inputs.test-results-directory }}*'
path: '${{ inputs.test-results-directory }}*'
6 changes: 3 additions & 3 deletions .github/actions/versioning/extract-version/action.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Extract version'
name: 'Extract version'
author: 'Pete Sramek'
description: 'Determines versions for the build.'
inputs:
Expand All @@ -16,9 +16,9 @@ inputs:
required: false
default: '(\d+).(\d+)'
dotnet_sdk_version:
description: '.NET SDK version. Default: ''9.x'''
description: '.NET SDK version. Default: ''10.x'''
required: false
default: '9.x'
default: '10.x'
outputs:
version:
description: 'Version extracted from the branch name.'
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/versioning/format-version/action.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Format version'
name: 'Format version'
author: 'Pete Sramek'
description: 'Formats versions.'
inputs:
Expand All @@ -20,9 +20,9 @@ inputs:
required: true
# Optional
dotnet_sdk_version:
description: '.NET SDK version. Default: ''9.x'''
description: '.NET SDK version. Default: ''10.x'''
required: false
default: '9.x'
default: '10.x'

outputs:
friendly-version:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build
name: Build

on:
workflow_dispatch:
Expand All @@ -20,7 +20,7 @@ concurrency:
cancel-in-progress: false

env:
dotnet-sdk-version: '9.x'
dotnet-sdk-version: '10.x'
build-configuration: 'Release'
build-platform: 'Any CPU'
git-version: '6.0.x'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/promote-branch.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Promote branch'
name: 'Promote branch'

on:
workflow_dispatch:
Expand Down Expand Up @@ -27,7 +27,7 @@ concurrency:
cancel-in-progress: false

env:
dotnet-sdk-version: '9.x'
dotnet-sdk-version: '10.x'
is-development-branch: ${{ startsWith(github.ref_name, 'develop') }}
is-maintenance-branch: ${{ startsWith(github.ref_name, 'support') }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Pull Request'
name: 'Pull Request'

on:
pull_request:
Expand All @@ -21,7 +21,7 @@ concurrency:
cancel-in-progress: true

env:
dotnet-sdk-version: '9.x'
dotnet-sdk-version: '10.x'
build-configuration: 'Release'
build-platform: 'Any CPU'
git-version: '6.0.x'
Expand Down Expand Up @@ -238,7 +238,7 @@ jobs:
with:
dotnet-version: |
8.x
9.x
10.x
- name: Download Build
uses: actions/download-artifact@v5
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Release'
name: 'Release'

on:
push:
Expand All @@ -19,7 +19,7 @@ concurrency:
cancel-in-progress: false

env:
dotnet-sdk-version: '9.x'
dotnet-sdk-version: '10.x'
build-configuration: 'Release'
build-platform: 'Any CPU'
git-version: '6.0.x'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0;</TargetFrameworks>
<LangVersion>13.0</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
19 changes: 11 additions & 8 deletions tests/PolylineAlgorithm.Tests/PolylineAlgorithm.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>13.0</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
Expand All @@ -16,6 +16,8 @@
<TestingPlatformShowTestsFailure>true</TestingPlatformShowTestsFailure>
<TestingPlatformCaptureOutput>false</TestingPlatformCaptureOutput>
<TestingExtensionsProfile>None</TestingExtensionsProfile>
<UseMicrosoftTestingPlatform>true</UseMicrosoftTestingPlatform>
<UseModernDotnetTest>true</UseModernDotnetTest>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -30,17 +32,18 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
<PackageReference Include="MSTest" Version="3.*" />
<PackageReference Include="Microsoft.Testing.Platform.MSBuild" Version="1.*" />
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.*" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="1.*" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" Version="9.*" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="MSTest" Version="4.1.0" />
<PackageReference Include="Microsoft.Testing.Platform.MSBuild" Version="2.1.0" />
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.5.2" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" Version="10.4.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.5" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\PolylineAlgorithm\PolylineAlgorithm.csproj" />
<ProjectReference Include="..\..\utilities\PolylineAlgorithm.Utility\PolylineAlgorithm.Utility.csproj" />
</ItemGroup>

</Project>
</Project>
Loading