Skip to content

Commit c2e77bc

Browse files
Ted-Jin-LabTed-Jin-Lab
authored
Merge pull request #68 from Ted-Jin-Lab/development
Fix the Pow
2 parents ebb6408 + fb9c0a8 commit c2e77bc

16 files changed

Lines changed: 144 additions & 332 deletions

File tree

‎.github/workflows/bump_version.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ jobs:
2929
- uses: actions/checkout@v4
3030
with:
3131
submodules: true
32+
- name: Setup .NET
33+
uses: actions/setup-dotnet@v4
34+
with:
35+
dotnet-version: 10.0.x
3236
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
3337
uses: actions/cache@v4
3438
with:

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ jobs:
2929
- uses: actions/checkout@v4
3030
with:
3131
submodules: true
32+
- name: Setup .NET
33+
uses: actions/setup-dotnet@v4
34+
with:
35+
dotnet-version: 10.0.x
3236
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
3337
uses: actions/cache@v4
3438
with:

‎.github/workflows/test.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ jobs:
2929
- uses: actions/checkout@v4
3030
with:
3131
submodules: true
32+
- name: Setup .NET
33+
uses: actions/setup-dotnet@v4
34+
with:
35+
dotnet-version: 10.0.x
3236
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
3337
uses: actions/cache@v4
3438
with:

‎.nuke/parameters.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "build.schema.json",
3-
"Solution": "TedToolkit.sln"
3+
"Solution": "TedToolkit.slnx"
44
}

‎Directory.Build.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<PropertyGroup>
4-
<Version>2025.11.21.0</Version>
4+
<Version>2025.11.24.0</Version>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<LangVersion>preview</LangVersion>
@@ -22,7 +22,7 @@
2222
</PropertyGroup>
2323
<PropertyGroup Condition="$(NeedTestsPackage)">
2424
<IsPackable>false</IsPackable>
25-
<TargetFramework>net9.0</TargetFramework>
25+
<TargetFramework>net10.0</TargetFramework>
2626
</PropertyGroup>
2727
<ItemGroup Condition="$(NeedTestsPackage)">
2828
<PackageReference Include="TUnit" />
@@ -49,7 +49,7 @@
4949
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
5050
</ItemGroup>
5151
<PropertyGroup Condition="$(NeedAlmostAllFrameWorks)">
52-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net472;net48;netstandard2.0</TargetFrameworks>
52+
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0;net472;net48;netstandard2.0</TargetFrameworks>
5353
</PropertyGroup>
5454
<ItemGroup Condition="$(NeedAlmostAllFrameWorks) and !$(MSBuildProjectName.EndsWith('Sources'))">
5555
<PackageReference Include="PolySharp">

‎Directory.Packages.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@
1313
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
1414
<PackageVersion Include="PeterO.Numbers" Version="1.8.2" />
1515
<PackageVersion Include="PolySharp" Version="1.15.0" />
16-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
17-
<PackageVersion Include="Nuke.Common" Version="9.0.4" />
16+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
17+
<PackageVersion Include="Nuke.Common" Version="10.0.0" />
1818
<PackageVersion Include="Octokit" Version="14.0.0" />
1919
<PackageVersion Include="Microsoft.Extensions.Logging" Version="3.0.0" />
2020
<PackageVersion Include="System.CodeDom" Version="8.0.0" />
21-
<PackageVersion Include="System.Drawing.Common" Version="9.0.9" />
22-
<PackageVersion Include="TUnit" Version="1.0.78" />
21+
<PackageVersion Include="System.Drawing.Common" Version="10.0.0" />
22+
<PackageVersion Include="TUnit" Version="1.2.11" />
2323
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.2" />
24-
<PackageVersion Include="Seq.Extensions.Logging" Version="8.0.0" />
24+
<PackageVersion Include="Seq.Extensions.Logging" Version="9.0.0" />
2525
<PackageVersion Include="UnitsNet" Version="5.75.0" />
2626
<PackageVersion Include="WPF-UI" Version="4.0.1" />
2727
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
2828
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
29-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.9" />
29+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
3030
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
3131
<PackageVersion Include="Grasshopper" Version="7.0.20314.3001" Condition="'$(TargetFramework)' == 'net48'" />
3232
<PackageVersion Include="Grasshopper" Version="8.0.23304.9001" Condition="'$(TargetFramework)' != 'net48'" />

