Skip to content

Commit d6f9188

Browse files
varndellwagglebeevarndellwagglebee
authored
Merge pull request #113 from Stillpoint-Software/develop
Updated to .NET 10
2 parents ddad08e + 2ea7a84 commit d6f9188

File tree

11 files changed

+101
-135
lines changed

11 files changed

+101
-135
lines changed

‎.github/workflows/format.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ jobs:
4646
if: ${{ needs.discover.result == 'success' }}
4747
uses: Stillpoint-Software/shared-workflows/.github/workflows/format.yml@main
4848
with:
49-
dotnet_version: "9.0.x"
5049
branch: ${{ needs.discover.outputs.branch_name }}
5150
secrets: inherit
5251

‎Directory.Build.props‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,10 @@
22
<!-- Shared package refs -->
33
<ItemGroup>
44
<!-- NBGV drives versions; PrivateAssets=all keeps it out of consumers -->
5-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.8.38-alpha" PrivateAssets="all" />
5+
<PackageReference Include="Nerdbank.GitVersioning" />
66

77
<!-- SourceLink for GitHub -->
8-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
9-
<PrivateAssets>all</PrivateAssets>
10-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
11-
</PackageReference>
12-
13-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
8+
<PackageReference Include="Microsoft.SourceLink.GitHub" />
149
</ItemGroup>
1510

1611
<!-- SourceLink / build hygiene -->
@@ -46,4 +41,10 @@
4641
PackagePath="\"
4742
Link="LICENSE" />
4843
</ItemGroup>
44+
<!-- Global project properies -->
45+
<PropertyGroup>
46+
<ImplicitUsings>enable</ImplicitUsings>
47+
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
48+
</PropertyGroup>
4949
</Project>
50+

‎Directory.Packages.props‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<PackageVersion Include="FastExpressionCompiler" Version="5.3.0" />
7+
<!-- Development Tools -->
8+
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.9.50">
9+
<PrivateAssets>all</PrivateAssets>
10+
</PackageVersion>
11+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
12+
<PrivateAssets>all</PrivateAssets>
13+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
14+
</PackageVersion>
15+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.0.0" />
16+
<!-- Testing Framework -->
17+
<PackageVersion Include="Hyperbee.Collections" Version="2.6.4" />
18+
<PackageVersion Include="Hyperbee.Resources" Version="2.0.4" />
19+
<PackageVersion Include="Hyperbee.XS" Version="1.3.3" />
20+
<PackageVersion Include="Hyperbee.XS.Extensions" Version="1.3.3" />
21+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
22+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
23+
<PackageVersion Include="MSTest.TestFramework" Version="4.0.2" />
24+
<PackageVersion Include="MSTest.TestAdapter" Version="4.0.2" />
25+
<PackageVersion Include="coverlet.collector" Version="6.0.4">
26+
<PrivateAssets>all</PrivateAssets>
27+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
28+
</PackageVersion>
29+
<PackageVersion Include="NSubstitute" Version="5.3.0" />
30+
<!-- Benchmarking Tools -->
31+
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
32+
</ItemGroup>
33+
</Project>

‎Hyperbee.Templating.sln‎

Lines changed: 0 additions & 81 deletions
This file was deleted.

