Skip to content

Commit 0602f9c

Browse files
[Bump] to version 0.16.0 and update release notes to indicate [TAG: 2024-12]
1 parent de28dbb commit 0602f9c

File tree

1,761 files changed

+13315
-6350
lines changed

Some content is hidden

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

1,761 files changed

+13315
-6350
lines changed

SySML2.NET.REST.Tests/SySML2.NET.REST.Tests.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.1" />
2222
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
2323
<PackageReference Include="NUnit" Version="4.3.2" />
24-
<PackageReference Include="NUnit.Console" Version="3.19.0" />
24+
<PackageReference Include="NUnit.Console" Version="3.19.1" />
2525
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
2626

27-
<PackageReference Include="coverlet.collector" Version="6.0.3">
27+
<PackageReference Include="coverlet.collector" Version="6.0.4">
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2929
<PrivateAssets>all</PrivateAssets>
3030
</PackageReference>
31-
<PackageReference Include="coverlet.msbuild" Version="6.0.3">
31+
<PackageReference Include="coverlet.msbuild" Version="6.0.4">
3232
<PrivateAssets>all</PrivateAssets>
3333
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3434
</PackageReference>

SySML2.NET.REST/SySML2.NET.REST.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<LangVersion>12.0</LangVersion>
6-
<Version>0.15.0</Version>
6+
<Version>0.16.0</Version>
77
<Description>A .NET implementation of the OMG SysML v2 REST/HTTP PSM Client</Description>
88
<PackageId>SysML2.NET.REST</PackageId>
99
<Company>Starion Group S.A.</Company>
@@ -14,8 +14,8 @@
1414
<Authors>Sam Gerené</Authors>
1515
<RequireLicenseAcceptance>true</RequireLicenseAcceptance>
1616
<PackageReleaseNotes>
17-
[Update] to SysML2.NET version 0.15.0
18-
[Update] SysML.ecore from source git repos - [TAG: 2024-11] (regenerate code)
17+
[Update] to SysML2.NET version 0.16.0
18+
[Update] SysML.ecore from source git repos - [TAG: 2024-12] (regenerate code)
1919
</PackageReleaseNotes>
2020
<PackageIcon>cdp4-icon.png</PackageIcon>
2121
<PackageReadmeFile>README.md</PackageReadmeFile>

SysML2.NET.API/SysML2.NET.API.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net9.0</TargetFramework>
55
<LangVersion>12.0</LangVersion>
6-
<Version>0.14.0</Version>
6+
<Version>0.16.0</Version>
77
<Description>A .NET implementation of the REST/HTTP Platform-specific model (PSM) of the SysML v2 API and Services.</Description>
88
<Company>Starion Group S.A.</Company>
99
<Copyright>Copyright © Starion Group S.A.</Copyright>

SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/AnnotatingElement.cs

+19-6
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ namespace SysML2.NET.Core.POCO
3636
/// Relationships, or it implicitly annotates its owningNamespace.annotatedElement = if
3737
/// annotation->notEmpty() then annotation.annotatedElement else Sequence{owningNamespace}
3838
/// endifownedAnnotatingRelationship = ownedRelationship-> selectByKind(Annotation)-> select(a |
39-
/// a.annotatingElement = self)
39+
/// a.annotatingElement = self)annotation = if owningAnnotatingRelationship = null then
40+
/// ownedAnnotatingRelationship else
41+
/// owningAnnotatingRelationship->prepend(owningAnnotatingRelationship) endif
4042
/// </summary>
4143
public partial class AnnotatingElement : IAnnotatingElement
4244
{
@@ -46,7 +48,6 @@ public partial class AnnotatingElement : IAnnotatingElement
4648
public AnnotatingElement()
4749
{
4850
this.AliasIds = new List<string>();
49-
this.Annotation = new List<Annotation>();
5051
this.IsImpliedIncluded = false;
5152
this.OwnedRelationship = new List<IRelationship>();
5253
}
@@ -73,10 +74,13 @@ public List<IElement> QueryAnnotatedElement()
7374
}
7475

7576
/// <summary>
76-
/// The Annotations that relate this AnnotatingElement to its annotatedElements.
77+
/// Queries the derived property Annotation
7778
/// </summary>
78-
[EFeature(isChangeable: true, isVolatile: false, isTransient: false, isUnsettable: false, isDerived: false, isOrdered: true, isUnique: true, lowerBound: 0, upperBound: -1, isMany: false, isRequired: false, isContainment: false)]
79-
public List<Annotation> Annotation { get; set; }
79+
[EFeature(isChangeable: true, isVolatile: true, isTransient: true, isUnsettable: false, isDerived: true, isOrdered: true, isUnique: true, lowerBound: 0, upperBound: -1, isMany: false, isRequired: false, isContainment: false)]
80+
public List<Annotation> QueryAnnotation()
81+
{
82+
throw new NotImplementedException("Derived property Annotation not yet supported");
83+
}
8084

