Skip to content

Commit e0c7e28

Browse files
samatstariongroupsamatstariongroup
committed
[Update] to SysML2.NET version 0.14.0
[Update] SysML.ecore from source git repos - [TAG: 2024-07] (regenerate code)
1 parent a963318 commit e0c7e28

File tree

135 files changed

+2081
-1353
lines changed

Some content is hidden

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

135 files changed

+2081
-1353
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<LangVersion>11.0</LangVersion>
6-
<Version>0.13.0</Version>
6+
<Version>0.14.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>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
55
<LangVersion>11.0</LangVersion>
6-
<Version>0.13.0</Version>
6+
<Version>0.14.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/Connector.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,15 @@ public List<FeatureMembership> QueryFeatureMembership()
204204
throw new NotImplementedException("Derived property FeatureMembership not yet supported");
205205
}
206206

207+
/// <summary>
208+
/// Queries the derived property FeatureTarget
209+
/// </summary>
210+
[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)]
211+
public Feature QueryFeatureTarget()
212+
{
213+
throw new NotImplementedException("Derived property FeatureTarget not yet supported");
214+
}
215+
207216
/// <summary>
208217
/// Queries the derived property FeaturingType
209218
/// </summary>

‎SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/Feature.cs

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,13 @@ namespace SysML2.NET.Core.POCO
108108
/// andownedTyping.type->includes(oclIsKindOf(Class)) andowningType <> null
109109
/// and(owningType.oclIsKindOf(Class) or owningType.oclIsKindOf(Feature) and
110110
/// owningType.oclAsType(Feature).type-> exists(oclIsKindOf(Class))) implies
111-
/// specializesFromLibrary('Occurrence::Occurrence::portions')
111+
/// specializesFromLibrary('Occurrence::Occurrence::portions')featureTarget = if
112+
/// chainingFeature->isEmpty() then self else chainingFeature->last() endifowningType <> null
113+
/// andowningType.oclIsKindOf(InvocationExpression) andlet owningInvocation: InvocationExpression =
114+
/// owningType.oclAsType(InvocationExpression) inself = owningInvocation.result andnot
115+
/// owningInvocation.ownedTyping->exists(oclIsKindOf(Function)) andnot
116+
/// owningInvocation.ownedSubsetting->reject(isImplied).subsettedFeature.type->exists(oclIsKindOf(Function))
117+
/// implies owningInvocation.ownedTyping->forAll(type | self.specializes(type))
112118
/// </summary>
113119
public partial class Feature : IFeature
114120
{
@@ -244,6 +250,15 @@ public List<FeatureMembership> QueryFeatureMembership()
244250
throw new NotImplementedException("Derived property FeatureMembership not yet supported");
245251
}
246252

253+
/// <summary>
254+
/// Queries the derived property FeatureTarget
255+
/// </summary>
256+
[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)]
257+
public Feature QueryFeatureTarget()
258+
{
259+
throw new NotImplementedException("Derived property FeatureTarget not yet supported");
260+
}
261+
247262
/// <summary>
248263
/// Queries the derived property FeaturingType
249264
/// </summary>

‎SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/IFeature.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,13 @@ namespace SysML2.NET.Core.POCO
108108
/// andownedTyping.type->includes(oclIsKindOf(Class)) andowningType <> null
109109
/// and(owningType.oclIsKindOf(Class) or owningType.oclIsKindOf(Feature) and
110110
/// owningType.oclAsType(Feature).type-> exists(oclIsKindOf(Class))) implies
111-
/// specializesFromLibrary('Occurrence::Occurrence::portions')
111+
/// specializesFromLibrary('Occurrence::Occurrence::portions')featureTarget = if
112+
/// chainingFeature->isEmpty() then self else chainingFeature->last() endifowningType <> null
113+
/// andowningType.oclIsKindOf(InvocationExpression) andlet owningInvocation: InvocationExpression =
114+
/// owningType.oclAsType(InvocationExpression) inself = owningInvocation.result andnot
115+
/// owningInvocation.ownedTyping->exists(oclIsKindOf(Function)) andnot
116+
/// owningInvocation.ownedSubsetting->reject(isImplied).subsettedFeature.type->exists(oclIsKindOf(Function))
117+
/// implies owningInvocation.ownedTyping->forAll(type | self.specializes(type))
112118
/// </summary>
113119
public partial interface IFeature : IType
114120
{
@@ -131,6 +137,12 @@ public partial interface IFeature : IType
131137
[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)]
132138
Type QueryEndOwningType();
133139

