Skip to content

Commit 042c069

Browse files
Merge pull request #147 from Stillpoint-Software/develop
Develop
2 parents ac0eb88 + 6e7ff5f commit 042c069

34 files changed

+1050
-1082
lines changed

.github/workflows/format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
if: ${{ needs.discover.result == 'success' }}
4747
uses: Stillpoint-Software/shared-workflows/.github/workflows/format.yml@main
4848
with:
49-
dotnet_version: "9.0.x"
49+
dotnet_version: "10.0.x"
5050
branch: ${{ needs.discover.outputs.branch_name }}
5151
secrets: inherit
5252

.github/workflows/pack_publish.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ permissions:
88
contents: write
99
pull-requests: write
1010
packages: write
11-
11+
statuses: write
12+
1213
jobs:
1314
set-config:
1415
uses: Stillpoint-Software/shared-workflows/.github/workflows/determine_build_configuration.yml@main
@@ -25,3 +26,9 @@ jobs:
2526
build_configuration: ${{ needs.set-config.outputs.build_configuration }}
2627
secrets:
2728
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
29+
result:
30+
needs: [publish]
31+
if: always()
32+
runs-on: ubuntu-latest
33+
steps:
34+
- run: echo "Pack & Publish result = ${{ needs.publish.result }}"

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Shared package refs -->
33
<ItemGroup>
44
<!-- NBGV drives versions; PrivateAssets=all keeps it out of consumers -->
5-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.8.38-alpha" PrivateAssets="all" />
5+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.9.50" PrivateAssets="all" />
66

77
<!-- SourceLink for GitHub -->
88
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">

Hyperbee.Json.sln

Lines changed: 0 additions & 83 deletions
This file was deleted.

Hyperbee.Json.slnx

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<Solution>
2+
<Folder Name="/Solution Items/">
3+
<File Path="Directory.Build.props" />
4+
<File Path="LICENSE" />
5+
<File Path="README.md" />
6+
<File Path="version.json" />
7+
<Project Path="docs/docs.shproj" />
8+
</Folder>
9+
<Folder Name="/Solution Items/.github/">
10+
<File Path=".github/dependabot.yml" />
11+
<File Path=".github/issue-branch.yml" />
12+
</Folder>
13+
<Folder Name="/Solution Items/.github/workflows/">
14+
<File Path=".github/workflows/create_release.yml" />
15+
<File Path=".github/workflows/create_test_report.yml" />
16+
<File Path=".github/workflows/deploy-gh-pages.yml" />
17+
<File Path=".github/workflows/format.yml" />
18+
<File Path=".github/workflows/issue_branch.yml" />
19+
<File Path=".github/workflows/pack_publish.yml" />
20+
<File Path=".github/workflows/run_tests.yml" />
21+
<File Path=".github/workflows/unlist_package.yml" />
22+
</Folder>
23+
<Folder Name="/Solution Tests/">
24+
<Project Path="test/Hyperbee.Json.Benchmark/Hyperbee.Json.Benchmark.csproj" />
25+
<Project Path="test/Hyperbee.Json.Cts/Hyperbee.Json.Cts.csproj" />
26+
<Project Path="test/Hyperbee.Json.Tests/Hyperbee.Json.Tests.csproj" />
27+
</Folder>
28+
<Project Path="src/Hyperbee.Json/Hyperbee.Json.csproj" />
29+
</Solution>

0 commit comments

Comments
 (0)