Skip to content

Fix #315 #319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
antoineatstariongroup merged 4 commits into from
Jul 28, 2026
Merged

Fix #315 #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f6c111
Fix #315: bump uml4net to 8.2.1, regenerate DTO/POCO subset+redefine…
samatstariongroup Jul 1, 2026
1ab7bbc
[WIP] : i tseams that the redefinition/subset mechanisms is broken an…
antoineatstariongroup Jul 2, 2026
1253459
[Fix] restore strict UML redefinition delegation in POCO generator an…
antoineatstariongroup Jul 28, 2026
b2857d3
covers new test cases
antoineatstariongroup Jul 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/EnumerationDefinition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ public partial class EnumerationDefinition : IEnumerationDefinition
/// </summary>
[Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")]
[Implements(implementation: "IDefinition.DirectedUsage")]
public List<Guid> directedUsage { get; internal set; } = [];

Expand Down Expand Up @@ -643,6 +644,7 @@ bool Systems.DefinitionAndUsage.IDefinition.IsVariation
/// </summary>
[Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")]
[Implements(implementation: "IDefinition.OwnedUsage")]
public List<Guid> ownedUsage { get; internal set; } = [];

Expand Down
3 changes: 3 additions & 0 deletions SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/IRequirementUsage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public partial interface IRequirementUsage : IConstraintUsage
/// </summary>
[Property(xmiId: "_19_0_4_12e503d9_1621564075474_350859_2735", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")]
[SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")]
List<Guid> actorParameter { get; }

/// <summary>
Expand Down Expand Up @@ -94,13 +95,15 @@ public partial interface IRequirementUsage : IConstraintUsage
/// </summary>
[Property(xmiId: "_19_0_4_12e503d9_1624032823963_328647_40107", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")]
[SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")]
List<Guid> stakeholderParameter { get; }

/// <summary>
/// The parameter of this RequirementUsage that represents its subject.
/// </summary>
[Property(xmiId: "_19_0_2_12e503d9_1595189397261_941898_844", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")]
[SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")]
Guid subjectParameter { get; }

/// <summary>
Expand Down
3 changes: 3 additions & 0 deletions SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/IUsage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ public partial interface IUsage : IFeature
/// </summary>
[Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")]
[SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")]
List<Guid> directedUsage { get; }

/// <summary>
Expand Down Expand Up @@ -247,6 +248,7 @@ public partial interface IUsage : IFeature
/// </summary>
[Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")]
[SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")]
List<Guid> nestedUsage { get; }

/// <summary>
Expand Down Expand Up @@ -282,6 +284,7 @@ public partial interface IUsage : IFeature
/// </summary>
[Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")]
Guid? owningDefinition { get; }

/// <summary>
Expand Down
6 changes: 6 additions & 0 deletions SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/RequirementUsage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public partial class RequirementUsage : IRequirementUsage
/// </summary>
[Property(xmiId: "_19_0_4_12e503d9_1621564075474_350859_2735", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")]
[SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")]
[Implements(implementation: "IRequirementUsage.ActorParameter")]
public List<Guid> actorParameter { get; internal set; } = [];

Expand Down Expand Up @@ -177,6 +178,7 @@ string Root.Elements.IElement.DeclaredShortName
/// </summary>
[Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")]
[SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")]
[Implements(implementation: "IUsage.DirectedUsage")]
public List<Guid> directedUsage { get; internal set; } = [];

Expand Down Expand Up @@ -710,6 +712,7 @@ bool Core.Features.IFeature.IsVariable
/// </summary>
[Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")]
[SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")]
[Implements(implementation: "IUsage.NestedUsage")]
public List<Guid> nestedUsage { get; internal set; } = [];

Expand Down Expand Up @@ -993,6 +996,7 @@ bool Core.Features.IFeature.IsVariable
/// </summary>
[Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")]
[Implements(implementation: "IUsage.OwningDefinition")]
public Guid? owningDefinition { get; internal set; }

Expand Down Expand Up @@ -1141,6 +1145,7 @@ bool Core.Features.IFeature.IsVariable
/// </summary>
[Property(xmiId: "_19_0_4_12e503d9_1624032823963_328647_40107", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")]
[SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")]
[Implements(implementation: "IRequirementUsage.StakeholderParameter")]
public List<Guid> stakeholderParameter { get; internal set; } = [];

Expand All @@ -1149,6 +1154,7 @@ bool Core.Features.IFeature.IsVariable
/// </summary>
[Property(xmiId: "_19_0_2_12e503d9_1595189397261_941898_844", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")]
[SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")]
[Implements(implementation: "IRequirementUsage.SubjectParameter")]
public Guid subjectParameter { get; internal set; }

Expand Down
3 changes: 3 additions & 0 deletions SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/Usage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ public partial class Usage : IUsage
/// </summary>
[Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")]
[SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")]
[Implements(implementation: "IUsage.DirectedUsage")]
public List<Guid> directedUsage { get; internal set; } = [];

Expand Down Expand Up @@ -625,6 +626,7 @@ bool Core.Features.IFeature.IsVariable
/// </summary>
[Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")]
[SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")]
[Implements(implementation: "IUsage.NestedUsage")]
public List<Guid> nestedUsage { get; internal set; } = [];

Expand Down Expand Up @@ -898,6 +900,7 @@ bool Core.Features.IFeature.IsVariable
/// </summary>
[Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")]
[Implements(implementation: "IUsage.OwningDefinition")]
public Guid? owningDefinition { get; internal set; }

Expand Down
Loading
Loading