mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-28 22:55:49 +08:00
Introduces a consistent `Microsoft.Extensions.DependencyInjection`
surface across the OPC UA libraries. Every consumer starts from a single
root entry point and chains feature-specific extension methods on a
unified builder. PubSub is intentionally excluded per the original
scope.
```csharp
services
.AddOpcUa() // Stack/Opc.Ua.Core
.AddServer(o => { /* … */ }) // Libraries/Opc.Ua.Server
.AddNodeManager<MyNodeManagerFactory>()
.Services
.AddOpcUa()
.AddClient(o => { /* … */ }); // Libraries/Opc.Ua.Client
```
Manual non-DI constructors (`new ApplicationInstance(...)`, `new
StandardServer(...)`, `new LdsServer(...)`, `new ManagedSession(...)`,
etc.) remain unchanged — DI is purely additive for users who want the
.NET Generic Host to own application lifetime, logging, and
configuration.
### What ships
| Feature library | Method on `IOpcUaBuilder` | Returns |
|----------------------------------------------|-------------------------------------------|--------------------------|
| `Opc.Ua.Core` (root) | `services.AddOpcUa()` | `IOpcUaBuilder` |
| `Opc.Ua.Configuration` | `builder.AddApplicationInstance()` |
`IOpcUaBuilder` |
| `Opc.Ua.Client` | `builder.AddClient(opt => …)` |
`IOpcUaClientBuilder` |
| `Opc.Ua.Client.ComplexTypes` | `builder.AddComplexTypes()` |
`IOpcUaBuilder` |
| `Opc.Ua.Server` | `builder.AddServer(opt => …)` |
`IOpcUaServerBuilder` |
| `Opc.Ua.Gds.Client.Common` | `builder.AddGdsClient(opt => …)` |
`IGdsClientBuilder` |
| `Opc.Ua.Gds.Server.Common` | `builder.AddGdsServer(opt => …)` |
`IGdsServerBuilder` |
| `Opc.Ua.Lds.Server` | `builder.AddLdsServer(opt => …)` |
`ILdsServerBuilder` |
| `Opc.Ua.WotCon.Server` | `builder.AddWotConServer(opt => …)` |
`IWotConServerBuilder` |
| `Opc.Ua.WotCon.Client` | `builder.AddWotConClient(opt => …)` |
`IOpcUaBuilder` |
### Design highlights
- **Binary-safe inheritance** — `IOpcUaBuilder :
IDependencyInjectionBuilder` so any existing `AddLogging(this
IDependencyInjectionBuilder)` callers keep compiling unchanged.
- **Three options overloads** per feature: `Action<TOptions>`
(AOT-safe), `IConfiguration`, `IConfigurationSection`. The two binding
overloads are annotated `[RequiresUnreferencedCode]` /
`[RequiresDynamicCode]`. Section names follow the `OpcUa:<Feature>`
convention (`OpcUa:Server`, `OpcUa:Client`, `OpcUa:Gds:Server`,
`OpcUa:Lds`, …).
- **Generic Host integration** — each server feature (regular, GDS, LDS)
registers its own `BackgroundService`. Marker singletons throw
`InvalidOperationException` on duplicate `.AddServer()` /
`.AddGdsServer()` / `.AddLdsServer()`. A regular server + GDS + LDS can
coexist in one host; each owns its own `IApplicationInstance` produced
by a shared `IApplicationInstanceFactory` so PKI roots, endpoints, and
certificates don't collide.
- **Registration isolation** — node managers registered under the
regular server via `.AddNodeManager<T>()` are wrapped in
`OpcUaServerNodeManagerRegistration` so they don't bleed into the GDS /
LDS hosted services.
- **WoT Connectivity server** composes on top of the regular server
feature: `.AddServer(...).AddWotConServer(...)` registers
`WotConnectivityNodeManagerFactory` as a server node-manager
registration.
- **Unified telemetry** — `services.AddOpcUa()` registers
`ITelemetryContext` via `TryAddSingleton` using a new
`ServiceProviderTelemetryContext` that resolves the host's
`ILoggerFactory` on first use. User-supplied registrations win.
### Removed pre-release DI surface
The pre-release `services.AddOpcUaServer(...)`,
`services.AddOpcUaClient(...)`, `services.AddOpcUaGdsClient(...)`
extensions are deleted. `IClientBuilder` was renamed to
`IOpcUaClientBuilder`. In-repo callers migrated:
- `Applications/MinimalCalcServer/Program.cs`
- `Applications/MinimalBoilerServer/Program.cs`
- `Tests/Opc.Ua.Client.Tests/ClientBuilder/OpcUaClientBuilderTests.cs`
(renamed from `OpcUaClientServiceCollectionExtensionsTests.cs`)
- Docs (`MigrationGuide.md`, `Sessions.md`,
`SourceGeneratedNodeManagers.md`, README, new
`Docs/DependencyInjection.md`)
### csproj audit
Pruned every redundant `Microsoft.Extensions.*` package reference.
`Opc.Ua.Core` already pulls in `Microsoft.Extensions.Diagnostics` and
`Microsoft.Extensions.Logging`, which transitively expose DI / Options /
Configuration.Abstractions / Options.ConfigurationExtensions to every
downstream library. Only `Microsoft.Extensions.Hosting.Abstractions`
stays explicit on the server libraries (it isn't transitively
available). Also pruned redundant `System.Formats.Asn1` (Bindings.Https)
and `System.Collections.Immutable` (Security.Certificates).
### Tests
50 new tests in eight projects:
| Project | Tests |
|--------------------------------------|-------|
| `Opc.Ua.Core.Tests` | 12 |
| `Opc.Ua.Client.Tests` | 4 |
| `Opc.Ua.Client.ComplexTypes.Tests` | 3 |
| `Opc.Ua.WotCon.Tests` | 6 |
| `Opc.Ua.Lds.Tests` | 5 |
| `Opc.Ua.Gds.Tests` | 6 |
| `Opc.Ua.Server.Tests` (integration) | 10 |
| `Opc.Ua.Aot.Tests` (smoke) | 4 |
| **Total** | **50** |
Combined-host integration tests cover the rubber-duck-driven scenarios:
telemetry-context override across legacy and new entry paths, server +
GDS + LDS coexistence with distinct ports and PKI roots,
duplicate-registration rejection, and node-manager isolation across
features.
### AOT
`dotnet publish Tests/Opc.Ua.Aot.Tests -c Release -r win-x64
--self-contained` reports zero `IL2026` / `IL3050` / `IL2104` warnings
from the new DI surface. All generic registrations carry
`[DynamicallyAccessedMembers(PublicConstructors)]`. AOT consumers stick
to the `Action<TOptions>` overload exclusively; the new
`Tests/Opc.Ua.Aot.Tests/HostingAotTests.cs` smoke fixture exercises this
end-to-end.
278 lines
4.2 KiB
Plaintext
278 lines
4.2 KiB
Plaintext
## Ignore Visual Studio temporary files, build results, and
|
|
## files generated by popular Visual Studio add-ons.
|
|
|
|
# User-specific files
|
|
*.suo
|
|
*.user
|
|
*.userosscache
|
|
*.sln.docstates
|
|
|
|
# User-specific files (MonoDevelop/Xamarin Studio)
|
|
*.userprefs
|
|
|
|
# Build results
|
|
[Dd]ebug/
|
|
[Dd]ebugPublic/
|
|
[Rr]elease/
|
|
[Rr]eleases/
|
|
x64/
|
|
x86/
|
|
bld/
|
|
[Bb]in/
|
|
[Oo]bj/
|
|
|
|
# Visual Studio 2015 cache/options directory
|
|
.vs/
|
|
# Uncomment if you have tasks that create the project's static files in wwwroot
|
|
#wwwroot/
|
|
|
|
# dotnet tool install directory
|
|
.store
|
|
|
|
# Rider cache/options directory
|
|
.idea/
|
|
|
|
# MSTest test Results
|
|
[Tt]est[Rr]esult*/
|
|
[Bb]uild[Ll]og.*
|
|
|
|
# NUNIT
|
|
*.VisualState.xml
|
|
TestResult.xml
|
|
|
|
# Build Results of an ATL Project
|
|
[Dd]ebugPS/
|
|
[Rr]eleasePS/
|
|
dlldata.c
|
|
|
|
# DNX
|
|
project.lock.json
|
|
artifacts/
|
|
|
|
*_i.c
|
|
*_p.c
|
|
*_i.h
|
|
*.ilk
|
|
*.meta
|
|
*.obj
|
|
*.pch
|
|
*.pdb
|
|
*.pgc
|
|
*.pgd
|
|
*.rsp
|
|
*.sbr
|
|
*.tlb
|
|
*.tli
|
|
*.tlh
|
|
*.tmp
|
|
*.tmp_proj
|
|
*.log
|
|
*.vspscc
|
|
*.vssscc
|
|
.builds
|
|
*.pidb
|
|
*.svclog
|
|
*.scc
|
|
*.nettrace
|
|
|
|
|
|
# Chutzpah Test files
|
|
_Chutzpah*
|
|
|
|
# Visual C++ cache files
|
|
ipch/
|
|
*.aps
|
|
*.ncb
|
|
*.opendb
|
|
*.opensdf
|
|
*.sdf
|
|
*.cachefile
|
|
|
|
# Visual Studio profiler
|
|
*.psess
|
|
*.vsp
|
|
*.vspx
|
|
*.sap
|
|
|
|
# TFS 2012 Local Workspace
|
|
$tf/
|
|
|
|
# Guidance Automation Toolkit
|
|
*.gpState
|
|
|
|
# ReSharper is a .NET coding add-in
|
|
_ReSharper*/
|
|
*.[Rr]e[Ss]harper
|
|
*.DotSettings.user
|
|
|
|
# JustCode is a .NET coding add-in
|
|
.JustCode
|
|
|
|
# TeamCity is a build add-in
|
|
_TeamCity*
|
|
|
|
# DotCover is a Code Coverage Tool
|
|
*.dotCover
|
|
|
|
# NCrunch
|
|
_NCrunch_*
|
|
.*crunch*.local.xml
|
|
nCrunchTemp_*
|
|
|
|
# MightyMoose
|
|
*.mm.*
|
|
AutoTest.Net/
|
|
|
|
# Web workbench (sass)
|
|
.sass-cache/
|
|
|
|
# Installshield output folder
|
|
[Ee]xpress/
|
|
|
|
# CodeCoverage
|
|
CodeCoverage/
|
|
TestResults/
|
|
|
|
# DocProject is a documentation generator add-in
|
|
DocProject/buildhelp/
|
|
DocProject/Help/*.HxT
|
|
DocProject/Help/*.HxC
|
|
DocProject/Help/*.hhc
|
|
DocProject/Help/*.hhk
|
|
DocProject/Help/*.hhp
|
|
DocProject/Help/Html2
|
|
DocProject/Help/html
|
|
|
|
# Click-Once directory
|
|
publish/
|
|
publish-aot/
|
|
|
|
# Publish Web Output
|
|
*.[Pp]ublish.xml
|
|
*.azurePubxml
|
|
*.pubxml
|
|
*.publishproj
|
|
|
|
# NuGet Packages
|
|
*.nupkg
|
|
# The packages folder can be ignored because of Package Restore
|
|
**/packages/*
|
|
# except build/, which is used as an MSBuild target.
|
|
!**/packages/build/
|
|
# Uncomment if necessary however generally it will be regenerated when needed
|
|
#!**/packages/repositories.config
|
|
# NuGet v3's project.json files produces more ignoreable files
|
|
*.nuget.props
|
|
*.nuget.targets
|
|
|
|
# Microsoft Azure Build Output
|
|
csx/
|
|
*.build.csdef
|
|
|
|
# Microsoft Azure Emulator
|
|
ecf/
|
|
rcf/
|
|
|
|
# Microsoft Azure ApplicationInsights config file
|
|
ApplicationInsights.config
|
|
|
|
# Windows Store app package directory
|
|
AppPackages/
|
|
BundleArtifacts/
|
|
|
|
# Visual Studio cache files
|
|
# files ending in .cache can be ignored
|
|
*.[Cc]ache
|
|
# but keep track of directories ending in .cache
|
|
!*.[Cc]ache/
|
|
|
|
# Others
|
|
ClientBin/
|
|
_publish/
|
|
~$*
|
|
*~
|
|
*.dbmdl
|
|
*.dbproj.schemaview
|
|
*.pfx
|
|
*.publishsettings
|
|
node_modules/
|
|
Generated_Code/
|
|
generated/
|
|
|
|
# Backup & report files from converting an old project file
|
|
# to a newer Visual Studio version. Backup files are not needed,
|
|
# because we have git ;-)
|
|
_UpgradeReport_Files/
|
|
Backup*/
|
|
UpgradeLog*.XML
|
|
UpgradeLog*.htm
|
|
|
|
# SQL Server files
|
|
*.mdf
|
|
*.ldf
|
|
|
|
# Business Intelligence projects
|
|
*.rdl.data
|
|
*.bim.layout
|
|
*.bim_*.settings
|
|
|
|
# Microsoft Fakes
|
|
FakesAssemblies/
|
|
|
|
# GhostDoc plugin setting file
|
|
*.GhostDoc.xml
|
|
|
|
# Node.js Tools for Visual Studio
|
|
.ntvs_analysis.dat
|
|
|
|
# Visual Studio 6 build log
|
|
*.plg
|
|
|
|
# Visual Studio 6 workspace options file
|
|
*.opt
|
|
|
|
# Visual Studio LightSwitch build output
|
|
**/*.HTMLClient/GeneratedArtifacts
|
|
**/*.DesktopClient/GeneratedArtifacts
|
|
**/*.DesktopClient/ModelManifest.xml
|
|
**/*.Server/GeneratedArtifacts
|
|
**/*.Server/ModelManifest.xml
|
|
_Pvt_Extensions
|
|
|
|
# Paket dependency manager
|
|
.paket/paket.exe
|
|
|
|
# FAKE - F# Make
|
|
.fake/
|
|
|
|
|
|
# BenchmarkDotNet Artifacts
|
|
BenchmarkDotNet.Artifacts
|
|
|
|
# OPC UA Sample app certificate stores
|
|
OPC\ Foundation/
|
|
*.der
|
|
*.pfx
|
|
/UA-NetStandard.VC.db
|
|
*.log.txt
|
|
/ComIOP/Wrapper/ProxyServer/OpcUaComProxyServer.h
|
|
*.VC.db
|
|
/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll
|
|
/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.xml
|
|
/SampleApplications/Samples/OPCOutput
|
|
!**/Assets/*.*
|
|
*.Nodeset2.xml.zip
|
|
testEnvironments.json
|
|
|
|
# UA Fuzzing findings folders
|
|
/Fuzzing/**/findings/
|
|
/Fuzzing/**/Testcases/
|
|
!/Fuzzing/**/Testcases/*.bin
|
|
**/Properties/launchSettings.json
|
|
|
|
aot-publish*.txt
|
|
aot.binlog
|
|
|
|
client-test-log.txt
|
|
mac-*.log
|