Skip to content

Commit cff3b99

Browse files
committed
Merge main into vectors (structural reconciliation)
Reconcile vectors with main's parallel evolution. Resolution rules: - Quantities: take vectors. dimensions.json + source generator is the intended end state; main's per-domain folder reorg of soon-to-be-deleted hand-written types is dropped (110 conflicts). - Path types: take main's flat layout (Semantics.Paths/{Implementations, Interfaces,Primitives}/...) instead of vectors' doubled Semantics.Paths/Paths/... (~50 conflicts via rename/rename). - Path utility: take main's conditional-compilation PathPolyfill pattern; drop vectors' PathHelper duplicate (Utilities/NetStandard20Polyfills.cs). - Validation: take vectors' attribute-per-file reorganisation under Semantics.Strings/Validation/Attributes/{Casing,Format,FirstClassTypes, Text}/ and Semantics.Paths/Validation/Attributes/Path/. - scripts/: take vectors' deletion (build moved to ktsu MSBuild SDKs). - Tests: take vectors where it adds coverage; take main where it improved assertion messages (PathUtilityTests). - Solution: take vectors (only it includes Semantics.SourceGenerators). - csproj files: take vectors (reflect new package layout, including InternalsVisibleTo and Microsoft.Bcl.AsyncInterfaces conditional refs). - Directory.Packages.props: merge — keep vectors' source-generator deps (CodeBlocker, Microsoft.CodeAnalysis.*, System.Text.Json, PreciseNumber, Microsoft.Bcl.AsyncInterfaces) plus main's bumped versions (Polyfill 10.5.0) and added packages (ktsu.RoundTripStringJsonConverter). - global.json: take main's MSTest.Sdk 4.2.2. This is pass 1 of the two-pass reconciliation. Pass 2 audits the substantive main commits (RoundTripStringJsonConverter integration, Ensure.NotNull replacement of Guard, DirectoryName type, .NET 10 / SDK adjustments) to ensure their content is applied where the resolution rules took vectors' file.
2 parents 3a4982a + 9bd8a9e commit cff3b99

92 files changed

Lines changed: 20767 additions & 1038 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,4 +644,10 @@ Temporary Items
644644
/.what-is-this.md
645645
# SpecStory derived-cursor-rules.mdc backup files
646646
/ai_rules_backups/*
647-
.specstory/ai_rules_backups/*
647+
.specstory/ai_rules_backups/*
648+
649+
# Claude.ai local settings
650+
.claude/settings.local.json
651+
652+
# ImGui.ini files
653+
imgui.ini

CHANGELOG.md

Lines changed: 324 additions & 34 deletions
Large diffs are not rendered by default.

COPYRIGHT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Copyright (c) 2023-2025 ktsu-dev
1+
Copyright (c) 2023-2026 ktsu-dev contributors

Directory.Packages.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
<!-- Test packages -->
99
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.3.2" />
1010
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.0.2" />
11-
<!-- Semantics project packages -->
12-
<!-- Strings has no external validation dependency - uses native ValidationAdapter -->
11+
<!-- Semantics runtime packages -->
1312
<PackageVersion Include="ktsu.PreciseNumber" Version="1.7.5" />
14-
<PackageVersion Include="Polyfill" Version="9.8.1" />
13+
<PackageVersion Include="ktsu.RoundTripStringJsonConverter" Version="1.0.10" />
14+
<PackageVersion Include="Polyfill" Version="10.5.0" />
1515
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.3" />
1616
<PackageVersion Include="System.Memory" Version="4.6.3" />
17-
<!-- SourceGenerators project packages -->
17+
<!-- Source generator packages -->
1818
<PackageVersion Include="ktsu.CodeBlocker" Version="1.2.0" />
1919
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
2020
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />

LATEST_CHANGELOG.md

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1-
## v1.0.20-pre.1 (prerelease)
1+
## v1.0.35 (patch)
2+
3+
Changes since v1.0.34:
4+
5+
- Bump Polyfill from 10.4.0 to 10.5.0 ([@dependabot[bot]](https://github.com/dependabot[bot]))
6+
- Bump Polyfill from 10.3.0 to 10.4.0 ([@dependabot[bot]](https://github.com/dependabot[bot]))
7+
- Bump MSTest.Sdk from 4.2.1 to 4.2.2 ([@dependabot[bot]](https://github.com/dependabot[bot]))
8+
- Bump Polyfill from 10.1.1 to 10.3.0 ([@dependabot[bot]](https://github.com/dependabot[bot]))
9+
- Bump Polyfill from 10.0.0 to 10.1.1 ([@dependabot[bot]](https://github.com/dependabot[bot]))
10+
- Bump MSTest.Sdk from 4.1.0 to 4.2.1 ([@dependabot[bot]](https://github.com/dependabot[bot]))
11+
- Bump Polyfill from 9.24.0 to 10.0.0 ([@dependabot[bot]](https://github.com/dependabot[bot]))
12+
- Bump Polyfill from 9.23.0 to 9.24.0 ([@dependabot[bot]](https://github.com/dependabot[bot]))
13+
- Bump Polyfill from 9.22.0 to 9.23.0 ([@dependabot[bot]](https://github.com/dependabot[bot]))
14+
- Bump Polyfill from 9.18.0 to 9.22.0 ([@dependabot[bot]](https://github.com/dependabot[bot]))
15+
- Bump Polyfill from 9.17.0 to 9.18.0 ([@dependabot[bot]](https://github.com/dependabot[bot]))
16+
- Bump Polyfill from 9.16.0 to 9.17.0 ([@dependabot[bot]](https://github.com/dependabot[bot]))
17+
- Bump Polyfill from 9.13.0 to 9.16.0 ([@dependabot[bot]](https://github.com/dependabot[bot]))
18+
- Bump Polyfill from 9.12.0 to 9.13.0 ([@dependabot[bot]](https://github.com/dependabot[bot]))
219

3-
Changes since v1.0.20-pre.1:

LICENSE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ MIT License
22

33
https://github.com/ktsu-dev/Semantics
44

5-
Copyright (c) 2023-2025 ktsu-dev
5+
Copyright (c) 2023-2026 ktsu-dev contributors
66

77
Permission is hereby granted, free of charge, to any person obtaining a copy
88
of this software and associated documentation files (the "Software"), to deal
@@ -20,4 +20,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
2020
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
2121
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2222
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
23-
SOFTWARE.
23+
SOFTWARE.

Semantics.Paths/AssemblyInfo.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Copyright (c) ktsu.dev
2+
// All rights reserved.
3+
// Licensed under the MIT license.
4+
5+
using System.Runtime.CompilerServices;
6+
7+
[assembly: InternalsVisibleTo("ktsu.Semantics.Test")]

0 commit comments

Comments
 (0)