Updated to .NET 10

.github/workflows/format.yml

@@ -46,7 +46,6 @@ jobs:
     if: ${{ needs.discover.result == 'success' }}
     uses: Stillpoint-Software/shared-workflows/.github/workflows/format.yml@main
     with:
-      dotnet_version: "9.0.x"
       branch: ${{ needs.discover.outputs.branch_name }}
     secrets: inherit
 

Directory.Build.props

@@ -2,15 +2,10 @@
   <!-- Shared package refs -->
   <ItemGroup>
     <!-- NBGV drives versions; PrivateAssets=all keeps it out of consumers -->
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.8.38-alpha" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" />
 
     <!-- SourceLink for GitHub -->
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
-      <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.SourceLink.GitHub" />
   </ItemGroup>
 
   <!-- SourceLink / build hygiene -->
@@ -46,4 +41,10 @@
           PackagePath="\"
           Link="LICENSE" />
   </ItemGroup>
+  <!-- Global project properies -->
+  <PropertyGroup>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
+  </PropertyGroup>
 </Project>
+

Directory.Packages.props

@@ -0,0 +1,33 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="FastExpressionCompiler" Version="5.3.0" />
+    <!-- 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" />
+    <!-- Testing Framework -->
+    <PackageVersion Include="Hyperbee.Collections" Version="2.6.4" />
+    <PackageVersion Include="Hyperbee.Resources" Version="2.0.4" />
+    <PackageVersion Include="Hyperbee.XS" Version="1.3.3" />
+    <PackageVersion Include="Hyperbee.XS.Extensions" Version="1.3.3" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageVersion Include="MSTest.TestFramework" Version="4.0.2" />
+    <PackageVersion Include="MSTest.TestAdapter" Version="4.0.2" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
+    <PackageVersion Include="NSubstitute" Version="5.3.0" />
+    <!-- Benchmarking Tools -->
+    <PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
+  </ItemGroup>
+</Project>

Hyperbee.Templating.slnx

@@ -0,0 +1,28 @@
+<Solution>
+  <Folder Name="/Solution Items/">
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Packages.props" />
+    <File Path="README.md" />
+    <File Path="version.json" />
+    <Project Path="docs/docs.shproj" />
+  </Folder>
+  <Folder Name="/Solution Items/.github/">
+    <File Path=".github/dependabot.yml" />
+    <File Path=".github/issue-branch.yml" />
+  </Folder>
+  <Folder Name="/Solution Items/.github/workflows/">
+    <File Path=".github/workflows/create_release.yml" />
+    <File Path=".github/workflows/create_test_report.yml" />
+    <File Path=".github/workflows/format.yml" />
+    <File Path=".github/workflows/issue_branch.yml" />
+    <File Path=".github/workflows/pack_publish.yml" />
+    <File Path=".github/workflows/run_tests.yml" />
+    <File Path=".github/workflows/unlist_package.yml" />
+  </Folder>
+  <Folder Name="/Solution Tests/">
+    <Project Path="test/Hyperbee.Templating.Benchmark/Hyperbee.Templating.Benchmark.csproj" />
+    <Project Path="test/Hyperbee.Templating.Tests/Hyperbee.Templating.Tests.csproj" />
+  </Folder>
+  <Project Path="src/Hyperbee.Templating.Provider.XS/Hyperbee.Templating.Provider.XS.csproj" />
+  <Project Path="src/Hyperbee.Templating/Hyperbee.Templating.csproj" />
+</Solution>

src/Hyperbee.Templating.Provider.XS/Hyperbee.Templating.Provider.XS.csproj

@@ -1,14 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
 	  <IsPackable>true</IsPackable>
 	  <Authors>Stillpoint Software, Inc.</Authors>
 	  <PackageReadmeFile>README.md</PackageReadmeFile>
 	  <PackageTags>templating;token;xs</PackageTags>
 	  <PackageIcon>icon.png</PackageIcon>
 	  <PackageProjectUrl>https://stillpoint-software.github.io/hyperbee.templating/</PackageProjectUrl>
-	  <TargetFrameworks>net9.0</TargetFrameworks>
 	  <PackageLicenseFile>LICENSE</PackageLicenseFile>
 	  <Copyright>Stillpoint Software, Inc.</Copyright>
 	  <Title>Hyperbee Templating Provider XS</Title>
@@ -37,14 +34,10 @@
 	  <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.SourceLink.GitHub" Version="8.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-	  <PackageReference Include="FastExpressionCompiler" Version="5.3.0" />
