Bring CESMII libs forward to latest version again.

OPCFoundation · Jul 9, 2024 · 517d98a · 517d98a
1 parent 963016c
commit 517d98a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/UACloudLibraryServer/CloudLibDataProvider.cs b/UACloudLibraryServer/CloudLibDataProvider.cs
@@ -109,10 +109,10 @@ public IQueryable<ObjectModel> GetObjects(string modelUri = null, DateTime? publ
             return GetNodeModels<ObjectModel>(nsm => nsm.Objects, modelUri, publicationDate, nodeId);
         }
 
-        //public IQueryable<MethodModel> GetMethods(string modelUri = null, DateTime? publicationDate = null, string nodeId = null)
-        //{
-        //    return GetNodeModels<MethodModel>(nsm => nsm.Methods, modelUri, publicationDate, nodeId);
-        //}
+        public IQueryable<MethodModel> GetMethods(string modelUri = null, DateTime? publicationDate = null, string nodeId = null)
+        {
+            return GetNodeModels<MethodModel>(nsm => nsm.Methods, modelUri, publicationDate, nodeId);
+        }
 
         public IQueryable<NodeModel> GetAllNodes(string modelUri = null, DateTime? publicationDate = null, string nodeId = null)
         {

diff --git a/UACloudLibraryServer/GraphQL/AppDbContext.cs b/UACloudLibraryServer/GraphQL/AppDbContext.cs
@@ -154,7 +154,7 @@ protected override void OnModelCreating(ModelBuilder builder)
                 .Property(nsm => nsm.ValidationStatus)
                     .HasConversion<string>();
             builder.Entity<NodeSetModel>()
- //               .Ignore(nsm => nsm.HeaderComments)
+                .Ignore(nsm => nsm.HeaderComments)
                 .HasAlternateKey(nm => nm.Identifier)
                 ;
 

diff --git a/UACloudLibraryServer/GraphQL/QueryModel.cs b/UACloudLibraryServer/GraphQL/QueryModel.cs
@@ -227,7 +227,7 @@ protected override void Configure(IObjectTypeDescriptor<CloudLibNodeSetModel> de
             ConfigureField(descriptor.Field(f => f.DataTypes));
             ConfigureField(descriptor.Field(f => f.Interfaces));
             ConfigureField(descriptor.Field(f => f.Objects));
-            //ConfigureField(descriptor.Field(f => f.Methods));
+            ConfigureField(descriptor.Field(f => f.Methods));
             ConfigureField(descriptor.Field(f => f.Properties));
             ConfigureField(descriptor.Field(f => f.DataVariables));
             ConfigureField(descriptor.Field(f => f.ReferenceTypes));

diff --git a/UACloudLibraryServer/Interfaces/IDatabase.cs b/UACloudLibraryServer/Interfaces/IDatabase.cs
@@ -64,7 +64,7 @@ public interface IDatabase
         IQueryable<ReferenceTypeModel> GetReferenceTypes(string modelUri = null, DateTime? publicationDate = null, string nodeId = null);
         IQueryable<InterfaceModel> GetInterfaces(string modelUri = null, DateTime? publicationDate = null, string nodeId = null);
         IQueryable<ObjectModel> GetObjects(string modelUri = null, DateTime? publicationDate = null, string nodeId = null);
-        //IQueryable<MethodModel> GetMethods(string modelUri = null, DateTime? publicationDate = null, string nodeId = null);
+        IQueryable<MethodModel> GetMethods(string modelUri = null, DateTime? publicationDate = null, string nodeId = null);
         IQueryable<NodeModel> GetAllNodes(string modelUri = null, DateTime? publicationDate = null, string nodeId = null);
 
         IQueryable<CategoryModel> GetCategories();

diff --git a/UACloudLibraryServer/NodeSetIndex/UANodeSetIFileStorage.cs b/UACloudLibraryServer/NodeSetIndex/UANodeSetIFileStorage.cs
@@ -56,7 +56,7 @@ public bool AddNodeSet(UANodeSetImportResult results, string nodeSetXml, object
             var nodeSet = InfoModelController.ReadUANodeSet(nodeSetXml);
             // Assumption: exactly one nodeSetXml was passed into UANodeSetImport.ImportNodeSets and it's the first one being added.
             bool isNew = !results.Models.Any();
-            var modelInfo = results.AddModelAndDependencies(nodeSet, nodeSet.Models?[0], null, isNew);
+            var modelInfo = results.AddModelAndDependencies(nodeSet, null, nodeSet.Models?[0], null, isNew);
             modelInfo.Model.RequestedForThisImport = requested;
             return modelInfo.Added;
         }

diff --git a/UACloudLibraryServer/UA-CloudLibrary.csproj b/UACloudLibraryServer/UA-CloudLibrary.csproj
@@ -52,10 +52,10 @@
 		<PackageReference Include="HotChocolate.Types.Scalars" Version="13.9.7" />
 		<PackageReference Include="HotChocolate.AspNetCore" Version="13.9.7" />
 		<PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="13.9.7" />
-        <PackageReference Include="CESMII.OpcUa.NodeSetImporter" Version="1.0.18" />
-        <PackageReference Include="CESMII.OpcUa.NodeSetModel.EF" Version="1.0.18" />
-        <PackageReference Include="CESMII.OpcUa.NodeSetModel.Factory.Opc" Version="1.0.18" />
-        <PackageReference Include="CESMII.OpcUa.NodeSetModel" Version="1.0.18" />
+        <PackageReference Include="CESMII.OpcUa.NodeSetImporter" Version="2.0.3" />
+        <PackageReference Include="CESMII.OpcUa.NodeSetModel.EF" Version="2.0.3" />
+        <PackageReference Include="CESMII.OpcUa.NodeSetModel.Factory.Opc" Version="2.0.3" />
+        <PackageReference Include="CESMII.OpcUa.NodeSetModel" Version="2.0.3" />
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="7.7.1" />
@@ -73,7 +73,6 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
 		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
 		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.16" />
 		<PackageReference Include="Npgsql" Version="6.0.11" />