Skip to content

Updated to .NET 10 #59

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
Dec 22, 2025
Merged

Updated to .NET 10 #59

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
adaee52
Merge branch 'main' into develop
varndellwagglebee Dec 12, 2025
70e2fe7
Centralized package versions and updated format.yml
varndellwagglebee Dec 18, 2025
7cd4626
chore: format code with dotnet format
invalid-email-address Dec 18, 2025
3bcbd4d
Merge branch 'dev-migration' into develop
varndellwagglebee Dec 22, 2025
dc5a0ed
chore(nbgv): set version via CI: 2.0.4
varndellwagglebee Dec 22, 2025
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
1 change: 0 additions & 1 deletion .github/workflows/Format.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
if: ${{ needs.discover.result == 'success' }}
uses: Stillpoint-Software/shared-workflows/.github/workflows/format.yml@main
with:
dotnet_version: "10.0.x"
branch: ${{ needs.discover.outputs.branch_name }}
secrets: inherit

12 changes: 9 additions & 3 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<!-- Shared package refs -->
<ItemGroup>
<!-- NBGV drives versions; PrivateAssets=all keeps it out of consumers -->
<PackageReference Include="Nerdbank.GitVersioning" Version="3.9.50" PrivateAssets="all" />
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />

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

<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting"/>
</ItemGroup>

<!-- SourceLink / build hygiene -->
Expand Down Expand Up @@ -46,4 +46,10 @@
PackagePath="\"
Link="LICENSE" />
</ItemGroup>

<!-- Global project properies -->
<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
</PropertyGroup>
</Project>
17 changes: 17 additions & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<!-- Core Application Dependencies -->
<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" />
<!-- Testing Framework -->
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
<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>
1 change: 1 addition & 0 deletions Hyperbee.Resources.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Solution>
<Folder Name="/Solution Items/">
<File Path="Directory.Build.props" />
<File Path="Directory.Packages.props" />
<File Path="LICENSE" />
<File Path="README.md" />
<File Path="version.json" />
Expand Down
8 changes: 3 additions & 5 deletions src/Hyperbee.Resources/Hyperbee.Resources.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPackable>true</IsPackable>
Expand All @@ -12,7 +10,7 @@
<PackageTags>resources;NET;embedded resources</PackageTags>
<PackageIcon>icon.png</PackageIcon>
<PackageProjectUrl>https://github.com/Stillpoint-Software/Hyperbee.Resources/</PackageProjectUrl>
<TargetFrameworks>net10.0</TargetFrameworks>
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<Copyright>Stillpoint Software, Inc.</Copyright>
<Title>Hyperbee Resources</Title>
Expand All @@ -35,11 +33,11 @@
<PackagePath>\</PackagePath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PackageReference Update="Microsoft.SourceLink.GitHub">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
<PackageReference Update="Nerdbank.GitVersioning" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 6 additions & 0 deletions test/Hyperbee.Resources.Tests/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;

// Explicitly enable test parallelization at method level
// This allows multiple test methods to run in parallel for faster execution
// Safe for resource loading tests that don't share mutable state
[assembly: Parallelize( Workers = 0, Scope = ExecutionScope.MethodLevel )]
15 changes: 6 additions & 9 deletions test/Hyperbee.Resources.Tests/Hyperbee.Resources.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>
Expand All @@ -18,13 +15,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.4">
<PackageReference Include="coverlet.collector">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="MSTest.TestAdapter" />
<PackageReference Include="MSTest.TestFramework" />
</ItemGroup>

<ItemGroup>
Expand All @@ -36,11 +33,11 @@
</ItemGroup>

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

</Project>
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.3",
"version": "2.0.4",
"publicReleaseRefSpec": [
"^refs/heads/main$",
"^refs/heads/hotfix$",
Expand Down
Loading