Skip to content

Commit 86cb372

Browse files
varndellwagglebeevarndellwagglebee
authored
Merge pull request #119 from Stillpoint-Software/develop
Develop
2 parents 4c083ff + e4349bb commit 86cb372

8 files changed

Lines changed: 60 additions & 109 deletions

File tree

‎Directory.Build.props‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
<Project>
2+
<PropertyGroup>
3+
<!-- Suppress NU1507 (multiple package sources with CPM) -->
4+
<NoWarn>$(NoWarn);NU1507;MSTEST0001</NoWarn>
5+
<WarningsNotAsErrors>$(WarningsNotAsErrors);MSTEST0001</WarningsNotAsErrors>
6+
</PropertyGroup>
27
<ItemGroup>
3-
<!-- NBGV drives versions; PrivateAssets=all keeps it out of consumers -->
48
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
5-
<!-- SourceLink for GitHub -->
69
<PackageReference Include="Microsoft.SourceLink.GitHub"/>
710
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" />
811
</ItemGroup>
9-
12+
1013
<PropertyGroup>
1114
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
1215
<Deterministic>true</Deterministic>
@@ -38,9 +41,10 @@
3841
PackagePath="\"
3942
Link="LICENSE" />
4043
</ItemGroup>
41-
<!-- Global project properies -->
44+
<!-- Global project properties - .NET 10 LTS First Strategy -->
4245
<PropertyGroup>
4346
<ImplicitUsings>enable</ImplicitUsings>
44-
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
47+
<!-- Primary target: .NET 10 (next LTS), with .NET 9 for current support, .NET 8 for compatibility -->
48+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
4549
</PropertyGroup>
4650
</Project>

‎Directory.Packages.props‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,30 @@
55
<ItemGroup>
66
<!-- Development Tools -->
77
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.9.50" />
8-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
8+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.102">
99
<PrivateAssets>all</PrivateAssets>
1010
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1111
</PackageVersion>
1212
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
13-
<PackageVersion Include="DotNext.Metaprogramming" Version="5.26.1" />
13+
<PackageVersion Include="DotNext.Metaprogramming" Version="5.26.2" />
1414
<PackageVersion Include="FastExpressionCompiler" Version="5.3.0" />
1515
<PackageVersion Include="coverlet.collector" Version="6.0.4">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
</PackageVersion>
19-
<!-- Hyperbee.Json: conditional versions by target framework -->
20-
<PackageVersion Include="Hyperbee.Json" Version="3.0.6" Condition="'$(TargetFramework)' == 'net8.0'" />
21-
<PackageVersion Include="Hyperbee.Json" Version="3.1.2" Condition="'$(TargetFramework)' == 'net10.0'" />
22-
23-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.1" />
24-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
25-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
26-
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.1" />
19+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.2" />
20+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.2" />
21+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.2" />
22+
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.2" />
2723
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
2824
<PackageVersion Include="MSTest.TestAdapter" Version="4.0.2" />
2925
<PackageVersion Include="MSTest.TestFramework" Version="4.0.2" />
30-
<PackageVersion Include="Hyperbee.Collections" Version="2.6.4" />
31-
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.1" />
26+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.2" />
3227
<!-- Roslyn: use consistent version for all frameworks -->
3328
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.0.0" />
3429
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
3530
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.0.0" />
31+
<PackageVersion Include="Hyperbee.Json" Version="3.2.1" />
32+
<PackageVersion Include="Hyperbee.Collections" Version="2.7.3" />
3633
</ItemGroup>
3734
</Project>

‎Hyperbee.Expressions.sln‎

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

