diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 3adcfc2..a428f7d 100644
--- a/.github/workflows/format.yml
+++ b/.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
diff --git a/Directory.Build.props b/Directory.Build.props
index 8f8cef8..93632c5 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,15 +2,10 @@
-
+
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
+
@@ -46,4 +41,10 @@
PackagePath="\"
Link="LICENSE" />
+
+
+ enable
+ net8.0;net10.0
+
+
diff --git a/Directory.Packages.props b/Directory.Packages.props
new file mode 100644
index 0000000..200d8a4
--- /dev/null
+++ b/Directory.Packages.props
@@ -0,0 +1,33 @@
+
+
+ true
+
+
+
+
+
+ all
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
+
+
+
+
+
+
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Hyperbee.Templating.sln b/Hyperbee.Templating.sln
deleted file mode 100644
index af7936b..0000000
--- a/Hyperbee.Templating.sln
+++ /dev/null
@@ -1,81 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31912.275
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{870D9301-BE3D-44EA-BF9C-FCC2E87FE4CD}"
- ProjectSection(SolutionItems) = preProject
- Directory.Build.props = Directory.Build.props
- README.md = README.md
- version.json = version.json
- EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Tests", "Solution Tests", "{F9B24CD9-E06B-4834-84CB-8C29E5F10BE0}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{1FA7CE2A-C9DA-4DC3-A242-5A7EAF8EE4FC}"
- ProjectSection(SolutionItems) = preProject
- .github\dependabot.yml = .github\dependabot.yml
- .github\issue-branch.yml = .github\issue-branch.yml
- EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{4DBDB7F5-3F66-4572-80B5-3322449C77A4}"
- ProjectSection(SolutionItems) = preProject
- .github\workflows\create_release.yml = .github\workflows\create_release.yml
- .github\workflows\create_test_report.yml = .github\workflows\create_test_report.yml
- .github\workflows\format.yml = .github\workflows\format.yml
- .github\workflows\issue_branch.yml = .github\workflows\issue_branch.yml
- .github\workflows\pack_publish.yml = .github\workflows\pack_publish.yml
- .github\workflows\run_tests.yml = .github\workflows\run_tests.yml
- .github\workflows\unlist_package.yml = .github\workflows\unlist_package.yml
- EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbee.Templating.Tests", "test\Hyperbee.Templating.Tests\Hyperbee.Templating.Tests.csproj", "{97886205-1467-4EE6-B3DA-496CA3D086E4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbee.Templating", "src\Hyperbee.Templating\Hyperbee.Templating.csproj", "{0FB94923-9CD3-4C31-BCD9-556069346517}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbee.Templating.Benchmark", "test\Hyperbee.Templating.Benchmark\Hyperbee.Templating.Benchmark.csproj", "{EB7D2A85-3C82-444A-84CD-D245DCF951CE}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "docs", "docs\docs.shproj", "{8409DDE0-C540-4A94-BF7F-9403888BEDAC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyperbee.Templating.Provider.XS", "src\Hyperbee.Templating.Provider.XS\Hyperbee.Templating.Provider.XS.csproj", "{EA264696-D88A-288E-0D8E-C834780D5F9E}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {97886205-1467-4EE6-B3DA-496CA3D086E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {97886205-1467-4EE6-B3DA-496CA3D086E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {97886205-1467-4EE6-B3DA-496CA3D086E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {97886205-1467-4EE6-B3DA-496CA3D086E4}.Release|Any CPU.Build.0 = Release|Any CPU
- {0FB94923-9CD3-4C31-BCD9-556069346517}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0FB94923-9CD3-4C31-BCD9-556069346517}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0FB94923-9CD3-4C31-BCD9-556069346517}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0FB94923-9CD3-4C31-BCD9-556069346517}.Release|Any CPU.Build.0 = Release|Any CPU
- {EB7D2A85-3C82-444A-84CD-D245DCF951CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {EB7D2A85-3C82-444A-84CD-D245DCF951CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {EB7D2A85-3C82-444A-84CD-D245DCF951CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {EB7D2A85-3C82-444A-84CD-D245DCF951CE}.Release|Any CPU.Build.0 = Release|Any CPU
- {EA264696-D88A-288E-0D8E-C834780D5F9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {EA264696-D88A-288E-0D8E-C834780D5F9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {EA264696-D88A-288E-0D8E-C834780D5F9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {EA264696-D88A-288E-0D8E-C834780D5F9E}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {1FA7CE2A-C9DA-4DC3-A242-5A7EAF8EE4FC} = {870D9301-BE3D-44EA-BF9C-FCC2E87FE4CD}
- {4DBDB7F5-3F66-4572-80B5-3322449C77A4} = {1FA7CE2A-C9DA-4DC3-A242-5A7EAF8EE4FC}
- {97886205-1467-4EE6-B3DA-496CA3D086E4} = {F9B24CD9-E06B-4834-84CB-8C29E5F10BE0}
- {EB7D2A85-3C82-444A-84CD-D245DCF951CE} = {F9B24CD9-E06B-4834-84CB-8C29E5F10BE0}
- {8409DDE0-C540-4A94-BF7F-9403888BEDAC} = {870D9301-BE3D-44EA-BF9C-FCC2E87FE4CD}
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {32874F5B-B467-4F28-A8E2-82C2536FB228}
- EndGlobalSection
- GlobalSection(SharedMSBuildProjectFiles) = preSolution
- docs\docs.projitems*{8409dde0-c540-4a94-bf7f-9403888bedac}*SharedItemsImports = 13
- EndGlobalSection
-EndGlobal
diff --git a/Hyperbee.Templating.slnx b/Hyperbee.Templating.slnx
new file mode 100644
index 0000000..a0d8669
--- /dev/null
+++ b/Hyperbee.Templating.slnx
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Hyperbee.Templating.Provider.XS/Hyperbee.Templating.Provider.XS.csproj b/src/Hyperbee.Templating.Provider.XS/Hyperbee.Templating.Provider.XS.csproj
index 79e604a..ebfd388 100644
--- a/src/Hyperbee.Templating.Provider.XS/Hyperbee.Templating.Provider.XS.csproj
+++ b/src/Hyperbee.Templating.Provider.XS/Hyperbee.Templating.Provider.XS.csproj
@@ -1,14 +1,11 @@
- net9.0
- enable
true
Stillpoint Software, Inc.
README.md
templating;token;xs
icon.png
https://stillpoint-software.github.io/hyperbee.templating/
- net9.0
LICENSE
Stillpoint Software, Inc.
Hyperbee Templating Provider XS
@@ -37,14 +34,10 @@
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
-
-
+
+
+
+
diff --git a/src/Hyperbee.Templating/Hyperbee.Templating.csproj b/src/Hyperbee.Templating/Hyperbee.Templating.csproj
index f7a9e7e..2189332 100644
--- a/src/Hyperbee.Templating/Hyperbee.Templating.csproj
+++ b/src/Hyperbee.Templating/Hyperbee.Templating.csproj
@@ -1,14 +1,11 @@
-
+
- net9.0
- enable
true
Stillpoint Software, Inc.
README.md
templating;template;template-engine
icon.png
https://stillpoint-software.github.io/hyperbee.templating/
- net9.0
LICENSE
Stillpoint Software, Inc.
Hyperbee Templating
@@ -38,11 +35,7 @@
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
+
+
\ No newline at end of file
diff --git a/test/Hyperbee.Templating.Benchmark/BenchmarkConfig.cs b/test/Hyperbee.Templating.Benchmark/BenchmarkConfig.cs
index b10d39e..21aeed3 100644
--- a/test/Hyperbee.Templating.Benchmark/BenchmarkConfig.cs
+++ b/test/Hyperbee.Templating.Benchmark/BenchmarkConfig.cs
@@ -1,6 +1,7 @@
using BenchmarkDotNet.Columns;
using BenchmarkDotNet.Configs;
using BenchmarkDotNet.Diagnosers;
+using BenchmarkDotNet.Environments;
using BenchmarkDotNet.Exporters;
using BenchmarkDotNet.Jobs;
using BenchmarkDotNet.Loggers;
@@ -8,13 +9,21 @@
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 );
diff --git a/test/Hyperbee.Templating.Benchmark/Hyperbee.Templating.Benchmark.csproj b/test/Hyperbee.Templating.Benchmark/Hyperbee.Templating.Benchmark.csproj
index 1cb9730..e83e2c9 100644
--- a/test/Hyperbee.Templating.Benchmark/Hyperbee.Templating.Benchmark.csproj
+++ b/test/Hyperbee.Templating.Benchmark/Hyperbee.Templating.Benchmark.csproj
@@ -2,16 +2,14 @@
Exe
- net9.0
- enable
enable
false
false
-
-
+
+
diff --git a/test/Hyperbee.Templating.Tests/Hyperbee.Templating.Tests.csproj b/test/Hyperbee.Templating.Tests/Hyperbee.Templating.Tests.csproj
index e9e9c6f..fca6dee 100644
--- a/test/Hyperbee.Templating.Tests/Hyperbee.Templating.Tests.csproj
+++ b/test/Hyperbee.Templating.Tests/Hyperbee.Templating.Tests.csproj
@@ -1,6 +1,5 @@
-
+
- net9.0
false
false
@@ -11,28 +10,22 @@
-
-
-
-
-
-
-
-
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
+
+
+
+
+
+
+
+
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
\ No newline at end of file
diff --git a/version.json b/version.json
index cbc8b16..293422d 100644
--- 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": "1.0.0",
+ "version": "3.3.2",
"publicReleaseRefSpec": [
"^refs/heads/main$",
"^refs/heads/hotfix$",