Skip to content

Commit 4c13bc5

Browse files
varndellwagglebeevarndellwagglebee
authored
Merge pull request #57 from Stillpoint-Software/develop
Develop
2 parents 39f7da4 + 66c6e41 commit 4c13bc5

File tree

9 files changed

+26
-46
lines changed

9 files changed

+26
-46
lines changed

‎.github/workflows/pack_publish.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ permissions:
88
contents: write
99
pull-requests: write
1010
packages: write
11-
statuses: write
1211

1312
jobs:
1413
set-config:
@@ -26,9 +25,3 @@ jobs:
2625
build_configuration: ${{ needs.set-config.outputs.build_configuration }}
2726
secrets:
2827
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: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,12 @@
22
<!-- Shared package refs -->
33
<ItemGroup>
44
<!-- NBGV drives versions; PrivateAssets=all keeps it out of consumers -->
5-
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
5+
<PackageReference Include="Nerdbank.GitVersioning" />
66

77
<!-- SourceLink for GitHub -->
8-
<PackageReference Include="Microsoft.SourceLink.GitHub" >
9-
<PrivateAssets>all</PrivateAssets>
10-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
11-
</PackageReference>
12-
13-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" />
8+
<PackageReference Include="Microsoft.SourceLink.GitHub" />
149
</ItemGroup>
15-
10+
1611
<!-- SourceLink / build hygiene -->
1712
<PropertyGroup>
1813
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
@@ -51,4 +46,4 @@
5146
<ImplicitUsings>enable</ImplicitUsings>
5247
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
5348
</PropertyGroup>
54-
</Project>
49+
</Project>

‎Directory.Packages.props‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,19 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55
<ItemGroup>
6-
<!-- Core Application Dependencies -->
6+
<!-- Development Tools -->
7+
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.9.50">
8+
<PrivateAssets>all</PrivateAssets>
9+
</PackageVersion>
10+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
11+
<PrivateAssets>all</PrivateAssets>
12+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
13+
</PackageVersion>
714
<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 -->
1315
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
14-
<PackageVersion Include="MSTest.TestAdapter" Version="4.0.2" />
1516
<PackageVersion Include="MSTest.TestFramework" Version="4.0.2" />
16-
</ItemGroup>
17-
</Project>
17+
<PackageVersion Include="MSTest.TestAdapter" Version="4.0.2" />
18+
<!-- Benchmarking Tools -->
19+
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
20+
</ItemGroup>
21+
</Project>

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,5 @@
3131
<None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="/" />
3232
<None Include="..\..\README.md" Pack="true" Visible="true" PackagePath="/" Link="README.md" />
3333
<None Include="..\..\LICENSE" Pack="true" Visible="false" PackagePath="/" />
34-
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Scripting" />
35-
36-
<PackageReference Update="Microsoft.SourceLink.GitHub">
37-
<PrivateAssets>all</PrivateAssets>
38-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
39-
</PackageReference>
40-
<PackageReference Update="Nerdbank.GitVersioning" />
4134
</ItemGroup>
4235
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ public class Config : ManualConfig
1717
public Config()
1818
{
1919
AddJob( Job.ShortRun
20-
.WithRuntime( CoreRuntime.Core80 )
21-
.WithId( ".NET 8" ) );
20+
.WithRuntime( CoreRuntime.Core80 )
21+
.WithId( ".NET 8" ) );
2222

2323
AddJob( Job.ShortRun
2424
.WithRuntime( CoreRuntime.Core10_0 )

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="BenchmarkDotNet" />
9+
<PackageReference Include="BenchmarkDotNet" />
1010
</ItemGroup>
11+
1112
<ItemGroup>
1213
<ProjectReference Include="..\..\src\Hyperbee.Collections\Hyperbee.Collections.csproj" />
1314
</ItemGroup>

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<ImplicitUsings>enable</ImplicitUsings>
4-
<TargetFrameworks>NET8.0;net10.0</TargetFrameworks>
53
<Nullable>disable</Nullable>
64
<IsPackable>false</IsPackable>
75
<RootNamespace>Hyperbee.Collections.Tests</RootNamespace>
@@ -19,12 +17,4 @@
1917
<ItemGroup>
2018
<ProjectReference Include="..\..\src\Hyperbee.Collections\Hyperbee.Collections.csproj" />
2119
</ItemGroup>
22-
<ItemGroup>
23-
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Scripting" />
24-
<PackageReference Update="Microsoft.SourceLink.GitHub">
25-
<PrivateAssets>all</PrivateAssets>
26-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
27-
</PackageReference>
28-
<PackageReference Update="Nerdbank.GitVersioning" />
29-
</ItemGroup>
3020
</Project>

‎test/Hyperbee.Collections.Tests/Properties/AssemblyInfo.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
using Microsoft.VisualStudio.TestTools.UnitTesting;
2+
3+
// Enable test parallelization for better performance
4+
[assembly: Parallelize( Workers = 0, Scope = ExecutionScope.MethodLevel )]

‎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.4",
3+
"version": "2.7.2",
44
"publicReleaseRefSpec": [
55
"^refs/heads/main$",
66
"^refs/heads/hotfix$",

0 commit comments

Comments
 (0)