Skip to content

Commit 39f7da4

Browse files
varndellwagglebeevarndellwagglebee
committed
Merge branch 'develop'
2 parents 0afff81 + c87b434 commit 39f7da4

File tree

10 files changed

+56
-26
lines changed

10 files changed

+56
-26
lines changed

‎.github/workflows/Format.yml‎

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

‎.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: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<!-- Shared package refs -->
33
<ItemGroup>
44
<!-- NBGV drives versions; PrivateAssets=all keeps it out of consumers -->
5-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.9.50" PrivateAssets="all" />
5+
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
66

77
<!-- SourceLink for GitHub -->
8-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
8+
<PackageReference Include="Microsoft.SourceLink.GitHub" >
99
<PrivateAssets>all</PrivateAssets>
1010
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1111
</PackageReference>
1212

13-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
13+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" />
1414
</ItemGroup>
1515

1616
<!-- SourceLink / build hygiene -->
@@ -46,4 +46,9 @@
4646
PackagePath="\"
4747
Link="LICENSE" />
4848
</ItemGroup>
49-
</Project>
49+
<!-- Global project properies -->
50+
<PropertyGroup>
51+
<ImplicitUsings>enable</ImplicitUsings>
52+
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
53+
</PropertyGroup>
54+
</Project>

‎Directory.Packages.props‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<!-- Core Application Dependencies -->
7+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.0.0" />
8+
<!-- Development Tools -->
9+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
10+
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.9.50" />
11+
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
12+
<!-- Testing Framework -->
13+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
14+
<PackageVersion Include="MSTest.TestAdapter" Version="4.0.2" />
15+
<PackageVersion Include="MSTest.TestFramework" Version="4.0.2" />
16+
</ItemGroup>
17+
</Project>

‎Hyperbee.Collections.slnx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Solution>
22
<Folder Name="/Solution Items/">
33
<File Path="Directory.Build.props" />
4+
<File Path="Directory.Packages.props" />
45
<File Path="LICENSE" />
56
<File Path="README.md" />
67
<File Path="version.json" />

‎src/Hyperbee.Collections/Hyperbee.Collections.csproj‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
4-
<ImplicitUsings>enable</ImplicitUsings>
53
<Nullable>disable</Nullable>
64
<IsPackable>true</IsPackable>
75
<PackageId>Hyperbee.Collections</PackageId>
@@ -33,13 +31,12 @@
3331
<None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="/" />
3432
<None Include="..\..\README.md" Pack="true" Visible="true" PackagePath="/" Link="README.md" />
3533
<None Include="..\..\LICENSE" Pack="true" Visible="false" PackagePath="/" />
36-
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
34+
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Scripting" />
3735

38-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
36+
<PackageReference Update="Microsoft.SourceLink.GitHub">
3937
<PrivateAssets>all</PrivateAssets>
4038
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4139
</PackageReference>
42-
43-
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
40+
<PackageReference Update="Nerdbank.GitVersioning" />
4441
</ItemGroup>
4542
</Project>

‎test/Hyperbee.Collections.Benchmark/BenchmarkConfig.cs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using BenchmarkDotNet.Columns;
22
using BenchmarkDotNet.Configs;
33
using BenchmarkDotNet.Diagnosers;
4+
using BenchmarkDotNet.Environments;
45
using BenchmarkDotNet.Exporters;
56
using BenchmarkDotNet.Jobs;
67
using BenchmarkDotNet.Loggers;
@@ -15,7 +16,13 @@ public class Config : ManualConfig
1516
{
1617
public Config()
1718
{
18-
AddJob( Job.ShortRun );
19+
AddJob( Job.ShortRun
20+
.WithRuntime( CoreRuntime.Core80 )
21+
.WithId( ".NET 8" ) );
22+
23+
AddJob( Job.ShortRun
24+
.WithRuntime( CoreRuntime.Core10_0 )
25+
.WithId( ".NET 10" ) );
1926
AddExporter( MarkdownExporter.GitHub );
2027
AddValidator( JitOptimizationsValidator.DontFailOnError );
2128
AddLogger( ConsoleLogger.Default );

‎test/Hyperbee.Collections.Benchmark/Hyperbee.Collections.Benchmark.csproj‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,19 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net10.0</TargetFramework>
6-
<ImplicitUsings>enable</ImplicitUsings>
75
<IsPackable>false</IsPackable>
86
</PropertyGroup>
97

108
<ItemGroup>
11-
<PackageReference Include="BenchmarkDotNet" Version="0.15.8" />
9+
<PackageReference Include="BenchmarkDotNet" />
1210
</ItemGroup>
13-
1411
<ItemGroup>
1512
<ProjectReference Include="..\..\src\Hyperbee.Collections\Hyperbee.Collections.csproj" />
1613
</ItemGroup>
1714

1815
<ItemGroup>
19-
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
20-
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
16+
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Scripting" />
17+
<PackageReference Update="Nerdbank.GitVersioning" />
2118
</ItemGroup>
2219

2320
</Project>

‎test/Hyperbee.Collections.Tests/Hyperbee.Collections.Tests.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
43
<ImplicitUsings>enable</ImplicitUsings>
4+
<TargetFrameworks>NET8.0;net10.0</TargetFrameworks>
55
<Nullable>disable</Nullable>
66
<IsPackable>false</IsPackable>
77
<RootNamespace>Hyperbee.Collections.Tests</RootNamespace>
@@ -12,19 +12,19 @@
1212
<None Remove="TestDocuments\**" />
1313
</ItemGroup>
1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
16-
<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
17-
<PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
16+
<PackageReference Include="MSTest.TestFramework" />
17+
<PackageReference Include="MSTest.TestAdapter" />
1818
</ItemGroup>
1919
<ItemGroup>
2020
<ProjectReference Include="..\..\src\Hyperbee.Collections\Hyperbee.Collections.csproj" />
2121
</ItemGroup>
2222
<ItemGroup>
23-
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
24-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
23+
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Scripting" />
24+
<PackageReference Update="Microsoft.SourceLink.GitHub">
2525
<PrivateAssets>all</PrivateAssets>
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
</PackageReference>
28-
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
28+
<PackageReference Update="Nerdbank.GitVersioning" />
2929
</ItemGroup>
3030
</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.6.3",
3+
"version": "2.6.4",
44
"publicReleaseRefSpec": [
55
"^refs/heads/main$",
66
"^refs/heads/hotfix$",

0 commit comments

Comments
 (0)