140+
/// <summary>
141+
/// Queries the derived property FeatureTarget
142+
/// </summary>
143+
[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)]
144+
Feature QueryFeatureTarget();
145+
134146
/// <summary>
135147
/// Queries the derived property FeaturingType
136148
/// </summary>

‎SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/IImport.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ namespace SysML2.NET.Core.POCO
3737
/// (the default), then only public Memberships are considered &quot;visible&quot;. If isImportAll =
3838
/// true, then all Memberships are considered &quot;visible&quot;, regardless of their declared
3939
/// visibility. If isRecursive = true, then visible Memberships are also recursively imported from owned
40-
/// sub-Namespaces.
40+
/// sub-Namespaces.importOwningNamespace.owningNamespace = null implies visibility =
41+
/// VisibilityKind::private
4142
/// </summary>
4243
public partial interface IImport : IRelationship
4344
{
@@ -67,6 +68,7 @@ public partial interface IImport : IRelationship
6768

6869
/// <summary>
6970
/// The visibility level of the imported members from this Import relative to the importOwningNamespace.
71+
/// The default is private.
7072
/// </summary>
7173
[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)]
7274
VisibilityKind Visibility { get; set; }

‎SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/LiteralInteger.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,15 @@ public List<FeatureMembership> QueryFeatureMembership()
178178
throw new NotImplementedException("Derived property FeatureMembership not yet supported");
179179
}
180180

181+
/// <summary>
182+
/// Queries the derived property FeatureTarget
183+
/// </summary>
184+
[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)]
185+
public Feature QueryFeatureTarget()
186+
{
187+
throw new NotImplementedException("Derived property FeatureTarget not yet supported");
188+
}
189+
181190
/// <summary>
182191
/// Queries the derived property FeaturingType
183192
/// </summary>

‎SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/LiteralRational.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,15 @@ public List<FeatureMembership> QueryFeatureMembership()
178178
throw new NotImplementedException("Derived property FeatureMembership not yet supported");
179179
}
180180

181+
/// <summary>
182+
/// Queries the derived property FeatureTarget
183+
/// </summary>
184+
[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)]
185+
public Feature QueryFeatureTarget()
186+
{
187+
throw new NotImplementedException("Derived property FeatureTarget not yet supported");
188+
}
189+
181190
/// <summary>
182191
/// Queries the derived property FeaturingType
183192
/// </summary>

‎SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/NamespaceImport.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public NamespaceImport()
5353
this.OwnedRelationship = new List<IRelationship>();
5454
this.Source = new List<IElement>();
5555
this.Target = new List<IElement>();
56-
this.Visibility = VisibilityKind.Public;
56+
this.Visibility = VisibilityKind.Private;
5757
}
5858

5959
/// <summary>
@@ -289,6 +289,7 @@ public List<TextualRepresentation> QueryTextualRepresentation()
289289

290290
/// <summary>
291291
/// The visibility level of the imported members from this Import relative to the importOwningNamespace.
292+
/// The default is private.
292293
/// </summary>
293294
[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)]
294295
public VisibilityKind Visibility { get; set; }

