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

jobs:
set-config:
Expand All @@ -26,9 +25,3 @@ 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 }}"
13 changes: 4 additions & 9 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,12 @@
<!-- Shared package refs -->
<ItemGroup>
<!-- NBGV drives versions; PrivateAssets=all keeps it out of consumers -->
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
<PackageReference Include="Nerdbank.GitVersioning" />

<!-- SourceLink for GitHub -->
<PackageReference Include="Microsoft.SourceLink.GitHub" >
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" />
<PackageReference Include="Microsoft.SourceLink.GitHub" />
</ItemGroup>

<!-- SourceLink / build hygiene -->
<PropertyGroup>
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
Expand Down Expand Up @@ -51,4 +46,4 @@
<ImplicitUsings>enable</ImplicitUsings>
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
</PropertyGroup>
</Project>
</Project>
22 changes: 13 additions & 9 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,19 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<!-- Core Application Dependencies -->
<!-- Development Tools -->
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.9.50">
<PrivateAssets>all</PrivateAssets>
</PackageVersion>
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.0.0" />
<!-- Development Tools -->
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.9.50" />
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
<!-- Testing Framework -->
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageVersion Include="MSTest.TestAdapter" Version="4.0.2" />
<PackageVersion Include="MSTest.TestFramework" Version="4.0.2" />
</ItemGroup>
</Project>
<PackageVersion Include="MSTest.TestAdapter" Version="4.0.2" />
<!-- Benchmarking Tools -->
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
</ItemGroup>
</Project>
7 changes: 0 additions & 7 deletions src/Hyperbee.Collections/Hyperbee.Collections.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,5 @@
<None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="/" />
<None Include="..\..\README.md" Pack="true" Visible="true" PackagePath="/" Link="README.md" />
<None Include="..\..\LICENSE" Pack="true" Visible="false" PackagePath="/" />
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Scripting" />

<PackageReference Update="Microsoft.SourceLink.GitHub">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Update="Nerdbank.GitVersioning" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions test/Hyperbee.Collections.Benchmark/BenchmarkConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ public class Config : ManualConfig
public Config()
{
AddJob( Job.ShortRun
.WithRuntime( CoreRuntime.Core80 )
.WithId( ".NET 8" ) );
.WithRuntime( CoreRuntime.Core80 )
.WithId( ".NET 8" ) );

AddJob( Job.ShortRun
.WithRuntime( CoreRuntime.Core10_0 )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" />
<PackageReference Include="BenchmarkDotNet" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Hyperbee.Collections\Hyperbee.Collections.csproj" />
</ItemGroup>
Expand Down
10 changes: 0 additions & 10 deletions test/Hyperbee.Collections.Tests/Hyperbee.Collections.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
<TargetFrameworks>NET8.0;net10.0</TargetFrameworks>
<Nullable>disable</Nullable>
<IsPackable>false</IsPackable>
<RootNamespace>Hyperbee.Collections.Tests</RootNamespace>
Expand All @@ -19,12 +17,4 @@
<ItemGroup>
<ProjectReference Include="..\..\src\Hyperbee.Collections\Hyperbee.Collections.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Scripting" />
<PackageReference Update="Microsoft.SourceLink.GitHub">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Update="Nerdbank.GitVersioning" />
</ItemGroup>
</Project>
4 changes: 4 additions & 0 deletions test/Hyperbee.Collections.Tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;

// Enable test parallelization for better performance
[assembly: Parallelize( Workers = 0, Scope = ExecutionScope.MethodLevel )]
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.6.4",
"version": "2.7.2",
"publicReleaseRefSpec": [
"^refs/heads/main$",
"^refs/heads/hotfix$",
Expand Down
Loading