Commit cff3b99
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.92 files changed
Lines changed: 20767 additions & 1038 deletions
File tree
- Semantics.Paths
- Implementations
- Interfaces
- Primitives
- Utilities
- Validation
- Attributes/Path
- Semantics.Quantities
- Semantics.Strings
- Semantics.Test
- Paths
- docs
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
644 | 644 | | |
645 | 645 | | |
646 | 646 | | |
647 | | - | |
| 647 | + | |
| 648 | + | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
| 652 | + | |
| 653 | + | |
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
12 | | - | |
| 11 | + | |
13 | 12 | | |
14 | | - | |
| 13 | + | |
| 14 | + | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
2 | 19 | | |
3 | | - | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
0 commit comments