diff --git a/.github/workflows/Format.yml b/.github/workflows/Format.yml index 3adcfc2..9c5b85b 100644 --- a/.github/workflows/Format.yml +++ b/.github/workflows/Format.yml @@ -46,7 +46,7 @@ jobs: if: ${{ needs.discover.result == 'success' }} uses: Stillpoint-Software/shared-workflows/.github/workflows/format.yml@main with: - dotnet_version: "9.0.x" + dotnet_version: "10.0.x" branch: ${{ needs.discover.outputs.branch_name }} secrets: inherit diff --git a/.github/workflows/pack_publish.yml b/.github/workflows/pack_publish.yml index da79cee..9ad205a 100644 --- a/.github/workflows/pack_publish.yml +++ b/.github/workflows/pack_publish.yml @@ -8,6 +8,7 @@ permissions: contents: write pull-requests: write packages: write + statuses: write jobs: set-config: @@ -25,3 +26,9 @@ jobs: build_configuration: ${{ needs.set-config.outputs.build_configuration }} secrets: NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }} + result: + needs: [publish] + if: always() + runs-on: ubuntu-latest + steps: + - run: echo "Pack & Publish result = ${{ needs.publish.result }}" \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 9bc9409..ad2e476 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ - + diff --git a/Hyperbee.Resources.sln b/Hyperbee.Resources.sln deleted file mode 100644 index 5770ffd..0000000 --- a/Hyperbee.Resources.sln +++ /dev/null @@ -1,70 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.9.34728.123 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D9648393-6F08-43BB-A860-CE7E5518E23F}" - ProjectSection(SolutionItems) = preProject - Directory.Build.props = Directory.Build.props - LICENSE = LICENSE - README.md = README.md - version.json = version.json - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Tests", "Solution Tests", "{3578FD7E-CD36-4C2B-974C-52C56F7B60AB}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{2D48C1F2-0FEE-4311-9A47-D547166735A3}" - ProjectSection(SolutionItems) = preProject - .github\dependabot.yml = .github\dependabot.yml - .github\issue-branch.yml = .github\issue-branch.yml - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbee.Resources", "src\Hyperbee.Resources\Hyperbee.Resources.csproj", "{B1539F5A-4780-4DFA-BD48-BFB09AFFE3F7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{3F11E2F8-DDBB-4CEC-8364-ADBC05A17E9D}" - ProjectSection(SolutionItems) = preProject - .github\workflows\format.yml = .github\workflows\format.yml - .github\workflows\create_test_report.yml = .github\workflows\create_test_report.yml - .github\workflows\create_release.yml = .github\workflows\create_release.yml - .github\workflows\issue_branch.yml = .github\workflows\issue_branch.yml - .github\workflows\pack_publish.yml = .github\workflows\pack_publish.yml - .github\workflows\run_tests.yml = .github\workflows\run_tests.yml - .github\workflows\unlist_package.yml = .github\workflows\unlist_package.yml - .github\workflows\deploy_github_pages.yml = .github\workflows\deploy_github_pages.yml - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbee.Resources.Tests", "test\Hyperbee.Resources.Tests\Hyperbee.Resources.Tests.csproj", "{C9DFA58D-268B-4CCD-807C-ECB81053856B}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "docs", "docs\docs.shproj", "{0CBE4E5F-4F8C-40C8-84FC-1BFE89E9018D}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B1539F5A-4780-4DFA-BD48-BFB09AFFE3F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1539F5A-4780-4DFA-BD48-BFB09AFFE3F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1539F5A-4780-4DFA-BD48-BFB09AFFE3F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1539F5A-4780-4DFA-BD48-BFB09AFFE3F7}.Release|Any CPU.Build.0 = Release|Any CPU - {C9DFA58D-268B-4CCD-807C-ECB81053856B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9DFA58D-268B-4CCD-807C-ECB81053856B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9DFA58D-268B-4CCD-807C-ECB81053856B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9DFA58D-268B-4CCD-807C-ECB81053856B}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {2D48C1F2-0FEE-4311-9A47-D547166735A3} = {D9648393-6F08-43BB-A860-CE7E5518E23F} - {3F11E2F8-DDBB-4CEC-8364-ADBC05A17E9D} = {2D48C1F2-0FEE-4311-9A47-D547166735A3} - {C9DFA58D-268B-4CCD-807C-ECB81053856B} = {3578FD7E-CD36-4C2B-974C-52C56F7B60AB} - {0CBE4E5F-4F8C-40C8-84FC-1BFE89E9018D} = {D9648393-6F08-43BB-A860-CE7E5518E23F} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {D1BE373C-31C9-468E-8DCC-7C214765266B} - EndGlobalSection - GlobalSection(SharedMSBuildProjectFiles) = preSolution - docs\docs.projitems*{0cbe4e5f-4f8c-40c8-84fc-1bfe89e9018d}*SharedItemsImports = 13 - EndGlobalSection -EndGlobal diff --git a/Hyperbee.Resources.slnx b/Hyperbee.Resources.slnx new file mode 100644 index 0000000..f72cf28 --- /dev/null +++ b/Hyperbee.Resources.slnx @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/README.md b/README.md index afe8d51..90865b1 100644 --- a/README.md +++ b/README.md @@ -46,11 +46,6 @@ Inject IResourceProvider to use. | `develop` | [![Build status](https://github.com/Stillpoint-Software/hyperbee.resources/actions/workflows/publish.yml/badge.svg?branch=develop)](https://github.com/Stillpoint-Software/hyperbee.resources/actions/workflows/pack_publish.yml) | | `main` | [![Build status](https://github.com/Stillpoint-Software/hyperbee.resources/actions/workflows/publish.yml/badge.svg)](https://github.com/Stillpoint-Software/hyperbee.resources/actions/workflows/pack_publish.yml) | - -# Benchmarks - See [Benchmarks](https://github.com/Stillpoint-Software/Hyperbee.Resources/test/Hyperbee.Resources.Benchmark/benchmark/results/Hyperbee.Resources.Benchmark.ResourcesBenchmark-report-github.md) - - # Help See [Todo](https://github.com/Stillpoint-Software/hyperbee.resources/blob/main/docs/todo.md) diff --git a/src/Hyperbee.Resources/Hyperbee.Resources.csproj b/src/Hyperbee.Resources/Hyperbee.Resources.csproj index e5bc165..0b99969 100644 --- a/src/Hyperbee.Resources/Hyperbee.Resources.csproj +++ b/src/Hyperbee.Resources/Hyperbee.Resources.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable enable true @@ -12,7 +12,7 @@ resources;NET;embedded resources icon.png https://github.com/Stillpoint-Software/Hyperbee.Resources/ - net9.0 + net10.0 LICENSE Stillpoint Software, Inc. Hyperbee Resources @@ -39,7 +39,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Hyperbee.Resources/README.md b/src/Hyperbee.Resources/README.md index eabb8cb..ff1a148 100644 --- a/src/Hyperbee.Resources/README.md +++ b/src/Hyperbee.Resources/README.md @@ -47,10 +47,6 @@ Inject IResourceProvider to use. | `main` | [![Build status](https://github.com/Stillpoint-Software/hyperbee.resources/actions/workflows/publish.yml/badge.svg)](https://github.com/Stillpoint-Software/hyperbee.resources/actions/workflows/publish.yml) | -# Benchmarks - See [Benchmarks](https://github.com/Stillpoint-Software/Hyperbee.Resources/test/Hyperbee.Resources.Benchmark/benchmark/results/Hyperbee.Resources.Benchmark.ResourcesBenchmark-report-github.md) - - # Help See [Todo](https://github.com/Stillpoint-Software/hyperbee.resources/blob/main/docs/todo.md) diff --git a/test/Hyperbee.Resources.Tests/Hyperbee.Resources.Tests.csproj b/test/Hyperbee.Resources.Tests/Hyperbee.Resources.Tests.csproj index 55fdf24..ed5d497 100644 --- a/test/Hyperbee.Resources.Tests/Hyperbee.Resources.Tests.csproj +++ b/test/Hyperbee.Resources.Tests/Hyperbee.Resources.Tests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable enable @@ -22,9 +22,9 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + @@ -40,6 +40,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/version.json b/version.json index 1e97407..026c978 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": "2.0.2", + "version": "2.0.3", "publicReleaseRefSpec": [ "^refs/heads/main$", "^refs/heads/hotfix$",