Skip to content

Commit

Permalink
[Bump] to version 0.16.0 and update release notes to indicate [TAG: 2…
Browse files Browse the repository at this point in the history 
…024-12]
  • Loading branch information
@samatstariongroup
samatstariongroup committed Jan 25, 2025
1 parent de28dbb commit 0602f9c
Show file tree
Hide file tree
Showing 1,761 changed files with 13,315 additions and 6,350 deletions.
8 changes: 4 additions & 4 deletions SySML2.NET.REST.Tests/SySML2.NET.REST.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit.Console" Version="3.19.0" />
<PackageReference Include="NUnit.Console" Version="3.19.1" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />

<PackageReference Include="coverlet.collector" Version="6.0.3">
<PackageReference Include="coverlet.collector" Version="6.0.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.msbuild" Version="6.0.3">
<PackageReference Include="coverlet.msbuild" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions SySML2.NET.REST/SySML2.NET.REST.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>12.0</LangVersion>
<Version>0.15.0</Version>
<Version>0.16.0</Version>
<Description>A .NET implementation of the OMG SysML v2 REST/HTTP PSM Client</Description>
<PackageId>SysML2.NET.REST</PackageId>
<Company>Starion Group S.A.</Company>
Expand All @@ -14,8 +14,8 @@
<Authors>Sam Gerené</Authors>
<RequireLicenseAcceptance>true</RequireLicenseAcceptance>
<PackageReleaseNotes>
[Update] to SysML2.NET version 0.15.0
[Update] SysML.ecore from source git repos - [TAG: 2024-11] (regenerate code)
[Update] to SysML2.NET version 0.16.0
[Update] SysML.ecore from source git repos - [TAG: 2024-12] (regenerate code)
</PackageReleaseNotes>
<PackageIcon>cdp4-icon.png</PackageIcon>
<PackageReadmeFile>README.md</PackageReadmeFile>
Expand Down
2 changes: 1 addition & 1 deletion SysML2.NET.API/SysML2.NET.API.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<LangVersion>12.0</LangVersion>
<Version>0.14.0</Version>
<Version>0.16.0</Version>
<Description>A .NET implementation of the REST/HTTP Platform-specific model (PSM) of the SysML v2 API and Services.</Description>
<Company>Starion Group S.A.</Company>
<Copyright>Copyright © Starion Group S.A.</Copyright>
Expand Down
25 changes: 19 additions & 6 deletions SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/AnnotatingElement.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ namespace SysML2.NET.Core.POCO
/// Relationships, or it implicitly annotates its owningNamespace.annotatedElement = if
/// annotation->notEmpty() then annotation.annotatedElement else Sequence{owningNamespace}
/// endifownedAnnotatingRelationship = ownedRelationship-> selectByKind(Annotation)-> select(a |
/// a.annotatingElement = self)
/// a.annotatingElement = self)annotation = if owningAnnotatingRelationship = null then
/// ownedAnnotatingRelationship else
/// owningAnnotatingRelationship->prepend(owningAnnotatingRelationship) endif
/// </summary>
public partial class AnnotatingElement : IAnnotatingElement
{
Expand All @@ -46,7 +48,6 @@ public partial class AnnotatingElement : IAnnotatingElement
public AnnotatingElement()
{
this.AliasIds = new List<string>();
this.Annotation = new List<Annotation>();
this.IsImpliedIncluded = false;
this.OwnedRelationship = new List<IRelationship>();
}
Expand All @@ -73,10 +74,13 @@ public List<IElement> QueryAnnotatedElement()
}

/// <summary>
/// The Annotations that relate this AnnotatingElement to its annotatedElements.
/// Queries the derived property Annotation
/// </summary>
[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)]
public List<Annotation> Annotation { get; set; }
[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)]
public List<Annotation> QueryAnnotation()
{
throw new NotImplementedException("Derived property Annotation not yet supported");
}

/// <summary>
/// The declared name of this Element.
Expand Down Expand Up @@ -140,7 +144,7 @@ public string QueryName()
/// <summary>
/// Queries the derived property OwnedAnnotatingRelationship
/// </summary>
[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)]
[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)]
public List<Annotation> QueryOwnedAnnotatingRelationship()
{
throw new NotImplementedException("Derived property OwnedAnnotatingRelationship not yet supported");
Expand Down Expand Up @@ -179,6 +183,15 @@ public IElement QueryOwner()
throw new NotImplementedException("Derived property Owner not yet supported");
}

