diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index ec7c0af..7b5dcde 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -44,12 +44,12 @@ jobs: VERSION='${{ inputs.version }}' INCR='${{ inputs.increment }}' if [[ "$MODE" == "explicit" && -z "$VERSION" ]]; then - echo "❌ mode=explicit requires 'version' (e.g., 1.3-alpha)."; exit 1 + echo "? mode=explicit requires 'version' (e.g., 1.3-alpha)."; exit 1 fi if [[ "$MODE" == "bump" && -z "$INCR" ]]; then - echo "❌ mode=bump requires 'increment' (major|minor|patch)."; exit 1 + echo "? mode=bump requires 'increment' (major|minor|patch)."; exit 1 fi - echo "✅ inputs look good." + echo "? inputs look good." set-version: needs: validate-inputs @@ -71,4 +71,4 @@ jobs: prerelease: ${{ needs.set-version.outputs.new_prerelease }} draft: true secrets: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index a428f7d..b313fad 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -8,7 +8,7 @@ on: branches: [main, develop] workflow_run: - workflows: [Create Prerelease, Create Release] + workflows: [Create Release] types: [requested] permissions: @@ -48,4 +48,4 @@ jobs: with: branch: ${{ needs.discover.outputs.branch_name }} secrets: inherit - + \ No newline at end of file diff --git a/.github/workflows/pack_publish.yml b/.github/workflows/pack_publish.yml index 36da3fc..9a27ace 100644 --- a/.github/workflows/pack_publish.yml +++ b/.github/workflows/pack_publish.yml @@ -1,4 +1,4 @@ -name: Pack and Publish +name: Pack and Publish on: release: @@ -11,7 +11,7 @@ permissions: statuses: write jobs: - set_config: + set-config: uses: Stillpoint-Software/shared-workflows/.github/workflows/determine_build_configuration.yml@main with: trigger: release @@ -20,17 +20,17 @@ jobs: prerelease: ${{ github.event.release.prerelease }} # true/false from the release tests: - needs: set_config + needs: set-config uses: Stillpoint-Software/shared-workflows/.github/workflows/run_tests.yml@main with: branch: ${{ github.event.release.target_commitish }} solution_name: ${{ vars.SOLUTION_NAME }} - + publish: - needs: [set_config, tests] + needs: [set-config, tests] uses: Stillpoint-Software/shared-workflows/.github/workflows/pack_and_publish.yml@main with: - build_configuration: ${{ needs.set_config.outputs.build_configuration }} + build_configuration: ${{ needs.set-config.outputs.build_configuration }} secrets: NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }} @@ -40,5 +40,4 @@ jobs: runs-on: ubuntu-latest steps: - run: echo "Tests result = ${{ needs.tests.result }}" - - run: echo "Pack & Publish result = ${{ needs.publish.result }}" - + - run: echo "Pack & Publish result = ${{ needs.publish.result }}" \ No newline at end of file diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 9efc51d..db7c3cd 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -2,7 +2,7 @@ name: Run Tests on: workflow_run: - workflows: [Create Prerelease, Create Release] + workflows: [Create Release] types: [requested] branches: [main, develop] workflow_dispatch: @@ -45,4 +45,4 @@ jobs: with: branch: ${{ needs.discover.outputs.branch_name }} solution_name: ${{ vars.SOLUTION_NAME }} - secrets: inherit + secrets: inherit \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 34d23df..09986e4 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -41,10 +41,11 @@ PackagePath="\" Link="LICENSE" /> - + enable - net8.0;net10.0 + + net10.0;net9.0;net8.0 diff --git a/Directory.Packages.props b/Directory.Packages.props index 200d8a4..313df33 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -8,17 +8,17 @@ all - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + diff --git a/src/Hyperbee.Templating.Provider.XS/Hyperbee.Templating.Provider.XS.csproj b/src/Hyperbee.Templating.Provider.XS/Hyperbee.Templating.Provider.XS.csproj index 3f1354d..e3098cb 100644 --- a/src/Hyperbee.Templating.Provider.XS/Hyperbee.Templating.Provider.XS.csproj +++ b/src/Hyperbee.Templating.Provider.XS/Hyperbee.Templating.Provider.XS.csproj @@ -41,7 +41,10 @@ - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/Hyperbee.Templating/Hyperbee.Templating.csproj b/src/Hyperbee.Templating/Hyperbee.Templating.csproj index 9e6fd86..def94b9 100644 --- a/src/Hyperbee.Templating/Hyperbee.Templating.csproj +++ b/src/Hyperbee.Templating/Hyperbee.Templating.csproj @@ -40,7 +40,10 @@ - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + \ No newline at end of file diff --git a/test/Hyperbee.Templating.Benchmark/BenchmarkConfig.cs b/test/Hyperbee.Templating.Benchmark/BenchmarkConfig.cs index 21aeed3..55bd2f7 100644 --- a/test/Hyperbee.Templating.Benchmark/BenchmarkConfig.cs +++ b/test/Hyperbee.Templating.Benchmark/BenchmarkConfig.cs @@ -20,6 +20,10 @@ public Config() .WithRuntime( CoreRuntime.Core80 ) .WithId( ".NET 8" ) ); + AddJob( Job.ShortRun + .WithRuntime( CoreRuntime.Core90 ) + .WithId( ".NET 9" ) ); + AddJob( Job.ShortRun .WithRuntime( CoreRuntime.Core10_0 ) .WithId( ".NET 10" ) ); diff --git a/test/Hyperbee.Templating.Benchmark/Hyperbee.Templating.Benchmark.csproj b/test/Hyperbee.Templating.Benchmark/Hyperbee.Templating.Benchmark.csproj index e83e2c9..738fc6f 100644 --- a/test/Hyperbee.Templating.Benchmark/Hyperbee.Templating.Benchmark.csproj +++ b/test/Hyperbee.Templating.Benchmark/Hyperbee.Templating.Benchmark.csproj @@ -9,7 +9,7 @@ - + @@ -18,4 +18,11 @@ + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/test/Hyperbee.Templating.Tests/Hyperbee.Templating.Tests.csproj b/test/Hyperbee.Templating.Tests/Hyperbee.Templating.Tests.csproj index fca6dee..442feac 100644 --- a/test/Hyperbee.Templating.Tests/Hyperbee.Templating.Tests.csproj +++ b/test/Hyperbee.Templating.Tests/Hyperbee.Templating.Tests.csproj @@ -10,22 +10,25 @@ - + - - + + - + - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + \ No newline at end of file diff --git a/version.json b/version.json index 3583276..e1f6e17 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", - "version": "3.3.4", + "version": "3.4.1", "publicReleaseRefSpec": [ "^refs/heads/main$", "^refs/heads/hotfix$",