-    <PackageReference Include="Hyperbee.Resources" Version="2.0.2" />
-    <PackageReference Include="Hyperbee.XS" Version="1.3.3" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
+	  <PackageReference Include="FastExpressionCompiler" />
+    <PackageReference Include="Hyperbee.Resources"  />
+    <PackageReference Include="Hyperbee.XS" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting"  />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Hyperbee.Templating\Hyperbee.Templating.csproj" />

src/Hyperbee.Templating/Hyperbee.Templating.csproj

@@ -1,14 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
 	  <IsPackable>true</IsPackable>
 	  <Authors>Stillpoint Software, Inc.</Authors>
 	  <PackageReadmeFile>README.md</PackageReadmeFile>
 	  <PackageTags>templating;template;template-engine</PackageTags>
 	  <PackageIcon>icon.png</PackageIcon>
 	  <PackageProjectUrl>https://stillpoint-software.github.io/hyperbee.templating/</PackageProjectUrl>
-	  <TargetFrameworks>net9.0</TargetFrameworks>
 	  <PackageLicenseFile>LICENSE</PackageLicenseFile>
 	  <Copyright>Stillpoint Software, Inc.</Copyright>
 	  <Title>Hyperbee Templating</Title>
@@ -38,11 +35,7 @@
 	  <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.SourceLink.GitHub" Version="8.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Hyperbee.Resources" Version="2.0.2" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
+    <PackageReference Include="Hyperbee.Resources"  />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting"  />
   </ItemGroup>
 </Project>

test/Hyperbee.Templating.Benchmark/BenchmarkConfig.cs

@@ -1,20 +1,29 @@
 using BenchmarkDotNet.Columns;
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Diagnosers;
+using BenchmarkDotNet.Environments;
 using BenchmarkDotNet.Exporters;
 using BenchmarkDotNet.Jobs;
 using BenchmarkDotNet.Loggers;
 using BenchmarkDotNet.Order;
 using BenchmarkDotNet.Validators;
 
 namespace Hyperbee.Templating.Benchmark;
+
 public class BenchmarkConfig
 {
     public class Config : ManualConfig
     {
         public Config()
         {
-            AddJob( Job.ShortRun );
+            AddJob( Job.ShortRun
+              .WithRuntime( CoreRuntime.Core80 )
+              .WithId( ".NET 8" ) );
+
+            AddJob( Job.ShortRun
+                .WithRuntime( CoreRuntime.Core10_0 )
+                .WithId( ".NET 10" ) );
+
             AddExporter( MarkdownExporter.GitHub );
             AddValidator( JitOptimizationsValidator.DontFailOnError );
             AddLogger( ConsoleLogger.Default );

test/Hyperbee.Templating.Benchmark/Hyperbee.Templating.Benchmark.csproj

@@ -2,16 +2,14 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
     <IsTestingPlatformApplication>false</IsTestingPlatformApplication>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.15.2" />
-    <PackageReference Include="Hyperbee.XS" Version="1.3.3" />
+    <PackageReference Include="BenchmarkDotNet" />
+    <PackageReference Include="Hyperbee.XS"  />
   </ItemGroup>
 
   <ItemGroup>

test/Hyperbee.Templating.Tests/Hyperbee.Templating.Tests.csproj

@@ -1,6 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
     <IsTestingPlatformApplication>false</IsTestingPlatformApplication>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -11,28 +10,22 @@
     <EmbeddedResource Include="TestSupport\Resources\TextFile1.txt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Hyperbee.Collections" Version="2.4.0" />
-    <PackageReference Include="Hyperbee.Resources" Version="2.0.2" />
-    <PackageReference Include="Hyperbee.XS" Version="1.3.3" />
-    <PackageReference Include="Hyperbee.XS.Extensions" Version="1.3.3" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.10.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.10.1" />
-    <PackageReference Include="coverlet.collector" Version="6.0.4">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="NSubstitute" Version="5.3.0" />
+    <PackageReference Include="Hyperbee.Collections"  />
+    <PackageReference Include="Hyperbee.Resources" />
+    <PackageReference Include="Hyperbee.XS"  />
+    <PackageReference Include="Hyperbee.XS.Extensions"  />    
+    <PackageReference Include="Microsoft.Extensions.Hosting" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="MSTest.TestFramework"  />
+    <PackageReference Include="MSTest.TestAdapter" />
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="NSubstitute"  />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Hyperbee.Templating.Provider.XS\Hyperbee.Templating.Provider.XS.csproj" />
     <ProjectReference Include="..\..\src\Hyperbee.Templating\Hyperbee.Templating.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Update="Microsoft.SourceLink.GitHub" />
   </ItemGroup>
 </Project>

version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.0.0",
+  "version": "3.3.2",
   "publicReleaseRefSpec": [
     "^refs/heads/main$",
     "^refs/heads/hotfix$",