/// <summary>
/// Queries the derived property OwningAnnotatingRelationship
/// </summary>
[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)]
public Annotation QueryOwningAnnotatingRelationship()
{
throw new NotImplementedException("Derived property OwningAnnotatingRelationship not yet supported");
}

/// <summary>
/// Queries the derived property OwningMembership
/// </summary>
Expand Down
25 changes: 21 additions & 4 deletions SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/Annotation.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,12 @@ namespace SysML2.NET.Core.POCO

/// <summary>
/// An Annotation is a Relationship between an AnnotatingElement and the Element that is annotated by
/// that AnnotatingElement.
/// that AnnotatingElement.(owningAnnotatedElement <> null) = (ownedAnnotatingElement <>
/// null)ownedAnnotatingElement <> null xor owningAnnotatingElement <> nullownedAnnotatingElement =
/// let ownedAnnotatingElements : Sequence(AnnotatingElement) =
/// ownedRelatedElement->selectByKind(AnnotatingElement) in if ownedAnnotatingElements->isEmpty()
/// then null else ownedAnnotatingElements->first() endifannotatingElement = if
/// ownedAnnotatingElement <> null then ownedAnnotatingElement else owningAnnotatingElement endif
/// </summary>
public partial class Annotation : IAnnotation
{
Expand Down Expand Up @@ -69,10 +74,13 @@ public Annotation()
public IElement AnnotatedElement { get; set; }

/// <summary>
/// The AnnotatingElement that annotates the annotatedElement of this Annotation.
/// Queries the derived property AnnotatingElement
/// </summary>
[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)]
public AnnotatingElement AnnotatingElement { get; set; }
[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)]
public AnnotatingElement QueryAnnotatingElement()
{
throw new NotImplementedException("Derived property AnnotatingElement not yet supported");
}

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

/// <summary>
/// Queries the derived property OwnedAnnotatingElement
/// </summary>
[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)]
public AnnotatingElement QueryOwnedAnnotatingElement()
{
throw new NotImplementedException("Derived property OwnedAnnotatingElement not yet supported");
}

/// <summary>
/// Queries the derived property OwnedAnnotation
/// </summary>
Expand Down
21 changes: 16 additions & 5 deletions SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/Comment.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ public partial class Comment : IComment
public Comment()
{
this.AliasIds = new List<string>();
this.Annotation = new List<Annotation>();
this.IsImpliedIncluded = false;
this.OwnedRelationship = new List<IRelationship>();
}
Expand All @@ -68,10 +67,13 @@ public List<IElement> QueryAnnotatedElement()
}

/// <summary>
/// The Annotations that relate this AnnotatingElement to its annotatedElements.
/// Queries the derived property Annotation
/// </summary>
[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)]
public List<Annotation> Annotation { get; set; }
[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)]
public List<Annotation> QueryAnnotation()
{
throw new NotImplementedException("Derived property Annotation not yet supported");
}

/// <summary>
/// The annotation text for the Comment.
Expand Down Expand Up @@ -149,7 +151,7 @@ public string QueryName()
/// <summary>
/// Queries the derived property OwnedAnnotatingRelationship
/// </summary>
[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)]
[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)]
public List<Annotation> QueryOwnedAnnotatingRelationship()
{
throw new NotImplementedException("Derived property OwnedAnnotatingRelationship not yet supported");
Expand Down Expand Up @@ -188,6 +190,15 @@ public IElement QueryOwner()
throw new NotImplementedException("Derived property Owner not yet supported");
}

/// <summary>
/// Queries the derived property OwningAnnotatingRelationship
/// </summary>
[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)]
public Annotation QueryOwningAnnotatingRelationship()
{
throw new NotImplementedException("Derived property OwningAnnotatingRelationship not yet supported");
}