‎Hyperbee.Templating.slnx‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<Solution>
2+
<Folder Name="/Solution Items/">
3+
<File Path="Directory.Build.props" />
4+
<File Path="Directory.Packages.props" />
5+
<File Path="README.md" />
6+
<File Path="version.json" />
7+
<Project Path="docs/docs.shproj" />
8+
</Folder>
9+
<Folder Name="/Solution Items/.github/">
10+
<File Path=".github/dependabot.yml" />
11+
<File Path=".github/issue-branch.yml" />
12+
</Folder>
13+
<Folder Name="/Solution Items/.github/workflows/">
14+
<File Path=".github/workflows/create_release.yml" />
15+
<File Path=".github/workflows/create_test_report.yml" />
16+
<File Path=".github/workflows/format.yml" />
17+
<File Path=".github/workflows/issue_branch.yml" />
18+
<File Path=".github/workflows/pack_publish.yml" />
19+
<File Path=".github/workflows/run_tests.yml" />
20+
<File Path=".github/workflows/unlist_package.yml" />
21+
</Folder>
22+
<Folder Name="/Solution Tests/">
23+
<Project Path="test/Hyperbee.Templating.Benchmark/Hyperbee.Templating.Benchmark.csproj" />
24+
<Project Path="test/Hyperbee.Templating.Tests/Hyperbee.Templating.Tests.csproj" />
25+
</Folder>
26+
<Project Path="src/Hyperbee.Templating.Provider.XS/Hyperbee.Templating.Provider.XS.csproj" />
27+
<Project Path="src/Hyperbee.Templating/Hyperbee.Templating.csproj" />
28+
</Solution>

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

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
4-
<ImplicitUsings>enable</ImplicitUsings>
53
<IsPackable>true</IsPackable>
64
<Authors>Stillpoint Software, Inc.</Authors>
75
<PackageReadmeFile>README.md</PackageReadmeFile>
86
<PackageTags>templating;token;xs</PackageTags>
97
<PackageIcon>icon.png</PackageIcon>
108
<PackageProjectUrl>https://stillpoint-software.github.io/hyperbee.templating/</PackageProjectUrl>
11-
<TargetFrameworks>net9.0</TargetFrameworks>
129
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1310
<Copyright>Stillpoint Software, Inc.</Copyright>
1411
<Title>Hyperbee Templating Provider XS</Title>
@@ -37,14 +34,10 @@
3734
<None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="/" />
3835
<None Include="..\..\README.md" Pack="true" Visible="true" PackagePath="/" Link="README.md" />
3936
<None Include="..\..\LICENSE" Pack="true" Visible="false" PackagePath="/" />
40-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
41-
<PrivateAssets>all</PrivateAssets>
42-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
43-
</PackageReference>
44-
<PackageReference Include="FastExpressionCompiler" Version="5.3.0" />
45-
<PackageReference Include="Hyperbee.Resources" Version="2.0.2" />
46-
<PackageReference Include="Hyperbee.XS" Version="1.3.3" />
47-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
37+
<PackageReference Include="FastExpressionCompiler" />
38+
<PackageReference Include="Hyperbee.Resources" />
39+
<PackageReference Include="Hyperbee.XS" />
40+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" />
4841
</ItemGroup>
4942
<ItemGroup>
5043
<ProjectReference Include="..\Hyperbee.Templating\Hyperbee.Templating.csproj" />

‎src/Hyperbee.Templating/Hyperbee.Templating.csproj‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
4-
<ImplicitUsings>enable</ImplicitUsings>
53
<IsPackable>true</IsPackable>
64
<Authors>Stillpoint Software, Inc.</Authors>
75
<PackageReadmeFile>README.md</PackageReadmeFile>
86
<PackageTags>templating;template;template-engine</PackageTags>
97
<PackageIcon>icon.png</PackageIcon>
108
<PackageProjectUrl>https://stillpoint-software.github.io/hyperbee.templating/</PackageProjectUrl>
11-
<TargetFrameworks>net9.0</TargetFrameworks>
129
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1310
<Copyright>Stillpoint Software, Inc.</Copyright>
1411
<Title>Hyperbee Templating</Title>
@@ -38,11 +35,7 @@
3835
<None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="/" />
3936
<None Include="..\..\README.md" Pack="true" Visible="true" PackagePath="/" Link="README.md" />
4037
<None Include="..\..\LICENSE" Pack="true" Visible="false" PackagePath="/" />
41-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
42-
<PrivateAssets>all</PrivateAssets>
43-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
44-
</PackageReference>
45-
<PackageReference Include="Hyperbee.Resources" Version="2.0.2" />
46-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
38+
<PackageReference Include="Hyperbee.Resources" />
39+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" />
4740
</ItemGroup>
4841
</Project>

