mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-16 21:02:51 +08:00
0374e19121
# Description _Describe the changes here to communicate to the maintainers why they should accept this pull request. By default - this will become the Commit message after merging and thus define history._ Add provider-backed MachineTool, bundled WMTP, GMS and CranesHoists companions using the existing Machinery/MachineVision fluent, DI and typed-client approach. **The PR is open/non-draft by user choice. Current head `ecc4a7d6ca3e8004cf28ab54da605da302d026bf` is mergeable and has 108 successful checks, six intentionally skipped checks, zero failures and zero pending checks. All five primary workflows completed successfully at that exact head.** | Family | Released specification/model | Packaging | | --- | --- | --- | | MachineTool | OPC 40501-1, 1.02.0 | Model, Server, Client and MCP; normal root versions | | WMTP | OPC 40505, 1.0.0 | Bundled in MachineTool; distinct CLR/wire namespace and independent WMTP-only hosting | | GMS | OPC 40210 reference 1.0.1, normative model 1.0.0 | Model, Server, Client and MCP; normal root versions | | CranesHoists | OPC 40020-1, 1.00 | Model, Server, Client and MCP; all four plus Debug variants forced preview | There are **12 new packable projects**. No separate WMTP package/profile/guide, root version bump, tag, release or package publication is included. Mandatory instance structure is the default; selected optional features require explicit providers. The implementation reuses Machinery results/jobs/files/ProcessValues and Robotics topology, including retained MachineTool Production, defined GMS jobs/parts, modern ISA95/Machinery jobs, shared-owner hosting and isolated instances alongside MachineVision. Runtime and integration fixes preserve raw quality/timestamps, coherent acquisition, namespace ownership, accepted-configuration state, borrowed-resource lifetime, session/node/file cleanup, terminal-value publication, event propagation and endpoint-aware capability publication. Firmware/licence transfer means provider acceptance, not installation/activation. Cancellation does not silently abort another caller's operation. The later upstream MCP expansion is integrated without losing either family set or its default-off privileged/live execution policy. ### Conformance and scope Canonical model inputs are pinned to UA-Nodeset revision `96a08945425d0295edb3607d2a38f6841ef44046`. **GMS upstream exception:** [Annex A.1](https://reference.opcfoundation.org/specs/OPC-40210/annex-a) makes the released NodeSet normative, but §12.3.2.7 requires undefined `GMS_ProductionStatisticsType`. Inherited statistics and defined jobs/parts are implemented without inventing a standard type/NodeId; the complete GMS Production facet is withheld. The requirement ledger records **102 positively evidenced CU rows, 96 directly negative-tested rows and six explicit negative-evidence limitations**. All 648 test-class/name/TRX links were independently resolved to passing cases. The six limitations concern Stacklight, retained legacy PowerOnDuration, Machinery PowerOnDuration, WorkingUnit, Obligation and MaintenanceMode. They are not claims that every invalid-input or hardware-control behavior was tested. The undefined GMS requirement is outside the 102 defined CUs. No external certification claim is made. Retained baseline complete-assembly line coverage, with generated code retained and no source exclusions: | Family | Model | Server | Client | | --- | ---: | ---: | ---: | | MachineTool/WMTP | 83.80% | 91.98% | 84.74% | | GMS | 95.51% | 90.63% | 88.38% | | CranesHoists | 92.76% | 94.45% | 92.24% | These nine measurements predate the later focused review fixes and merges; they are not relabelled as new `ecc4a7d6c` percentages. The current head's separate CI code-coverage check succeeded. No new exclusions or threshold relaxations were introduced. ## Related Issues - Fixes [#4764](https://github.com/OPCFoundation/UA-.NETStandard/issues/4764), the implementation/design and acceptance tracker. ## Checklist _Put an `x` in the boxes that apply. You can complete these step by step after opening the PR._ - [ ] 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. - [ ] I have verified that my changes do not introduce (new) build or analyzer warnings. - [ ] I ran **all** tests locally using the **UA.slnx** solution against at least .net **framework** and .net **10**, and all passed. - [ ] I fixed **all** failing and flaky tests in the CI pipelines and **all** CodeQL warnings. - [x] I have addressed **all** PR feedback received.
108 lines
8.5 KiB
XML
108 lines
8.5 KiB
XML
<Project>
|
|
<PropertyGroup>
|
|
<!--
|
|
A Debug-configuration pack renames every package to "<id>.Debug" (see
|
|
the per-project PackageId overrides), so classify on the base ID: the
|
|
Debug variant of a preview family must be pinned exactly like its
|
|
Release counterpart. Test-PreviewPackageId in
|
|
.azurepipelines/package-version-policy.ps1 strips the same suffix, and
|
|
validate-nuget-package-set.ps1 fails the build if the two classifiers
|
|
ever disagree.
|
|
-->
|
|
<_PreviewPackageBaseId>$([System.Text.RegularExpressions.Regex]::Replace('$(PackageId)', '\.Debug$', ''))</_PreviewPackageBaseId>
|
|
<_IsPreviewPackage Condition="'$(_PreviewPackageBaseId)' == '$(PackagePrefix).Opc.Ua.XRegistry' OR $([System.String]::Copy('$(_PreviewPackageBaseId)').StartsWith('$(PackagePrefix).Opc.Ua.XRegistry.'))">true</_IsPreviewPackage>
|
|
<_IsPreviewPackage Condition="'$(_PreviewPackageBaseId)' == '$(PackagePrefix).Opc.Ua.WotCon' OR $([System.String]::Copy('$(_PreviewPackageBaseId)').StartsWith('$(PackagePrefix).Opc.Ua.WotCon.'))">true</_IsPreviewPackage>
|
|
<_IsPreviewPackage Condition="'$(_PreviewPackageBaseId)' == '$(PackagePrefix).Opc.Ua.Vision.OpenUsd' OR $([System.String]::Copy('$(_PreviewPackageBaseId)').StartsWith('$(PackagePrefix).Opc.Ua.Vision.OpenUsd.'))">true</_IsPreviewPackage>
|
|
<_IsPreviewPackage Condition="'$(_PreviewPackageBaseId)' == '$(PackagePrefix).Opc.Ua.CranesHoists' OR $([System.String]::Copy('$(_PreviewPackageBaseId)').StartsWith('$(PackagePrefix).Opc.Ua.CranesHoists.'))">true</_IsPreviewPackage>
|
|
<_IsPreviewPackage Condition="'$(_PreviewPackageBaseId)' == '$(PackagePrefix).Opc.Ua.Robotics' OR $([System.String]::Copy('$(_PreviewPackageBaseId)').StartsWith('$(PackagePrefix).Opc.Ua.Robotics.'))">true</_IsPreviewPackage>
|
|
<_IsPreviewPackage Condition="'$(_PreviewPackageBaseId)' == '$(PackagePrefix).Opc.Ua.Redundancy' OR $([System.String]::Copy('$(_PreviewPackageBaseId)').StartsWith('$(PackagePrefix).Opc.Ua.Redundancy.'))">true</_IsPreviewPackage>
|
|
<_IsPreviewPackage Condition="'$(_PreviewPackageBaseId)' == '$(PackagePrefix).Opc.Ua.Positioning' OR $([System.String]::Copy('$(_PreviewPackageBaseId)').StartsWith('$(PackagePrefix).Opc.Ua.Positioning.'))">true</_IsPreviewPackage>
|
|
<_IsPreviewPackage Condition="'$(_PreviewPackageBaseId)' == '$(PackagePrefix).Opc.Ua.OpenUsd' OR $([System.String]::Copy('$(_PreviewPackageBaseId)').StartsWith('$(PackagePrefix).Opc.Ua.OpenUsd.'))">true</_IsPreviewPackage>
|
|
<_IsPreviewPackage Condition="'$(_PreviewPackageBaseId)' == '$(PackagePrefix).Opc.Ua.AI' OR $([System.String]::Copy('$(_PreviewPackageBaseId)').StartsWith('$(PackagePrefix).Opc.Ua.AI.'))">true</_IsPreviewPackage>
|
|
<_IsPreviewPackage Condition="'$(_PreviewPackageBaseId)' == '$(PackagePrefix).Opc.Ua.Mcp.Robotics' OR '$(_PreviewPackageBaseId)' == '$(PackagePrefix).Opc.Ua.Mcp.CranesHoists' OR '$(_PreviewPackageBaseId)' == '$(PackagePrefix).Opc.Ua.OpenUsd.Connector' OR '$(_PreviewPackageBaseId)' == '$(PackagePrefix).Opc.Ua.OpenUsd.Connector.Viewer'">true</_IsPreviewPackage>
|
|
<!--
|
|
On a canonical release/M.m branch build (NBGV_PublicRelease == 'True'),
|
|
common.props/version.props deliberately do NOT reference the
|
|
Nerdbank.GitVersioning package (Version/PackageVersion instead come from
|
|
NBGV_* environment variables set once per pipeline run by
|
|
.azurepipelines/set-version.ps1), so the GetBuildVersion target this
|
|
target would otherwise depend on does not exist in that build and a
|
|
literal "GetBuildVersion" DependsOnTargets would fail every release
|
|
build with MSB4057. Depend on it only in the local/dev path, where the
|
|
package IS referenced and Version/PackageVersion are computed
|
|
dynamically at build time rather than already resolved at evaluation
|
|
time.
|
|
-->
|
|
<_PreviewVersionDependsOn Condition="'$(NBGV_PublicRelease)' != 'True'">GetBuildVersion</_PreviewVersionDependsOn>
|
|
<GetPackageVersionDependsOn>
|
|
ApplyPreviewPackageVersion;
|
|
$(GetPackageVersionDependsOn)
|
|
</GetPackageVersionDependsOn>
|
|
<GenerateNuspecDependsOn>
|
|
ApplyPreviewPackageVersion;
|
|
$(GenerateNuspecDependsOn)
|
|
</GenerateNuspecDependsOn>
|
|
</PropertyGroup>
|
|
|
|
<!--
|
|
Keeps the package families listed above ("_IsPreviewPackage") on the
|
|
preview channel even once the root version.json commit is an exact
|
|
stable release such as "2.0.0" on release/2.0. See
|
|
docs/ReleaseProcess.md for the release-branch/version model this
|
|
implements and preview-version.props for how the numbered suffix below
|
|
is chosen.
|
|
-->
|
|
<Target Name="ApplyPreviewPackageVersion"
|
|
DependsOnTargets="$(_PreviewVersionDependsOn)"
|
|
Condition="'$(_IsPreviewPackage)' == 'true' AND '$(IsPackable)' == 'true'">
|
|
<PropertyGroup>
|
|
<_PreviewSourceVersion Condition="'$(PackageVersion)' != ''">$(PackageVersion)</_PreviewSourceVersion>
|
|
<_PreviewSourceVersion Condition="'$(_PreviewSourceVersion)' == '' AND '$(NuGetPackageVersion)' != ''">$(NuGetPackageVersion)</_PreviewSourceVersion>
|
|
<_PreviewSourceVersion Condition="'$(_PreviewSourceVersion)' == ''">$(Version)</_PreviewSourceVersion>
|
|
<!-- Case 1: the root version is already an in-development preview
|
|
(e.g. "2.0.0-preview.42" or "2.0.1-preview.7+gabcdef" while
|
|
master or a release branch is not yet at a stable commit) - every
|
|
package, selected or not, already carries that same tag. Nothing
|
|
to do. -->
|
|
<_PreviewPackageVersion
|
|
Condition="$([System.String]::Copy('$(_PreviewSourceVersion)').Contains('-preview'))">$(_PreviewSourceVersion)</_PreviewPackageVersion>
|
|
<!-- Case 2a: the root version's only prerelease identifier is a commit
|
|
id (e.g. "2.0.0-gabcdef0123"). Nerdbank.GitVersioning produces
|
|
this for a stable version.json built from a non-public-release
|
|
ref, such as master briefly carrying "2.0.0". Case 2 would turn it
|
|
into "2.0.0-preview.gabcdef0123", and SemVer 2 ranks the
|
|
alphanumeric "g..." identifier above every numeric one, so it
|
|
would outrank every "-preview.N" ever released from that base -
|
|
permanently, because published versions are immutable. Number it
|
|
0 instead so it sorts below any committed
|
|
PreviewPackageBuildNumber. ConvertTo-PreviewPackageVersion in
|
|
.azurepipelines/package-version-policy.ps1 applies the same rule. -->
|
|
<_PreviewPackageVersion
|
|
Condition="'$(_PreviewPackageVersion)' == '' AND $([System.Text.RegularExpressions.Regex]::IsMatch('$(_PreviewSourceVersion)', '^[^-+]+-g[0-9a-f]+(\+.*)?$'))">$([System.Text.RegularExpressions.Regex]::Replace('$(_PreviewSourceVersion)', '^([^-+]+)-(g[0-9a-f]+)', '$1-preview.0.$2'))</_PreviewPackageVersion>
|
|
<!-- Case 2: the root version carries some other prerelease label
|
|
(for example a hypothetical "-rc.1"). Preserve that label but
|
|
mark the selected families as preview under it too. -->
|
|
<_PreviewPackageVersion
|
|
Condition="'$(_PreviewPackageVersion)' == '' AND $([System.String]::Copy('$(_PreviewSourceVersion)').Contains('-'))">$([System.String]::Copy('$(_PreviewSourceVersion)').Replace('-', '-preview.'))</_PreviewPackageVersion>
|
|
<!-- Case 3: the root version has build metadata but no prerelease
|
|
label at all (e.g. "2.0.0+gabcdef"). SemVer requires build
|
|
metadata to stay last, so insert the tag before the "+" rather
|
|
than appending after it. -->
|
|
<_PreviewPackageVersion
|
|
Condition="'$(_PreviewPackageVersion)' == '' AND $([System.String]::Copy('$(_PreviewSourceVersion)').Contains('+'))">$([System.String]::Copy('$(_PreviewSourceVersion)').Replace('+', '-preview.$(PreviewPackageBuildNumber)+'))</_PreviewPackageVersion>
|
|
<!-- Case 4: the root version is an exact stable release (no
|
|
prerelease label or build metadata at all, e.g. "2.0.0" once
|
|
release/2.0 has been stabilized) - synthesize the numbered
|
|
preview suffix explicitly, since there is no git-height
|
|
placeholder left in the string to reuse. See
|
|
preview-version.props for how the number is chosen. -->
|
|
<_PreviewPackageVersion
|
|
Condition="'$(_PreviewPackageVersion)' == ''">$(_PreviewSourceVersion)-preview.$(PreviewPackageBuildNumber)</_PreviewPackageVersion>
|
|
<Version>$(_PreviewPackageVersion)</Version>
|
|
<PackageVersion>$(_PreviewPackageVersion)</PackageVersion>
|
|
<NuGetPackageVersion>$(_PreviewPackageVersion)</NuGetPackageVersion>
|
|
<NBGV_NuGetPackageVersion>$(_PreviewPackageVersion)</NBGV_NuGetPackageVersion>
|
|
</PropertyGroup>
|
|
</Target>
|
|
</Project>
|