mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-20 16:52:07 +08:00
Copilot
d525bc3f28
# Description This PR fixes bounded ManagedSession reconnect cleanup and reorganizes the sample applications into domain-focused folders. ## Reconnect cleanup - Bounds reconnect integration cleanup with independent 30-second close and dispose limits. - Sends `CloseSession` through the awaited transport request path during `Session.DisposeAsync`. - Preserves explicit `Session.CloseAsync` behavior that waits for or cancels outstanding publish requests. - Covers the disposal request path with a regression test. ## Sample organization - `samples/OpenUsd`: `GeneratorServer`, `SiteCompositionServer` - `samples/Redundancy`: `RedundantClient`, `RedundantServer`, `RedundantPubSub` - `samples/Isa95`: `MinimalIsa95Server` - `samples/MinimalApi`: `MinimalBoilerServer`, `MinimalCalcServer`, `MinimalClient` - `samples/DI`: `PumpDeviceIntegrationServer` - `samples/Lds`: `ConsoleLdsServer` - `samples/Reference`: `ConsoleReferenceClient`, `ConsoleReferenceServer` - `samples/PubSub`: `ConsoleReferencePubSubClient` `UA.slnx` now exposes the same requested domain groups. Project references, tests, runtime sample probes, CI workflows, Dockerfiles, Compose files, helper scripts, and documentation were updated to the new paths. `samples/Robotics/MinimalRobotServer` remains under `Robotics`. ## Validation - `dotnet build UA.slnx` - 3 Redundancy short-haul sample tests - 70 DI sample tests - 914 OpenUSD tests - 1 WotCon model-materialization test - 137 AOT tests - `docker compose config` for all 6 moved Redundancy Compose files ## Related Issues - Fixes #4273 ## Checklist - [ ] I have signed the [CLA](https://opcfoundation.org/license/cla/ContributorLicenseAgreementv1.0.pdf) and read the [CONTRIBUTING](https://github.com/OPCFoundation/UA-.NETStandard/blob/master/CONTRIBUTING.md) doc. - [x] I have added tests that prove my fix is effective or that my feature works and increased code coverage. - [x] I have added all necessary documentation. - [x] I have verified that my changes do not introduce new build or analyzer warnings. - [x] I built the complete `UA.slnx` solution locally. - [ ] I ran all tests locally against at least .NET Framework and .NET 10. - [ ] I fixed all failing and flaky tests in the CI pipelines and all CodeQL warnings. - [x] I have addressed all PR feedback received. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: marcschier <11168470+marcschier@users.noreply.github.com> Co-authored-by: Marc Schier <mschier@microsoft.com> Co-authored-by: Marc Schier <marcschier@users.noreply.github.com> Copilot-Session: a2c2838f-74ae-4997-a1d4-50574d9e0636
115 lines
4.9 KiB
XML
115 lines
4.9 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
* Copyright (c) 2005-2025 The OPC Foundation, Inc. All rights reserved.
|
|
*
|
|
* OPC Foundation MIT License 1.00
|
|
-->
|
|
<opc:ModelDesign
|
|
xmlns:uax="http://opcfoundation.org/UA/2008/02/Types.xsd"
|
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
xmlns:ua="http://opcfoundation.org/UA/"
|
|
xmlns:opc="http://opcfoundation.org/UA/ModelDesign.xsd"
|
|
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
|
|
xmlns="http://opcfoundation.org/UA/Calc/"
|
|
TargetNamespace="http://opcfoundation.org/UA/Calc/"
|
|
TargetXmlNamespace="http://opcfoundation.org/UA/Calc/Types.xsd"
|
|
TargetVersion="1.00.0"
|
|
TargetPublicationDate="2025-01-01T00:00:00Z">
|
|
|
|
<opc:Namespaces>
|
|
<opc:Namespace Name="Calc" Prefix="Calc" XmlNamespace="http://opcfoundation.org/UA/Calc/Types.xsd" XmlPrefix="Calc">http://opcfoundation.org/UA/Calc/</opc:Namespace>
|
|
<opc:Namespace Name="OpcUa" Prefix="Opc.Ua" Version="1.05.07" PublicationDate="2025-12-25T00:00:00Z" InternalPrefix="Opc.Ua.Server" XmlNamespace="http://opcfoundation.org/UA/2008/02/Types.xsd" XmlPrefix="OpcUa">http://opcfoundation.org/UA/</opc:Namespace>
|
|
</opc:Namespaces>
|
|
|
|
<!--
|
|
Top-level MethodType declarations. The model compiler emits one
|
|
typed MethodState subclass per top-level Method (AddMethodState,
|
|
MultiplyMethodState, ConcatMethodState) plus the matching typed
|
|
OnCall delegate so the source-generated fluent surface can offer
|
|
Func<T1, T2, TResult> (sync) and Func<T1, T2, CancellationToken,
|
|
ValueTask<TResult>> (async) overloads on each MethodBuilder.
|
|
-->
|
|
<opc:Method SymbolicName="AddMethodType">
|
|
<opc:Description>Returns a + b.</opc:Description>
|
|
<opc:InputArguments>
|
|
<opc:Argument Name="a" DataType="ua:Int32">
|
|
<opc:Description>First addend.</opc:Description>
|
|
</opc:Argument>
|
|
<opc:Argument Name="b" DataType="ua:Int32">
|
|
<opc:Description>Second addend.</opc:Description>
|
|
</opc:Argument>
|
|
</opc:InputArguments>
|
|
<opc:OutputArguments>
|
|
<opc:Argument Name="sum" DataType="ua:Int32">
|
|
<opc:Description>Computed sum.</opc:Description>
|
|
</opc:Argument>
|
|
</opc:OutputArguments>
|
|
</opc:Method>
|
|
|
|
<opc:Method SymbolicName="MultiplyMethodType">
|
|
<opc:Description>Returns a * b. Wired with the asynchronous typed OnCall overload.</opc:Description>
|
|
<opc:InputArguments>
|
|
<opc:Argument Name="a" DataType="ua:Double">
|
|
<opc:Description>First factor.</opc:Description>
|
|
</opc:Argument>
|
|
<opc:Argument Name="b" DataType="ua:Double">
|
|
<opc:Description>Second factor.</opc:Description>
|
|
</opc:Argument>
|
|
</opc:InputArguments>
|
|
<opc:OutputArguments>
|
|
<opc:Argument Name="product" DataType="ua:Double">
|
|
<opc:Description>Computed product.</opc:Description>
|
|
</opc:Argument>
|
|
</opc:OutputArguments>
|
|
</opc:Method>
|
|
|
|
<opc:Method SymbolicName="ConcatMethodType">
|
|
<opc:Description>Returns left + right.</opc:Description>
|
|
<opc:InputArguments>
|
|
<opc:Argument Name="left" DataType="ua:String">
|
|
<opc:Description>Left-hand string.</opc:Description>
|
|
</opc:Argument>
|
|
<opc:Argument Name="right" DataType="ua:String">
|
|
<opc:Description>Right-hand string.</opc:Description>
|
|
</opc:Argument>
|
|
</opc:InputArguments>
|
|
<opc:OutputArguments>
|
|
<opc:Argument Name="result" DataType="ua:String">
|
|
<opc:Description>Concatenated value.</opc:Description>
|
|
</opc:Argument>
|
|
</opc:OutputArguments>
|
|
</opc:Method>
|
|
|
|
<!--
|
|
CalculatorType binds the three method types as Mandatory children so
|
|
every CalculatorType instance exposes the Add/Multiply/Concat
|
|
methods at fixed browse paths. The predefined Calculator instance
|
|
just below uses CalculatorType so users only need to wire one set
|
|
of OnCall handlers.
|
|
-->
|
|
<opc:ObjectType SymbolicName="CalculatorType" BaseType="ua:BaseObjectType">
|
|
<opc:Description>An object type that exposes Add/Multiply/Concat methods exercising the typed fluent OnCall surface.</opc:Description>
|
|
<opc:Children>
|
|
<opc:Method SymbolicName="Add" TypeDefinition="AddMethodType" ModellingRule="Mandatory" />
|
|
<opc:Method SymbolicName="Multiply" TypeDefinition="MultiplyMethodType" ModellingRule="Mandatory" />
|
|
<opc:Method SymbolicName="Concat" TypeDefinition="ConcatMethodType" ModellingRule="Mandatory" />
|
|
</opc:Children>
|
|
</opc:ObjectType>
|
|
|
|
<!--
|
|
Predefined Calculator instance. The source generator surfaces it on
|
|
the typed fluent root as builder.Calculator, with the three method
|
|
children reachable via builder.Calculator.Add/.Multiply/.Concat.
|
|
-->
|
|
<opc:Object SymbolicName="Calculator" TypeDefinition="CalculatorType">
|
|
<opc:Description>A calculator exposing Add, Multiply and Concat under the Objects folder.</opc:Description>
|
|
<opc:References>
|
|
<opc:Reference IsInverse="true">
|
|
<opc:ReferenceType>ua:Organizes</opc:ReferenceType>
|
|
<opc:TargetId>ua:ObjectsFolder</opc:TargetId>
|
|
</opc:Reference>
|
|
</opc:References>
|
|
</opc:Object>
|
|
|
|
</opc:ModelDesign>
|