Skip to content

Commit 07c9758

Browse files
varndellwagglebeevarndellwagglebee
authored
Merge pull request #58 from Stillpoint-Software/develop
updating to .net 10
2 parents 2eb29c0 + 7d0960b commit 07c9758

File tree

10 files changed

+45
-89
lines changed

10 files changed

+45
-89
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: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ permissions:
88
contents: write
99
pull-requests: write
1010
packages: write
11+
statuses: write
1112

1213
jobs:
1314
set-config:
@@ -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.Resources.sln‎

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

‎Hyperbee.Resources.slnx‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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_github_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.Resources.Tests/Hyperbee.Resources.Tests.csproj" />
25+
</Folder>
26+
<Project Path="src/Hyperbee.Resources/Hyperbee.Resources.csproj" />
27+
</Solution>

‎README.md‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ Inject IResourceProvider<Implementation> to use.
4646
| `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) |
4747
| `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) |
4848

49-
50-
# Benchmarks
51-
See [Benchmarks](https://github.com/Stillpoint-Software/Hyperbee.Resources/test/Hyperbee.Resources.Benchmark/benchmark/results/Hyperbee.Resources.Benchmark.ResourcesBenchmark-report-github.md)
52-
53-
5449
# Help
5550

5651
See [Todo](https://github.com/Stillpoint-Software/hyperbee.resources/blob/main/docs/todo.md)

‎src/Hyperbee.Resources/Hyperbee.Resources.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -12,7 +12,7 @@
1212
<PackageTags>resources;NET;embedded resources</PackageTags>
1313
<PackageIcon>icon.png</PackageIcon>
1414
<PackageProjectUrl>https://github.com/Stillpoint-Software/Hyperbee.Resources/</PackageProjectUrl>
15-
<TargetFrameworks>net9.0</TargetFrameworks>
15+
<TargetFrameworks>net10.0</TargetFrameworks>
1616
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1717
<Copyright>Stillpoint Software, Inc.</Copyright>
1818
<Title>Hyperbee Resources</Title>
@@ -39,7 +39,7 @@
3939
<PrivateAssets>all</PrivateAssets>
4040
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4141
</PackageReference>
42-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.13.0" />
42+
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
4343
</ItemGroup>
4444

4545
<ItemGroup>

‎src/Hyperbee.Resources/README.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ Inject IResourceProvider<Implementation> to use.
4747
| `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) |
4848

4949

50-
# Benchmarks
51-
See [Benchmarks](https://github.com/Stillpoint-Software/Hyperbee.Resources/test/Hyperbee.Resources.Benchmark/benchmark/results/Hyperbee.Resources.Benchmark.ResourcesBenchmark-report-github.md)
52-
53-
5450
# Help
5551

5652
See [Todo](https://github.com/Stillpoint-Software/hyperbee.resources/blob/main/docs/todo.md)

‎test/Hyperbee.Resources.Tests/Hyperbee.Resources.Tests.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

@@ -22,9 +22,9 @@
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
</PackageReference>
25-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
26-
<PackageReference Include="MSTest.TestAdapter" Version="3.8.3" />
27-
<PackageReference Include="MSTest.TestFramework" Version="3.8.3" />
25+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
26+
<PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
27+
<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
2828
</ItemGroup>
2929

3030
<ItemGroup>
@@ -40,6 +40,7 @@
4040
<PrivateAssets>all</PrivateAssets>
4141
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4242
</PackageReference>
43+
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
4344
</ItemGroup>
4445

4546
</Project>

‎version.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "2.0.2",
3+
"version": "2.0.3",
44
"publicReleaseRefSpec": [
55
"^refs/heads/main$",
66
"^refs/heads/hotfix$",

0 commit comments

Comments
 (0)