Upgrade metamodel v3.1

Author: juileetikekar

src/AasCore.Aas3_0/Attributes/CountForHash.cs

@@ -4,9 +4,9 @@
     <Nullable>enable</Nullable>
     <Configurations>Debug;Release;DebugSlow</Configurations>
     <Platforms>AnyCPU</Platforms>
-    <LangVersion>8</LangVersion>
+    <LangVersion>12</LangVersion>
 
-    <PackageId>AasCore.Aas3_0</PackageId>
+    <PackageId>AasCore.Aas3_1</PackageId>
     <Version>1.0.0-rc1</Version>
     <Authors>Marko Ristin</Authors>
     <Description>

src/AasCore.Aas3_0/Attributes/MetaModelName.cs

@@ -0,0 +1,25 @@
+/********************************************************************************
+* Copyright (c) {2019 - 2024} Contributors to the Eclipse Foundation
+*
+* See the NOTICE file(s) distributed with this work for additional
+* information regarding copyright ownership.
+*
+* This program and the accompanying materials are made available under the
+* terms of the Apache License Version 2.0 which is available at
+* https://www.apache.org/licenses/LICENSE-2.0
+*
+* SPDX-License-Identifier: Apache-2.0
+********************************************************************************/
+
+using System;
+
+namespace AasCore.Aas3_1.Attributes
+{
+    /// <summary>
+    /// This attribute indicates, that it should e.g. serialized in JSON.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = true)]
+    public class CountForHash : Attribute
+    {
+    }
+}

src/AasCore.Aas3_0/Attributes/SkipForReflection.cs

@@ -0,0 +1,28 @@
+/********************************************************************************
+* Copyright (c) {2019 - 2024} Contributors to the Eclipse Foundation
+*
+* See the NOTICE file(s) distributed with this work for additional
+* information regarding copyright ownership.
+*
+* This program and the accompanying materials are made available under the
+* terms of the Apache License Version 2.0 which is available at
+* https://www.apache.org/licenses/LICENSE-2.0
+*
+* SPDX-License-Identifier: Apache-2.0
+********************************************************************************/
+
+namespace AasCore.Aas3_1.Attributes
+{
+    /// <summary>
+    /// This attribute indicates, that the field / property is searchable
+    /// </summary>
+    [System.AttributeUsage(System.AttributeTargets.Field | System.AttributeTargets.Property, AllowMultiple = true)]
+    public class MetaModelName : System.Attribute
+    {
+        public string name;
+        public MetaModelName(string name)
+        {
+            this.name = name;
+        }
+    }
+}

src/AasCore.Aas3_0/Attributes/SkipForSearch.cs

@@ -0,0 +1,24 @@
+/********************************************************************************
+* Copyright (c) {2019 - 2024} Contributors to the Eclipse Foundation
+*
+* See the NOTICE file(s) distributed with this work for additional
+* information regarding copyright ownership.
+*
+* This program and the accompanying materials are made available under the
+* terms of the Apache License Version 2.0 which is available at
+* https://www.apache.org/licenses/LICENSE-2.0
+*
+* SPDX-License-Identifier: Apache-2.0
+********************************************************************************/
+
+namespace AasCore.Aas3_1.Attributes
+{
+    /// <summary>
+    /// This attribute indicates, that the field / property shall be skipped for reflection
+    /// in order to avoid cycles
+    /// </summary>
+    [System.AttributeUsage(System.AttributeTargets.Field | System.AttributeTargets.Property, AllowMultiple = true)]
+    public class SkipForReflection : System.Attribute
+    {
+    }
+}

src/AasCore.Aas3_0/Attributes/TextSearchable.cs

@@ -0,0 +1,24 @@
+/********************************************************************************
+* Copyright (c) {2019 - 2024} Contributors to the Eclipse Foundation
+*
+* See the NOTICE file(s) distributed with this work for additional
+* information regarding copyright ownership.
+*
+* This program and the accompanying materials are made available under the
+* terms of the Apache License Version 2.0 which is available at
+* https://www.apache.org/licenses/LICENSE-2.0
+*
+* SPDX-License-Identifier: Apache-2.0
+********************************************************************************/
+
+namespace AasCore.Aas3_1.Attributes
+{
+    /// <summary>
+    /// This attribute indicates, that the field / property shall be skipped for searching, because it is not
+    /// directly displayed in Package Explorer
+    /// </summary>
+    [System.AttributeUsage(System.AttributeTargets.Field | System.AttributeTargets.Property, AllowMultiple = true)]
+    public class SkipForSearch : System.Attribute
+    {
+    }
+}

src/AasCore.Aas3_0/DiaryData/IAasDiaryEntry.cs

@@ -0,0 +1,23 @@
+/********************************************************************************
+* Copyright (c) {2019 - 2024} Contributors to the Eclipse Foundation
+*
+* See the NOTICE file(s) distributed with this work for additional
+* information regarding copyright ownership.
+*
+* This program and the accompanying materials are made available under the
+* terms of the Apache License Version 2.0 which is available at
+* https://www.apache.org/licenses/LICENSE-2.0
+*
+* SPDX-License-Identifier: Apache-2.0
+********************************************************************************/
+
+namespace AasCore.Aas3_1.Attributes
+{
+    /// <summary>
+    /// This attribute indicates, that the field / property is searchable
+    /// </summary>
+    [System.AttributeUsage(System.AttributeTargets.Field | System.AttributeTargets.Property, AllowMultiple = true)]
+    public class TextSearchable : System.Attribute
+    {
+    }
+}

src/AasCore.Aas3_0/DiaryData/IDiaryData.cs

