Skip to content

Develop #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
varndellwagglebee merged 5 commits into from
Jan 21, 2026
Merged

Develop #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
88a943b
Merge branch 'main' into develop
varndellwagglebee Dec 22, 2025
7d4e80c
Targeted for .net 8, 9 and 10
varndellwagglebee Jan 20, 2026
06bc44b
Clean up
varndellwagglebee Jan 20, 2026
4caed35
chore(nbgv): set version via CI: 2.1-alpha
varndellwagglebee Jan 21, 2026
5bd5db6
chore(nbgv): set version via CI: 2.1.1
varndellwagglebee Jan 21, 2026
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
12 changes: 6 additions & 6 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<Project>
<!-- Shared package refs -->
<PropertyGroup>
<!-- Suppress NU1507 (multiple package sources with CPM) -->
<NoWarn>$(NoWarn);NU1507</NoWarn>
</PropertyGroup>
<ItemGroup>
<!-- NBGV drives versions; PrivateAssets=all keeps it out of consumers -->
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />

<!-- 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"/>
</ItemGroup>

Expand Down Expand Up @@ -50,6 +49,7 @@
<!-- Global project properies -->
<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
<!-- Primary target: .NET 10 (next LTS), with .NET 9 for current support, .NET 8 for compatibility -->
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
</PropertyGroup>
</Project>
19 changes: 13 additions & 6 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,20 @@
<ItemGroup>
<!-- Core Application Dependencies -->
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.0.0" />
<!-- Development Tools -->
<!-- Development Tools -->
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.9.50" />
<!-- Testing Framework -->
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.9.50" >
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<!-- Testing Framework -->
<PackageVersion Include="coverlet.collector" Version="6.0.4" >
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<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>

</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions Hyperbee.Resources.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<File Path="Directory.Build.props" />
<File Path="Directory.Packages.props" />
<File Path="LICENSE" />
<File Path="NuGet.Config" />
<File Path="README.md" />
<File Path="version.json" />
<Project Path="docs/docs.shproj" />
Expand Down
8 changes: 2 additions & 6 deletions src/Hyperbee.Resources/Hyperbee.Resources.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPackable>true</IsPackable>

<Authors>Stillpoint Software, Inc.</Authors>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageTags>resources;NET;embedded resources</PackageTags>
<PackageIcon>icon.png</PackageIcon>
<PackageProjectUrl>https://github.com/Stillpoint-Software/Hyperbee.Resources/</PackageProjectUrl>
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageId>Hyperbee.Resources</PackageId>
<Copyright>Stillpoint Software, Inc.</Copyright>
<Title>Hyperbee Resources</Title>
<Description>
Expand All @@ -33,10 +32,7 @@
<PackagePath>\</PackagePath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<PackageReference Update="Microsoft.SourceLink.GitHub">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Update="Microsoft.SourceLink.GitHub"/>
<PackageReference Update="Nerdbank.GitVersioning" />
</ItemGroup>

Expand Down
11 changes: 3 additions & 8 deletions test/Hyperbee.Resources.Tests/Hyperbee.Resources.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" />

<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="MSTest.TestAdapter" />
<PackageReference Include="MSTest.TestFramework" />
Expand All @@ -33,10 +31,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" >
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Update="Microsoft.SourceLink.GitHub" />
<PackageReference Update="Nerdbank.GitVersioning" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion version.json
View file
Open in desktop
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.0.4",
"version": "2.1.1",
"publicReleaseRefSpec": [
"^refs/heads/main$",
"^refs/heads/hotfix$",
Expand Down
Loading