Merge pull request #122 from Stillpoint-Software/develop

varndellwagglebee · web-flow · commit 7cdbc6229116 · 2026-01-26T10:33:18.000-05:00
updated multi target version
diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
@@ -44,12 +44,12 @@ jobs:
           VERSION='${{ inputs.version }}'
           INCR='${{ inputs.increment }}'
           if [[ "$MODE" == "explicit" && -z "$VERSION" ]]; then
-            echo "❌ mode=explicit requires 'version' (e.g., 1.3-alpha)."; exit 1
+            echo "? mode=explicit requires 'version' (e.g., 1.3-alpha)."; exit 1
           fi
           if [[ "$MODE" == "bump" && -z "$INCR" ]]; then
-            echo "❌ mode=bump requires 'increment' (major|minor|patch)."; exit 1
+            echo "? mode=bump requires 'increment' (major|minor|patch)."; exit 1
           fi
-          echo "✅ inputs look good."
+          echo "? inputs look good."
 
   set-version:
     needs: validate-inputs
@@ -71,4 +71,4 @@ jobs:
       prerelease:   ${{ needs.set-version.outputs.new_prerelease }}
       draft:        true
     secrets:
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -8,7 +8,7 @@ on:
     branches: [main, develop]
 
   workflow_run:
-    workflows: [Create Prerelease, Create Release]
+    workflows: [Create Release]
     types: [requested]
  
 permissions:
@@ -48,4 +48,4 @@ jobs:
     with:
       branch: ${{ needs.discover.outputs.branch_name }}
     secrets: inherit
-      
+      
diff --git a/.github/workflows/pack_publish.yml b/.github/workflows/pack_publish.yml
@@ -1,4 +1,4 @@
-﻿name: Pack and Publish
+name: Pack and Publish
  
 on:
   release:
@@ -11,7 +11,7 @@ permissions:
   statuses: write
 
 jobs:
-  set_config:
+  set-config:
     uses: Stillpoint-Software/shared-workflows/.github/workflows/determine_build_configuration.yml@main
     with:
       trigger: release
@@ -20,17 +20,17 @@ jobs:
       prerelease: ${{ github.event.release.prerelease }} # true/false from the release
   
   tests:
-    needs: set_config
+    needs: set-config
     uses: Stillpoint-Software/shared-workflows/.github/workflows/run_tests.yml@main
     with:
       branch: ${{ github.event.release.target_commitish }}
       solution_name: ${{ vars.SOLUTION_NAME }}
-
+  
   publish:
-    needs: [set_config, tests]
+    needs: [set-config, tests]
     uses: Stillpoint-Software/shared-workflows/.github/workflows/pack_and_publish.yml@main
     with:
-      build_configuration: ${{ needs.set_config.outputs.build_configuration }}
+      build_configuration: ${{ needs.set-config.outputs.build_configuration }}
     secrets:
       NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
 
@@ -40,5 +40,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
        - run: echo "Tests result = ${{ needs.tests.result }}"
-       - run: echo "Pack & Publish result = ${{ needs.publish.result }}"
-
+       - run: echo "Pack & Publish result = ${{ needs.publish.result }}"
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
@@ -2,7 +2,7 @@ name: Run Tests
 
 on:
   workflow_run:
-    workflows: [Create Prerelease, Create Release]
+    workflows: [Create Release]
     types: [requested]
     branches: [main, develop]        
   workflow_dispatch:
@@ -45,4 +45,4 @@ jobs:
     with:
       branch: ${{ needs.discover.outputs.branch_name }}
       solution_name: ${{ vars.SOLUTION_NAME }}
-    secrets: inherit
+    secrets: inherit
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -41,10 +41,11 @@
           PackagePath="\"
           Link="LICENSE" />
   </ItemGroup>