‎Hyperbee.Expressions.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="Directory.Packages.props" />
5+
<File Path="LICENSE" />
6+
<File Path="README.md" />
7+
<File Path="version.json" />
8+
<Project Path="docs/docs.shproj" />
9+
</Folder>
10+
<Folder Name="/Solution Items/.github/">
11+
<File Path=".github/dependabot.yml" />
12+
<File Path=".github/issue-branch.yml" />
13+
</Folder>
14+
<Folder Name="/Solution Items/.github/workflows/">
15+
<File Path=".github/workflows/create_release.yml" />
16+
<File Path=".github/workflows/create_test_report.yml" />
17+
<File Path=".github/workflows/deploy-gh-pages.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.Expressions.Benchmark/Hyperbee.Expressions.Benchmark.csproj" />
25+
<Project Path="test/Hyperbee.Expressions.Tests/Hyperbee.Expressions.Tests.csproj" />
26+
</Folder>
27+
<Project Path="src/Hyperbee.Expressions.Lab/Hyperbee.Expressions.Lab.csproj" />
28+
<Project Path="src/Hyperbee.Expressions/Hyperbee.Expressions.csproj" />
29+
</Solution>

‎src/Hyperbee.Expressions.Lab/Hyperbee.Expressions.Lab.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
<PropertyGroup>
44
<Nullable>disable</Nullable>
55
<IsPackable>true</IsPackable>
6-
76
<Authors>Stillpoint Software, Inc.</Authors>
87
<PackageId>Hyperbee.Expressions.Lab</PackageId>
98
<PackageReadmeFile>README.md</PackageReadmeFile>
109
<PackageTags>expression-tree;expressions;lab;samples</PackageTags>
11-
1210
<PackageIcon>icon.png</PackageIcon>
1311
<PackageProjectUrl>https://stillpoint-software.github.io/hyperbee.expressions/</PackageProjectUrl>
1412
<PackageLicenseFile>LICENSE</PackageLicenseFile>
@@ -23,7 +21,7 @@
2321
<PropertyGroup>
2422
<DefineConstants>$(DefineConstants);FAST_COMPILER</DefineConstants>
2523
</PropertyGroup>
26-
24+
2725
<ItemGroup>
2826
<None Update="$(MSBuildProjectName).csproj.DotSettings" Visible="false" />
2927
</ItemGroup>

‎src/Hyperbee.Expressions/Hyperbee.Expressions.csproj‎

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

33
<PropertyGroup>
44
<Nullable>disable</Nullable>
5-
<IsPackable>true</IsPackable>
65

76
<Authors>Stillpoint Software, Inc.</Authors>
87
<PackageId>Hyperbee.Expressions</PackageId>
98
<PackageReadmeFile>README.md</PackageReadmeFile>
109
<PackageTags>expression-tree;expressions;async;await;expression-extension</PackageTags>
11-
1210
<PackageIcon>icon.png</PackageIcon>
1311
<PackageProjectUrl>https://stillpoint-software.github.io/hyperbee.expressions/</PackageProjectUrl>
1412
<PackageLicenseFile>LICENSE</PackageLicenseFile>
@@ -23,7 +21,7 @@
2321
<PropertyGroup>
2422
<DefineConstants>$(DefineConstants);FAST_COMPILER</DefineConstants>
2523
</PropertyGroup>
26-
24+
2725
<ItemGroup>
2826
<None Update="$(MSBuildProjectName).csproj.DotSettings" Visible="false" />
2927
</ItemGroup>
@@ -47,7 +45,10 @@
4745
<PackageReference Include="Microsoft.Extensions.Configuration" />
4846
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
4947
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
50-
<PackageReference Update="Microsoft.SourceLink.GitHub" />
48+
<PackageReference Update="Microsoft.SourceLink.GitHub">
49+
<PrivateAssets>all</PrivateAssets>
50+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
51+
</PackageReference>
5152
</ItemGroup>
5253

5354
</Project>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ public Config()
2020
.WithRuntime( CoreRuntime.Core80 )
2121
.WithId( ".NET 8" ) );
2222

23+
AddJob( Job.ShortRun
24+
.WithRuntime( CoreRuntime.Core90 )
25+
.WithId( ".NET 9" ) );
26+
27+
2328
AddJob( Job.ShortRun
2429
.WithRuntime( CoreRuntime.Core10_0 )
2530
.WithId( ".NET 10" ) );

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

0 commit comments

Comments
 (0)