8185
/// <summary>
8286
/// The declared name of this Element.
@@ -140,7 +144,7 @@ public string QueryName()
140144
/// <summary>
141145
/// Queries the derived property OwnedAnnotatingRelationship
142146
/// </summary>
143-
[EFeature(isChangeable: true, isVolatile: true, isTransient: true, isUnsettable: false, isDerived: true, isOrdered: false, isUnique: true, lowerBound: 0, upperBound: -1, isMany: false, isRequired: false, isContainment: false)]
147+
[EFeature(isChangeable: true, isVolatile: true, isTransient: true, isUnsettable: false, isDerived: true, isOrdered: true, isUnique: true, lowerBound: 0, upperBound: -1, isMany: false, isRequired: false, isContainment: false)]
144148
public List<Annotation> QueryOwnedAnnotatingRelationship()
145149
{
146150
throw new NotImplementedException("Derived property OwnedAnnotatingRelationship not yet supported");
@@ -179,6 +183,15 @@ public IElement QueryOwner()
179183
throw new NotImplementedException("Derived property Owner not yet supported");
180184
}
181185

186+
/// <summary>
187+
/// Queries the derived property OwningAnnotatingRelationship
188+
/// </summary>
189+
[EFeature(isChangeable: true, isVolatile: true, isTransient: true, isUnsettable: false, isDerived: true, isOrdered: false, isUnique: true, lowerBound: 0, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
190+
public Annotation QueryOwningAnnotatingRelationship()
191+
{
192+
throw new NotImplementedException("Derived property OwningAnnotatingRelationship not yet supported");
193+
}
194+
182195
/// <summary>
183196
/// Queries the derived property OwningMembership
184197
/// </summary>

SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/Annotation.cs

+21-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,12 @@ namespace SysML2.NET.Core.POCO
3232

3333
/// <summary>
3434
/// An Annotation is a Relationship between an AnnotatingElement and the Element that is annotated by
35-
/// that AnnotatingElement.
35+
/// that AnnotatingElement.(owningAnnotatedElement <> null) = (ownedAnnotatingElement <>
36+
/// null)ownedAnnotatingElement <> null xor owningAnnotatingElement <> nullownedAnnotatingElement =
37+
/// let ownedAnnotatingElements : Sequence(AnnotatingElement) =
38+
/// ownedRelatedElement->selectByKind(AnnotatingElement) in if ownedAnnotatingElements->isEmpty()
39+
/// then null else ownedAnnotatingElements->first() endifannotatingElement = if
40+
/// ownedAnnotatingElement <> null then ownedAnnotatingElement else owningAnnotatingElement endif
3641
/// </summary>
3742
public partial class Annotation : IAnnotation
3843
{
@@ -69,10 +74,13 @@ public Annotation()
6974
public IElement AnnotatedElement { get; set; }
7075

7176
/// <summary>
72-
/// The AnnotatingElement that annotates the annotatedElement of this Annotation.
77+
/// Queries the derived property AnnotatingElement
7378
/// </summary>
74-
[EFeature(isChangeable: true, isVolatile: false, isTransient: false, isUnsettable: false, isDerived: false, isOrdered: false, isUnique: true, lowerBound: 1, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
75-
public AnnotatingElement AnnotatingElement { get; set; }
79+
[EFeature(isChangeable: true, isVolatile: true, isTransient: true, isUnsettable: false, isDerived: true, isOrdered: false, isUnique: true, lowerBound: 1, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
80+
public AnnotatingElement QueryAnnotatingElement()
81+
{
82+
throw new NotImplementedException("Derived property AnnotatingElement not yet supported");
83+
}
7684

7785
/// <summary>
7886
/// The declared name of this Element.
@@ -140,6 +148,15 @@ public string QueryName()
140148
throw new NotImplementedException("Derived property Name not yet supported");
141149
}
142150

151+
/// <summary>
152+
/// Queries the derived property OwnedAnnotatingElement
153+
/// </summary>
154+
[EFeature(isChangeable: true, isVolatile: true, isTransient: true, isUnsettable: false, isDerived: true, isOrdered: false, isUnique: true, lowerBound: 0, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
155+
public AnnotatingElement QueryOwnedAnnotatingElement()
156+
{
157+
throw new NotImplementedException("Derived property OwnedAnnotatingElement not yet supported");
158+
}
159+
143160
/// <summary>
144161
/// Queries the derived property OwnedAnnotation
145162
/// </summary>

SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/Comment.cs

+16-5
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ public partial class Comment : IComment
4141
public Comment()
4242
{
4343
this.AliasIds = new List<string>();
44-
this.Annotation = new List<Annotation>();
4544
this.IsImpliedIncluded = false;
4645
this.OwnedRelationship = new List<IRelationship>();
4746
}
@@ -68,10 +67,13 @@ public List<IElement> QueryAnnotatedElement()
6867
}
6968

7069
/// <summary>
71-
/// The Annotations that relate this AnnotatingElement to its annotatedElements.
70+
/// Queries the derived property Annotation
7271
/// </summary>
73-
[EFeature(isChangeable: true, isVolatile: false, isTransient: false, isUnsettable: false, isDerived: false, isOrdered: true, isUnique: true, lowerBound: 0, upperBound: -1, isMany: false, isRequired: false, isContainment: false)]
74-
public List<Annotation> Annotation { get; set; }
72+
[EFeature(isChangeable: true, isVolatile: true, isTransient: true, isUnsettable: false, isDerived: true, isOrdered: true, isUnique: true, lowerBound: 0, upperBound: -1, isMany: false, isRequired: false, isContainment: false)]
73+
public List<Annotation> QueryAnnotation()
74+
{
75+
throw new NotImplementedException("Derived property Annotation not yet supported");
76+
}
7577

7678
/// <summary>
7779
/// The annotation text for the Comment.
@@ -149,7 +151,7 @@ public string QueryName()
149151
/// <summary>
150152
/// Queries the derived property OwnedAnnotatingRelationship
151153
/// </summary>
152-
[EFeature(isChangeable: true, isVolatile: true, isTransient: true, isUnsettable: false, isDerived: true, isOrdered: false, isUnique: true, lowerBound: 0, upperBound: -1, isMany: false, isRequired: false, isContainment: false)]
154+
[EFeature(isChangeable: true, isVolatile: true, isTransient: true, isUnsettable: false, isDerived: true, isOrdered: true, isUnique: true, lowerBound: 0, upperBound: -1, isMany: false, isRequired: false, isContainment: false)]
153155
public List<Annotation> QueryOwnedAnnotatingRelationship()
154156
{
155157
throw new NotImplementedException("Derived property OwnedAnnotatingRelationship not yet supported");
@@ -188,6 +190,15 @@ public IElement QueryOwner()
188190
throw new NotImplementedException("Derived property Owner not yet supported");
189191
}
190192

193+
/// <summary>
194+
/// Queries the derived property OwningAnnotatingRelationship
195+
/// </summary>
196+
[EFeature(isChangeable: true, isVolatile: true, isTransient: true, isUnsettable: false, isDerived: true, isOrdered: false, isUnique: true, lowerBound: 0, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
197+
public Annotation QueryOwningAnnotatingRelationship()
198+
{
199+
throw new NotImplementedException("Derived property OwningAnnotatingRelationship not yet supported");
200+
}
201+
191202
/// <summary>
192203
/// Queries the derived property OwningMembership
193204
/// </summary>

SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/Connector.cs

+38-21
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,18 @@ namespace SysML2.NET.Core.POCO
3434
/// A Connector is a usage of Associations, with links restricted according to instances of the Type in
3535
/// which they are used (domain of the Connector). The associations of the Connector restrict what kinds
3636
/// of things might be linked. The Connector further restricts these links to be between values of
37-
/// Features on instances of its domain.relatedFeature = connectorEnd.ownedReferenceSubsetting->
38-
/// select(s | s <> null).subsettedFeaturerelatedFeature->forAll(f | if featuringType->isEmpty()
39-
/// then f.isFeaturedWithin(null) else featuringType->forAll(t | f.isFeaturedWithin(t))
40-
/// endif)sourceFeature = if relatedFeature->isEmpty() then null else relatedFeature->first()
41-
/// endiftargetFeature = if relatedFeature->size() < 2 then OrderedSet{} else
42-
/// relatedFeature-> subSequence(2, relatedFeature->size())-> asOrderedSet()
43-
/// endifnot isAbstract implies relatedFeature->size() >=
44-
/// 2specializesFromLibrary('Links::links')association->exists(oclIsKindOf(AssociationStructure))
45-
/// implies specializesFromLibrary('Objects::linkObjects')connectorEnds->size() = 2
46-
/// andassociation->exists(oclIsKindOf(AssocationStructure)) implies
47-
/// specializesFromLibrary('Objects::binaryLinkObjects')connectorEnd->size() = 2 implies
48-
/// specializesFromLibrary('Links::binaryLinks')connectorEnds->size() > 2 implies not
49-
/// specializesFromLibrary('Links::BinaryLink')
37+
/// Features on instances of its domain.not isAbstract implies relatedFeature->size() >=
38+
/// 2connectorEnds->size() = 2 andassociation->exists(oclIsKindOf(AssociationStructure)) implies
39+
/// specializesFromLibrary('Objects::binaryLinkObjects')sourceFeature = if relatedFeature->isEmpty()
40+
/// then null else relatedFeature->first() endifconnectorEnds->size() > 2 implies not
41+
/// specializesFromLibrary('Links::BinaryLink')relatedFeature->forAll(f | if
42+
/// featuringType->isEmpty() then f.isFeaturedWithin(null) else featuringType->forAll(t |
43+
/// f.isFeaturedWithin(t)) endif)relatedFeature = connectorEnd.ownedReferenceSubsetting-> select(s
44+
/// | s <> null).subsettedFeaturespecializesFromLibrary('Links::links')connectorEnd->size() = 2 implies
45+
/// specializesFromLibrary('Links::binaryLinks')association->exists(oclIsKindOf(AssociationStructure))
46+
/// implies specializesFromLibrary('Objects::linkObjects')targetFeature = if
47+
/// relatedFeature->size() < 2 then OrderedSet{} else relatedFeature->
48+
/// subSequence(2, relatedFeature->size())-> asOrderedSet() endif
5049
/// </summary>
5150
public partial class Connector : IConnector
5251
{
@@ -112,6 +111,15 @@ public List<Feature> QueryConnectorEnd()
112111
throw new NotImplementedException("Derived property ConnectorEnd not yet supported");
113112
}
114113

114+
/// <summary>
115+
/// Queries the derived property CrossFeature
116+
/// </summary>
117+
[EFeature(isChangeable: true, isVolatile: true, isTransient: true, isUnsettable: false, isDerived: true, isOrdered: false, isUnique: true, lowerBound: 0, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
118+
public Feature QueryCrossFeature()
119+
{
120+
throw new NotImplementedException("Derived property CrossFeature not yet supported");
121+
}
122+
115123
/// <summary>
116124
/// The declared name of this Element.
117125
/// </summary>
@@ -297,14 +305,14 @@ public bool QueryIsConjugated()
297305
public bool IsDerived { get; set; }
298306

299307
/// <summary>
300-
/// Whether or not the this Feature is an end Feature, requiring a different interpretation of the
301-
/// multiplicity of the Feature.An end Feature is always considered to map each domain instance to a
302-
/// single co-domain instance, whether or not a Multiplicity is given for it. If a Multiplicity is given
303-
/// for an end Feature, rather than giving the co-domain cardinality for the Feature as usual, it
304-
/// specifies a cardinality constraint for navigating across the endFeatures of the featuringType of the
305-
/// end Feature. That is, if a Type has n endFeatures, then the Multiplicity of any one of those end
306-
/// Features constrains the cardinality of the set of values of that Feature when the values of the
307-
/// other n-1 end Features are held fixed.
308+
/// Whether or not this Feature is an end Feature. An end Feature always has multiplicity 1, mapping
309+
/// each of its domain instances to a single co-domain instance. However, it may have a crossFeature, in
310+
/// which case values of the crossFeature must be the same as those found by navigation across instances
311+
/// of the owningType from values of other end Features to values of this Feature. If the owningType has
312+
/// n end Features, then the multiplicity, ordering, and uniqueness declared for the crossFeature of any
313+
/// one of these end Features constrains the cardinality, ordering, and uniqueness of the collection of
314+
/// values of that Feature reached by navigation when the values of the other n-1 end Features are held
315+
/// fixed.
308316
/// </summary>
309317
[EFeature(isChangeable: true, isVolatile: false, isTransient: false, isUnsettable: false, isDerived: false, isOrdered: false, isUnique: true, lowerBound: 1, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
310318
public bool IsEnd { get; set; }
@@ -443,6 +451,15 @@ public Conjugation QueryOwnedConjugator()
443451
throw new NotImplementedException("Derived property OwnedConjugator not yet supported");
444452
}
445453

454+
/// <summary>
455+
/// Queries the derived property OwnedCrossSubsetting
456+
/// </summary>
457+
[EFeature(isChangeable: true, isVolatile: true, isTransient: true, isUnsettable: false, isDerived: true, isOrdered: false, isUnique: true, lowerBound: 0, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
458+
public CrossSubsetting QueryOwnedCrossSubsetting()
459+
{
460+
throw new NotImplementedException("Derived property OwnedCrossSubsetting not yet supported");
461+
}
462+
446463
/// <summary>
447464
/// Queries the derived property OwnedDifferencing
448465
/// </summary>

0 commit comments

Comments
 (0)