Merge origin/master into marcschier/3907-repository-layout

Author: marcschier

samples/PumpDeviceIntegrationServer/Program.cs

@@ -94,6 +94,16 @@
         // the simulated supervision flags shared across both pumps).
         pump.Device.AddDeviceHealth(ctx.Manager.SystemContext);
         pump.WithDeviceHealth(DeviceHealthEnumeration.NORMAL);
+
+        // The DeviceHealth child was added to the in-memory DeviceState
+        // subtree after the device itself was registered, so it must be
+        // registered with the manager explicitly. Without this the node
+        // is browsable but its attributes never resolve, so the DI
+        // companion-spec checker cannot map it to the declared DeviceHealth node.
+        await ctx.Manager
+            .AddPredefinedNodeAsync(pump.Device.DeviceHealth!, ctx.CancellationToken)
+            .ConfigureAwait(false);
+
         ((PumpNodeManager)ctx.Manager)
             .RegisterSupervisedDeviceHealth(pump.Device.DeviceHealth);
 

src/Opc.Ua.Di.Server/Builders/SoftwareUpdateFacetWiring.cs

@@ -102,7 +102,13 @@ public static SoftwareUpdateState BuildAndAttach(
             su.BrowseName = new QualifiedName(SoftwareUpdateBrowseName, diNs);
             su.DisplayName = new LocalizedText(SoftwareUpdateBrowseName);
             su.NodeId = context.NodeIdFactory.New(context, su);
-            su.ReferenceTypeId = Types.ReferenceTypeIds.HasComponent;
+            // OPC 10000-100 models the SoftwareUpdate object as an AddIn on
+            // its host, referenced via HasAddIn (a subtype of HasComponent)
+            // rather than a plain HasComponent. Using HasAddIn keeps the
+            // facet spec-correct and lets companion-spec checkers treat it
+            // as an added-in component instead of validating it against the
+            // host type's OptionalPlaceholder children (GEN-07 noise).
+            su.ReferenceTypeId = Types.ReferenceTypeIds.HasAddIn;
             su.ModellingRuleId = NodeId.Null;
 
             // Loading subtype (the address-space slot is non-abstract;

tests/Opc.Ua.Di.Tests/DeviceBuilderSoftwareUpdateTests.cs

@@ -85,6 +85,13 @@ public async Task WithSoftwareUpdateAttachesSoftwareUpdateSubtree()
                 "SoftwareUpdate child must be attached to the device.");
             Assert.That(su, Is.TypeOf<SoftwareUpdateState>(),
                 "SoftwareUpdate child must be a SoftwareUpdateState instance.");
+
+            // OPC 10000-100 models the SoftwareUpdate object as an AddIn,
+            // so it must be referenced from its host via HasAddIn rather
+            // than a plain HasComponent.
+            Assert.That(((BaseInstanceState)su!).ReferenceTypeId,
+                Is.EqualTo(Opc.Ua.Types.ReferenceTypeIds.HasAddIn),
+                "SoftwareUpdate must be attached via the HasAddIn reference.");
         }
 
         [Test]