‎test/Hyperbee.Templating.Benchmark/BenchmarkConfig.cs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,29 @@
11
using BenchmarkDotNet.Columns;
22
using BenchmarkDotNet.Configs;
33
using BenchmarkDotNet.Diagnosers;
4+
using BenchmarkDotNet.Environments;
45
using BenchmarkDotNet.Exporters;
56
using BenchmarkDotNet.Jobs;
67
using BenchmarkDotNet.Loggers;
78
using BenchmarkDotNet.Order;
89
using BenchmarkDotNet.Validators;
910

1011
namespace Hyperbee.Templating.Benchmark;
12+
1113
public class BenchmarkConfig
1214
{
1315
public class Config : ManualConfig
1416
{
1517
public Config()
1618
{
17-
AddJob( Job.ShortRun );
19+
AddJob( Job.ShortRun
20+
.WithRuntime( CoreRuntime.Core80 )
21+
.WithId( ".NET 8" ) );
22+
23+
AddJob( Job.ShortRun
24+
.WithRuntime( CoreRuntime.Core10_0 )
25+
.WithId( ".NET 10" ) );
26+
1827
AddExporter( MarkdownExporter.GitHub );
1928
AddValidator( JitOptimizationsValidator.DontFailOnError );
2029
AddLogger( ConsoleLogger.Default );

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net9.0</TargetFramework>
6-
<ImplicitUsings>enable</ImplicitUsings>
75
<Nullable>enable</Nullable>
86
<IsPackable>false</IsPackable>
97
<IsTestingPlatformApplication>false</IsTestingPlatformApplication>
108
</PropertyGroup>
119

1210
<ItemGroup>
13-
<PackageReference Include="BenchmarkDotNet" Version="0.15.2" />
14-
<PackageReference Include="Hyperbee.XS" Version="1.3.3" />
11+
<PackageReference Include="BenchmarkDotNet" />
12+
<PackageReference Include="Hyperbee.XS" />
1513
</ItemGroup>
1614

1715
<ItemGroup>

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

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
43
<IsTestingPlatformApplication>false</IsTestingPlatformApplication>
54
<IsPackable>false</IsPackable>
65
</PropertyGroup>
@@ -11,28 +10,22 @@
1110
<EmbeddedResource Include="TestSupport\Resources\TextFile1.txt" />
1211
</ItemGroup>
1312
<ItemGroup>
14-
<PackageReference Include="Hyperbee.Collections" Version="2.4.0" />
15-
<PackageReference Include="Hyperbee.Resources" Version="2.0.2" />
16-
<PackageReference Include="Hyperbee.XS" Version="1.3.3" />
17-
<PackageReference Include="Hyperbee.XS.Extensions" Version="1.3.3" />
18-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
20-
<PackageReference Include="MSTest.TestFramework" Version="3.10.1" />
21-
<PackageReference Include="MSTest.TestAdapter" Version="3.10.1" />
22-
<PackageReference Include="coverlet.collector" Version="6.0.4">
23-
<PrivateAssets>all</PrivateAssets>
24-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
25-
</PackageReference>
26-
<PackageReference Include="NSubstitute" Version="5.3.0" />
13+
<PackageReference Include="Hyperbee.Collections" />
14+
<PackageReference Include="Hyperbee.Resources" />
15+
<PackageReference Include="Hyperbee.XS" />
16+
<PackageReference Include="Hyperbee.XS.Extensions" />
17+
<PackageReference Include="Microsoft.Extensions.Hosting" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
19+
<PackageReference Include="MSTest.TestFramework" />
20+
<PackageReference Include="MSTest.TestAdapter" />
21+
<PackageReference Include="coverlet.collector" />
22+
<PackageReference Include="NSubstitute" />
2723
</ItemGroup>
2824
<ItemGroup>
2925
<ProjectReference Include="..\..\src\Hyperbee.Templating.Provider.XS\Hyperbee.Templating.Provider.XS.csproj" />
3026
<ProjectReference Include="..\..\src\Hyperbee.Templating\Hyperbee.Templating.csproj" />
3127
</ItemGroup>
3228
<ItemGroup>
33-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
34-
<PrivateAssets>all</PrivateAssets>
35-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
36-
</PackageReference>
29+
<PackageReference Update="Microsoft.SourceLink.GitHub" />
3730
</ItemGroup>
3831
</Project>

0 commit comments

Comments
 (0)