@@ -1,4 +1,17 @@
-using AasCore.Aas3_0;
+/********************************************************************************
+* Copyright (c) {2019 - 2024} Contributors to the Eclipse Foundation
+*
+* See the NOTICE file(s) distributed with this work for additional
+* information regarding copyright ownership.
+*
+* This program and the accompanying materials are made available under the
+* terms of the Apache License Version 2.0 which is available at
+* https://www.apache.org/licenses/LICENSE-2.0
+*
+* SPDX-License-Identifier: Apache-2.0
+********************************************************************************/
+
+using AasCore.Aas3_1;
 using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;

src/AasCore.Aas3_0/AasCore.Aas3_0.csproj src/AasCore.Aas3_1/AasCore.Aas3_1.csproj

@@ -0,0 +1,19 @@
+/********************************************************************************
+* Copyright (c) {2019 - 2024} Contributors to the Eclipse Foundation
+*
+* See the NOTICE file(s) distributed with this work for additional
+* information regarding copyright ownership.
+*
+* This program and the accompanying materials are made available under the
+* terms of the Apache License Version 2.0 which is available at
+* https://www.apache.org/licenses/LICENSE-2.0
+*
+* SPDX-License-Identifier: Apache-2.0
+********************************************************************************/
+
+namespace AdminShellNS.DiaryData
+{
+    public interface IAasDiaryEntry
+    {
+    }
+}

src/AasCore.Aas3_1/Attributes/CountForHash.cs

@@ -0,0 +1,26 @@
+/********************************************************************************
+* Copyright (c) {2019 - 2024} Contributors to the Eclipse Foundation
+*
+* See the NOTICE file(s) distributed with this work for additional
+* information regarding copyright ownership.
+*
+* This program and the accompanying materials are made available under the
+* terms of the Apache License Version 2.0 which is available at
+* https://www.apache.org/licenses/LICENSE-2.0
+*
+* SPDX-License-Identifier: Apache-2.0
+********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AdminShellNS.DiaryData
+{
+    public interface IDiaryData
+    {
+        DiaryDataDef DiaryData { get; }
+    }
+}

src/AasCore.Aas3_1/Attributes/MetaModelName.cs

@@ -1,17 +1,31 @@
+/********************************************************************************
+* Copyright (c) {2019 - 2024} Contributors to the Eclipse Foundation
+*
+* See the NOTICE file(s) distributed with this work for additional
+* information regarding copyright ownership.
+*
+* This program and the accompanying materials are made available under the
+* terms of the Apache License Version 2.0 which is available at
+* https://www.apache.org/licenses/LICENSE-2.0
+*
+* SPDX-License-Identifier: Apache-2.0
+********************************************************************************/
+
 /*
  * This code has been automatically generated by aas-core-codegen.
  * Do NOT edit or append.
  */
 
 using System.Collections.Generic;  // can't alias
 
-namespace AasCore.Aas3_0
+namespace AasCore.Aas3_1
 {
     /// <summary>
     /// Provide constant values of the meta-model.
     /// </summary>
     public static class Constants
     {
+        //TODO:jtikekar: remove
         public static readonly HashSet<string> ValidCategoriesForDataElement = (
             new HashSet<string>()
             {
@@ -48,6 +62,7 @@ public static class Constants
                 KeyTypes.BasicEventElement,
                 KeyTypes.Blob,
                 KeyTypes.Capability,
+                KeyTypes.ContainerElement,
                 KeyTypes.DataElement,
                 KeyTypes.Entity,
                 KeyTypes.EventElement,
@@ -70,6 +85,7 @@ public static class Constants
                 KeyTypes.BasicEventElement,
                 KeyTypes.Blob,
                 KeyTypes.Capability,
+                KeyTypes.ContainerElement,
                 KeyTypes.DataElement,
                 KeyTypes.Entity,
                 KeyTypes.EventElement,
@@ -96,6 +112,7 @@ public static class Constants
                 KeyTypes.BasicEventElement,
                 KeyTypes.Blob,
                 KeyTypes.Capability,
+                KeyTypes.ContainerElement,
                 KeyTypes.DataElement,
                 KeyTypes.Entity,
                 KeyTypes.EventElement,
@@ -129,6 +146,7 @@ public static class Constants
                 KeyTypes.BasicEventElement,
                 KeyTypes.Blob,
                 KeyTypes.Capability,
+                KeyTypes.ContainerElement,
                 KeyTypes.DataElement,
                 KeyTypes.Entity,
                 KeyTypes.EventElement,

src/AasCore.Aas3_1/Attributes/SkipForReflection.cs

@@ -1,12 +1,25 @@
+/********************************************************************************
+* Copyright (c) {2019 - 2024} Contributors to the Eclipse Foundation
+*
+* See the NOTICE file(s) distributed with this work for additional
+* information regarding copyright ownership.
+*
+* This program and the accompanying materials are made available under the
+* terms of the Apache License Version 2.0 which is available at
+* https://www.apache.org/licenses/LICENSE-2.0
+*
+* SPDX-License-Identifier: Apache-2.0
+********************************************************************************/
+
 /*
  * This code has been automatically generated by aas-core-codegen.
  * Do NOT edit or append.
  */
 
-using Aas = AasCore.Aas3_0;  // renamed
+using Aas = AasCore.Aas3_1;  // renamed
 using System.Collections.Generic;  // can't alias
 
-namespace AasCore.Aas3_0
+namespace AasCore.Aas3_1
 {
     /// <summary>
     /// Allow for making shallow and deep copies of AAS model instances.