‎TedToolkit.sln‎

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

‎TedToolkit.sln.DotSettings‎

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

‎TedToolkit.slnx‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
<Solution>
2+
<Folder Name="/build/">
3+
<File Path=".gitignore" />
4+
<File Path="Directory.Build.props" />
5+
<File Path="Directory.Packages.props" />
6+
<File Path="README.md" />
7+
<Project Path="build/NukeBuilder.csproj">
8+
<Build Project="false" />
9+
</Project>
10+
</Folder>
11+
<Folder Name="/src/">
12+
<Project Path="src/libraries/TedToolkit.RoslynHelper/TedToolkit.RoslynHelper.csproj" />
13+
</Folder>
14+
<Folder Name="/src/Assertions/">
15+
<Project Path="src/libraries/TedToolkit.Assertions.FluentValidation/TedToolkit.Assertions.FluentValidation.csproj" />
16+
<Project Path="src/libraries/TedToolkit.Assertions.Logging/TedToolkit.Assertions.Logging.csproj" />
17+
<Project Path="src/libraries/TedToolkit.Assertions/TedToolkit.Assertions.csproj" />
18+
<Project Path="tests/TedToolkit.Assertions.Tests/TedToolkit.Assertions.Tests.csproj" />
19+
</Folder>
20+
<Folder Name="/src/CppInteropGen/">
21+
<Project Path="src/analyzers/TedToolkit.CppInteropGen.SourceGenerator/TedToolkit.CppInteropGen.SourceGenerator.csproj" />
22+
<Project Path="src/libraries/TedToolkit.CppInteropGen/TedToolkit.CppInteropGen.csproj">
23+
<BuildDependency Project="src/analyzers/TedToolkit.CppInteropGen.SourceGenerator/TedToolkit.CppInteropGen.SourceGenerator.csproj" />
24+
</Project>
25+
</Folder>
26+
<Folder Name="/src/Fluent/">
27+
<Project Path="src/analyzers/TedToolkit.Fluent.SourceGenerator/TedToolkit.Fluent.SourceGenerator.csproj" />
28+
<Project Path="src/libraries/TedToolkit.Fluent/TedToolkit.Fluent.csproj">
29+
<BuildDependency Project="src/analyzers/TedToolkit.Fluent.SourceGenerator/TedToolkit.Fluent.SourceGenerator.csproj" />
30+
</Project>
31+
<Project Path="tests/TedToolkit.Fluent.Tests/TedToolkit.Fluent.Tests.csproj" />
32+
</Folder>
33+
<Folder Name="/src/Grasshopper/">
34+
<Project Path="src/analyzers/TedToolkit.Grasshopper.SourceGenerator/TedToolkit.Grasshopper.SourceGenerator.csproj" />
35+
<Project Path="src/libraries/TedToolkit.Grasshopper.Sources/TedToolkit.Grasshopper.Sources.csproj">
36+
<Build Solution="Debug|*" Project="false" />
37+
</Project>
38+
<Project Path="src/libraries/TedToolkit.Grasshopper/TedToolkit.Grasshopper.csproj">
39+
<BuildDependency Project="src/analyzers/TedToolkit.Grasshopper.SourceGenerator/TedToolkit.Grasshopper.SourceGenerator.csproj" />
40+
</Project>
41+
<Project Path="tests/TedToolkit.Grasshopper.Instance/TedToolkit.Grasshopper.Instance.csproj" />
42+
</Folder>
43+
<Folder Name="/src/InterpolatedParser/">
44+
<Project Path="src/analyzers/TedToolkit.InterpolatedParser.SourceGenerator/TedToolkit.InterpolatedParser.SourceGenerator.csproj" />
45+
<Project Path="src/libraries/TedToolkit.InterpolatedParser.Sources/TedToolkit.InterpolatedParser.Sources.csproj">
46+
<Build Solution="Debug|*" Project="false" />
47+
</Project>
48+
<Project Path="src/libraries/TedToolkit.InterpolatedParser/TedToolkit.InterpolatedParser.csproj">
49+
<BuildDependency Project="src/analyzers/TedToolkit.InterpolatedParser.SourceGenerator/TedToolkit.InterpolatedParser.SourceGenerator.csproj" />
50+
</Project>
51+
<Project Path="tests/TedToolkit.InterpolatedParser.Tests/TedToolkit.InterpolatedParser.Tests.csproj" />
52+
</Folder>
53+
<Folder Name="/src/PureConst/">
54+
<Project Path="src/analyzers/TedToolkit.PureConst.Analyzer/TedToolkit.PureConst.Analyzer.csproj" />
55+
<Project Path="src/libraries/TedToolkit.PureConst/TedToolkit.PureConst.csproj">
56+
<BuildDependency Project="src/analyzers/TedToolkit.PureConst.Analyzer/TedToolkit.PureConst.Analyzer.csproj" />
57+
</Project>
58+
<Project Path="tests/TedToolkit.PureConst.Tests/TedToolkit.PureConst.Tests.csproj" />
59+
</Folder>
60+
<Folder Name="/src/QuantExtensions/">
61+
<Project Path="src/analyzers/TedToolkit.QuantExtensions.SourceGenerator/TedToolkit.QuantExtensions.SourceGenerator.csproj" />
62+
<Project Path="src/libraries/TedToolkit.QuantExtensions/TedToolkit.QuantExtensions.csproj">
63+
<BuildDependency Project="src/analyzers/TedToolkit.QuantExtensions.SourceGenerator/TedToolkit.QuantExtensions.SourceGenerator.csproj" />
64+
</Project>
65+
</Folder>
66+
<Folder Name="/src/Quantities/">
67+
<Project Path="src/analyzers/TedToolkit.Quantities.Analyzer/TedToolkit.Quantities.Analyzer.csproj" />
68+
<Project Path="src/applications/TedToolkit.Quantities.Generator/TedToolkit.Quantities.Generator.csproj" />
69+
<Project Path="src/libraries/TedToolkit.Quantities.Data/TedToolkit.Quantities.Data.csproj" />
70+
<Project Path="src/libraries/TedToolkit.Quantities/TedToolkit.Quantities.csproj">
71+
<BuildDependency Project="src/analyzers/TedToolkit.Quantities.Analyzer/TedToolkit.Quantities.Analyzer.csproj" />
72+
<BuildDependency Project="src/libraries/TedToolkit.Quantities.Data/TedToolkit.Quantities.Data.csproj" />
73+
</Project>
74+
</Folder>
75+
<Folder Name="/src/Scopes/">
76+
<Project Path="src/libraries/TedToolkit.Scopes/TedToolkit.Scopes.csproj" />
77+
</Folder>
78+
<Folder Name="/src/ValidResults/">
79+
<Project Path="src/analyzers/TedToolkit.ValidResults.SourceGenerator/TedToolkit.ValidResults.SourceGenerator.csproj" />
80+
<Project Path="src/libraries/TedToolkit.ValidResults/TedToolkit.ValidResults.csproj">
81+
<BuildDependency Project="src/analyzers/TedToolkit.ValidResults.SourceGenerator/TedToolkit.ValidResults.SourceGenerator.csproj" />
82+
</Project>
83+
</Folder>
84+
<Project Path="tests/TedToolkit.Console/TedToolkit.Console.csproj">
85+
<Build Project="false" />
86+
</Project>
87+
</Solution>

‎Tests/TedToolkit.Console/AssemblyInfo.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
global using TedToolkit.Quantities;
2-
32
using TedToolkit.QuantExtensions;
43
using UnitsNet;
54
using Length = UnitsNet.Length;
@@ -8,4 +7,6 @@
87
[assembly: NumberExtension<int, Angle>]
98
[assembly: NumberExtension<double, Angle>]
109

11-
[assembly:Quantities<double>(QuantitySystems.ALL, "AbsorbedDose", "Dimensionless", "DimensionlessRatio")]
10+
[assembly:
11+
Quantities<double>(QuantitySystems.ALL, "Area", "AbsorbedDose", "Dimensionless", "DimensionlessRatio",
12+
Length = LengthUnit.Millimetre)]

0 commit comments

Comments
 (0)