Skip to content

Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel

build: make .slnx canonical and dual-target net10/net8

Yuechen Li74d7eb6290e5
diff --git a/Aetheris.CLI.Tests/Aetheris.CLI.Tests.csproj b/Aetheris.CLI.Tests/Aetheris.CLI.Tests.csproj
index 27acd7cf..7bb433f6 100644
--- a/Aetheris.CLI.Tests/Aetheris.CLI.Tests.csproj
+++ b/Aetheris.CLI.Tests/Aetheris.CLI.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
+ <TargetFrameworks>net10.0;net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
diff --git a/Aetheris.CLI/Aetheris.CLI.csproj b/Aetheris.CLI/Aetheris.CLI.csproj
index f9d0db6d..a4df84b8 100644
--- a/Aetheris.CLI/Aetheris.CLI.csproj
+++ b/Aetheris.CLI/Aetheris.CLI.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net8.0</TargetFramework>
+ <TargetFrameworks>net10.0;net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AssemblyName>aetheris</AssemblyName>
diff --git a/Aetheris.Firmament.FrictionLab/Aetheris.Firmament.FrictionLab.csproj b/Aetheris.Firmament.FrictionLab/Aetheris.Firmament.FrictionLab.csproj
index a02fee58..8a07963d 100644
--- a/Aetheris.Firmament.FrictionLab/Aetheris.Firmament.FrictionLab.csproj
+++ b/Aetheris.Firmament.FrictionLab/Aetheris.Firmament.FrictionLab.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net8.0</TargetFramework>
+ <TargetFrameworks>net10.0;net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/Aetheris.Forge/Aetheris.Forge.csproj b/Aetheris.Forge/Aetheris.Forge.csproj
index f563f5a2..e95acbe2 100644
--- a/Aetheris.Forge/Aetheris.Forge.csproj
+++ b/Aetheris.Forge/Aetheris.Forge.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
+ <TargetFrameworks>net10.0;net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/Aetheris.Kernel.Core.Tests/Aetheris.Kernel.Core.Tests.csproj b/Aetheris.Kernel.Core.Tests/Aetheris.Kernel.Core.Tests.csproj
index a7a5d8f7..ff7384ee 100644
--- a/Aetheris.Kernel.Core.Tests/Aetheris.Kernel.Core.Tests.csproj
+++ b/Aetheris.Kernel.Core.Tests/Aetheris.Kernel.Core.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
+ <TargetFrameworks>net10.0;net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
diff --git a/Aetheris.Kernel.Core.Tests/Brep/Queries/BrepSpatialQueriesPointClassificationTests.cs b/Aetheris.Kernel.Core.Tests/Brep/Queries/BrepSpatialQueriesPointClassificationTests.cs
index b3da5ae8..b55cbf3d 100644
--- a/Aetheris.Kernel.Core.Tests/Brep/Queries/BrepSpatialQueriesPointClassificationTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Brep/Queries/BrepSpatialQueriesPointClassificationTests.cs
@@ -142,7 +142,7 @@ public sealed class BrepSpatialQueriesPointClassificationTests
var dir = AppContext.BaseDirectory;
while (!string.IsNullOrWhiteSpace(dir))
{
- if (File.Exists(Path.Combine(dir, "Aetheris.sln"))) return dir;
+ if (File.Exists(Path.Combine(dir, "Aetheris.slnx"))) return dir;
dir = Directory.GetParent(dir)?.FullName ?? string.Empty;
}
diff --git a/Aetheris.Kernel.Core/Aetheris.Kernel.Core.csproj b/Aetheris.Kernel.Core/Aetheris.Kernel.Core.csproj
index e8cd5992..d61bb5e1 100644
--- a/Aetheris.Kernel.Core/Aetheris.Kernel.Core.csproj
+++ b/Aetheris.Kernel.Core/Aetheris.Kernel.Core.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
+ <TargetFrameworks>net10.0;net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/Aetheris.Kernel.Firmament.Tests/Aetheris.Kernel.Firmament.Tests.csproj b/Aetheris.Kernel.Firmament.Tests/Aetheris.Kernel.Firmament.Tests.csproj
index d290ff33..0f91a8e8 100644
--- a/Aetheris.Kernel.Firmament.Tests/Aetheris.Kernel.Firmament.Tests.csproj
+++ b/Aetheris.Kernel.Firmament.Tests/Aetheris.Kernel.Firmament.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
+ <TargetFrameworks>net10.0;net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
diff --git a/Aetheris.Kernel.Firmament/Aetheris.Kernel.Firmament.csproj b/Aetheris.Kernel.Firmament/Aetheris.Kernel.Firmament.csproj
index 0a27402b..63fa8d17 100644
--- a/Aetheris.Kernel.Firmament/Aetheris.Kernel.Firmament.csproj
+++ b/Aetheris.Kernel.Firmament/Aetheris.Kernel.Firmament.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
+ <TargetFrameworks>net10.0;net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/Aetheris.Kernel.StandardLibrary/Aetheris.Kernel.StandardLibrary.csproj b/Aetheris.Kernel.StandardLibrary/Aetheris.Kernel.StandardLibrary.csproj
index eed53a3f..c3b321af 100644
--- a/Aetheris.Kernel.StandardLibrary/Aetheris.Kernel.StandardLibrary.csproj
+++ b/Aetheris.Kernel.StandardLibrary/Aetheris.Kernel.StandardLibrary.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
+ <TargetFrameworks>net10.0;net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/Aetheris.Server.Tests/Aetheris.Server.Tests.csproj b/Aetheris.Server.Tests/Aetheris.Server.Tests.csproj
index 0ff99127..004b82e1 100644
--- a/Aetheris.Server.Tests/Aetheris.Server.Tests.csproj
+++ b/Aetheris.Server.Tests/Aetheris.Server.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
+ <TargetFrameworks>net10.0;net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
diff --git a/Aetheris.Server/Aetheris.Server.csproj b/Aetheris.Server/Aetheris.Server.csproj
index d3dbef35..a4e233b4 100644
--- a/Aetheris.Server/Aetheris.Server.csproj
+++ b/Aetheris.Server/Aetheris.Server.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
+ <TargetFrameworks>net10.0;net8.0</TargetFrameworks>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<SpaRoot>..\aetheris.client\</SpaRoot>
diff --git a/Aetheris.sln b/Aetheris.sln
deleted file mode 100644
index c5be0d4a..00000000
--- a/Aetheris.sln
+++ /dev/null
@@ -1,64 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31903.59
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aetheris.Kernel.Core", "Aetheris.Kernel.Core\Aetheris.Kernel.Core.csproj", "{41402728-B69A-4179-AF43-2F40CAABA890}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aetheris.Kernel.Core.Tests", "Aetheris.Kernel.Core.Tests\Aetheris.Kernel.Core.Tests.csproj", "{8A55AA65-5176-4663-B28E-9BA3255F724E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aetheris.Kernel.Firmament", "Aetheris.Kernel.Firmament\Aetheris.Kernel.Firmament.csproj", "{B4F4DFA7-5C08-47E1-AEDE-CC869FECC59F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aetheris.Kernel.Firmament.Tests", "Aetheris.Kernel.Firmament.Tests\Aetheris.Kernel.Firmament.Tests.csproj", "{3C09858D-81FE-447E-8103-5335616203F6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aetheris.Server", "Aetheris.Server\Aetheris.Server.csproj", "{7BD1B3FB-2B1C-46CA-B0CA-53C761E3840D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aetheris.Server.Tests", "Aetheris.Server.Tests\Aetheris.Server.Tests.csproj", "{03B71CD1-35E4-453D-BFBF-A62314338316}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aetheris.CLI", "Aetheris.CLI\Aetheris.CLI.csproj", "{3E506C1D-AFF7-4FB2-9208-EEFCD1AE12DC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aetheris.CLI.Tests", "Aetheris.CLI.Tests\Aetheris.CLI.Tests.csproj", "{DEBC8B25-C561-4887-B93F-A5164461AB1E}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {41402728-B69A-4179-AF43-2F40CAABA890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {41402728-B69A-4179-AF43-2F40CAABA890}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {41402728-B69A-4179-AF43-2F40CAABA890}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {41402728-B69A-4179-AF43-2F40CAABA890}.Release|Any CPU.Build.0 = Release|Any CPU
- {8A55AA65-5176-4663-B28E-9BA3255F724E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8A55AA65-5176-4663-B28E-9BA3255F724E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8A55AA65-5176-4663-B28E-9BA3255F724E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8A55AA65-5176-4663-B28E-9BA3255F724E}.Release|Any CPU.Build.0 = Release|Any CPU
- {B4F4DFA7-5C08-47E1-AEDE-CC869FECC59F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B4F4DFA7-5C08-47E1-AEDE-CC869FECC59F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B4F4DFA7-5C08-47E1-AEDE-CC869FECC59F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B4F4DFA7-5C08-47E1-AEDE-CC869FECC59F}.Release|Any CPU.Build.0 = Release|Any CPU
- {3C09858D-81FE-447E-8103-5335616203F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3C09858D-81FE-447E-8103-5335616203F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3C09858D-81FE-447E-8103-5335616203F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3C09858D-81FE-447E-8103-5335616203F6}.Release|Any CPU.Build.0 = Release|Any CPU
- {7BD1B3FB-2B1C-46CA-B0CA-53C761E3840D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7BD1B3FB-2B1C-46CA-B0CA-53C761E3840D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7BD1B3FB-2B1C-46CA-B0CA-53C761E3840D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7BD1B3FB-2B1C-46CA-B0CA-53C761E3840D}.Release|Any CPU.Build.0 = Release|Any CPU
- {03B71CD1-35E4-453D-BFBF-A62314338316}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {03B71CD1-35E4-453D-BFBF-A62314338316}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {03B71CD1-35E4-453D-BFBF-A62314338316}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {03B71CD1-35E4-453D-BFBF-A62314338316}.Release|Any CPU.Build.0 = Release|Any CPU
- {3E506C1D-AFF7-4FB2-9208-EEFCD1AE12DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3E506C1D-AFF7-4FB2-9208-EEFCD1AE12DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3E506C1D-AFF7-4FB2-9208-EEFCD1AE12DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3E506C1D-AFF7-4FB2-9208-EEFCD1AE12DC}.Release|Any CPU.Build.0 = Release|Any CPU
- {DEBC8B25-C561-4887-B93F-A5164461AB1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DEBC8B25-C561-4887-B93F-A5164461AB1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DEBC8B25-C561-4887-B93F-A5164461AB1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DEBC8B25-C561-4887-B93F-A5164461AB1E}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
-EndGlobal
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 70c3752f..9f610bb7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -28,7 +28,7 @@
dotnet test Aetheris.Kernel.Core.Tests/Aetheris.Kernel.Core.Tests.csproj --logger "console;verbosity=minimal"
```
-- Use `Aetheris.sln` for solution-oriented automation and editor compatibility with .NET 8; do not rely on `Aetheris.slnx` as the routine automation entrypoint.
+- Use `Aetheris.slnx` as the canonical solution file. Default automation should target `net10.0`; use `net8.0` only for explicit fallback validation.
## Kernel discipline
diff --git a/README.md b/README.md
index dc9af740..ce3ad2de 100644
--- a/README.md
+++ b/README.md
@@ -33,11 +33,11 @@ If you want the API entry point instead of the test wrapper, use `FirmamentBuild
## Automation-friendly test entrypoints
-The repository now has a classic `Aetheris.sln` for compatibility with .NET 8 automation and tools that do not handle `Aetheris.slnx` reliably.
+The canonical solution format is `Aetheris.slnx` for both local and automation workflows. Primary targeting is .NET 10 (`net10.0`) with .NET 8 (`net8.0`) as an explicit fallback target.
### Canonical repo-level test path
-Use the shell script below as the official automation-friendly entrypoint. It runs the repository test projects in a deterministic order, prints each `dotnet test` command before running it, and fails fast on the first failing suite. In the current .NET 8 automation environment it runs the full Firmament and Server test projects plus the Core suite with `Category!=SlowCorpus`.
+Use the shell script below as the official automation-friendly entrypoint. It runs the canonical solution (`Aetheris.slnx`) on the primary framework (`net10.0`) and excludes `SlowCorpus` by default.
```bash
export PATH="$HOME/.dotnet:$PATH"
@@ -66,18 +66,18 @@ For editor/IDE compatibility or solution-wide restore/build flows, use:
```bash
export PATH="$HOME/.dotnet:$PATH"
-dotnet test Aetheris.sln --filter "Category!=SlowCorpus"
+dotnet test Aetheris.slnx -f net10.0 --filter "Category!=SlowCorpus"
```
Use the `SlowCorpus` category to keep the heavyweight STEP242 NIST audit out of default solution runs. Invoke that corpus explicitly when needed:
```bash
export PATH="$HOME/.dotnet:$PATH"
-dotnet test Aetheris.sln --filter "Category!=SlowCorpus"
+dotnet test Aetheris.slnx -f net10.0 --filter "Category!=SlowCorpus"
dotnet test Aetheris.Kernel.Core.Tests --filter "Category=SlowCorpus"
```
-`Aetheris.slnx` is retained for newer tooling convenience, but routine automation should use `./scripts/test-all.sh` and `Aetheris.sln`.
+Use `Aetheris.slnx` as the only solution entrypoint. For fallback framework validation, run `dotnet build Aetheris.slnx -f net8.0`.
## Repo map
diff --git a/global.json b/global.json
index 391ba3c2..ab84b817 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "8.0.100",
+ "version": "10.0.203",
"rollForward": "latestFeature"
}
}
diff --git a/scripts/test-all.sh b/scripts/test-all.sh
index a41a3280..dd21eb84 100755
--- a/scripts/test-all.sh
+++ b/scripts/test-all.sh
@@ -3,6 +3,7 @@ set -euo pipefail
DOTNET_BIN="${DOTNET_BIN:-dotnet}"
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+PRIMARY_TFM="${AETHERIS_PRIMARY_TFM:-net10.0}"
run() {
printf '+'
@@ -15,20 +16,11 @@ run() {
cd "$REPO_ROOT"
-run_test() {
- local test_project="$1"
- shift || true
- run "$DOTNET_BIN" test "$test_project" --logger "console;verbosity=minimal" "$@"
-}
-
if [ "$#" -gt 0 ]; then
- TEST_PROJECTS=("$@")
- for test_project in "${TEST_PROJECTS[@]}"; do
- run_test "$test_project"
+ for test_project in "$@"; do
+ run "$DOTNET_BIN" test "$test_project" -f "$PRIMARY_TFM" --logger "console;verbosity=minimal"
done
exit 0
fi
-run_test "Aetheris.Kernel.Firmament.Tests/Aetheris.Kernel.Firmament.Tests.csproj"
-run_test "Aetheris.Server.Tests/Aetheris.Server.Tests.csproj"
-run_test "Aetheris.Kernel.Core.Tests/Aetheris.Kernel.Core.Tests.csproj" --filter "Category!=SlowCorpus"
+run "$DOTNET_BIN" test Aetheris.slnx -f "$PRIMARY_TFM" --logger "console;verbosity=minimal" --filter "Category!=SlowCorpus"