‎SysML2.NET.CodeGenerator.Tests/Expected/AutoGenDto/Feature.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,13 @@ namespace SysML2.NET.Core.DTO
108108
/// andownedTyping.type->includes(oclIsKindOf(Class)) andowningType <> null
109109
/// and(owningType.oclIsKindOf(Class) or owningType.oclIsKindOf(Feature) and
110110
/// owningType.oclAsType(Feature).type-> exists(oclIsKindOf(Class))) implies
111-
/// specializesFromLibrary('Occurrence::Occurrence::portions')
111+
/// specializesFromLibrary('Occurrence::Occurrence::portions')featureTarget = if
112+
/// chainingFeature->isEmpty() then self else chainingFeature->last() endifowningType <> null
113+
/// andowningType.oclIsKindOf(InvocationExpression) andlet owningInvocation: InvocationExpression =
114+
/// owningType.oclAsType(InvocationExpression) inself = owningInvocation.result andnot
115+
/// owningInvocation.ownedTyping->exists(oclIsKindOf(Function)) andnot
116+
/// owningInvocation.ownedSubsetting->reject(isImplied).subsettedFeature.type->exists(oclIsKindOf(Function))
117+
/// implies owningInvocation.ownedTyping->forAll(type | self.specializes(type))
112118
/// </summary>
113119
public partial class Feature : IFeature
114120
{

‎SysML2.NET.CodeGenerator.Tests/Expected/AutoGenDto/IFeature.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,13 @@ namespace SysML2.NET.Core.DTO
108108
/// andownedTyping.type->includes(oclIsKindOf(Class)) andowningType <> null
109109
/// and(owningType.oclIsKindOf(Class) or owningType.oclIsKindOf(Feature) and
110110
/// owningType.oclAsType(Feature).type-> exists(oclIsKindOf(Class))) implies
111-
/// specializesFromLibrary('Occurrence::Occurrence::portions')
111+
/// specializesFromLibrary('Occurrence::Occurrence::portions')featureTarget = if
112+
/// chainingFeature->isEmpty() then self else chainingFeature->last() endifowningType <> null
113+
/// andowningType.oclIsKindOf(InvocationExpression) andlet owningInvocation: InvocationExpression =
114+
/// owningType.oclAsType(InvocationExpression) inself = owningInvocation.result andnot
115+
/// owningInvocation.ownedTyping->exists(oclIsKindOf(Function)) andnot
116+
/// owningInvocation.ownedSubsetting->reject(isImplied).subsettedFeature.type->exists(oclIsKindOf(Function))
117+
/// implies owningInvocation.ownedTyping->forAll(type | self.specializes(type))
112118
/// </summary>
113119
public partial interface IFeature : IType
114120
{

‎SysML2.NET.CodeGenerator.Tests/Expected/AutoGenDto/IImport.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ namespace SysML2.NET.Core.DTO
3737
/// (the default), then only public Memberships are considered &quot;visible&quot;. If isImportAll =
3838
/// true, then all Memberships are considered &quot;visible&quot;, regardless of their declared
3939
/// visibility. If isRecursive = true, then visible Memberships are also recursively imported from owned
40-
/// sub-Namespaces.
40+
/// sub-Namespaces.importOwningNamespace.owningNamespace = null implies visibility =
41+
/// VisibilityKind::private
4142
/// </summary>
4243
public partial interface IImport : IRelationship
4344
{
@@ -55,6 +56,7 @@ public partial interface IImport : IRelationship
5556

5657
/// <summary>
5758
/// The visibility level of the imported members from this Import relative to the importOwningNamespace.
59+
/// The default is private.
5860
/// </summary>
5961
[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)]
6062
VisibilityKind Visibility { get; set; }

‎SysML2.NET.CodeGenerator.Tests/Expected/AutoGenDto/NamespaceImport.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public NamespaceImport()
5353
this.OwnedRelationship = new List<Guid>();
5454
this.Source = new List<Guid>();
5555
this.Target = new List<Guid>();
56-
this.Visibility = VisibilityKind.Public;
56+
this.Visibility = VisibilityKind.Private;
5757
}
5858

5959
/// <summary>
@@ -163,6 +163,7 @@ public NamespaceImport()
163163

164164
/// <summary>
165165
/// The visibility level of the imported members from this Import relative to the importOwningNamespace.
166+
/// The default is private.
166167
/// </summary>
167168
[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)]
168169
public VisibilityKind Visibility { get; set; }

‎SysML2.NET.CodeGenerator/SysML2.NET.CodeGenerator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
55
<LangVersion>11.0</LangVersion>
6-
<Version>0.13.0</Version>
6+
<Version>0.14.0</Version>
77
<Description>A Library to generate SysML v2 code.</Description>
88
<PackageId>SysML2.NET</PackageId>
99
<Company>Starion Group S.A.</Company>

0 commit comments

Comments
 (0)