/// <summary>
/// Queries the derived property OwningMembership
/// </summary>
Expand Down
59 changes: 38 additions & 21 deletions SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/Connector.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,18 @@ namespace SysML2.NET.Core.POCO
/// A Connector is a usage of Associations, with links restricted according to instances of the Type in
/// which they are used (domain of the Connector). The associations of the Connector restrict what kinds
/// of things might be linked. The Connector further restricts these links to be between values of
/// Features on instances of its domain.relatedFeature = connectorEnd.ownedReferenceSubsetting->
/// select(s | s <> null).subsettedFeaturerelatedFeature->forAll(f | if featuringType->isEmpty()
/// then f.isFeaturedWithin(null) else featuringType->forAll(t | f.isFeaturedWithin(t))
/// endif)sourceFeature = if relatedFeature->isEmpty() then null else relatedFeature->first()
/// endiftargetFeature = if relatedFeature->size() < 2 then OrderedSet{} else
/// relatedFeature-> subSequence(2, relatedFeature->size())-> asOrderedSet()
/// endifnot isAbstract implies relatedFeature->size() >=
/// 2specializesFromLibrary('Links::links')association->exists(oclIsKindOf(AssociationStructure))
/// implies specializesFromLibrary('Objects::linkObjects')connectorEnds->size() = 2
/// andassociation->exists(oclIsKindOf(AssocationStructure)) implies
/// specializesFromLibrary('Objects::binaryLinkObjects')connectorEnd->size() = 2 implies
/// specializesFromLibrary('Links::binaryLinks')connectorEnds->size() > 2 implies not
/// specializesFromLibrary('Links::BinaryLink')
/// Features on instances of its domain.not isAbstract implies relatedFeature->size() >=
/// 2connectorEnds->size() = 2 andassociation->exists(oclIsKindOf(AssociationStructure)) implies
/// specializesFromLibrary('Objects::binaryLinkObjects')sourceFeature = if relatedFeature->isEmpty()
/// then null else relatedFeature->first() endifconnectorEnds->size() > 2 implies not
/// specializesFromLibrary('Links::BinaryLink')relatedFeature->forAll(f | if
/// featuringType->isEmpty() then f.isFeaturedWithin(null) else featuringType->forAll(t |
/// f.isFeaturedWithin(t)) endif)relatedFeature = connectorEnd.ownedReferenceSubsetting-> select(s
/// | s <> null).subsettedFeaturespecializesFromLibrary('Links::links')connectorEnd->size() = 2 implies
/// specializesFromLibrary('Links::binaryLinks')association->exists(oclIsKindOf(AssociationStructure))
/// implies specializesFromLibrary('Objects::linkObjects')targetFeature = if
/// relatedFeature->size() < 2 then OrderedSet{} else relatedFeature->
/// subSequence(2, relatedFeature->size())-> asOrderedSet() endif
/// </summary>
public partial class Connector : IConnector
{
Expand Down Expand Up @@ -112,6 +111,15 @@ public List<Feature> QueryConnectorEnd()
throw new NotImplementedException("Derived property ConnectorEnd not yet supported");
}

/// <summary>
/// Queries the derived property CrossFeature
/// </summary>
[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)]
public Feature QueryCrossFeature()
{
throw new NotImplementedException("Derived property CrossFeature not yet supported");
}

/// <summary>
/// The declared name of this Element.
/// </summary>
Expand Down Expand Up @@ -297,14 +305,14 @@ public bool QueryIsConjugated()
public bool IsDerived { get; set; }

/// <summary>
/// Whether or not the this Feature is an end Feature, requiring a different interpretation of the
/// multiplicity of the Feature.An end Feature is always considered to map each domain instance to a
/// single co-domain instance, whether or not a Multiplicity is given for it. If a Multiplicity is given
/// for an end Feature, rather than giving the co-domain cardinality for the Feature as usual, it
/// specifies a cardinality constraint for navigating across the endFeatures of the featuringType of the
/// end Feature. That is, if a Type has n endFeatures, then the Multiplicity of any one of those end
/// Features constrains the cardinality of the set of values of that Feature when the values of the
/// other n-1 end Features are held fixed.
/// Whether or not this Feature is an end Feature. An end Feature always has multiplicity 1, mapping
/// each of its domain instances to a single co-domain instance. However, it may have a crossFeature, in
/// which case values of the crossFeature must be the same as those found by navigation across instances
/// of the owningType from values of other end Features to values of this Feature. If the owningType has
/// n end Features, then the multiplicity, ordering, and uniqueness declared for the crossFeature of any
/// one of these end Features constrains the cardinality, ordering, and uniqueness of the collection of
/// values of that Feature reached by navigation when the values of the other n-1 end Features are held
/// fixed.
/// </summary>
[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)]
public bool IsEnd { get; set; }
Expand Down Expand Up @@ -443,6 +451,15 @@ public Conjugation QueryOwnedConjugator()
throw new NotImplementedException("Derived property OwnedConjugator not yet supported");
}

/// <summary>
/// Queries the derived property OwnedCrossSubsetting
/// </summary>
[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)]
public CrossSubsetting QueryOwnedCrossSubsetting()
{
throw new NotImplementedException("Derived property OwnedCrossSubsetting not yet supported");
}

/// <summary>
/// Queries the derived property OwnedDifferencing
/// </summary>
Expand Down
Loading

0 comments on commit 0602f9c

Please sign in to comment.