Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/Format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

7 changes: 7 additions & 0 deletions .github/workflows/pack_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ permissions:
contents: write
pull-requests: write
packages: write
statuses: write

jobs:
set-config:
Expand All @@ -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 }}"
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- Shared package refs -->
<ItemGroup>
<!-- NBGV drives versions; PrivateAssets=all keeps it out of consumers -->
<PackageReference Include="Nerdbank.GitVersioning" Version="3.8.38-alpha" PrivateAssets="all" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.9.50" PrivateAssets="all" />

<!-- SourceLink for GitHub -->
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
Expand Down
70 changes: 0 additions & 70 deletions Hyperbee.Resources.sln

This file was deleted.

27 changes: 27 additions & 0 deletions Hyperbee.Resources.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<Solution>
<Folder Name="/Solution Items/">
<File Path="Directory.Build.props" />
<File Path="LICENSE" />
<File Path="README.md" />
<File Path="version.json" />
<Project Path="docs/docs.shproj" />
</Folder>
<Folder Name="/Solution Items/.github/">
<File Path=".github/dependabot.yml" />
<File Path=".github/issue-branch.yml" />
</Folder>
<Folder Name="/Solution Items/.github/workflows/">
<File Path=".github/workflows/create_release.yml" />
<File Path=".github/workflows/create_test_report.yml" />
<File Path=".github/workflows/deploy_github_pages.yml" />
<File Path=".github/workflows/format.yml" />
<File Path=".github/workflows/issue_branch.yml" />
<File Path=".github/workflows/pack_publish.yml" />
<File Path=".github/workflows/run_tests.yml" />
<File Path=".github/workflows/unlist_package.yml" />
</Folder>
<Folder Name="/Solution Tests/">
<Project Path="test/Hyperbee.Resources.Tests/Hyperbee.Resources.Tests.csproj" />
</Folder>
<Project Path="src/Hyperbee.Resources/Hyperbee.Resources.csproj" />
</Solution>
5 changes: 0 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@ Inject IResourceProvider<Implementation> 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)
Expand Down
6 changes: 3 additions & 3 deletions src/Hyperbee.Resources/Hyperbee.Resources.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>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand All @@ -12,7 +12,7 @@
<PackageTags>resources;NET;embedded resources</PackageTags>
<PackageIcon>icon.png</PackageIcon>
<PackageProjectUrl>https://github.com/Stillpoint-Software/Hyperbee.Resources/</PackageProjectUrl>
<TargetFrameworks>net9.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<Copyright>Stillpoint Software, Inc.</Copyright>
<Title>Hyperbee Resources</Title>
Expand All @@ -39,7 +39,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.13.0" />
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 0 additions & 4 deletions src/Hyperbee.Resources/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ Inject IResourceProvider<Implementation> 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)
Expand Down
9 changes: 5 additions & 4 deletions test/Hyperbee.Resources.Tests/Hyperbee.Resources.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>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand All @@ -22,9 +22,9 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.8.3" />
<PackageReference Include="MSTest.TestFramework" Version="3.8.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
</ItemGroup>

<ItemGroup>
Expand All @@ -40,6 +40,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -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$",
Expand Down
Loading