-  <!-- Global project properies -->
+  <!-- Global project properties - .NET 10 LTS First Strategy -->
   <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>
 
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -8,17 +8,17 @@
     <PackageVersion Include="Nerdbank.GitVersioning" Version="3.9.50">
       <PrivateAssets>all</PrivateAssets>
     </PackageVersion>
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.102">
       <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="Hyperbee.Collections" Version="2.7.3" />
+    <PackageVersion Include="Hyperbee.Resources" Version="2.1.1" />
+    <PackageVersion Include="Hyperbee.XS" Version="1.6.2" />
+    <PackageVersion Include="Hyperbee.XS.Extensions" Version="1.6.2" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.2" />
     <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" />
diff --git a/src/Hyperbee.Templating.Provider.XS/Hyperbee.Templating.Provider.XS.csproj b/src/Hyperbee.Templating.Provider.XS/Hyperbee.Templating.Provider.XS.csproj
@@ -41,7 +41,10 @@
     <PackageReference Include="Hyperbee.Resources" />
     <PackageReference Include="Hyperbee.XS" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" />
-    <PackageReference Update="Microsoft.SourceLink.GitHub" />
+    <PackageReference Update="Microsoft.SourceLink.GitHub">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Update="Nerdbank.GitVersioning" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Hyperbee.Templating/Hyperbee.Templating.csproj b/src/Hyperbee.Templating/Hyperbee.Templating.csproj
@@ -40,7 +40,10 @@
     <None Include="..\..\README.md" Pack="true" Visible="true" PackagePath="/" />
     <PackageReference Include="Hyperbee.Resources" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" />
-    <PackageReference Update="Microsoft.SourceLink.GitHub" />
+    <PackageReference Update="Microsoft.SourceLink.GitHub">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Update="Nerdbank.GitVersioning" />
   </ItemGroup>
 </Project>
diff --git a/test/Hyperbee.Templating.Benchmark/BenchmarkConfig.cs b/test/Hyperbee.Templating.Benchmark/BenchmarkConfig.cs
@@ -20,6 +20,10 @@ public Config()
               .WithRuntime( CoreRuntime.Core80 )
               .WithId( ".NET 8" ) );
 
+            AddJob( Job.ShortRun
+            .WithRuntime( CoreRuntime.Core90 )
+            .WithId( ".NET 9" ) );
+
             AddJob( Job.ShortRun
                 .WithRuntime( CoreRuntime.Core10_0 )
                 .WithId( ".NET 10" ) );
diff --git a/test/Hyperbee.Templating.Benchmark/Hyperbee.Templating.Benchmark.csproj b/test/Hyperbee.Templating.Benchmark/Hyperbee.Templating.Benchmark.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" />
-    <PackageReference Include="Hyperbee.XS"  />
+    <PackageReference Include="Hyperbee.XS" />
   </ItemGroup>
 
   <ItemGroup>
@@ -18,4 +18,11 @@
     <ProjectReference Include="..\Hyperbee.Templating.Tests\Hyperbee.Templating.Tests.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.SourceLink.GitHub">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
diff --git a/test/Hyperbee.Templating.Tests/Hyperbee.Templating.Tests.csproj b/test/Hyperbee.Templating.Tests/Hyperbee.Templating.Tests.csproj
@@ -10,22 +10,25 @@
     <EmbeddedResource Include="TestSupport\Resources\TextFile1.txt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Hyperbee.Collections"  />
+    <PackageReference Include="Hyperbee.Collections" />
     <PackageReference Include="Hyperbee.Resources" />
-    <PackageReference Include="Hyperbee.XS"  />
-    <PackageReference Include="Hyperbee.XS.Extensions"  />    
+    <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.TestFramework" />
     <PackageReference Include="MSTest.TestAdapter" />
     <PackageReference Include="coverlet.collector" />
-    <PackageReference Include="NSubstitute"  />
+    <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" />
+    <PackageReference Update="Microsoft.SourceLink.GitHub">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 </Project>
diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "3.3.4",
+  "version": "3.4.1",
   "publicReleaseRefSpec": [
     "^refs/heads/main$",
     "^refs/heads/hotfix$",
